@contentstack/cli-cm-import 1.8.0 → 1.8.2

package/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.8.0 linux-x64 node-v18.17.1
+@contentstack/cli-cm-import/1.8.2 linux-x64 node-v18.17.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/import/modules/base-class.d.ts

@@ -9,8 +9,8 @@ export type ApiOptions = {
     url?: string;
     entity: ApiModuleType;
     apiData?: Record<any, any> | any;
-    resolve: (value: any) => void;
-    reject: (error: any) => void;
+    resolve: (value: any) => Promise<void> | void;
+    reject: (error: any) => Promise<void> | void;
     additionalInfo?: Record<any, any>;
     includeParamOnCompletion?: boolean;
     serializeData?: (input: ApiOptions) => any;

package/lib/import/modules/workflows.d.ts

@@ -20,6 +20,7 @@ export default class ImportWorkflows extends BaseClass {
     start(): Promise<void>;
     getRoles(): Promise<void>;
     importWorkflows(): Promise<void>;
+    updateNextAvailableStagesUid(workflow: Record<string, any>, newWorkflowStages: Record<string, any>[], oldWorkflowStages: Record<string, any>[]): Promise<import("@contentstack/management/types/stack/workflow").Workflow>;
     /**
      * @method serializeWorkflows
      * @param {ApiOptions} apiOptions ApiOptions

package/lib/import/modules/workflows.js

@@ -2,11 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
-const values_1 = tslib_1.__importDefault(require("lodash/values"));
+const map_1 = tslib_1.__importDefault(require("lodash/map"));
 const find_1 = tslib_1.__importDefault(require("lodash/find"));
-const findIndex_1 = tslib_1.__importDefault(require("lodash/findIndex"));
 const node_path_1 = require("node:path");
+const values_1 = tslib_1.__importDefault(require("lodash/values"));
+const filter_1 = tslib_1.__importDefault(require("lodash/filter"));
+const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
+const cloneDeep_1 = tslib_1.__importDefault(require("lodash/cloneDeep"));
+const findIndex_1 = tslib_1.__importDefault(require("lodash/findIndex"));
 const config_1 = tslib_1.__importDefault(require("../../config"));
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const utils_1 = require("../../utils");
@@ -66,19 +69,30 @@ class ImportWorkflows extends base_class_1.default {
             .fetchAll()
             .then((data) => data)
             .catch((err) => (0, utils_1.log)(this.importConfig, `Failed to fetch roles. ${(0, utils_1.formatError)(err)}`, 'error'));
-        for (const role of roles === null || roles === void 0 ? void 0 : roles.items) {
+        for (const role of (roles === null || roles === void 0 ? void 0 : roles.items) || []) {
             this.roleNameMap[role.name] = role.uid;
         }
     }
     async importWorkflows() {
         const apiContent = (0, values_1.default)(this.workflows);
+        const oldWorkflows = (0, cloneDeep_1.default)((0, values_1.default)(this.workflows));
         //check and create custom roles if not exists
         for (const workflow of (0, values_1.default)(this.workflows)) {
             if (!this.workflowUidMapper.hasOwnProperty(workflow.uid)) {
                 await this.createCustomRoleIfNotExists(workflow);
             }
         }
-        const onSuccess = ({ response, apiData: { uid, name } = { uid: null, name: '' } }) => {
+        const onSuccess = async ({ response, apiData: { uid, name } = { uid: null, name: '' } }) => {
+            var _a;
+            const oldWorkflowStages = (_a = (0, find_1.default)(oldWorkflows, { uid })) === null || _a === void 0 ? void 0 : _a.workflow_stages;
+            if (!(0, isEmpty_1.default)((0, filter_1.default)(oldWorkflowStages, ({ next_available_stages }) => !(0, isEmpty_1.default)(next_available_stages)))) {
+                let updateRresponse = await this.updateNextAvailableStagesUid(response, response.workflow_stages, oldWorkflowStages).catch((error) => {
+                    (0, utils_1.log)(this.importConfig, `Workflow '${name}' update failed.`, 'error');
+                    (0, utils_1.log)(this.importConfig, error, 'error');
+                });
+                if (updateRresponse)
+                    response = updateRresponse;
+            }
             this.createdWorkflows.push(response);
             this.workflowUidMapper[uid] = response.uid;
             (0, utils_1.log)(this.importConfig, `Workflow '${name}' imported successfully`, 'success');
@@ -114,6 +128,25 @@ class ImportWorkflows extends base_class_1.default {
             concurrencyLimit: config_1.default.fetchConcurrency || 1,
         }, undefined, false);
     }
+    updateNextAvailableStagesUid(workflow, newWorkflowStages, oldWorkflowStages) {
+        newWorkflowStages = (0, map_1.default)(newWorkflowStages, (newStage, index) => {
+            const oldStage = oldWorkflowStages[index];
+            if (!(0, isEmpty_1.default)(oldStage.next_available_stages)) {
+                newStage.next_available_stages = (0, map_1.default)(oldStage.next_available_stages, (stageUid) => {
+                    var _a, _b;
+                    if (stageUid === '$all')
+                        return stageUid;
+                    const stageName = (_a = (0, find_1.default)(oldWorkflowStages, { uid: stageUid })) === null || _a === void 0 ? void 0 : _a.name;
+                    return (_b = (0, find_1.default)(newWorkflowStages, { name: stageName })) === null || _b === void 0 ? void 0 : _b.uid;
+                }).filter((val) => val);
+            }
+            return newStage;
+        });
+        workflow.workflow_stages = newWorkflowStages;
+        const updateWorkflow = this.stack.workflow(workflow.uid);
+        Object.assign(updateWorkflow, workflow);
+        return updateWorkflow.update();
+    }
     /**
      * @method serializeWorkflows
      * @param {ApiOptions} apiOptions ApiOptions
@@ -134,6 +167,12 @@ class ImportWorkflows extends base_class_1.default {
             if (!workflow.branches) {
                 workflow.branches = ['main'];
             }
+            for (const stage of workflow.workflow_stages) {
+                delete stage.uid;
+                if (!(0, isEmpty_1.default)(stage.next_available_stages)) {
+                    stage.next_available_stages = ['$all'];
+                }
+            }
             apiOptions.apiData = workflow;
         }
         return apiOptions;

package/lib/import/modules-js/entries.js

@@ -395,12 +395,12 @@ module.exports = class ImportEntries {
             })
                 .catch((error) => {
                 var _a, _b;
-                let title = (_b = JSON.parse(((_a = error === null || error === void 0 ? void 0 : error.request) === null || _a === void 0 ? void 0 : _a.data) || "{}").entry) === null || _b === void 0 ? void 0 : _b.title;
+                let title = (_b = JSON.parse(((_a = error === null || error === void 0 ? void 0 : error.request) === null || _a === void 0 ? void 0 : _a.data) || '{}').entry) === null || _b === void 0 ? void 0 : _b.title;
                 addlogs(this.config, chalk.red("Failed to create entries in '" +
                     lang +
                     "' language. " +
                     'Title of the failed entry: ' +
-                    `'${title || ""}'`), 'error');
+                    `'${title || ''}'`), 'error');
                 return reject(error);
             });
         });
@@ -990,6 +990,7 @@ module.exports = class ImportEntries {
                     break;
                 }
                 case 'json': {
+                    const structuredPTag = '{"type":"p","attrs":{},"children":[{"text":""}]}';
                     if (entry[element.uid] && element.field_metadata.rich_text_type) {
                         if (element.multiple) {
                             entry[element.uid] = entry[element.uid].map((jsonRteData) => {
@@ -997,6 +998,9 @@ module.exports = class ImportEntries {
                                 let entryReferences = jsonRteData.children.filter((e) => this.doEntryReferencesExist(e));
                                 if (entryReferences.length > 0) {
                                     jsonRteData.children = jsonRteData.children.filter((e) => !this.doEntryReferencesExist(e));
+                                    if (jsonRteData.children.length === 0) {
+                                        jsonRteData.children.push(JSON.parse(structuredPTag));
+                                    }
                                     return jsonRteData; // return jsonRteData without entry references
                                 }
                                 else {
@@ -1008,6 +1012,9 @@ module.exports = class ImportEntries {
                             let entryReferences = entry[element.uid].children.filter((e) => this.doEntryReferencesExist(e));
                             if (entryReferences.length > 0) {
                                 entry[element.uid].children = entry[element.uid].children.filter((e) => !this.doEntryReferencesExist(e));
+                                if (entry[element.uid].children.length === 0) {
+                                    entry[element.uid].children.push(JSON.parse(structuredPTag));
+                                }
                             }
                         }
                     }

package/lib/import/modules-js/global-fields.js

@@ -71,7 +71,6 @@ module.exports = class ImportGlobalFields {
                         log(self.config, chalk.green('Global field ' + global_field_uid + ' created successfully'), 'success');
                     })
                         .catch(function (err) {
-                        console.log;
                         let error = JSON.parse(err.message);
                         if (error.errors.title) {
                             // eslint-disable-next-line no-undef

package/lib/import/modules-js/workflows.d.ts

@@ -14,5 +14,6 @@ declare class importWorkflows {
     stackAPIClient: any;
     start(): Promise<any>;
     workflows: any;
+    updateNextAvailableStagesUid(workflow: any, newWorkflowStages: any, oldWorkflowStages: any): any;
 }
 import Promise = require("bluebird");

package/lib/import/modules-js/workflows.js

@@ -3,12 +3,12 @@
  * Copyright (c) 2019 Contentstack LLC
  * MIT Licensed
  */
-const mkdirp = require('mkdirp');
 const fs = require('fs');
 const path = require('path');
-const Promise = require('bluebird');
 const chalk = require('chalk');
-const { isEmpty, merge } = require('lodash');
+const mkdirp = require('mkdirp');
+const Promise = require('bluebird');
+const { isEmpty, merge, filter, map, cloneDeep, find } = require('lodash');
 let { default: config } = require('../../config');
 const { fileHelper, log, formatError } = require('../../utils');
 module.exports = class importWorkflows {
@@ -46,11 +46,16 @@ module.exports = class importWorkflows {
                 if (!self.workflowUidMapper.hasOwnProperty(workflowUid)) {
                     const roleNameMap = {};
                     const workflowStages = workflow.workflow_stages;
+                    const oldWorkflowStages = cloneDeep(workflow.workflow_stages);
                     const roles = await self.stackAPIClient.role().fetchAll();
                     for (const role of roles.items) {
                         roleNameMap[role.name] = role.uid;
                     }
                     for (const stage of workflowStages) {
+                        delete stage.uid;
+                        if (!isEmpty(stage.next_available_stages)) {
+                            stage.next_available_stages = ['$all'];
+                        }
                         if (stage.SYS_ACL.users.uids.length && stage.SYS_ACL.users.uids[0] !== '$all') {
                             stage.SYS_ACL.users.uids = ['$all'];
                         }
@@ -94,7 +99,17 @@ module.exports = class importWorkflows {
                     return self.stackAPIClient
                         .workflow()
                         .create({ workflow })
-                        .then(function (response) {
+                        .then(async function (response) {
+                        if (!isEmpty(filter(oldWorkflowStages, ({ next_available_stages }) => !isEmpty(next_available_stages)))) {
+                            let updateRresponse = await self
+                                .updateNextAvailableStagesUid(response, response.workflow_stages, oldWorkflowStages)
+                                .catch((error) => {
+                                log(self.config, `Workflow '${workflow.name}' update failed.`, 'error');
+                                log(self.config, error, 'error');
+                            });
+                            if (updateRresponse)
+                                response = updateRresponse;
+                        }
                         self.workflowUidMapper[workflowUid] = response;
                         fileHelper.writeFileSync(workflowUidMapperPath, self.workflowUidMapper);
                     })
@@ -129,4 +144,23 @@ module.exports = class importWorkflows {
             });
         });
     }
+    updateNextAvailableStagesUid(workflow, newWorkflowStages, oldWorkflowStages) {
+        newWorkflowStages = map(newWorkflowStages, (newStage, index) => {
+            const oldStage = oldWorkflowStages[index];
+            if (!isEmpty(oldStage.next_available_stages)) {
+                newStage.next_available_stages = map(oldStage.next_available_stages, (stageUid) => {
+                    var _a, _b;
+                    if (stageUid === '$all')
+                        return stageUid;
+                    const stageName = (_a = find(oldWorkflowStages, { uid: stageUid })) === null || _a === void 0 ? void 0 : _a.name;
+                    return (_b = find(newWorkflowStages, { name: stageName })) === null || _b === void 0 ? void 0 : _b.uid;
+                }).filter((val) => val);
+            }
+            return newStage;
+        });
+        workflow.workflow_stages = newWorkflowStages;
+        const updateWorkflow = this.stackAPIClient.workflow(workflow.uid);
+        Object.assign(updateWorkflow, workflow);
+        return updateWorkflow.update();
+    }
 };

package/lib/utils/asset-helper.js

@@ -75,6 +75,9 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
                 (schema[i].field_metadata.markdown || schema[i].field_metadata.rich_text_type)) {
                 parent.push(schema[i].uid);
                 findFileUrls(schema[i], entryToFind, assetUrls);
+                if (schema[i].field_metadata.rich_text_type) {
+                    findAssetIdsFromHtmlRte(entryToFind, schema[i]);
+                }
                 parent.pop();
             }
             if (schema[i].data_type === 'group' || schema[i].data_type === 'global_field') {
@@ -131,6 +134,14 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
             return row;
         });
     }
+    function findAssetIdsFromHtmlRte(entryObj, ctSchema) {
+        const regex = /<img asset_uid=\\"([^"]+)\\"/g;
+        let match;
+        const entry = JSON.stringify(entryObj);
+        while ((match = regex.exec(entry)) !== null) {
+            assetUids.push(match[1]);
+        }
+    }
     function findAssetIdsFromJsonRte(entryObj, ctSchema) {
         for (const element of ctSchema) {
             switch (element.data_type) {
@@ -329,7 +340,8 @@ function findFileUrls(schema, _entry, assetUrls) {
     markdownRegEx = new RegExp('(https://(assets|(eu-|azure-na-|azure-eu-)?images).contentstack.(io|com)/v3/assets/(.*?)/(.*?)/(.*?)/(.*?)(?="))', 'g');
     while ((markdownMatch = markdownRegEx.exec(text)) !== null) {
         if (markdownMatch && typeof markdownMatch[0] === 'string') {
-            assetUrls.push(markdownMatch[0]);
+            let assetUrl = markdownMatch[0].replace(/\\/g, '');
+            assetUrls.push(assetUrl);
         }
     }
 }

package/lib/utils/content-type-helper.js

@@ -89,7 +89,7 @@ const removeReferenceFields = async function (schema, flag = { supressed: false
                 await (0, exports.removeReferenceFields)(schema[i].blocks[block].schema, flag, stackAPIClient);
             }
         }
-        else if (schema[i].data_type === 'reference' || schema[i].reference_to) {
+        else if (schema[i].data_type === 'reference') {
             flag.supressed = true;
             // Check if content-type exists
             // If exists, then no change should be required.
@@ -128,7 +128,15 @@ const removeReferenceFields = async function (schema, flag = { supressed: false
                     });
                 }
             }
-            return true;
+        }
+        else if (
+        // handling entry references in json rte
+        schema[i].data_type === 'json' &&
+            schema[i].field_metadata.allow_json_rte &&
+            schema[i].field_metadata.embed_entry &&
+            schema[i].reference_to.length > 1) {
+            flag.supressed = true;
+            schema[i].reference_to = ['sys_assets'];
         }
         else if (
         // handling entry references in json rte
@@ -138,7 +146,6 @@ const removeReferenceFields = async function (schema, flag = { supressed: false
             schema[i].reference_to.length > 1) {
             flag.supressed = true;
             schema[i].reference_to = ['sys_assets'];
-            return true;
         }
     }
 };

package/lib/utils/entries-helper.js

@@ -372,6 +372,7 @@ const removeEntryRefsFromJSONRTE = (entry, ctSchema) => {
                 break;
             }
             case 'json': {
+                const structuredPTag = '{"type":"p","attrs":{},"children":[{"text":""}]}';
                 if (entry[element.uid] && element.field_metadata.rich_text_type) {
                     if (element.multiple) {
                         entry[element.uid] = entry[element.uid].map((jsonRteData) => {
@@ -379,6 +380,9 @@ const removeEntryRefsFromJSONRTE = (entry, ctSchema) => {
                             let entryReferences = jsonRteData.children.filter((e) => doEntryReferencesExist(e));
                             if (entryReferences.length > 0) {
                                 jsonRteData.children = jsonRteData.children.filter((e) => !doEntryReferencesExist(e));
+                                if (jsonRteData.children.length === 0) { // empty children array are no longer acceptable by the API, a default structure must be there 
+                                    jsonRteData.children.push(JSON.parse(structuredPTag));
+                                }
                                 return jsonRteData; // return jsonRteData without entry references
                             }
                             else {
@@ -390,6 +394,9 @@ const removeEntryRefsFromJSONRTE = (entry, ctSchema) => {
                         let entryReferences = entry[element.uid].children.filter((e) => doEntryReferencesExist(e));
                         if (entryReferences.length > 0) {
                             entry[element.uid].children = entry[element.uid].children.filter((e) => !doEntryReferencesExist(e));
+                            if (entry[element.uid].children.length === 0) {
+                                entry[element.uid].children.push(JSON.parse(structuredPTag));
+                            }
                         }
                     }
                 }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.0",
+  "version": "1.8.2",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.8.0",
+  "version": "1.8.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {