Merge pull request #594 from HubSpot/clean-up-prompt-files

Cleaning up the prompt files

Author: brandenrodgers

packages/cli-lib/lang/en.lyaml

@@ -128,9 +128,6 @@ en:
             errors:
               pathExists: "The {{ path }} path already exists"
               nameRequired: "The \"name\" argument is required when creating a Custom Module."
-          project:
-            success:
-              projectCreated: "Project created in {{ path }}"
           template:
             debug:
               creatingPath: "Making {{ path }} if needed"
@@ -622,39 +619,72 @@ en:
           useEnv:
             describe: "Use environment variable config"
       prompts:
-        accountId: "Enter the account ID for your account (the number under the DOMAIN column at https://app.hubspot.com/myaccounts-beta ):"
-        accountName: "Enter a unique name to reference your account:"
-        apiKey: "Enter the API key for your account (found at https://app.hubspot.com/l/api-key):"
-        clientId: "Enter your OAuth2 client ID:"
-        clientSecret: "Enter your OAuth2 client secret:"
-        errors:
-          invalidAccountId: "You did not enter a valid account ID. Please try again."
-          invalidAPIKey: "You did not enter a valid API key. Please try again"
-          invalidName: "You entered an invalid name. Please try again."
-          invalidOauthClientId: "You entered an invalid OAuth2 client ID. Please try again."
-          invalidOauthClientIdLength: "The OAuth2 client ID must be 36 characters long. Please try again."
-          invalidOauthClientSecret: "You entered an invalid OAuth2 client secret. Please try again."
-          invalidOauthClientSecretLength: "The OAuth2 client secret must be 36 characters long. Please try again."
-          invalidOauthClientSecretCopy: "Please copy the actual OAuth2 client secret rather than the asterisks that mask it."
-          invalidPersonalAccessKey: "You did not enter a valid access key. Please try again."
-          invalidPersonalAccessKeyCopy: "Please copy the actual access key rather than the bullets that mask it."
-          nameRequired: "The name may not be blank. Please try again."
-          spacesInName: "The name may not contain spaces. Please try again."
-        folderOverwrite: "The folder with name \"{{ folderName }}\" already exists. Overwrite?"
-        logs:
-          openingWebBrowser: "Opening {{ url }} in your web browser"
-        personalAccessKey: "Enter your personal access key:"
-        personalAccessKeyBrowserOpenPrep: "When you're ready, we'll open a secure page in your default browser where you can view and copy your personal access key, which you'll need to complete the next step.\n<Press enter to open the page and generate your personal access key>"
-        projects:
-          enterDescription: "Enter a description for the project"
-          enterLabel: "Enter a label for the project"
-          selectTemplate: "Select a project template to use"
+        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: "
+          enterClientSecret: "Enter your OAuth2 client secret: "
+          enterAccountName: "Enter a unique name to reference your account: "
+          enterApiKey: "Enter the API key for your account (found at https://app.hubspot.com/l/api-key): "
+          enterPersonalAccessKey: "Enter your personal access key: "
+          selectScopes: "Select access scopes (see https://developers.hubspot.com/docs/methods/oauth2/initiate-oauth-integration#scopes)"
+          personalAccessKeyBrowserOpenPrep: "When you're ready, we'll open a secure page in your default browser where you can view and copy your personal access key, which you'll need to complete the next step.\n<Press enter to open the page and generate your personal access key>"
+          logs:
+            openingWebBrowser: "Opening {{ url }} in your web browser"
+          errors:
+            invalidAccountId: "You did not enter a valid account ID. Please try again."
+            invalidAPIKey: "You did not enter a valid API key. Please try again"
+            invalidName: "You entered an invalid name. Please try again."
+            invalidOauthClientId: "You entered an invalid OAuth2 client ID. Please try again."
+            invalidOauthClientIdLength: "The OAuth2 client ID must be 36 characters long. Please try again."
+            invalidOauthClientSecret: "You entered an invalid OAuth2 client secret. Please try again."
+            invalidOauthClientSecretLength: "The OAuth2 client secret must be 36 characters long. Please try again."
+            invalidOauthClientSecretCopy: "Please copy the actual OAuth2 client secret rather than the asterisks that mask it."
+            invalidPersonalAccessKey: "You did not enter a valid access key. Please try again."
+            invalidPersonalAccessKeyCopy: "Please copy the actual access key rather than the bullets that mask it."
+            nameRequired: "The name may not be blank. Please try again."
+            spacesInName: "The name may not contain spaces. Please try again."
+        folderOverwritePrompt:
+          overwriteConfirm: "The folder with name \"{{ folderName }}\" already exists. Overwrite?"
+        createTemplatePrompt:
+          selectTemplate: "Select the type of template to create"
+        createModulePrompt:
+          enterLabel: "What should the module label be?"
+          selectContentType: "What types of content will this module be used in?"
+          confirmGlobal: "Is this a global module?"
+          errors:
+            invalidLabel: "You entered an invalid name. Please try again."
+            labelRequired: "The name may not be blank. Please try again."
+            contentTypeRequired: "Please select at least one content type for this module."
+        createFunctionPrompt:
+          enterFolder: "Name of the folder where your function will be created: "
+          enterFilename: "Name of the JavaScript file for your function: "
+          enterEndpointPath: "Path portion of the URL created for the function: "
+          selectEndpointMethod: "Select the HTTP method for the endpoint"
+          errors:
+            invalid: "You entered an invalid name. Please try again."
+            blank: "The name may not be blank. Please try again."
+            space: "The name may not contain spaces. Please try again."
+        createApiSamplePrompt:
+          selectApiSampleApp: "Please, select API sample app"
+          selectLanguage: "Please, select sample app's language"
+          errors:
+            apiSampleAppRequired: "Please select API sample app"
+            languageRequired: "Please select API sample app's language"
+        createProjectPrompt:
+          enterName: "[--name] Give your project a name: "
+          enterLocation: "[--location] Where should the project be created?"
+          selectTemplate: "[--template] Start from a template?"
+          templateOptions:
+            noTemplate: "No template"
+          errors:
+            nameRequired: "A project name is required"
+            locationRequired: "A project location is required"
+            invalidTemplate: "[--template] Could not find template {{ template }}. Please choose an available template."
+        secretPrompt:
+          enterValue: "Enter a value for your secret: "
           errors:
