fix: Resolved the issue of private apps re-creation after selecting n…

…o by skipping the private app. Version bump
contentstack · Mar 28, 2024 · 5da1cef · 5da1cef
1 parent b9633a5
commit 5da1cef
Show file tree

Hide file tree

Showing 9 changed files with 450 additions and 239 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@colors/colors": "^1.5.0",
     "@contentstack/cli-cm-export": "~1.11.1",
-    "@contentstack/cli-cm-import": "~1.15.0",
+    "@contentstack/cli-cm-import": "~1.15.1",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.6.0",
     "async": "^3.2.4",

diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

diff --git a/packages/contentstack-import/src/import/modules/marketplace-apps.ts b/packages/contentstack-import/src/import/modules/marketplace-apps.ts
@@ -231,35 +231,38 @@ export default class ImportMarketplaceApps {
       return Promise.resolve();
     }
 
-    await getConfirmationToCreateApps(privateApps, this.importConfig);
-
-    log(this.importConfig, 'Starting developer hub private apps re-creation', 'success');
+    let canCreatePrivateApp = await getConfirmationToCreateApps(privateApps, this.importConfig);
+    this.importConfig.canCreatePrivateApp = canCreatePrivateApp;
+    if (canCreatePrivateApp) {
+      log(this.importConfig, 'Starting developer hub private apps re-creation', 'success');
+      for (let app of privateApps) {
+        if (this.importConfig.skipPrivateAppRecreationIfExist && (await this.isPrivateAppExistInDeveloperHub(app))) {
+          // NOTE Found app already exist in the same org
+          this.appUidMapping[app.uid] = app.uid;
+          cliux.print(`App '${app.manifest.name}' already exist. skipping app recreation.!`, { color: 'yellow' });
+          continue;
+        }
 
-    for (let app of privateApps) {
-      if (this.importConfig.skipPrivateAppRecreationIfExist && (await this.isPrivateAppExistInDeveloperHub(app))) {
-        // NOTE Found app already exist in the same org
-        this.appUidMapping[app.uid] = app.uid;
-        cliux.print(`App '${app.manifest.name}' already exist. skipping app recreation.!`, { color: 'yellow' });
-        continue;
+        // NOTE keys can be passed to install new app in the developer hub
+        const validKeys = [
+          'uid',
+          'name',
+          'icon',
+          'oauth',
+          'webhook',
+          'visibility',
+          'target_type',
+          'description',
+          'ui_location',
+          'framework_version',
+        ];
+        const manifest = pick(app.manifest, validKeys) as Manifest;
+        this.appOriginalName = manifest.name;
+
+        await this.createPrivateApp(manifest);
       }
-
-      // NOTE keys can be passed to install new app in the developer hub
-      const validKeys = [
-        'uid',
-        'name',
-        'icon',
-        'oauth',
-        'webhook',
-        'visibility',
-        'target_type',
-        'description',
-        'ui_location',
-        'framework_version',
-      ];
-      const manifest = pick(app.manifest, validKeys) as Manifest;
-      this.appOriginalName = manifest.name;
-
-      await this.createPrivateApp(manifest);
+    } else {
+      log(this.importConfig, 'Skipping developer hub private apps creation', 'success');
     }
 
     this.appOriginalName = undefined;
@@ -422,6 +425,10 @@ export default class ImportMarketplaceApps {
 
     if (!currentStackApp) {
       // NOTE install new app
+      if (app.manifest.visibility === 'private' && !this.importConfig.canCreatePrivateApp) {
+        log(this.importConfig, `Skipping the installation of Private App ${app.manifest.name}`, 'info');
+        return Promise.resolve();
+      }
       const installation = await this.installApp(
         this.importConfig,
         // NOTE if it's private app it should get uid from mapper else will use manifest uid

diff --git a/packages/contentstack-import/src/types/import-config.ts b/packages/contentstack-import/src/types/import-config.ts
@@ -11,6 +11,7 @@ export interface ExternalConfig {
 }
 
 export default interface ImportConfig extends DefaultConfig, ExternalConfig {
+  canCreatePrivateApp: boolean;
   contentDir: string;
   data: string;
   management_token?: string;

diff --git a/packages/contentstack-import/src/utils/marketplace-app-helper.ts b/packages/contentstack-import/src/utils/marketplace-app-helper.ts
@@ -9,7 +9,7 @@ import {
   configHandler,
   managementSDKClient,
   marketplaceSDKClient,
-  createDeveloperHubUrl
+  createDeveloperHubUrl,
 } from '@contentstack/cli-utilities';
 
 import { log } from './logger';
@@ -72,6 +72,7 @@ export const getOrgUid = async (config: ImportConfig): Promise<string> => {
 };
 
 export const getConfirmationToCreateApps = async (privateApps: any, config: ImportConfig): Promise<boolean> => {
+  console.log(privateApps);
   if (!config.forceStopMarketplaceAppsPrompt) {
     if (
       !(await cliux.confirm(
@@ -90,15 +91,17 @@ export const getConfirmationToCreateApps = async (privateApps: any, config: Impo
           ),
         )
       ) {
-        return Promise.resolve(true);
-      }
-
-      if (
-        !(await cliux.confirm(
-          chalk.yellow('\nWould you like to re-create the private app and then proceed with the installation? (y/n)'),
-        ))
-      ) {
-        process.exit();
+        return Promise.resolve(false);
+      } else {
+        if (
+          !(await cliux.confirm(
+            chalk.yellow('\nWould you like to re-create the private app and then proceed with the installation? (y/n)'),
+          ))
+        ) {
+          return Promise.resolve(true);
+        } else {
+          return Promise.resolve(false);
+        }
       }
     }
   }

diff --git a/packages/contentstack-seed/package.json b/packages/contentstack-seed/package.json
@@ -5,7 +5,7 @@
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-import": "~1.15.0",
+    "@contentstack/cli-cm-import": "~1.15.1",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.6.0",
     "inquirer": "8.2.4",

diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run"
@@ -30,7 +30,7 @@
     "@contentstack/cli-cm-export": "~1.11.1",
     "@contentstack/cli-cm-clone": "~1.10.3",
     "@contentstack/cli-cm-export-to-csv": "~1.7.0",
-    "@contentstack/cli-cm-import": "~1.15.0",
+    "@contentstack/cli-cm-import": "~1.15.1",
     "@contentstack/cli-cm-migrate-rte": "~1.4.15",
     "@contentstack/cli-cm-seed": "~1.7.3",
     "@contentstack/cli-command": "~1.2.17",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml