Merge pull request #1699 from contentstack/fix/DX-1781

Fix/dx 1781

Author: cs-raj

package-lock.json

@@ -6,7 +6,7 @@
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
     "@contentstack/cli-command": "~1.3.2",
-    "@contentstack/cli-variants": "~1.1.3",
+    "@contentstack/cli-variants": "~1.1.4",
     "@contentstack/cli-utilities": "~1.8.0",
     "@oclif/core": "^3.27.0",
     "async": "^3.2.6",

packages/contentstack-export/package.json

@@ -9,7 +9,7 @@
     "@contentstack/cli-command": "~1.3.2",
     "@contentstack/cli-utilities": "~1.8.0",
     "@contentstack/management": "~1.18.4",
-    "@contentstack/cli-variants": "~1.1.3",
+    "@contentstack/cli-variants": "~1.1.4",
     "@oclif/core": "^3.27.0",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",

packages/contentstack-import/package.json

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

packages/contentstack-variants/package.json

@@ -45,7 +45,7 @@ export default class Experiences extends PersonalizationAdapter<ImportConfig> {
     const conf: APIConfig = {
       config,
       baseURL: config.modules.personalize.baseURL[config.region.name],
-      headers: { 'X-Project-Uid': config.modules.personalize.project_id},
+      headers: { 'X-Project-Uid': config.modules.personalize.project_id },
       cmaConfig: {
         baseURL: config.region.cma + `/v3`,
         headers: { api_key: config.apiKey },
@@ -141,8 +141,11 @@ export default class Experiences extends PersonalizationAdapter<ImportConfig> {
         const jobRes = await this.validateVariantGroupAndVariantsCreated();
         fsUtil.writeFile(this.cmsVariantPath, this.cmsVariants);
         fsUtil.writeFile(this.cmsVariantGroupPath, this.cmsVariantGroups);
-        if (jobRes)
+        if (jobRes) {
           this.log(this.config, this.$t(this.messages.CREATE_SUCCESS, { module: 'Variant & Variant groups' }), 'info');
+        } else {
+          this.personalizeConfig.importData = false;
+        }
 
         if (this.personalizeConfig.importData) {
           this.log(this.config, this.messages.UPDATING_CT_IN_EXP, 'info');
@@ -162,7 +165,11 @@ export default class Experiences extends PersonalizationAdapter<ImportConfig> {
    * function import experience versions from a JSON file and creates them in the project.
    */
   async importExperienceVersions(experience: ExperienceStruct, oldExperienceUid: string) {
-    const versionsPath = resolve(sanitizePath(this.experiencesDirPath), 'versions', `${sanitizePath(oldExperienceUid)}.json`);
+    const versionsPath = resolve(
+      sanitizePath(this.experiencesDirPath),
+      'versions',
+      `${sanitizePath(oldExperienceUid)}.json`,
+    );
 
     if (!existsSync(versionsPath)) {
       return;
@@ -231,7 +238,7 @@ export default class Experiences extends PersonalizationAdapter<ImportConfig> {
     try {
       const promises = this.pendingVariantAndVariantGrpForExperience.map(async (expUid) => {
         const expRes = await this.getExperience(expUid);
-        if (expRes?._cms) {
+        if (expRes?._cms && expRes?._cms?.variantGroup && Object.keys(expRes._cms.variants).length > 0) {
           this.cmsVariants[expUid] = expRes._cms?.variants ?? {};
           this.cmsVariantGroups[expUid] = expRes._cms?.variantGroup ?? {};
           return expUid; // Return the expUid for filtering later

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

@@ -28,8 +28,13 @@ export default class Project extends PersonalizationAdapter<ImportConfig> {
   async import() {
     const personalize = this.config.modules.personalize;
     const { dirName, fileName } = personalize.projects;
-    const projectPath = join(sanitizePath(this.config.data), sanitizePath(personalize.dirName), sanitizePath(dirName), sanitizePath(fileName));
-    
+    const projectPath = join(
+      sanitizePath(this.config.data),
+      sanitizePath(personalize.dirName),
+      sanitizePath(dirName),
+      sanitizePath(fileName),
+    );
+
     if (existsSync(projectPath)) {
       const projects = JSON.parse(readFileSync(projectPath, 'utf8')) as CreateProjectInput[];
 
@@ -46,7 +51,10 @@ export default class Project extends PersonalizationAdapter<ImportConfig> {
             description: project.description,
             connectedStackApiKey: this.config.apiKey,
           }).catch(async (error) => {
-            if (error.includes('personalization.PROJECTS.DUPLICATE_NAME') || error.includes('personalize.PROJECTS.DUPLICATE_NAME')) {
+            if (
+              error.includes('personalization.PROJECTS.DUPLICATE_NAME') ||
+              error.includes('personalize.PROJECTS.DUPLICATE_NAME')
+            ) {
               const projectName = await askProjectName('Copy Of ' + (newName || project.name));
               return await createProject(projectName);
             }

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

@@ -39,7 +39,7 @@
     "@contentstack/cli-migration": "~1.6.4",
     "@contentstack/cli-utilities": "~1.8.0",
     "@contentstack/management": "~1.18.4",
-    "@contentstack/cli-variants": "~1.1.3",
+    "@contentstack/cli-variants": "~1.1.4",
     "@contentstack/cli-cm-import-setup": "1.0.0-beta.1",
     "@oclif/core": "^3.27.0",
     "@oclif/plugin-help": "^5",