Merge branch 'development' into fix/CS-41944

contentstack · Oct 11, 2023 · bf0762e · bf0762e
2 parents 3985bdc + a3b80b7
commit bf0762e
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 27 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-export/src/export/modules-js/marketplace-apps.js b/packages/contentstack-export/src/export/modules-js/marketplace-apps.js
@@ -45,7 +45,7 @@ module.exports = class ExportMarketplaceApps {
 
     this.developerHubBaseUrl = this.config.developerHubBaseUrl || (await getDeveloperHubUrl(this.config));
     this.appSdkAxiosInstance = await managementSDKClient({
-      host: this.developerHubBaseUrl.split('://').pop()
+      endpoint: this.developerHubBaseUrl,
     });
     await this.getOrgUid();
 
@@ -82,7 +82,7 @@ module.exports = class ExportMarketplaceApps {
         console.log(error);
       });
 
-    if (tempStackData && tempStackData.org_uid) {
+    if (tempStackData?.org_uid) {
       this.config.org_uid = tempStackData.org_uid;
     }
   }
@@ -96,10 +96,7 @@ module.exports = class ExportMarketplaceApps {
         await this.getAppConfigurations(client, installedApps, [+index, app]);
       }
 
-      await fileHelper.writeFileSync(
-        path.join(this.marketplaceAppPath, this.marketplaceAppConfig.fileName),
-        installedApps,
-      );
+      fileHelper.writeFileSync(path.join(this.marketplaceAppPath, this.marketplaceAppConfig.fileName), installedApps);
 
       log(this.config, chalk.green('All the marketplace apps have been exported successfully'), 'success');
     } else {

diff --git a/packages/contentstack-export/src/export/modules/marketplace-apps.ts b/packages/contentstack-export/src/export/modules/marketplace-apps.ts
@@ -84,14 +84,13 @@ export default class ExportMarketplaceApps extends BaseClass {
   async getAllStackSpecificApps(skip = 0): Promise<any> {
     const data = await getStackSpecificApps({
       developerHubBaseUrl: this.developerHubBaseUrl,
-      httpClient: this.httpClient as HttpClient,
       config: this.exportConfig,
       skip,
     });
 
     const { data: apps, count } = data;
 
-    if (!this.nodeCrypto && find(apps, (app) => isEmpty(app.configuration))) {
+    if (!this.nodeCrypto && find(apps, (app) => !isEmpty(app.configuration))) {
       this.nodeCrypto = await createNodeCryptoInstance(this.exportConfig);
     }
 

diff --git a/packages/contentstack-export/src/utils/file-helper.ts b/packages/contentstack-export/src/utils/file-helper.ts
@@ -39,7 +39,7 @@ export const readLargeFile = function (filePath: string, options: { type?: strin
   if (fs.existsSync(filePath)) {
     return new Promise((resolve, reject) => {
       const readStream = fs.createReadStream(filePath, { encoding: 'utf-8' });
-      const parseStream = bigJSON.createParseStream();
+      const parseStream: any = bigJSON.createParseStream();
       parseStream.on('data', function (data: unknown) {
         if (options.type === 'array') {
           return resolve(Object.values(data));
@@ -50,7 +50,7 @@ export const readLargeFile = function (filePath: string, options: { type?: strin
         console.log('error', error);
         reject(error);
       });
-      readStream.pipe(parseStream as any);
+      readStream.pipe(parseStream);
     });
   }
 };
@@ -81,7 +81,7 @@ export const writeLargeFile = function (filePath: string, data: any): Promise<an
     const stringifyStream = bigJSON.createStringifyStream({
       body: data,
     });
-    var writeStream = fs.createWriteStream(filePath, 'utf-8');
+    let writeStream = fs.createWriteStream(filePath, 'utf-8');
     stringifyStream.pipe(writeStream);
     writeStream.on('finish', () => {
       resolve('');

diff --git a/packages/contentstack-export/src/utils/marketplace-app-helper.ts b/packages/contentstack-export/src/utils/marketplace-app-helper.ts
@@ -36,7 +36,7 @@ export async function createNodeCryptoInstance(config: ExportConfig): Promise<No
       type: 'input',
       name: 'name',
       default: config.marketplaceAppEncryptionKey,
-      validate: (url) => {
+      validate: (url: any) => {
         if (!url) return "Encryption key can't be empty.";
 
         return true;
@@ -50,13 +50,12 @@ export async function createNodeCryptoInstance(config: ExportConfig): Promise<No
 
 export const getStackSpecificApps = async (params: {
   developerHubBaseUrl: string;
-  httpClient: HttpClient;
   config: ExportConfig;
   skip: number;
 }) => {
-  const { developerHubBaseUrl, httpClient, config, skip } = params;
+  const { developerHubBaseUrl, config, skip } = params;
   const appSdkAxiosInstance = await managementSDKClient({
-    host: developerHubBaseUrl.split('://').pop()
+    endpoint: developerHubBaseUrl,
   });
   return appSdkAxiosInstance.axiosInstance
     .get(`${developerHubBaseUrl}/installations?target_uids=${config.source_stack}&skip=${skip}`, {

diff --git a/packages/contentstack-import/package.json b/packages/contentstack-import/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

diff --git a/packages/contentstack-import/src/import/modules/entries.ts b/packages/contentstack-import/src/import/modules/entries.ts
@@ -200,7 +200,8 @@ export default class EntriesImport extends BaseClass {
    * @returns {ApiOptions} ApiOptions
    */
   serializeUpdateCTs(apiOptions: ApiOptions): ApiOptions {
-    const { apiData: contentType } = apiOptions;
+    const { apiData } = apiOptions;
+    const contentType = cloneDeep(apiData);
     if (contentType.field_rules) {
       delete contentType.field_rules;
     }
@@ -286,7 +287,11 @@ export default class EntriesImport extends BaseClass {
     const onSuccess = ({ response, apiData: entry, additionalInfo }: any) => {
       if (additionalInfo[entry.uid]?.isLocalized) {
         let oldUid = additionalInfo[entry.uid].entryOldUid;
-        log(this.importConfig, `Localized entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`, 'info');
+        log(
+          this.importConfig,
+          `Localized entry: '${entry.title}' of content type ${cTUid} in locale ${locale}`,
+          'info',
+        );
         entry.uid = oldUid;
         entry.entryOldUid = oldUid;
         entry.sourceEntryFilePath = path.join(basePath, additionalInfo.entryFileName); // stores source file path temporarily
@@ -379,7 +384,7 @@ export default class EntriesImport extends BaseClass {
         apiOptions.apiData = entryResponse;
         apiOptions.additionalInfo[entryResponse.uid] = {
           isLocalized: true,
-          entryOldUid: entry.uid
+          entryOldUid: entry.uid,
         };
         return apiOptions;
       }
@@ -544,7 +549,8 @@ export default class EntriesImport extends BaseClass {
    * @returns {ApiOptions} ApiOptions
    */
   serializeUpdateCTsWithRef(apiOptions: ApiOptions): ApiOptions {
-    const { apiData: contentType } = apiOptions;
+    const { apiData } = apiOptions;
+    const contentType = cloneDeep(apiData);
     if (contentType.field_rules) {
       delete contentType.field_rules;
     }

diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli",
   "description": "Command-line tool (CLI) to interact with Contentstack",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "author": "Contentstack",
   "bin": {
     "csdx": "./bin/run"
@@ -30,7 +30,7 @@
     "@contentstack/cli-cm-clone": "~1.5.1",
     "@contentstack/cli-cm-export": "~1.9.1",
     "@contentstack/cli-cm-export-to-csv": "~1.4.3",
-    "@contentstack/cli-cm-import": "~1.9.1",
+    "@contentstack/cli-cm-import": "~1.9.2",
     "@contentstack/cli-cm-migrate-rte": "~1.4.12",
     "@contentstack/cli-cm-seed": "~1.5.1",
     "@contentstack/cli-command": "~1.2.13",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml