Merge pull request #1388 from contentstack/staging

Sprint 56 Release
contentstack · Apr 29, 2024 · 22c0065 · 22c0065
2 parents ca42566 + 11fd7f0
commit 22c0065
Show file tree

Hide file tree

Showing 23 changed files with 277 additions and 101 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-audit/src/modules/entries.ts b/packages/contentstack-audit/src/modules/entries.ts
@@ -981,7 +981,14 @@ export default class Entries {
           const entries = (await fsUtility.readChunkFiles.next()) as Record<string, EntryStruct>;
           for (const entryUid in entries) {
             let { title } = entries[entryUid];
-            if (!title) {
+
+            if (entries[entryUid].hasOwnProperty('title') && !title) {
+              this.isEntryWithoutTitleField = true;
+              this.log(
+                `The 'title' field in Entry with UID '${entryUid}' of Content Type '${uid}' in Locale '${code}' is empty.`,
+                `error`,
+              );
+            } else if (!title) {
               this.isEntryWithoutTitleField = true;
               this.log(
                 `Entry with UID '${entryUid}' of Content Type '${uid}' in Locale '${code}' does not have a 'title' field.`,
@@ -993,8 +1000,8 @@ export default class Entries {
         }
       }
     }
-    if (this.isEntryWithoutTitleField) {
-      throw Error(`Entries found with missing 'title' field! Please make the data corrections and re-run the audit.`);
-    }
+    // if (this.isEntryWithoutTitleField) {
+    //    throw Error(`Entries found with missing 'title' field! Please make the data corrections and re-run the audit.`);
+    // }
   }
 }
diff --git a/packages/contentstack-clone/package.json b/packages/contentstack-clone/package.json
@@ -6,8 +6,8 @@
   "bugs": "https://github.com/rohitmishra209/cli-cm-clone/issues",
   "dependencies": {
     "@colors/colors": "^1.5.0",
-    "@contentstack/cli-cm-export": "~1.11.1",
-    "@contentstack/cli-cm-import": "~1.15.1",
+    "@contentstack/cli-cm-export": "~1.11.2",
+    "@contentstack/cli-cm-import": "~1.15.2",
     "@contentstack/cli-command": "~1.2.16",
     "@contentstack/cli-utilities": "~1.6.0",
     "async": "^3.2.4",

diff --git a/packages/contentstack-export-to-csv/package.json b/packages/contentstack-export-to-csv/package.json
@@ -65,4 +65,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
diff --git a/packages/contentstack-export/package.json b/packages/contentstack-export/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-export",
   "description": "Contentstack CLI plugin to export content from stack",
-  "version": "1.11.1",
+  "version": "1.11.2",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
@@ -98,4 +98,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}
diff --git a/packages/contentstack-export/src/commands/cm/stacks/export.ts b/packages/contentstack-export/src/commands/cm/stacks/export.ts
@@ -8,7 +8,7 @@ import {
   flags,
   ContentstackClient,
   FlagInput,
-  pathValidator
+  pathValidator,
 } from '@contentstack/cli-utilities';
 import { ModuleExporter } from '../../../export';
 import { setupExportConfig, log, formatError, writeExportMetaFile } from '../../../utils';
@@ -105,15 +105,19 @@ export default class ExportCommand extends Command {
       let exportConfig = await setupExportConfig(flags);
       // Note setting host to create cma client
       exportConfig.host = this.cmaHost;
-      exportDir = exportConfig.data || exportConfig.exportDir;
+      exportDir = exportConfig.cliLogsPath || exportConfig.data || exportConfig.exportDir;
       const managementAPIClient: ContentstackClient = await managementSDKClient(exportConfig);
       const moduleExporter = new ModuleExporter(managementAPIClient, exportConfig);
       await moduleExporter.start();
       if (!exportConfig.branches?.length) {
         writeExportMetaFile(exportConfig);
       }
       log(exportConfig, `The content of the stack ${exportConfig.apiKey} has been exported successfully!`, 'success');
-      log(exportConfig, `The log has been stored at '${pathValidator(path.join(exportDir, 'logs', 'export'))}'`, 'success');
+      log(
+        exportConfig,
+        `The log has been stored at '${pathValidator(path.join(exportDir, 'logs', 'export'))}'`,
+        'success',
+      );
     } catch (error) {
       log({ data: exportDir } as ExportConfig, `Failed to export stack content - ${formatError(error)}`, 'error');
       log({ data: exportDir } as ExportConfig, `The log has been stored at ${exportDir}`, 'info');

diff --git a/packages/contentstack-export/src/types/export-config.ts b/packages/contentstack-export/src/types/export-config.ts
@@ -2,6 +2,7 @@ import { Modules } from '.';
 import DefaultConfig from './default-config';
 
 export default interface ExportConfig extends DefaultConfig {
+  cliLogsPath: string;
   exportDir: string;
   data: string;
   management_token?: string;
@@ -27,7 +28,7 @@ export default interface ExportConfig extends DefaultConfig {
   access_token?: string;
   org_uid?: string;
   source_stack?: string;
-  sourceStackName?:string;
+  sourceStackName?: string;
 }
 
 type branch = {

diff --git a/packages/contentstack-export/src/utils/logger.ts b/packages/contentstack-export/src/utils/logger.ts
@@ -134,7 +134,7 @@ function init(_logPath: string) {
 }
 
 export const log = async (config: ExportConfig, message: any, type: string) => {
-  const logsPath = config.data;
+  const logsPath = config.cliLogsPath || config.data;
   // ignoring the type argument, as we are not using it to create a logfile anymore
   if (type !== 'error') {
     // removed type argument from init method
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,4 +65,4 @@ @@
         }
       },
       "repository": "https://github.com/contentstack/cli"
-    }
+    }