@hubspot/cli 4.1.8-beta.7 → 4.2.0

package/commands/list.js

@@ -52,44 +52,35 @@ exports.handler = async options => {
     process.exit(EXIT_CODES.SUCCESS);
   }
 
-  if (contentsResp.children.length) {
-    const mappedContents = contentsResp.children.map(fileOrFolder => {
-      if (!isPathFolder(fileOrFolder)) {
-        return fileOrFolder;
-      }
-
-      return chalk.reset.blue(fileOrFolder);
-    });
-    const hubspotFolder = `/${HUBSPOT_FOLDER}`;
-    const marketplaceFolder = `/${MARKETPLACE_FOLDER}`;
-    const folderContentsOutput = mappedContents
-      .sort(function(a, b) {
-        // Pin @hubspot folder to top
-        if (a === hubspotFolder) {
-          return -1;
-        } else if (b === hubspotFolder) {
-          return 1;
-        }
-
-        // Pin @marketplace folder to top
-        if (a === marketplaceFolder) {
-          return -1;
-        } else if (b === marketplaceFolder) {
-          return 1;
-        }
-
-        return a.localeCompare(b);
+  if (!contentsResp.folder) {
+    logger.info(
+      i18n(`${i18nKey}.noFilesFoundAtPath`, {
+        path: directoryPath,
       })
-      .join('\n');
+    );
+    return;
+  }
+  // getDirectoryContentsByPath omits @hubspot
+  const contents =
+    directoryPath === '/'
+      ? ['@hubspot', ...contentsResp.children]
+      : contentsResp.children;
 
-    logger.log(folderContentsOutput);
-  } else {
+  if (contents.length === 0) {
     logger.info(
-      i18n(`${i18nKey}.noFilesFoundInPath`, {
+      i18n(`${i18nKey}.noFilesFoundAtPath`, {
         path: directoryPath,
       })
     );
+    return;
   }
+
+  const folderContentsOutput = contents
+    .map(addColorToContents)
+    .sort(sortContents)
+    .join('\n');
+
+  logger.log(folderContentsOutput);
 };
 
 exports.builder = yargs => {
@@ -105,3 +96,31 @@ exports.builder = yargs => {
 
   return yargs;
 };
+
+const addColorToContents = fileOrFolder => {
+  if (!isPathFolder(fileOrFolder)) {
+    return chalk.reset.cyan(fileOrFolder);
+  }
+  if (fileOrFolder === HUBSPOT_FOLDER || fileOrFolder === MARKETPLACE_FOLDER) {
+    return chalk.reset.bold.blue(fileOrFolder);
+  }
+  return chalk.reset.blue(fileOrFolder);
+};
+
+const sortContents = (a, b) => {
+  // Pin @hubspot folder to top
+  if (a === HUBSPOT_FOLDER) {
+    return -1;
+  } else if (b === HUBSPOT_FOLDER) {
+    return 1;
+  }
+
+  // Pin @marketplace folder to top
+  if (a === MARKETPLACE_FOLDER) {
+    return -1;
+  } else if (b === MARKETPLACE_FOLDER) {
+    return 1;
+  }
+
+  return a.localeCompare(b);
+};

package/commands/project/create.js

@@ -29,7 +29,11 @@ exports.handler = async options => {
 
   const { name, template, location } = await createProjectPrompt(options);
 
-  trackCommandUsage('project-create', null, accountId);
+  trackCommandUsage(
+    'project-create',
+    { type: options.template || template },
+    accountId
+  );
 
   await createProjectConfig(
     path.resolve(getCwd(), options.location || location),

package/lang/en.lyaml

@@ -998,7 +998,7 @@ en:
             invalidName: "You entered an invalid name. Please try again."
             nameRequired: "The name may not be blank. Please try again."
             spacesInName: "The name may not contain spaces. Please try again."
-            accountNameExists: "Account name \"{{ name }}\" already exists, please enter a different name."
+            accountNameExists: "Account with name \"{{ name }}\" already exists in the CLI config, please enter a different name."
         personalAccessKeyPrompt:
           enterAccountId: "Enter the account ID for your account (the number under the DOMAIN column at https://app.hubspot.com/myaccounts-beta ): "
           enterClientId: "Enter your OAuth2 client ID: "
@@ -1077,7 +1077,7 @@ en:
             errors:
               invalidName: "You entered an invalid name. Please try again."
               nameRequired: "The name may not be blank. Please try again."
-              accountNameExists: "Account name \"{{ name }}\" already exists, please enter a different name."
+              accountNameExists: "Account with name \"{{ name }}\" already exists in the CLI config, please enter a different name."
             selectAccountName: "Select the sandbox account you want to delete"
             selectParentAccountName: "Select the account that the sandbox belongs to"
           type:
@@ -1174,14 +1174,14 @@ en:
               standard: "Sync all supported assets to {{#cyan}}{{#bold}}{{ sandboxName }}{{/bold}}{{/cyan}} from {{#bold}}{{ parentAccountName }}{{/bold}}?"
               developer: "Sync CRM object definitions to {{#cyan}}{{#bold}}{{ sandboxName }}{{/bold}}{{/cyan}} from {{#bold}}{{ parentAccountName }}{{/bold}}?"
             syncContactRecords:
-              standard: "Include up to 5000 most recent contact records and associations in this sync? Syncing contact records may take some time"
-              developer: "Include up to 100 most recent contact records and associations in this sync? Syncing contact records may take some time"
+              standard: "Include up to 5000 most recently updated contacts? This includes up to 100 of each of the following: associated deals, tickets, and companies. This can be done once per sandbox."
+              developer: "Include up to 100 most recently updated contacts? This includes up to 100 of each of the following: associated deals, tickets, and companies. This can be done once per sandbox."
           loading:
             startSync: "Initiating sync..."
             fail: "Failed to sync sandbox."
             succeed: "Sandbox sync initiated to {{ accountName }}."
             skipPolling: "Syncing CRM object definitions."
-            skipPollingWithContacts: "Syncing CRM object definitions and up to 100 most recent contacts and associated records."
+            skipPollingWithContacts: "Syncing CRM object definitions and up to 100 most recently updated contacts with associated deals, tickets, and companies (up to 100 each)."
           polling:
             syncing: "Syncing sandbox..."
             fail: "Failed to fetch sync updates. View the sync status at: {{ url }}"

package/lib/sandboxes.js

@@ -256,19 +256,20 @@ const saveSandboxToConfig = async (env, result, force = false) => {
     const invalidAccountName = accountNameExistsInConfig(nameForConfig);
     if (invalidAccountName) {
       if (!force) {
-        logger.log(
+        logger.log('');
+        logger.warn(
           i18n(
             `cli.lib.prompts.enterAccountNamePrompt.errors.accountNameExists`,
             { name: nameForConfig }
           )
         );
         const { name: promptName } = await enterAccountNamePrompt(
-          nameForConfig
+          nameForConfig + `_${result.sandbox.sandboxHubId}`
         );
         validName = promptName;
       } else {
         // Basic invalid name handling when force flag is passed
-        validName = nameForConfig + `_${Date.now()}`;
+        validName = nameForConfig + `_${result.sandbox.sandboxHubId}`;
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.1.8-beta.7",
+  "version": "4.2.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -43,5 +43,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3116f0d518598a1b72d07457edf2374181a8f35e"
+  "gitHead": "a60ba8c2375e1102cfc98826147dbadaa94e8f31"
 }