@contentstack/cli-cm-import 1.8.2 → 1.8.4

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.2 linux-x64 node-v18.17.1
+@contentstack/cli-cm-import/1.8.4 linux-x64 node-v18.17.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

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.js

@@ -142,9 +142,12 @@ class ImportWorkflows extends base_class_1.default {
             }
             return newStage;
         });
-        workflow.workflow_stages = newWorkflowStages;
         const updateWorkflow = this.stack.workflow(workflow.uid);
-        Object.assign(updateWorkflow, workflow);
+        Object.assign(updateWorkflow, {
+            name: workflow.name,
+            branches: workflow.branches,
+            workflow_stages: newWorkflowStages,
+        });
         return updateWorkflow.update();
     }
     /**

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/entries.js

@@ -14,7 +14,7 @@ const { default: config } = require('../../config');
 const addlogs = log;
 module.exports = class ImportEntries {
     constructor(importConfig, stackAPIClient) {
-        this.skipFiles = ['__master.json', '__priority.json', 'schema.json'];
+        this.skipFiles = ['__master.json', '__priority.json', 'schema.json', '.DS_Store'];
         this.config = _.merge(config, importConfig);
         this.stackAPIClient = stackAPIClient;
         this.mappedAssetUidPath = path.resolve(this.config.data, 'mapper', 'assets', 'uid-mapping.json');
@@ -1029,7 +1029,7 @@ module.exports = class ImportEntries {
         // only checking one level deep, not recursive
         if (element.length) {
             for (const item of element) {
-                if ((item.type === 'p' || item.type === 'a') && item.children && item.children.length > 0) {
+                if ((item.type === 'p' || item.type === 'a' || item.type === 'span') && item.children && item.children.length > 0) {
                     return this.doEntryReferencesExist(item.children);
                 }
                 else if (this.isEntryRef(item)) {
@@ -1041,7 +1041,7 @@ module.exports = class ImportEntries {
             if (this.isEntryRef(element)) {
                 return true;
             }
-            if ((element.type === 'p' || element.type === 'a') && element.children && element.children.length > 0) {
+            if ((element.type === 'p' || element.type === 'a' || element.type === 'span') && element.children && element.children.length > 0) {
                 return this.doEntryReferencesExist(element.children);
             }
         }

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

@@ -158,9 +158,12 @@ module.exports = class importWorkflows {
             }
             return newStage;
         });
-        workflow.workflow_stages = newWorkflowStages;
         const updateWorkflow = this.stackAPIClient.workflow(workflow.uid);
-        Object.assign(updateWorkflow, workflow);
+        Object.assign(updateWorkflow, {
+            name: workflow.name,
+            branches: workflow.branches,
+            workflow_stages: newWorkflowStages,
+        });
         return updateWorkflow.update();
     }
 };

package/lib/utils/asset-helper.js

@@ -191,8 +191,7 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
         jsonRteData.children.forEach((element) => {
             if (element.type) {
                 switch (element.type) {
-                    case 'a':
-                    case 'p': {
+                    default: {
                         if (element.children && element.children.length > 0) {
                             gatherJsonRteAssetIds(element);
                         }

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/lib/utils/entries-helper.js

@@ -21,8 +21,7 @@ const lookupEntries = function (data, mappedUids, uidMapperPath) {
         jsonRteData.children.forEach((element) => {
             if (element.type) {
                 switch (element.type) {
-                    case 'a':
-                    case 'p': {
+                    default: {
                         if (element.children && element.children.length > 0) {
                             gatherJsonRteEntryIds(element);
                         }
@@ -412,7 +411,7 @@ function doEntryReferencesExist(element) {
     // only checking one level deep, not recursive
     if (element.length) {
         for (const item of element) {
-            if ((item.type === 'p' || item.type === 'a') && item.children && item.children.length > 0) {
+            if ((item.type === 'p' || item.type === 'a' || item.type === 'span') && item.children && item.children.length > 0) {
                 return doEntryReferencesExist(item.children);
             }
             else if (isEntryRef(item)) {
@@ -424,7 +423,7 @@ function doEntryReferencesExist(element) {
         if (isEntryRef(element)) {
             return true;
         }
-        if ((element.type === 'p' || element.type === 'a') && element.children && element.children.length > 0) {
+        if ((element.type === 'p' || element.type === 'a' || element.type === 'span') && element.children && element.children.length > 0) {
             return doEntryReferencesExist(element.children);
         }
     }

package/oclif.manifest.json

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

package/package.json

@@ -1,14 +1,13 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "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",
     "big-json": "^3.2.0",
     "bluebird": "^3.7.2",
@@ -96,4 +95,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}