Merge branch 'v2-beta-dev' into enh/dx-362-inquirer-v12

Author: harshithad0703

.talismanrc

@@ -1,8 +1,8 @@
 fileignoreconfig:
   - filename: pnpm-lock.yaml
-    checksum: 160c630237c8460589759ddf1a86c3e932b18986c9bbbd96ff69d3bf3f61eb3c
+    checksum: 2845e79bd5176da75694132383ef026ab8f1a7dc31a1e0472c3950f7d2df0a2b
   - filename: package-lock.json
-    checksum: a230db8eb9df6f77e249d47c14b54ac18f4b971c25358d2e0a17e22eb1bd1b48
+    checksum: a227bddb54a87ad21f9d1400fb4f9f2b98a87153d8263200dd3ce3de9b29b9d9
   - filename: packages/contentstack-audit/src/modules/entries.ts
     checksum: 8ad10d72522433bc5ce66079248aa2dabae1758ee63335024efd8526d76dd885
   - filename: packages/contentstack-config/src/utils/region-handler.ts

package-lock.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "@contentstack/cli-command": "~2.0.0-beta",
     "@contentstack/cli-utilities": "~2.0.0-beta",
-    "@contentstack/cli-variants": "~2.0.0-beta.5",
+    "@contentstack/cli-variants": "~2.0.0-beta.6",
     "@oclif/core": "^4.8.0",
     "async": "^3.2.6",
     "big-json": "^3.2.0",

packages/contentstack-export/package.json

@@ -8,7 +8,7 @@
     "@contentstack/cli-audit": "~2.0.0-beta.5",
     "@contentstack/cli-command": "~2.0.0-beta",
     "@contentstack/cli-utilities": "~2.0.0-beta",
-    "@contentstack/cli-variants": "~2.0.0-beta.5",
+    "@contentstack/cli-variants": "~2.0.0-beta.6",
     "@oclif/core": "^4.3.0",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",

packages/contentstack-import/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-variants",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.6",
   "description": "Variants plugin",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

packages/contentstack-variants/package.json

@@ -272,9 +272,11 @@ export default class Experiences extends PersonalizationAdapter<ImportConfig> {
       let versionReqObj = lookUpAudiences(version, this.audiencesUid) as CreateExperienceVersionInput;
       versionReqObj = lookUpEvents(version, this.eventsUid) as CreateExperienceVersionInput;
 
-      if (versionReqObj && versionReqObj.status) {
+      if (versionReqObj && versionReqObj.status && (versionReqObj.variants?.length ?? 0) > 0) {
         versionMap[versionReqObj.status] = versionReqObj;
         log.debug(`Mapped version with status: ${versionReqObj.status}`, this.config.context);
+      } else if (versionReqObj?.status && !(versionReqObj.variants?.length ?? 0)) {
+        log.warn(`Skipping version ${versionReqObj.status}: no valid variants (all had unmapped Lytics audiences)`, this.config.context);
       }
     });
 

packages/contentstack-variants/src/import/experiences.ts

@@ -65,11 +65,11 @@ export const lookUpAudiences = (
       const expVariations = experience.variants[index];
       log.debug(`Processing variant ${index + 1}/${experience.variants.length} of type: ${expVariations['__type']}`);
 
-      if (expVariations['__type'] === 'SegmentedVariant' && expVariations?.audiences?.length) {
-        log.debug(`Found ${expVariations.audiences.length} audiences in SegmentedVariant`);
-        updateAudiences(expVariations.audiences, audiencesUid);
-        
-        if (!expVariations.audiences.length) {
+      if (expVariations['__type'] === 'SegmentedVariant' && (expVariations?.audiences?.length || expVariations?.lyticsAudiences?.length)) {
+        log.debug(`Found ${expVariations.audiences?.length ?? 0} audiences in SegmentedVariant`);
+        if (expVariations?.audiences?.length) updateAudiences(expVariations.audiences, audiencesUid);
+        if (expVariations?.lyticsAudiences?.length) updateAudiences(expVariations.lyticsAudiences, audiencesUid);
+        if (!(expVariations.audiences?.length || expVariations?.lyticsAudiences?.length)) {
           log.warn('No audiences remaining after mapping. Removing variant.');
           experience.variants.splice(index, 1);
         }

packages/contentstack-variants/src/utils/audiences-helper.ts

@@ -38,7 +38,7 @@
     "@contentstack/cli-launch": "^1.9.6",
     "@contentstack/cli-migration": "~2.0.0-beta.5",
     "@contentstack/cli-utilities": "~2.0.0-beta",
-    "@contentstack/cli-variants": "~2.0.0-beta.5",
+    "@contentstack/cli-variants": "~2.0.0-beta.6",
     "@contentstack/management": "~1.27.6",
     "@contentstack/utils": "~1.7.0",
     "@oclif/core": "^4.8.0",