@hubspot/cli 4.1.6-beta.1 → 4.1.7-beta.0

package/commands/sandbox/create.js

@@ -10,7 +10,10 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const Spinnies = require('spinnies');
 const { createSandbox } = require('@hubspot/cli-lib/sandboxes');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { createSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
+const {
+  createSandboxPrompt,
+  getSandboxType,
+} = require('../../lib/prompts/sandboxesPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
 const {
@@ -122,6 +125,21 @@ exports.handler = async options => {
 
   trackCommandUsage('sandbox-create', null, accountId);
 
+  if (
+    accountConfig.sandboxAccountType &&
+    accountConfig.sandboxAccountType !== null
+  ) {
+    trackCommandUsage('sandbox-create', { successful: false }, accountId);
+
+    logger.error(
+      i18n(`${i18nKey}.failure.creatingWithinSandbox`, {
+        sandboxType: getSandboxType(accountConfig.sandboxAccountType),
+      })
+    );
+
+    process.exit(EXIT_CODES.ERROR);
+  }
+
   let namePrompt;
 
   logger.log(i18n(`${i18nKey}.sandboxLimitation`));

package/lib/projects.js

@@ -18,6 +18,8 @@ const {
   PROJECT_BUILD_TEXT,
   PROJECT_DEPLOY_TEXT,
   PROJECT_CONFIG_FILE,
+  PROJECT_TASK_TYPES,
+  SPINNER_STATUS,
 } = require('@hubspot/cli-lib/lib/constants');
 const {
   createProject,
@@ -361,7 +363,7 @@ const handleProjectUpload = async (
   archive.pipe(output);
 
   archive.directory(srcDir, false, file =>
-    shouldIgnoreFile(file.name) ? false : file
+    shouldIgnoreFile(file.name, true) ? false : file
   );
 
   archive.finalize();
@@ -374,6 +376,8 @@ const makePollTaskStatusFunc = ({
   statusStrings,
   linkToHubSpot,
 }) => {
+  const i18nKey = 'cli.commands.project.lib.makePollTaskStatusFunc';
+
   const isTaskComplete = task => {
     if (
       !task[statusText.SUBTASK_KEY].length ||
@@ -410,29 +414,60 @@ const makePollTaskStatusFunc = ({
       structureFn(accountId, taskName, taskId),
     ]);
 
-    const topLevelSubtasks = initialTaskStatus[statusText.SUBTASK_KEY].filter(
-      ({ id }) => !!taskStructure[id]
+    const tasksById = initialTaskStatus[statusText.SUBTASK_KEY].reduce(
+      (acc, task) => {
+        const type = task[statusText.TYPE_KEY];
+        if (type !== 'APP_ID' && type !== 'SERVERLESS_PKG') {
+          acc[task.id] = task;
+        }
+        return acc;
+      },
+      {}
     );
 
-    const numOfComponents = topLevelSubtasks.length;
-    const componentCountText = `\nFound ${numOfComponents} component${
-      numOfComponents !== 1 ? 's' : ''
-    } in this project ...\n`;
+    const structuredTasks = Object.keys(taskStructure).map(key => {
+      return {
+        ...tasksById[key],
+        subtasks: taskStructure[key]
+          .filter(taskId => Boolean(tasksById[taskId]))
+          .map(taskId => tasksById[taskId]),
+      };
+    });
+
+    const numComponents = structuredTasks.length;
+    const componentCountText = i18n(
+      numComponents === 1
+        ? `${i18nKey}.componentCountSingular`
+        : `${i18nKey}.componentCount`,
+      { numComponents }
+    );
 
     spinnies.update('overallTaskStatus', {
-      text: `${statusStrings.INITIALIZE(taskName)}${componentCountText}`,
+      text: `${statusStrings.INITIALIZE(taskName)}\n${componentCountText}\n`,
     });
 
-    for (let subTask of topLevelSubtasks) {
-      const subTaskName = subTask[statusText.SUBTASK_NAME_KEY];
-
-      spinnies.add(subTaskName, {
-        text: `${chalk.bold(subTaskName)} ${
-          statusText.STATUS_TEXT[statusText.STATES.ENQUEUED]
-        }\n`,
-        indent: 2,
+    const addTaskSpinner = (task, indent, newline) => {
+      const taskName = task[statusText.SUBTASK_NAME_KEY];
+      const taskType = task[statusText.TYPE_KEY];
+      const formattedTaskType = PROJECT_TASK_TYPES[taskType]
+        ? `[${PROJECT_TASK_TYPES[taskType]}]`
+        : '';
+      const text = `${statusText.STATUS_TEXT} ${chalk.bold(
+        taskName
+      )} ${formattedTaskType} ...${newline ? '\n' : ''}`;
+
+      spinnies.add(task.id, {
+        text,
+        indent,
       });
-    }
+    };
+
+    structuredTasks.forEach(task => {
+      addTaskSpinner(task, 2, !task.subtasks || task.subtasks.length === 0);
+      task.subtasks.forEach((subtask, i) =>
+        addTaskSpinner(subtask, 4, i === task.subtasks.length - 1)
+      );
+    });
 
     return new Promise((resolve, reject) => {
       const pollInterval = setInterval(async () => {
@@ -444,34 +479,43 @@ const makePollTaskStatusFunc = ({
 
         if (spinnies.hasActiveSpinners()) {
           subTaskStatus.forEach(subTask => {
-            const subTaskName = subTask[statusText.SUBTASK_NAME_KEY];
+            const { id, status } = subTask;
+            const spinner = spinnies.pick(id);
 
-            if (!spinnies.pick(subTaskName)) {
+            if (!spinner || spinner.status !== SPINNER_STATUS.SPINNING) {
               return;
             }
 
-            const updatedText = `${chalk.bold(subTaskName)} ${
-              statusText.STATUS_TEXT[subTask.status]
-            }\n`;
-
-            switch (subTask.status) {
-              case statusText.STATES.SUCCESS:
-                spinnies.succeed(subTaskName, { text: updatedText });
-                break;
-              case statusText.STATES.FAILURE:
-                spinnies.fail(subTaskName, { text: updatedText });
-                break;
-              default:
-                spinnies.update(subTaskName, { text: updatedText });
-                break;
+            const topLevelTask = structuredTasks.find(t => t.id == id);
+
+            if (
+              status === statusText.STATES.SUCCESS ||
+              status === statusText.STATES.FAILURE
+            ) {
+              const taskStatusText =
+                subTask.status === statusText.STATES.SUCCESS
+                  ? i18n(`${i18nKey}.successStatusText`)
+                  : i18n(`${i18nKey}.failedStatusText`);
+              const hasNewline =
+                spinner.text.includes('\n') || Boolean(topLevelTask);
+              const updatedText = `${spinner.text.replace(
+                '\n',
+                ''
+              )} ${taskStatusText}${hasNewline ? '\n' : ''}`;
+
+              status === statusText.STATES.SUCCESS
+                ? spinnies.succeed(id, { text: updatedText })
+                : spinnies.fail(id, { text: updatedText });
+
+              if (topLevelTask) {
+                topLevelTask.subtasks.forEach(currentSubtask =>
+                  spinnies.remove(currentSubtask.id)
+                );
+              }
             }
           });
 
           if (isTaskComplete(taskStatus)) {
-            // subTaskStatus.forEach(subTask => {
-            //   spinnies.remove(subTask[statusText.SUBTASK_NAME_KEY]);
-            // });
-
             if (status === statusText.STATES.SUCCESS) {
               spinnies.succeed('overallTaskStatus', {
                 text: statusStrings.SUCCESS(taskName),
@@ -481,7 +525,7 @@ const makePollTaskStatusFunc = ({
                 text: statusStrings.FAIL(taskName),
               });
 
-              const failedSubtask = subTaskStatus.filter(
+              const failedSubtasks = subTaskStatus.filter(
                 subtask => subtask.status === 'FAILURE'
               );
 
@@ -489,19 +533,19 @@ const makePollTaskStatusFunc = ({
               logger.log(
                 `${statusStrings.SUBTASK_FAIL(
                   displayId,
-                  failedSubtask.length === 1
-                    ? failedSubtask[0][statusText.SUBTASK_NAME_KEY]
-                    : failedSubtask.length + ' components'
+                  failedSubtasks.length === 1
+                    ? failedSubtasks[0][statusText.SUBTASK_NAME_KEY]
+                    : failedSubtasks.length + ' components'
                 )}\n`
               );
               logger.log('See below for a summary of errors.');
               uiLine();
 
-              failedSubtask.forEach(subTask => {
+              failedSubtasks.forEach(subTask => {
                 logger.log(
-                  `\n--- ${chalk.bold(subTask[statusText.SUBTASK_NAME_KEY])} ${
-                    statusText.STATUS_TEXT[subTask.status]
-                  } with the following error ---`
+                  `\n--- ${chalk.bold(
+                    subTask[statusText.SUBTASK_NAME_KEY]
+                  )} failed with the following error ---`
                 );
                 logger.error(subTask.errorMessage);
 

package/lib/prompts/accountsPrompt.js

@@ -1,7 +1,19 @@
 const { updateDefaultAccount } = require('@hubspot/cli-lib/lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
-const { mapAccountChoices } = require('./sandboxesPrompt');
+
+const getSandboxType = type =>
+  type === 'DEVELOPER' ? 'development' : 'standard';
+
+const mapAccountChoices = portals =>
+  portals.map(p => {
+    const isSandbox = p.sandboxAccountType && p.sandboxAccountType !== null;
+    const sandboxName = `[${getSandboxType(p.sandboxAccountType)} sandbox] `;
+    return {
+      name: `${p.name} ${isSandbox ? sandboxName : ''}(${p.portalId})`,
+      value: p.name || p.portalId,
+    };
+  });
 
 const i18nKey = 'cli.commands.accounts.subcommands.use';
 

package/lib/prompts/sandboxesPrompt.js

@@ -6,15 +6,16 @@ const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
 const getSandboxType = type =>
   type === 'DEVELOPER' ? 'development' : 'standard';
 
-const mapAccountChoices = portals =>
-  portals.map(p => {
-    const isSandbox = p.sandboxAccountType !== null;
-    const sandboxName = `[${getSandboxType(p.sandboxAccountType)} sandbox] `;
-    return {
-      name: `${p.name} ${isSandbox ? sandboxName : ''}(${p.portalId})`,
-      value: p.name || p.portalId,
-    };
-  });
+const mapSandboxAccountChoices = portals =>
+  portals
+    .filter(p => p.sandboxAccountType && p.sandboxAccountType !== null)
+    .map(p => {
+      const sandboxName = `[${getSandboxType(p.sandboxAccountType)} sandbox] `;
+      return {
+        name: `${p.name} ${sandboxName}(${p.portalId})`,
+        value: p.name || p.portalId,
+      };
+    });
 
 const createSandboxPrompt = () => {
   return promptUser([
@@ -44,7 +45,7 @@ const deleteSandboxPrompt = (config, promptParentAccount = false) => {
       type: 'list',
       look: false,
       pageSize: 20,
-      choices: mapAccountChoices(config.portals),
+      choices: mapSandboxAccountChoices(config.portals),
       default: config.defaultPortal,
     },
   ]);
@@ -54,5 +55,4 @@ module.exports = {
   createSandboxPrompt,
   deleteSandboxPrompt,
   getSandboxType,
-  mapAccountChoices,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.1.6-beta.1",
+  "version": "4.1.7-beta.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,8 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "4.1.6-beta.1",
-    "@hubspot/serverless-dev-runtime": "4.1.6-beta.1",
+    "@hubspot/cli-lib": "4.1.7-beta.0",
+    "@hubspot/serverless-dev-runtime": "4.1.7-beta.0",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "886b32d3fd4385be85dfb118e58b61a24a7ac568"
+  "gitHead": "2f99be18415403ff6bbd48faba96cf5315f220ab"
 }