@contentstack/cli-cm-import 1.8.1 → 1.8.3

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.1 linux-x64 node-v18.17.1
+@contentstack/cli-cm-import/1.8.3 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/content-types.js

@@ -11,6 +11,7 @@ const path = tslib_1.__importStar(require("path"));
 const lodash_1 = require("lodash");
 const utils_1 = require("../../utils");
 const base_class_1 = tslib_1.__importDefault(require("./base-class"));
+const content_type_helper_1 = require("../../utils/content-type-helper");
 class ContentTypesImport extends base_class_1.default {
     constructor({ importConfig, stackAPIClient }) {
         super({ importConfig, stackAPIClient });
@@ -134,8 +135,11 @@ class ContentTypesImport extends base_class_1.default {
     serializeUpdateCTs(apiOptions) {
         const { apiData: contentType } = apiOptions;
         if (contentType.field_rules) {
+            contentType.field_rules = (0, content_type_helper_1.updateFieldRules)(contentType);
+            if (!contentType.field_rules.length) {
+                delete contentType.field_rules;
+            }
             this.fieldRules.push(contentType.uid);
-            delete contentType.field_rules;
         }
         (0, utils_1.lookupExtension)(this.importConfig, contentType.schema, this.importConfig.preserveStackVersion, this.installedExtensions);
         const contentTypePayload = this.stack.contentType(contentType.uid);

package/lib/import/modules/entries.js

@@ -415,13 +415,19 @@ class EntriesImport extends base_class_1.default {
             return;
         }
         for (let cTUid of cTsWithFieldRules) {
-            const contentType = (0, lodash_1.find)(this.cTs, { uid: cTUid });
+            const cTs = utils_1.fsUtil.readFile(path.join(this.cTsPath, 'schema.json'));
+            const contentType = (0, lodash_1.find)(cTs, { uid: cTUid });
             if (contentType.field_rules) {
                 let fieldRuleLength = contentType.field_rules.length;
+                const fieldDatatypeMap = {};
+                for (let i = 0; i < contentType.schema.length; i++) {
+                    const field = contentType.schema[i].uid;
+                    fieldDatatypeMap[field] = contentType.schema[i].data_type;
+                }
                 for (let k = 0; k < fieldRuleLength; k++) {
                     let fieldRuleConditionLength = contentType.field_rules[k].conditions.length;
                     for (let i = 0; i < fieldRuleConditionLength; i++) {
-                        if (contentType.field_rules[k].conditions[i].operand_field === 'reference') {
+                        if (fieldDatatypeMap[contentType.field_rules[k].conditions[i].operand_field] === 'reference') {
                             let fieldRulesValue = contentType.field_rules[k].conditions[i].value;
                             let fieldRulesArray = fieldRulesValue.split('.');
                             let updatedValue = [];

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,24 @@ 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;
+        });
+        const updateWorkflow = this.stack.workflow(workflow.uid);
+        Object.assign(updateWorkflow, { workflow_stages: newWorkflowStages, name: workflow.name });
+        return updateWorkflow.update();
+    }
     /**
      * @method serializeWorkflows
      * @param {ApiOptions} apiOptions ApiOptions
@@ -134,6 +166,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/content-types.d.ts

@@ -30,4 +30,5 @@ declare class ContentTypesImport {
     updateContentType(contentType: any): Promise<void>;
     updateGlobalFields(uid: any): Promise<boolean>;
     mapUidToTitle(): Promise<void>;
+    updateFieldRules(contentType: any): any[];
 }

package/lib/import/modules-js/content-types.js

@@ -130,8 +130,11 @@ class ContentTypesImport {
             return;
         const requestObject = cloneDeep(this.requestOptions);
         if (contentType.field_rules) {
+            contentType.field_rules = this.updateFieldRules(contentType);
+            if (!contentType.field_rules.length) {
+                delete contentType.field_rules;
+            }
             this.fieldRules.push(contentType.uid);
-            delete contentType.field_rules;
         }
         lookupExtension(this.importConfig, contentType.schema, this.importConfig.preserveStackVersion, this.installedExtensions);
         requestObject.json.content_type = contentType;
@@ -172,5 +175,29 @@ class ContentTypesImport {
             this.titleToUIdMap.set(ct.uid, ct.title);
         });
     }
+    updateFieldRules(contentType) {
+        const fieldDataTypeMap = {};
+        for (let i = 0; i < contentType.schema.length; i++) {
+            const field = contentType.schema[i];
+            fieldDataTypeMap[field.uid] = field.data_type;
+        }
+        const fieldRules = [...contentType.field_rules];
+        let len = fieldRules.length;
+        // Looping backwards as we need to delete elements as we move.
+        for (let i = len - 1; i >= 0; i--) {
+            const conditions = fieldRules[i].conditions;
+            let isReference = false;
+            for (let j = 0; j < conditions.length; j++) {
+                const field = conditions[j].operand_field;
+                if (fieldDataTypeMap[field] === 'reference') {
+                    isReference = true;
+                }
+            }
+            if (isReference) {
+                fieldRules.splice(i, 1);
+            }
+        }
+        return fieldRules;
+    }
 }
 module.exports = ContentTypesImport;

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,22 @@ 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;
+        });
+        const updateWorkflow = this.stackAPIClient.workflow(workflow.uid);
+        Object.assign(updateWorkflow, { workflow_stages: newWorkflowStages, name: workflow.name });
+        return updateWorkflow.update();
+    }
 };

package/lib/utils/content-type-helper.d.ts

@@ -49,3 +49,4 @@ export declare const suppressSchemaReference: (schema: any, flag: any) => void;
 export declare const removeReferenceFields: (schema: any, flag: {
     supressed: boolean;
 }, stackAPIClient: any) => Promise<boolean | void>;
+export declare const updateFieldRules: (contentType: any) => any[];

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

@@ -6,7 +6,7 @@
  * suppress mandatory fields
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeReferenceFields = exports.suppressSchemaReference = exports.schemaTemplate = void 0;
+exports.updateFieldRules = exports.removeReferenceFields = exports.suppressSchemaReference = exports.schemaTemplate = void 0;
 exports.schemaTemplate = {
     content_type: {
         title: 'Seed',
@@ -150,3 +150,28 @@ const removeReferenceFields = async function (schema, flag = { supressed: false
     }
 };
 exports.removeReferenceFields = removeReferenceFields;
+const updateFieldRules = function (contentType) {
+    const fieldDataTypeMap = {};
+    for (let i = 0; i < contentType.schema.length; i++) {
+        const field = contentType.schema[i];
+        fieldDataTypeMap[field.uid] = field.data_type;
+    }
+    const fieldRules = [...contentType.field_rules];
+    let len = fieldRules.length;
+    // Looping backwards as we need to delete elements as we move.
+    for (let i = len - 1; i >= 0; i--) {
+        const conditions = fieldRules[i].conditions;
+        let isReference = false;
+        for (let j = 0; j < conditions.length; j++) {
+            const field = conditions[j].operand_field;
+            if (fieldDataTypeMap[field] === 'reference') {
+                isReference = true;
+            }
+        }
+        if (isReference) {
+            fieldRules.splice(i, 1);
+        }
+    }
+    return fieldRules;
+};
+exports.updateFieldRules = updateFieldRules;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.1",
+  "version": "1.8.3",
   "commands": {
     "cm:stacks:import": {
       "id": "cm:stacks:import",

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "~1.2.11",
-    "@contentstack/cli-utilities": "~1.5.1",
+    "@contentstack/cli-command": "~1.2.12",
+    "@contentstack/cli-utilities": "~1.5.2",
     "@contentstack/management": "~1.10.0",
     "@oclif/config": "^1.18.3",
     "@oclif/core": "^2.9.3",