Merge pull request #1370 from contentstack/development

Sprint 55 Development to Staging

packages/contentstack-audit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-audit",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "Contentstack audit plugin",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/cli",

packages/contentstack-audit/src/modules/workflows.ts

@@ -66,17 +66,20 @@ export default class Workflows {
 
     for (const workflow of this.workflowSchema) {
       const ctNotPresent = workflow.content_types.filter((ct) => !this.ctUidSet.has(ct));
-      const branch = workflow?.branches?.filter((branch) => branch !== this.config?.branch);
+      let branchesToBeRemoved: string[] = [];
+      if (this.config?.branch) {
+        branchesToBeRemoved = workflow?.branches?.filter((branch) => branch !== this.config?.branch) || [];
+      }
 
-      if (ctNotPresent.length || branch?.length) {
+      if (ctNotPresent.length || branchesToBeRemoved?.length) {
         const tempwf = cloneDeep(workflow);
         tempwf.content_types = ctNotPresent || [];
 
-        if (workflow?.branches) {
-          tempwf.branches = branch;
+        if (workflow?.branches && this.config?.branch) {
+          tempwf.branches = branchesToBeRemoved;
         }
 
-        if (branch?.length) {
+        if (branchesToBeRemoved?.length) {
           this.isBranchFixDone = true;
         }
 
@@ -111,17 +114,19 @@ export default class Workflows {
         const fixedCts = workflow.content_types.filter((ct) => !this.missingCts.has(ct));
         const fixedBranches: string[] = [];
 
-        workflow?.branches?.forEach((branch) => {
-          if (branch !== this.config?.branch) {
-            const { uid, name } = workflow;
-            this.log($t(commonMsg.WF_BRANCH_REMOVAL, { uid, name, branch }), { color: 'yellow' });
-          } else {
-            fixedBranches.push(branch);
+        if (this.config.branch) {
+          workflow?.branches?.forEach((branch) => {
+            if (branch !== this.config?.branch) {
+              const { uid, name } = workflow;
+              this.log($t(commonMsg.WF_BRANCH_REMOVAL, { uid, name, branch }), { color: 'yellow' });
+            } else {
+              fixedBranches.push(branch);
+            }
+          });
+
+          if (fixedBranches.length > 0) {
+            newWorkflowSchema[workflow.uid].branches = fixedBranches;
           }
-        });
-
-        if (fixedBranches.length > 0) {
-          newWorkflowSchema[workflow.uid].branches = fixedBranches;
         }
 
         if (fixedCts.length) {

packages/contentstack-bulk-publish/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-bulk-publish",
   "description": "Contentstack CLI plugin for bulk publish actions",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

packages/contentstack-bulk-publish/src/producer/cross-publish.js

@@ -192,6 +192,12 @@ async function getSyncEntries(
 
       const entriesResponse = await Stack.sync(syncData);
 
+      if (filter?.content_type_uid?.length) {
+        entriesResponse.items = entriesResponse.items.filter((entry) =>
+          filter?.content_type_uid.includes(entry.content_type_uid),
+        );
+      }
+
       if (entriesResponse.items.length > 0) {
         await bulkAction(stack, entriesResponse.items, bulkPublish, filter, destEnv, apiVersion);
       }

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",

packages/contentstack-export/src/utils/marketplace-app-helper.ts

@@ -34,7 +34,7 @@ export async function createNodeCryptoInstance(config: ExportConfig): Promise<No
 
         return true;
       },
-      message: 'Enter marketplace app configurations encryption key',
+      message: 'Enter Marketplace app configurations encryption key',
     });
   }
 

packages/contentstack-import/package.json

@@ -1,11 +1,11 @@
 {
   "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": {
-    "@contentstack/cli-audit": "~1.5.2",
+    "@contentstack/cli-audit": "~1.5.3",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.6.0",
     "@contentstack/management": "~1.15.3",

packages/contentstack-import/src/import/modules-js/marketplace-apps.js

@@ -120,7 +120,7 @@ module.exports = class ImportMarketplaceApps {
 
         return true;
       },
-      message: 'Enter marketplace app configurations encryption key',
+      message: 'Enter Marketplace app configurations encryption key',
     });
 
     try {

packages/contentstack-import/src/import/modules/entries.ts

@@ -552,7 +552,7 @@ export default class EntriesImport extends BaseClass {
 
   async replaceEntriesHandler({
     apiParams,
-    element: entry
+    element: entry,
   }: {
     apiParams: ApiOptions;
     element: Record<string, string>;
@@ -876,19 +876,21 @@ export default class EntriesImport extends BaseClass {
     }
     // log(this.importConfig, `Starting publish entries for ${cTUid} in locale ${locale}`, 'info');
 
-    const onSuccess = ({ response, apiData: { environments, entryUid }, additionalInfo }: any) => {
+    const onSuccess = ({ response, apiData: { environments, entryUid, locales }, additionalInfo }: any) => {
       log(
         this.importConfig,
-        `Published entry: '${entryUid}' of content type ${cTUid} and locale ${locale} in ${environments?.join(
+        `Published the entry: '${entryUid}' of Content Type '${cTUid}' and Locale '${locale}' in Environments '${environments?.join(
           ',',
-        )} environments`,
+        )}' and Locales '${locales?.join(',')}'`,
         'info',
       );
     };
-    const onReject = ({ error, apiData, additionalInfo }: any) => {
+    const onReject = ({ error, apiData: { environments, entryUid, locales }, additionalInfo }: any) => {
       log(
         this.importConfig,
-        `${apiData.entryUid} entry of content type ${cTUid} in locale ${locale} failed to publish`,
+        `Failed to publish: '${entryUid}' entry of Content Type '${cTUid}' and Locale '${locale}' in Environments '${environments?.join(
+          ',',
+        )}' and Locales '${locales?.join(',')}'`,
         'error',
       );
       log(this.importConfig, formatError(error), 'error');

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 private apps creation on Developer Hub...', '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 the 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

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;

packages/contentstack-import/src/utils/asset-helper.ts

@@ -251,9 +251,11 @@ export const lookupAssets = function (
   assetUrls.forEach(function (assetUrl: any) {
     let mappedAssetUrl = mappedAssetUrls[assetUrl];
     if (typeof mappedAssetUrl !== 'undefined') {
-      const sanitizedUrl = escapeRegExp(assetUrl).replace(/\.\./g, '\\$&');
-      const escapedMappedUrl = escapeRegExp(mappedAssetUrl).replace(/\.\./g, '\\$&');
-      entry = entry.replace(new RegExp(sanitizedUrl, 'img'), escapedMappedUrl);
+      //NOTE - This code was added to resolve the SRE issue but once the code was merged Assets URLs in JSON RTE started breaking
+      // const sanitizedUrl = escapeRegExp(assetUrl).replace(/\.\./g, '\\$&');
+      // const escapedMappedUrl = escapeRegExp(mappedAssetUrl).replace(/\.\./g, '\\$&');
+      // entry = entry.replace(new RegExp(sanitizedUrl, 'img'), escapedMappedUrl);
+      entry = entry.replace(new RegExp(assetUrl, 'img'), mappedAssetUrl);
       matchedUrls.push(mappedAssetUrl);
     } else {
       unmatchedUrls.push(assetUrl);

packages/contentstack-import/src/utils/interactive.ts

@@ -33,7 +33,7 @@ export const askEncryptionKey = async(defaultValue: unknown): Promise<string> =>
 
       return true;
     },
-    message: 'Enter marketplace app configurations encryption key',
+    message: 'Enter Marketplace app configurations encryption key',
   });
 }
 

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';
@@ -90,15 +90,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);
+        }
       }
     }
   }