@hubspot/cli 5.2.1-beta.0 → 5.2.1-beta.2

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -1,28 +1,42 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { uiAccountDescription, uiCommandReference } = require('../ui');
-const { isSandbox } = require('../sandboxes');
+const { isSandbox, isDeveloperTestAccount } = require('../accountTypes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { getSandboxUsageLimits } = require('@hubspot/local-dev-lib/sandboxes');
 const {
   HUBSPOT_ACCOUNT_TYPES,
+  HUBSPOT_ACCOUNT_TYPE_STRINGS,
 } = require('@hubspot/local-dev-lib/constants/config');
 const { logger } = require('@hubspot/local-dev-lib/logger');
+const {
+  fetchDeveloperTestAccounts,
+} = require('@hubspot/local-dev-lib/developerTestAccounts');
 
 const i18nKey = 'cli.lib.prompts.projectDevTargetAccountPrompt';
 
-const mapSandboxAccount = accountConfig => ({
+const mapNestedAccount = accountConfig => ({
   name: uiAccountDescription(accountConfig.portalId, false),
   value: {
     targetAccountId: getAccountId(accountConfig.name),
-    createNewSandbox: false,
+    createNestedAccount: false,
+    parentAccountId: accountConfig.parentAccountId,
   },
 });
 
-const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
-  let sandboxUsage = {};
-  const defaultAccountId = getAccountId(defaultAccountConfig.name);
+const getNonConfigDeveloperTestAccountName = account => {
+  return `${account.accountName} [${
+    HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]
+  }] (${account.id})`;
+};
 
+const selectSandboxTargetAccountPrompt = async (
+  accounts,
+  defaultAccountConfig
+) => {
+  const defaultAccountId = getAccountId(defaultAccountConfig.name);
+  let choices = [];
+  let sandboxUsage = {};
   try {
     sandboxUsage = await getSandboxUsageLimits(defaultAccountId);
   } catch (err) {
@@ -48,20 +62,19 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
       });
     }
   }
-
   // Order choices by Developer Sandbox -> Standard Sandbox
-  const choices = [
+  choices = [
     ...sandboxAccounts
       .filter(a => a.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX)
-      .map(mapSandboxAccount),
+      .map(mapNestedAccount),
     ...sandboxAccounts
       .filter(a => a.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX)
-      .map(mapSandboxAccount),
+      .map(mapNestedAccount),
     {
       name: i18n(`${i18nKey}.createNewSandboxOption`),
       value: {
         targetAccountId: null,
-        createNewSandbox: true,
+        createNestedAccount: true,
       },
       disabled: disabledMessage,
     },
@@ -69,17 +82,102 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
       name: i18n(`${i18nKey}.chooseDefaultAccountOption`),
       value: {
         targetAccountId: defaultAccountId,
-        createNewSandbox: false,
+        createNestedAccount: false,
       },
     },
   ];
 
+  return selectTargetAccountPrompt(
+    defaultAccountId,
+    'sandbox account',
+    choices
+  );
+};
+
+const selectDeveloperTestTargetAccountPrompt = async (
+  accounts,
+  defaultAccountConfig
+) => {
+  const defaultAccountId = getAccountId(defaultAccountConfig.name);
+  let choices = [];
+  let devTestAccountsResponse = undefined;
+  try {
+    devTestAccountsResponse = await fetchDeveloperTestAccounts(
+      defaultAccountId
+    );
+  } catch (err) {
+    logger.debug('Unable to fetch developer test account usage limits: ', err);
+  }
+
+  const devTestAccounts = accounts
+    .reverse()
+    .filter(
+      config =>
+        isDeveloperTestAccount(config) &&
+        config.parentAccountId === defaultAccountId
+    );
+  let disabledMessage = false;
+  if (
+    devTestAccountsResponse &&
+    devTestAccountsResponse.results.length >=
+      devTestAccountsResponse.maxTestPortals
+  ) {
+    disabledMessage = i18n(`${i18nKey}.developerTestAccountLimit`, {
+      authCommand: uiCommandReference('hs auth'),
+      limit: devTestAccountsResponse.maxTestPortals,
+    });
+  }
+
+  let devTestAccountsNotInConfig = [];
+  if (devTestAccountsResponse && devTestAccountsResponse.results) {
+    const inConfigIds = devTestAccounts.map(d => d.portalId);
+    devTestAccountsResponse.results.forEach(acct => {
+      if (inConfigIds.indexOf(acct.id) < 0) {
+        devTestAccountsNotInConfig.push({
+          name: getNonConfigDeveloperTestAccountName(acct),
+          value: {
+            targetAccountId: acct.id,
+            createdNestedAccount: false,
+            parentAccountId: defaultAccountId,
+            notInConfigAccount: acct,
+          },
+        });
+      }
+    });
+  }
+
+  choices = [
+    ...devTestAccounts.map(mapNestedAccount),
+    ...devTestAccountsNotInConfig,
+    {
+      name: i18n(`${i18nKey}.createNewDeveloperTestAccountOption`),
+      value: {
+        targetAccountId: null,
+        createNestedAccount: true,
+      },
+      disabled: disabledMessage,
+    },
+  ];
+
+  return selectTargetAccountPrompt(
+    defaultAccountId,
+    HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST],
+    choices
+  );
+};
+
+const selectTargetAccountPrompt = async (
+  defaultAccountId,
+  accountType,
+  choices
+) => {
   const { targetAccountInfo } = await promptUser([
     {
       name: 'targetAccountInfo',
       type: 'list',
       message: i18n(`${i18nKey}.promptMessage`, {
         accountIdentifier: uiAccountDescription(defaultAccountId),
+        accountType,
       }),
       choices,
     },
@@ -102,7 +200,22 @@ const confirmDefaultAccountPrompt = async (accountName, accountType) => {
   return useDefaultAccount;
 };
 
+const confirmUseExistingDeveloperTestAccountPrompt = async account => {
+  const { confirmUseExistingDeveloperTestAccount } = await promptUser([
+    {
+      name: 'confirmUseExistingDeveloperTestAccount',
+      type: 'confirm',
+      message: i18n(`${i18nKey}.confirmUseExistingDeveloperTestAccount`, {
+        accountName: getNonConfigDeveloperTestAccountName(account),
+      }),
+    },
+  ]);
+  return confirmUseExistingDeveloperTestAccount;
+};
+
 module.exports = {
-  selectTargetAccountPrompt,
+  selectSandboxTargetAccountPrompt,
+  selectDeveloperTestTargetAccountPrompt,
   confirmDefaultAccountPrompt,
+  confirmUseExistingDeveloperTestAccountPrompt,
 };

package/lib/prompts/sandboxesPrompt.js

@@ -5,7 +5,7 @@ const { uiAccountDescription } = require('../ui');
 const {
   HUBSPOT_ACCOUNT_TYPES,
 } = require('@hubspot/local-dev-lib/constants/config');
-const { isSandbox } = require('../sandboxes');
+const { isSandbox } = require('../accountTypes');
 
 const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
 

package/lib/sandboxSync.js

@@ -2,11 +2,11 @@ const SpinniesManager = require('./ui/SpinniesManager');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { i18n } = require('./lang');
+const { isDevelopmentSandbox } = require('./accountTypes');
 const {
   getAvailableSyncTypes,
   pollSyncTaskStatus,
   syncTypes,
-  isDevelopmentSandbox,
 } = require('./sandboxes');
 const { initiateSync } = require('@hubspot/local-dev-lib/sandboxes');
 const {

package/lib/sandboxes.js

@@ -10,6 +10,7 @@ const {
 const { getConfig, getAccountId } = require('@hubspot/local-dev-lib/config');
 const CliProgressMultibarManager = require('./ui/CliProgressMultibarManager');
 const { promptUser } = require('./prompts/promptUtils');
+const { isDevelopmentSandbox } = require('./accountTypes');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
   HUBSPOT_ACCOUNT_TYPES,
@@ -41,19 +42,6 @@ const getSandboxTypeAsString = accountType => {
 const getSandboxName = config =>
   `[${getSandboxTypeAsString(config.accountType)} sandbox] `;
 
-const isSandbox = config =>
-  config.accountType &&
-  (config.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
-    config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX);
-
-const isStandardSandbox = config =>
-  config.accountType &&
-  config.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
-
-const isDevelopmentSandbox = config =>
-  config.accountType &&
-  config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
-
 function getHasSandboxesByType(parentAccountConfig, type) {
   const config = getConfig();
   const parentPortalId = getAccountId(parentAccountConfig.portalId);
@@ -356,9 +344,6 @@ module.exports = {
   sandboxTypeMap,
   sandboxApiTypeMap,
   syncTypes,
-  isSandbox,
-  isStandardSandbox,
-  isDevelopmentSandbox,
   getSandboxName,
   getSandboxTypeAsString,
   getHasSandboxesByType,

package/lib/ui/index.js

@@ -3,8 +3,12 @@ const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const supportsHyperlinks = require('./supportHyperlinks');
 const supportsColor = require('./supportsColor');
-const { isSandbox, getSandboxName } = require('../sandboxes');
-const { isDeveloperTestAccount } = require('../developerTestAccounts');
+const {
+  isSandbox,
+  isDeveloperTestAccount,
+  isAppDeveloperAccount,
+} = require('../accountTypes');
+const { getSandboxName } = require('../sandboxes');
 const { i18n } = require('../lang');
 
 const {
@@ -87,6 +91,10 @@ const uiAccountDescription = (accountId, bold = true) => {
     accountTypeString = `[${
       HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]
     }] `;
+  } else if (isAppDeveloperAccount(account)) {
+    accountTypeString = `[${
+      HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER]
+    }] `;
   }
   const message = `${account.name} ${accountTypeString}(${account.portalId})`;
   return bold ? chalk.bold(message) : message;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.2.1-beta.0",
+  "version": "5.2.1-beta.2",
   "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/local-dev-lib": "^0.3.13",
-    "@hubspot/serverless-dev-runtime": "5.2.1-beta.0",
+    "@hubspot/local-dev-lib": "1.0.1",
+    "@hubspot/serverless-dev-runtime": "5.2.1-beta.2",
     "@hubspot/theme-preview-dev-server": "0.0.4",
     "@hubspot/ui-extensions-dev-server": "0.8.12",
     "archiver": "^5.3.0",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ce6013a55ac84a69335200abbcbc6fc8080585b7"
+  "gitHead": "eeed6c79043020a0be2552fd0b5271866f8d73f9"
 }