@contentstack/cli-cm-export-to-csv 1.3.7 → 1.3.9

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.3.7",
+  "version": "1.3.9",
   "commands": {
     "cm:export-to-csv": {
       "id": "cm:export-to-csv",
@@ -15,8 +15,8 @@
         "Exporting entries to csv",
         "csdx cm:export-to-csv --action <entries> --locale <locale> --alias <management-token-alias> --content-type <content-type>",
         "",
-        "Exporting entries to csv with stack name provided",
-        "csdx cm:export-to-csv --action <entries> --locale <locale> --alias <management-token-alias> --content-type <content-type> --stack-name <stack-name>",
+        "Exporting entries to csv with stack name provided and branch name provided",
+        "csdx cm:export-to-csv --action <entries> --locale <locale> --alias <management-token-alias> --content-type <content-type> --stack-name <stack-name> --branch <branch-name>",
         "",
         "Exporting organization users to csv",
         "csdx cm:export-to-csv --action <users> --org <org-uid>",
@@ -78,6 +78,13 @@
           "description": "Content type for which entries needs to be exported",
           "required": false,
           "multiple": false
+        },
+        "branch": {
+          "name": "branch",
+          "type": "option",
+          "description": "Branch from which entries need to be exported",
+          "required": false,
+          "multiple": false
         }
       },
       "args": {}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@contentstack/cli-cm-export-to-csv",
   "description": "Export entities to csv",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "author": "Abhinav Gupta @abhinav-from-contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-command": "^1.2.7",
-    "@contentstack/cli-utilities": "^1.4.3",
+    "@contentstack/cli-command": "^1.2.9",
+    "@contentstack/cli-utilities": "^1.4.5",
     "chalk": "^4.1.0",
     "fast-csv": "^4.3.6",
     "inquirer": "8.2.4",
@@ -60,4 +60,4 @@
     }
   },
   "repository": "https://github.com/contentstack/cli"
-}
+}

package/src/commands/cm/export-to-csv.js

@@ -1,5 +1,12 @@
 const { Command } = require('@contentstack/cli-command');
-const { configHandler, managementSDKClient, flags, isAuthenticated } = require('@contentstack/cli-utilities');
+const {
+  configHandler,
+  managementSDKClient,
+  flags,
+  isAuthenticated,
+  cliux,
+  doesBranchExist,
+} = require('@contentstack/cli-utilities');
 const util = require('../../util');
 const config = require('../../util/config');
 
@@ -41,6 +48,11 @@ class ExportToCsvCommand extends Command {
       required: false,
       multiple: false,
     }),
+    branch: flags.string({
+      description: 'Branch from which entries need to be exported',
+      multiple: false,
+      required: false,
+    }),
   };
 
   async run() {
@@ -55,6 +67,7 @@ class ExportToCsvCommand extends Command {
           locale: locale,
           'content-type': contentTypesFlag,
           alias: managementTokenAlias,
+          branch: branchUid,
         },
       } = await this.parse(ExportToCsvCommand);
 
