From e597a70dd981da9fad2c362b6e6aa29816af4ad1 Mon Sep 17 00:00:00 2001
From: Aman Kumar <aman.kumar@contentstack.com>
Date: Wed, 24 Jul 2024 11:11:31 +0530
Subject: [PATCH 1/2] fix: invalid boilerplate error

---
 README.md                  |  9 +++++++--
 src/commands/app/create.ts | 36 +++++++++++++++++++++---------------
 src/messages/index.ts      |  2 +-
 src/util/common-utils.ts   | 15 +++++++++------
 4 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 87390ef..4d0f2fa 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,8 @@ FLAGS
   -n, --name=<value>      [default: app-boilerplate] Name of the app to be created
   --app-type=<option>     [default: stack] Type of app
                           <options: stack|organization>
-  --boilerplate=<value>   Choose a boilerplate from search list
+  --boilerplate=<value>   Provide a boilerplate from the following options: App Boilerplate, DAM App Boilerplate or
+                          Ecommerce App Boilerplate
 
 DESCRIPTION
   Create a new app in Developer Hub and optionally clone a boilerplate locally.
@@ -98,7 +99,11 @@ EXAMPLES
 
   $ csdx app:create --name App-3 --app-type organization --org <UID> -d ./boilerplate -c ./external-config.json
 
