Merge pull request #1444 from contentstack/staging-to-development

Staging to development
contentstack · Jun 26, 2024 · 9241e7e · 9241e7e
2 parents f644dc4 + 701f66b
commit 9241e7e
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 72 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-import/README.md b/packages/contentstack-import/README.md
@@ -79,7 +79,7 @@ FLAGS
   -k, --stack-api-key=<value>       API key of the target stack
   -m, --module=<value>              [optional] specific module name
   -y, --yes                         [optional] Override marketplace prompts
-  --exclude-global-modules          Excluded the Module that are branch independent from the import
+  --exclude-global-modules          Excludes the branch-independent module from the import operation
   --import-webhook-status=<option>  [default: disable] [optional] Webhook state
                                     <options: disable|current>
   --replace-existing                Replaces the existing module in the target stack.
@@ -129,7 +129,7 @@ FLAGS
   -k, --stack-api-key=<value>       API key of the target stack
   -m, --module=<value>              [optional] specific module name
   -y, --yes                         [optional] Override marketplace prompts
-  --exclude-global-modules          Excluded the Module that are branch independent from the import
+  --exclude-global-modules          Excludes the branch-independent module from the import operation
   --import-webhook-status=<option>  [default: disable] [optional] Webhook state
                                     <options: disable|current>
   --replace-existing                Replaces the existing module in the target stack.

diff --git a/packages/contentstack-import/src/import/modules/environments.ts b/packages/contentstack-import/src/import/modules/environments.ts
@@ -20,7 +20,7 @@ export default class ImportEnvironments extends BaseClass {
 
   constructor({ importConfig, stackAPIClient }: ModuleClassParams) {
     super({ importConfig, stackAPIClient });
-    this.environmentsConfig =importConfig.modules.environments;
+    this.environmentsConfig = importConfig.modules.environments;
     this.mapperDirPath = join(this.importConfig.backupDir, 'mapper', 'environments');
     this.environmentsFolderPath = join(this.importConfig.backupDir, this.environmentsConfig.dirName);
     this.envUidMapperPath = join(this.mapperDirPath, 'uid-mapping.json');
@@ -40,7 +40,10 @@ export default class ImportEnvironments extends BaseClass {
 
     //Step1 check folder exists or not
     if (fileHelper.fileExistsSync(this.environmentsFolderPath)) {
-      this.environments = fsUtil.readFile(join(this.environmentsFolderPath, 'environments.json'), true) as Record<string,unknown>;
+      this.environments = fsUtil.readFile(join(this.environmentsFolderPath, 'environments.json'), true) as Record<
+        string,
+        unknown
+      >;
     } else {
       log(this.importConfig, `No such file or directory - '${this.environmentsFolderPath}'`, 'error');
       return;
@@ -79,10 +82,13 @@ export default class ImportEnvironments extends BaseClass {
       fsUtil.writeFile(this.envUidMapperPath, this.envUidMapper);
     };
 
-    const onReject = ({ error, apiData }: any) => {
+    const onReject = async ({ error, apiData }: any) => {
       const err = error?.message ? JSON.parse(error.message) : error;
-      const { name } = apiData;
+      const { name, uid } = apiData;
       if (err?.errors?.name) {
+        const res = await this.getEnvDetails(name);
+        this.envUidMapper[uid] = res?.uid || ' ';
+        fsUtil.writeFile(this.envUidMapperPath, this.envUidMapper);
         log(this.importConfig, `Environment '${name}' already exists`, 'info');
       } else {
         this.envFailed.push(apiData);
@@ -128,4 +134,14 @@ export default class ImportEnvironments extends BaseClass {
     }
     return apiOptions;
   }
+
+  async getEnvDetails(envName: string) {
+    return await this.stack
+      .environment(envName)
+      .fetch()
+      .then((data: any) => data)
+      .catch((error: any) => {
+        log(this.importConfig, `Failed to fetch environment details. ${formatError(error)}`, 'error');
+      });
+  }
 }
diff --git a/packages/contentstack-import/src/import/modules/taxonomies.ts b/packages/contentstack-import/src/import/modules/taxonomies.ts
@@ -85,14 +85,20 @@ export default class ImportTaxonomies extends BaseClass {
 
     const onReject = ({ error, apiData }: any) => {
       const taxonomyUID = apiData?.taxonomy?.uid;
-      if (error?.errorMessage || error?.message) {
-        const errorMsg = error?.errorMessage || error?.errors?.taxonomy || error?.errors?.term || error?.message;
-        log(this.importConfig, `Taxonomy '${taxonomyUID}' failed to be import! ${errorMsg}`, 'error');
+      if (error?.status === 409 && error?.statusText === 'Conflict') {
+        log(this.importConfig, `Taxonomy '${taxonomyUID}' already exists!`, 'info');
+        this.createdTaxonomies[taxonomyUID] = apiData?.taxonomy;
+        this.createdTerms[taxonomyUID] = apiData?.terms;
       } else {
-        log(this.importConfig, `Taxonomy '${taxonomyUID}' failed to be import! ${formatError(error)}`, 'error');
+        if (error?.errorMessage || error?.message) {
+          const errorMsg = error?.errorMessage || error?.errors?.taxonomy || error?.errors?.term || error?.message;
+          log(this.importConfig, `Taxonomy '${taxonomyUID}' failed to be import! ${errorMsg}`, 'error');
+        } else {
+          log(this.importConfig, `Taxonomy '${taxonomyUID}' failed to be import! ${formatError(error)}`, 'error');
+        }
+        this.failedTaxonomies[taxonomyUID] = apiData?.taxonomy;
+        this.failedTerms[taxonomyUID] = apiData?.terms;
       }
-      this.failedTaxonomies[taxonomyUID] = apiData?.taxonomy;
-      this.failedTerms[taxonomyUID] = apiData?.terms;
     };
 
     await this.makeConcurrentCall(

diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md
@@ -2153,7 +2153,7 @@ FLAGS
   -k, --stack-api-key=<value>           API key of the target stack
   -m, --module=<value>                  [optional] specific module name
   -y, --yes                             [optional] Override marketplace prompts
-      --exclude-global-modules          Excluded the Module that are branch independent from the import
+      --exclude-global-modules          Excludes the branch-independent module from the import operation
       --import-webhook-status=<option>  [default: disable] [optional] Webhook state
                                         <options: disable|current>
       --replace-existing                Replaces the existing module in the target stack.
@@ -2578,7 +2578,7 @@ FLAGS
   -k, --stack-api-key=<value>           API key of the target stack
   -m, --module=<value>                  [optional] specific module name
   -y, --yes                             [optional] Override marketplace prompts
-      --exclude-global-modules          Excluded the Module that are branch independent from the import
+      --exclude-global-modules          Excludes the branch-independent module from the import operation
       --import-webhook-status=<option>  [default: disable] [optional] Webhook state
                                         <options: disable|current>
       --replace-existing                Replaces the existing module in the target stack.