@contentstack/cli-cm-import 1.2.4 → 1.3.0

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

@@ -1,13 +1,12 @@
 const fs = require('fs');
 const path = require('path');
 const chalk = require('chalk');
+const { cloneDeep, find, findIndex } = require('lodash');
+
 const fileHelper = require('../util/fs');
-const config = require('../../config/default');
+const { addlogs } = require('../util/log');
 const supress = require('../util/extensionsUidReplace');
-const { getInstalledExtensions } = require('../util/marketplace-app-helper');
 const { executeTask, formatError } = require('../util');
-const { addlogs } = require('../util/log');
-const { cloneDeep, remove, isEmpty, find, findIndex } = require('lodash');
 const schemaTemplate = require('../util/schemaTemplate');
 
 class ContentTypesImport {
@@ -24,7 +23,6 @@ class ContentTypesImport {
     this.globalFieldsFolderPath = path.resolve(this.importConfig.data, this.globalFieldConfig.dirName);
     this.globalFieldMapperFolderPath = path.join(importConfig.data, 'mapper', 'global_fields', 'success.json');
     this.globalFieldPendingPath = path.join(importConfig.data, 'mapper', 'global_fields', 'pending_global_fields.js');
-    this.appMapperFolderPath = path.join(importConfig.data, 'mapper', 'marketplace_apps');
     this.ignoredFilesInContentTypesFolder = new Map([
       ['__master.json', 'true'],
       ['__priority.json', 'true'],
@@ -32,7 +30,7 @@ class ContentTypesImport {
       ['.DS_Store', 'true'],
     ]);
     this.contentTypes = [];
-    this.existingContentTypesUIds;
+    this.existingContentTypesUIds = [];
     this.titleToUIdMap = new Map();
     this.requestOptions = {
       json: {},
@@ -46,6 +44,10 @@ class ContentTypesImport {
 
   async start() {
     try {
+      const appMapperPath = path.join(this.importConfig.data, 'mapper', 'marketplace_apps', 'uid-mapping.json');
+      this.installedExtensions = (
+        (await fileHelper.readFileSync(appMapperPath)) || { extension_uid: {} }
+      ).extension_uid;
       // read content types
       // remove content types already existing
       if (fs.existsSync(this.existingContentTypesPath)) {
@@ -58,27 +60,19 @@ class ContentTypesImport {
         if (!this.ignoredFilesInContentTypesFolder.has(contentTypeName)) {
           const contentTypePath = path.join(this.contentTypesFolderPath, contentTypeName);
           const contentType = await fileHelper.readFile(contentTypePath);
-          if (!this.existingContentTypesUIds?.has(contentType.uid)) {
+          if (!this.existingContentTypesUIds.length || !this.existingContentTypesUIds.has(contentType.uid)) {
             this.contentTypes.push(await fileHelper.readFile(contentTypePath));
           }
         }
       }
-      // this.mapUidToTitle(this.csontentTypes);
 
       // seed content type
       addlogs(this.importConfig, 'Started to seed content types', 'info');
-      await executeTask(this.contentTypes, this.seedContentType.bind(this), { concurrency: this.importConcurrency });
+      await executeTask(this.seedContentType.bind(this), { concurrency: this.importConcurrency }, this.contentTypes);
       addlogs(this.importConfig, 'Created content types', 'success');
 
-      // update content type
-      this.installedExtensions =
-        fileHelper.readFileSync(path.join(this.appMapperFolderPath, 'marketplace-apps.json')) || {};
-      if (isEmpty(this.installedExtensions)) {
-        this.installedExtensions = await getInstalledExtensions(this.importConfig);
-      }
-
       addlogs(this.importConfig, 'Started to update content types with references', 'info');
-      await executeTask(this.contentTypes, this.updateContentType.bind(this), { concurrency: this.importConcurrency });
+      await executeTask(this.updateContentType.bind(this), { concurrency: this.importConcurrency }, this.contentTypes);
       addlogs(this.importConfig, 'Updated content types with references', 'success');
 
       // global field update
@@ -90,9 +84,13 @@ class ContentTypesImport {
         this.existingGlobalFields = fileHelper.readFileSync(this.globalFieldMapperFolderPath);
         try {
           addlogs(this.importConfig, 'Started to update pending global field with content type references', 'info');
-          await executeTask(this.pendingGlobalFields, this.updateGlobalFields.bind(this), {
-            concurrency: this.importConcurrency,
-          });
+          await executeTask(
+            this.updateGlobalFields.bind(this),
+            {
+              concurrency: this.importConcurrency,
+            },
+            this.pendingGlobalFields,
+          );
           addlogs(this.importConfig, 'Updated pending global fields with content type with references', 'success');
         } catch (error) {
           addlogs(
@@ -175,7 +173,7 @@ class ContentTypesImport {
         return true;
       } catch (error) {
         addlogs(this.importConfig, `failed to update the global field ${uid} ${formatError(error)}`);
-      } 
+      }
     } else {
       addlogs(this.importConfig, `Global field ${uid} does not exist, and hence failed to update.`);
     }

package/src/lib/import/custom-roles.js

@@ -10,18 +10,16 @@ const helper = require('../util/fs');
 const { addlogs } = require('../util/log');
 const { formatError } = require('../util');
 let config = require('../../config/default');
-const stack = require('../util/contentstack-management-sdk');
 
 module.exports = class ImportCustomRoles {
   fails = [];
-  client = null;
   labelUids = [];
   customRolesUidMapper = {};
   customRolesConfig = config.modules.customRoles;
 
-  constructor(credentialConfig) {
-    this.config = merge(config, credentialConfig);
-    this.client = stack.Client(this.config);
+  constructor(importConfig, stackAPIClient) {
+    this.config = merge(config, importConfig);
+    this.stackAPIClient = stackAPIClient;
   }
 
   async start() {
@@ -56,7 +54,7 @@ module.exports = class ImportCustomRoles {
       }
       self.customRolesUids = Object.keys(self.customRoles);
 
-      self.localesUidMap = await getLocalesUidMap(self.client, self.config, self.customRolesLocales);
+      self.localesUidMap = await getLocalesUidMap(self.stackAPIClient, self.config, self.customRolesLocales);
 
       if (fs.existsSync(environmentsUidMapperFolderPath)) {
         self.environmentsUidMap = helper.readFileSync(
@@ -93,11 +91,7 @@ module.exports = class ImportCustomRoles {
               acl: { read: true },
             });
           }
-          const role = await self.client
-            .stack({ api_key: self.config.target_stack, management_token: self.config.management_token })
-            .role()
-            .create({ role: customRole });
-
+          const role = await self.stackAPIClient.role().create({ role: customRole });
           self.customRolesUidMapper[uid] = role;
           helper.writeFileSync(customRolesUidMapperPath, self.customRolesUidMapper);
         } catch (error) {
@@ -158,12 +152,8 @@ const noopTransformer = (rule) => {
   return rule;
 };
 
-const getLocalesUidMap = async (client, config, sourceLocales) => {
-  const { items } = await client
-    .stack({ api_key: config.target_stack, management_token: config.management_token })
-    .locale()
-    .query()
-    .find();
+const getLocalesUidMap = async (stackAPIClient, config, sourceLocales) => {
+  const { items } = await stackAPIClient.locale().query().find();
   const [targetLocalesMap, sourceLocalesMap] = [{}, {}];
 
   items.forEach((locale) => {