-  $ csdx app:create --name App-4 --app-type organization --org <UID> --boilerplates <boilerplate-name>
+  $ csdx app:create --name App-4 --app-type organization --org <UID> --boilerplate <App Boilerplate>
+
+  $ csdx app:create --name App-4 --app-type organization --org <UID> --boilerplate <DAM App Boilerplate>
+
+  $ csdx app:create --name App-4 --app-type organization --org <UID> --boilerplate <Ecommerce App Boilerplate>
 ```
 
 _See code: [src/commands/app/create.ts](https://github.com/contentstack/apps-cli/blob/v1.3.0/src/commands/app/create.ts)_
diff --git a/src/commands/app/create.ts b/src/commands/app/create.ts
index 3efc03d..1223767 100644
--- a/src/commands/app/create.ts
+++ b/src/commands/app/create.ts
@@ -53,7 +53,9 @@ export default class Create extends BaseCommand<typeof Create> {
     "$ <%= config.bin %> <%= command.id %> --name App-1 --app-type stack",
     "$ <%= config.bin %> <%= command.id %> --name App-2 --app-type stack -d ./boilerplate",
     "$ <%= config.bin %> <%= command.id %> --name App-3 --app-type organization --org <UID> -d ./boilerplate -c ./external-config.json",
-    "$ <%= config.bin %> <%= command.id %> --name App-4 --app-type organization --org <UID> --boilerplates <boilerplate-name>",
+    "$ <%= config.bin %> <%= command.id %> --name App-4 --app-type organization --org <UID> --boilerplate <App Boilerplate>",
+    "$ <%= config.bin %> <%= command.id %> --name App-4 --app-type organization --org <UID> --boilerplate <DAM App Boilerplate>",
+    "$ <%= config.bin %> <%= command.id %> --name App-4 --app-type organization --org <UID> --boilerplate <Ecommerce App Boilerplate>",
   ];
 
   static flags: FlagInput = {
@@ -75,7 +77,7 @@ export default class Create extends BaseCommand<typeof Create> {
       char: "d",
       description: commonMsg.CURRENT_WORKING_DIR,
     }),
-    "boilerplate": flags.string({
+    boilerplate: flags.string({
       description: appCreate.BOILERPLATE_TEMPLATES,
     }),
   };
@@ -155,22 +157,26 @@ export default class Create extends BaseCommand<typeof Create> {
         this.sharedConfig.defaultAppName
       );
     }
+    let boilerplate: BoilerplateAppType | null = null;
+
     if (isEmpty(this.sharedConfig.boilerplateName)) {
-      const boilerplate: BoilerplateAppType = await selectedBoilerplate();
-
-      if (boilerplate) {
-        this.sharedConfig.boilerplateName = boilerplate.name
-          .toLowerCase()
-          .replace(/ /g, "-");
-        this.sharedConfig.appBoilerplateGithubUrl = boilerplate.link;
-        this.sharedConfig.appName = await getAppName(
-          this.sharedConfig.boilerplateName
-        );
-      }
+      boilerplate = await selectedBoilerplate();
     } else {
-      await validateBoilerplate(this.sharedConfig.boilerplateName);
+      boilerplate = (await validateBoilerplate(
+        this.sharedConfig.boilerplateName
+      )) as BoilerplateAppType;
+    }
+
+    if (boilerplate) {
+      const transformedName = boilerplate.name
+        .toLowerCase()
+        .replace(/ /g, "-")
+        .substring(0, 20);
+
+      this.sharedConfig.boilerplateName = transformedName;
+      this.sharedConfig.appBoilerplateGithubUrl = boilerplate.link;
+      this.sharedConfig.appName = transformedName;
     }
-    this.sharedConfig.appName = this.sharedConfig.boilerplateName;
 
     //Auto select org in case of oauth
     this.sharedConfig.org =
diff --git a/src/messages/index.ts b/src/messages/index.ts
index 0fa4ea4..0562e4b 100644
--- a/src/messages/index.ts
+++ b/src/messages/index.ts
@@ -58,7 +58,7 @@ const appCreate = {
   REGISTER_THE_APP_ON_DEVELOPER_HUB:
     "Registering the app with the name {appName} on the Developer Hub...",
   START_APP_COMMAND: "Start the app using the following command: {command}",
-  BOILERPLATE_TEMPLATES: "Choose a boilerplate from search list"
+  BOILERPLATE_TEMPLATES: "Provide a boilerplate from the following options: App Boilerplate, DAM App Boilerplate or Ecommerce App Boilerplate"
 };
 
 const getAppMsg = {
diff --git a/src/util/common-utils.ts b/src/util/common-utils.ts
index cc8444f..5aa3807 100644
--- a/src/util/common-utils.ts
+++ b/src/util/common-utils.ts
@@ -407,16 +407,19 @@ async function fetchBoilerplateDetails(): Promise<Record<string, any>[]> {
     throw error;
   }
 }
-async function validateBoilerplate(boilerplateName: string): Promise<void> {
+
+async function validateBoilerplate(boilerplateName: string) {
   const boilerplates = await fetchBoilerplateDetails();
-  const isValid = find(
+  const boilerplate = find(
     boilerplates,
-    (boilerplate) => boilerplate.name.toLowerCase()
-    .replace(/ /g, "-") === boilerplateName
+    (boilerplate) => boilerplate.name === boilerplateName
   );
-  if (!isValid) {
-    throw new Error("Invalid boilerplate. Please enter a valid boilerplate.");
+  if (!boilerplate) {
+    throw new Error(
+      "Invalid boilerplate! Please select a boilerplate from the following options: App Boilerplate, DAM App Boilerplate or Ecommerce App Boilerplate"
+    );
   }
+  return boilerplate;
 }
 
 export {

From 7ae18a8f7718ac6dc8a0db7e17cd1efd588ebdf7 Mon Sep 17 00:00:00 2001
From: Aman Kumar <aman.kumar@contentstack.com>
Date: Wed, 24 Jul 2024 15:33:12 +0530
Subject: [PATCH 2/2] refactor: default app name

---
 README.md                  |  2 +-
 src/commands/app/create.ts | 25 +++++++++++++------------
 src/util/inquirer.ts       | 10 +++++++---
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index 4d0f2fa..21e60b2 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ USAGE
 FLAGS
   -c, --config=<value>    Path of the external config
   -d, --data-dir=<value>  Current working directory.
-  -n, --name=<value>      [default: app-boilerplate] Name of the app to be created
+  -n, --name=<value>      Name of the app to be created
   --app-type=<option>     [default: stack] Type of app
                           <options: stack|organization>
   --boilerplate=<value>   Provide a boilerplate from the following options: App Boilerplate, DAM App Boilerplate or
diff --git a/src/commands/app/create.ts b/src/commands/app/create.ts
index 1223767..048ae66 100644
--- a/src/commands/app/create.ts
+++ b/src/commands/app/create.ts
@@ -35,6 +35,7 @@ import {
   sanitizePath,
   selectedBoilerplate,
   validateBoilerplate,
+  validateAppName,
 } from "../../util";
 
 export default class Create extends BaseCommand<typeof Create> {
@@ -61,7 +62,6 @@ export default class Create extends BaseCommand<typeof Create> {
   static flags: FlagInput = {
     name: flags.string({
       char: "n",
-      default: "app-boilerplate",
       description: appCreate.NAME_DESCRIPTION,
     }),
     "app-type": flags.string({
@@ -152,13 +152,11 @@ export default class Create extends BaseCommand<typeof Create> {
    * @memberof Create
    */
   async flagsPromptQueue() {
-    if (isEmpty(this.sharedConfig.appName)) {
-      this.sharedConfig.appName = await getAppName(
-        this.sharedConfig.defaultAppName
-      );
+    if (this.sharedConfig.appName) {
+      validateAppName(this.sharedConfig.appName);
     }
-    let boilerplate: BoilerplateAppType | null = null;
 
+    let boilerplate: BoilerplateAppType | null = null;
     if (isEmpty(this.sharedConfig.boilerplateName)) {
       boilerplate = await selectedBoilerplate();
     } else {
@@ -168,14 +166,17 @@ export default class Create extends BaseCommand<typeof Create> {
     }
 
     if (boilerplate) {
-      const transformedName = boilerplate.name
-        .toLowerCase()
-        .replace(/ /g, "-")
-        .substring(0, 20);
+      let boilerplateName = this.sharedConfig.appName || boilerplate.name;
+      if (isEmpty(this.sharedConfig.appName)) {
+        boilerplateName = boilerplateName
+          .toLowerCase()
+          .replace(/ /g, "-")
+          .substring(0, 20);
+      }
 
-      this.sharedConfig.boilerplateName = transformedName;
+      this.sharedConfig.boilerplateName = boilerplateName;
       this.sharedConfig.appBoilerplateGithubUrl = boilerplate.link;
-      this.sharedConfig.appName = transformedName;
+      this.sharedConfig.appName = boilerplateName;
     }
 
     //Auto select org in case of oauth
diff --git a/src/util/inquirer.ts b/src/util/inquirer.ts
index ab5f0cd..3a0a9e3 100644
--- a/src/util/inquirer.ts
+++ b/src/util/inquirer.ts
@@ -368,9 +368,7 @@ async function askConfirmation(): Promise<boolean> {
   });
 }
 
-const askProjectName = async (
-  projectName: string,
-): Promise<string> => {
+const askProjectName = async (projectName: string): Promise<string> => {
   return await cliux.inquire({
     type: "input",
     name: "name",
@@ -402,6 +400,11 @@ const selectedBoilerplate = async (): Promise<any> => {
     });
 };
 
+const validateAppName = (name: string) => {
+  if (name.length < 3 || name.length > 20) {
+    throw new Error($t(errors.INVALID_NAME, { min: "3", max: "20" }));
+  }
+};
 export {
   getOrg,
   getAppName,
@@ -418,4 +421,5 @@ export {
   selectProject,
   askProjectName,
   selectedBoilerplate,
+  validateAppName,
 };