Add util for getting account description

packages/cli/commands/project/listBuilds.js

@@ -21,8 +21,8 @@ const {
   getTableHeader,
 } = require('@hubspot/cli-lib/lib/table');
 const { getCwd } = require('@hubspot/cli-lib/path');
+const { link } = require('../../lib/ui');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { link } = require('../../lib/links');
 const {
   getProjectConfig,
   getProjectDetailUrl,

packages/cli/commands/project/upload.js

@@ -15,6 +15,7 @@ const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
+const { getAccountDescription } = require('../../lib/ui');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { uploadProject } = require('@hubspot/cli-lib/api/dfs');
 const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
@@ -36,9 +37,9 @@ const uploadProjectFiles = async (accountId, projectName, filePath) => {
   });
 
   spinnies.add('upload', {
-    text: `Uploading ${chalk.bold(projectName)} project files to ${chalk.bold(
-      accountId
-    )}`,
+    text: `Uploading ${chalk.bold(
+      projectName
+    )} project files to ${getAccountDescription(accountId)}`,
   });
 
   let buildId;
@@ -49,9 +50,9 @@ const uploadProjectFiles = async (accountId, projectName, filePath) => {
     buildId = upload.buildId;
 
     spinnies.succeed('upload', {
-      text: `Uploaded ${chalk.bold(projectName)} project files to ${chalk.bold(
-        accountId
-      )}`,
+      text: `Uploaded ${chalk.bold(
+        projectName
+      )} project files to ${getAccountDescription(accountId)}`,
     });
 
     logger.debug(
@@ -61,7 +62,7 @@ const uploadProjectFiles = async (accountId, projectName, filePath) => {
     spinnies.fail('upload', {
       text: `Failed to upload ${chalk.bold(
         projectName
-      )} project files to ${chalk.bold(accountId)}`,
+      )} project files to ${getAccountDescription(accountId)}`,
     });
 
     logApiErrorInstance(
@@ -143,7 +144,7 @@ exports.handler = async options => {
       logger.log(
         `Build #${buildId} succeeded. ${chalk.bold(
           'Automatically deploying'
-        )} to ${accountId}`
+        )} to ${getAccountDescription(accountId)}`
       );
       const { status } = await pollDeployStatus(
         accountId,

packages/cli/lib/links.js

@@ -1,4 +1,3 @@
-const supportsHyperlinks = require('supports-hyperlinks');
 const { getEnv } = require('@hubspot/cli-lib/lib/config');
 const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
@@ -121,18 +120,9 @@ const openLink = (accountId, shortcut) => {
   logger.success(`We opened ${match.url} in your browser`);
 };
 
-const link = (linkText, url, options = {}) => {
-  if (supportsHyperlinks.stdout) {
-    return ['\u001B]8;;', url, '\u0007', linkText, '\u001B]8;;\u0007'].join('');
-  } else {
-    return options.fallback ? `${linkText}: ${url}` : linkText;
-  }
-};
-
 module.exports = {
   getSiteLinks,
   getSiteLinksAsArray,
   logSiteLinks,
   openLink,
-  link,
 };

packages/cli/lib/projects.js

@@ -11,7 +11,6 @@ const {
   createProject: createProjectTemplate,
 } = require('@hubspot/cli-lib/projects');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
-
 const {
   ENVIRONMENTS,
   POLLING_DELAY,
@@ -30,6 +29,7 @@ const {
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
 const { getCwd } = require('@hubspot/cli-lib/path');
+const { getAccountDescription } = require('../lib/ui');
 
 const PROJECT_STRINGS = {
   BUILD: {
@@ -176,7 +176,9 @@ const ensureProjectExists = async (accountId, projectName, forceCreate) => {
         const promptResult = await prompt([
           {
             name: 'shouldCreateProject',
-            message: `The project ${projectName} does not exist in ${accountId}. Would you like to create it?`,
+            message: `The project ${projectName} does not exist in ${getAccountDescription(
+              accountId
+            )}. Would you like to create it?`,
             type: 'confirm',
           },
         ]);

packages/cli/lib/ui.js

@@ -0,0 +1,37 @@
+const chalk = require('chalk');
+const supportsHyperlinks = require('supports-hyperlinks');
+const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
+
+/**
+ * Returns a hyperlink or link and description
+ *
+ * @param {string} linkText
+ * @param {string} url
+ * @param {object} options
+ * @returns {string}
+ */
+const link = (linkText, url, options = {}) => {
+  if (supportsHyperlinks.stdout) {
+    return ['\u001B]8;;', url, '\u0007', linkText, '\u001B]8;;\u0007'].join('');
+  } else {
+    return options.fallback ? `${linkText}: ${url}` : linkText;
+  }
+};
+
+/**
+ * Returns formatted account name and ID
+ *
+ * @param {number} accountId
+ * @returns {string}
+ */
+const getAccountDescription = accountId => {
+  const account = getAccountConfig(accountId);
+  return chalk.bold(
+    account.name ? `${account.name} (${account.portalId})` : account.portalId
+  );
+};
+
+module.exports = {
+  link,
+  getAccountDescription,
+};