@@ -76,6 +89,7 @@ class ExportToCsvCommand extends Command {
             let stackAPIClient;
             let language;
             let contentTypes = [];
+            let stackBranches;
             const listOfTokens = configHandler.get('tokens');
 
             if (managementTokenAlias && listOfTokens[managementTokenAlias]) {
@@ -110,7 +124,34 @@ class ExportToCsvCommand extends Command {
             }
 
             stackAPIClient = this.getStackClient(managementAPIClient, stack);
+
+            if (branchUid) {
+              try {
+                const branchExists = await doesBranchExist(stackAPIClient, branchUid);
+                if (branchExists?.errorCode) {
+                  throw new Error(branchExists.errorMessage);
+                }
+                stack.branch_uid = branchUid;
+                stackAPIClient = this.getStackClient(managementAPIClient, stack);
+              } catch (error) {
+                if (error.message || error.errorMessage) {
+                  cliux.error(util.formatError(error));
+                  this.exit();
+                }
+              }
+            } else {
+              stackBranches = await this.getStackBranches(stackAPIClient);
+              if (stackBranches === undefined) {
+                stackAPIClient = this.getStackClient(managementAPIClient, stack);
+              } else {
+                const { branch } = await util.chooseBranch(stackBranches);
+                stack.branch_uid = branch;
+                stackAPIClient = this.getStackClient(managementAPIClient, stack);
+              }
+            }
+
             const contentTypeCount = await util.getContentTypeCount(stackAPIClient);
+
             const environments = await util.getEnvironments(stackAPIClient); // fetch environments, because in publish details only env uid are available and we need env names
 
             if (contentTypesFlag) {
@@ -189,7 +230,7 @@ class ExportToCsvCommand extends Command {
 
             util.write(this, listOfUsers, fileName, 'organization details');
           } catch (error) {
-            if (error.message) {
+            if (error.message || error.errorMessage) {
               this.log(util.formatError(error));
             }
           }
@@ -197,7 +238,7 @@ class ExportToCsvCommand extends Command {
         }
       }
     } catch (error) {
-      if (error.message) {
+      if (error.message || error.errorMessage) {
         this.log(util.formatError(error));
       }
     }
@@ -208,13 +249,26 @@ class ExportToCsvCommand extends Command {
   }
 
   getStackClient(managementAPIClient, stack) {
+    const stackInit = {
+      api_key: stack.apiKey,
+      branch_uid: stack.branch_uid,
+    };
     if (stack.token) {
       return managementAPIClient.stack({
-        api_key: stack.apiKey,
+        ...stackInit,
         management_token: stack.token,
       });
     }
-    return managementAPIClient.stack({ api_key: stack.apiKey });
+    return managementAPIClient.stack(stackInit);
+  }
+
+  getStackBranches(stackAPIClient) {
+    return stackAPIClient
+      .branch()
+      .query()
+      .find()
+      .then(({ items }) => (items !== undefined ? items : []))
+      .catch((_err) => {});
   }
 }
 
@@ -226,8 +280,8 @@ ExportToCsvCommand.examples = [
   'Exporting entries to csv',
   'csdx cm:export-to-csv --action <entries> --locale <locale> --alias <management-token-alias> --content-type <content-type>',
   '',
-  'Exporting entries to csv with stack name provided',
-  'csdx cm:export-to-csv --action <entries> --locale <locale> --alias <management-token-alias> --content-type <content-type> --stack-name <stack-name>',
+  'Exporting entries to csv with stack name provided and branch name provided',
+  'csdx cm:export-to-csv --action <entries> --locale <locale> --alias <management-token-alias> --content-type <content-type> --stack-name <stack-name> --branch <branch-name>',
   '',
   'Exporting organization users to csv',
   'csdx cm:export-to-csv --action <users> --org <org-uid>',

package/src/util/index.js

@@ -8,6 +8,7 @@ const debug = require('debug')('export-to-csv');
 const checkboxPlus = require('inquirer-checkbox-plus-prompt');
 
 const config = require('./config.js');
+const { cliux } = require('@contentstack/cli-utilities');
 
 const directory = './data';
 const delimeter = os.platform() === 'win32' ? '\\' : '/';
@@ -126,6 +127,26 @@ function chooseStack(managementAPIClient, orgUid) {
   });
 }
 
+async function chooseBranch(branchList) {
+  try {
+    const branches = await branchList;
+
+    const branchesArray = branches.map((branch) => branch.uid);
+
+    let _chooseBranch = [
+      {
+        type: 'list',
+        name: 'branch',
+        message: 'Choose a Branch',
+        choices: branchesArray,
+      },
+    ];
+    return await inquirer.prompt(_chooseBranch);
+  } catch (err) {
+    cliux.error(err);
+  }
+}
+
 function getStacks(managementAPIClient, orgUid) {
   return new Promise((resolve, reject) => {
     let result = {};
@@ -167,7 +188,7 @@ function chooseContentType(stackAPIClient, skip) {
 }
 
 function chooseInMemContentTypes(contentTypesList) {
-  return new Promise(async (resolve, reject) => {
+  return new Promise((resolve, reject) => {
     let _chooseContentType = [
       {
         type: 'checkbox-plus',
@@ -213,7 +234,7 @@ function getContentTypes(stackAPIClient, skip) {
     let result = {};
     stackAPIClient
       .contentType()
-      .query({ skip: skip * 100 })
+      .query({ skip: skip * 100, include_branch: true })
       .find()
       .then((contentTypes) => {
         contentTypes.items.forEach((contentType) => {
@@ -400,7 +421,7 @@ function startupQuestions() {
   });
 }
 
-function getOrgUsers(managementAPIClient, orgUid, ecsv) {
+function getOrgUsers(managementAPIClient, orgUid) {
   return new Promise((resolve, reject) => {
     managementAPIClient
       .getUser({ include_orgs_roles: true })
@@ -442,10 +463,7 @@ async function getUsers(managementAPIClient, organization, params, result = [])
       await wait(200);
       return getUsers(managementAPIClient, organization, params, result);
     }
-  } catch (error) {
-    console.error(error);
-    throw error;
-  }
+  } catch (error) {}
 }
 
 function getMappedUsers(users) {
@@ -612,6 +630,7 @@ function wait(time) {
 module.exports = {
   chooseOrganization: chooseOrganization,
   chooseStack: chooseStack,
+  chooseBranch: chooseBranch,
   chooseContentType: chooseContentType,
   chooseLanguage: chooseLanguage,
   getEntries: getEntries,