-            invalidDescription: "You entered an invalid description. Please try again."
-            invalidLabel: "You entered an invalid label. Please try again."
-        sandboxes:
+            invalidValue: "You entered an invalid value. Please try again."
+        sandboxesPrompt:
           enterName: "Enter a name to use for the sandbox: "
           errors:
             invalidName: "You entered an invalid name. Please try again."
-        scopes: "Select access scopes (see https://developers.hubspot.com/docs/methods/oauth2/initiate-oauth-integration#scopes)"
-

packages/cli/commands/auth.js

@@ -18,13 +18,13 @@ const {
   getConfigPath,
 } = require('@hubspot/cli-lib/lib/config');
 const { commaSeparatedValues } = require('@hubspot/cli-lib/lib/text');
+const { promptUser } = require('../lib/prompts/promptUtils');
 const {
-  promptUser,
   personalAccessKeyPrompt,
   OAUTH_FLOW,
   API_KEY_FLOW,
   ACCOUNT_NAME,
-} = require('../lib/prompts');
+} = require('../lib/prompts/personalAccessKeyPrompt');
 const {
   addConfigOptions,
   setLogLevel,

packages/cli/commands/config/set/allowUsageTracking.js

@@ -1,17 +1,17 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const { updateAllowUsageTracking } = require('@hubspot/cli-lib/lib/config');
-const inquirer = require('inquirer');
 
 const { getAccountId } = require('../../../lib/commonOpts');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey =
   'cli.commands.config.subcommands.set.subcommands.allowUsageTracking';
 
 const enableOrDisableUsageTracking = async () => {
-  const { isEnabled } = await inquirer.prompt([
+  const { isEnabled } = await promptUser([
     {
       type: 'list',
       look: false,

packages/cli/commands/config/set/defaultAccount.js

@@ -4,18 +4,18 @@ const {
   getConfigPath,
   updateDefaultAccount,
 } = require('@hubspot/cli-lib/lib/config');
-const inquirer = require('inquirer');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 
 const { getAccountId } = require('../../../lib/commonOpts');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey =
   'cli.commands.config.subcommands.set.subcommands.defaultAccount';
 
 const selectAccountFromConfig = async config => {
-  const { default: selectedDefault } = await inquirer.prompt([
+  const { default: selectedDefault } = await promptUser([
     {
       type: 'list',
       look: false,

packages/cli/commands/config/set/defaultMode.js

@@ -1,11 +1,11 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const { updateDefaultMode } = require('@hubspot/cli-lib/lib/config');
-const inquirer = require('inquirer');
 const { Mode } = require('@hubspot/cli-lib');
 const { commaSeparatedValues } = require('@hubspot/cli-lib/lib/text');
 
 const { getAccountId } = require('../../../lib/commonOpts');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
+const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
@@ -14,7 +14,7 @@ const i18nKey = 'cli.commands.config.subcommands.set.subcommands.defaultMode';
 const ALL_MODES = Object.values(Mode);
 
 const selectMode = async () => {
-  const { mode } = await inquirer.prompt([
+  const { mode } = await promptUser([
     {
       type: 'list',
       look: false,

packages/cli/commands/create/api-sample.js

@@ -1,5 +1,9 @@
-const { createApiSamplePrompt } = require('../../lib/createApiSamplePrompt');
-const { folderOverwritePrompt } = require('../../lib/prompts');
+const {
+  createApiSamplePrompt,
+} = require('../../lib/prompts/createApiSamplePrompt');
+const {
+  folderOverwritePrompt,
+} = require('../../lib/prompts/folderOverwritePrompt');
 const { logger } = require('@hubspot/cli-lib/logger');
 const path = require('path');
 const fs = require('fs-extra');

packages/cli/commands/create/function.js

@@ -1,5 +1,7 @@
 const { createFunction } = require('@hubspot/cli-lib/functions');
-const { createFunctionPrompt } = require('../../lib/createFunctionPrompt');
+const {
+  createFunctionPrompt,
+} = require('../../lib/prompts/createFunctionPrompt');
 
 module.exports = {
   dest: ({ name }) => name,

packages/cli/commands/create/index.js

@@ -3,7 +3,6 @@ module.exports = {
   app: require('./app'),
   function: require('./function'),
   module: require('./module'),
-  project: require('./project'),
   'react-app': require('./react-app'),
   template: require('./template'),
   'vue-app': require('./vue-app'),

packages/cli/commands/create/module.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const { createModulePrompt } = require('../../lib/createModulePrompt');
+const { createModulePrompt } = require('../../lib/prompts/createModulePrompt');
 const fs = require('fs-extra');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');