Merge pull request #79 from contentstack/feat/CS-40500

fix: added suggestions made in the demo for delete and get commands

Author: abhinav-from-contentstack

README.md

@@ -20,7 +20,7 @@ $ npm install -g @contentstack/apps-cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/apps-cli/1.0.0 darwin-arm64 node-v16.19.0
+@contentstack/apps-cli/1.0.0 darwin-arm64 node-v20.3.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

src/commands/app/delete.ts

@@ -1,5 +1,5 @@
 import { BaseCommand } from "./base-command";
-import { flags } from "@contentstack/cli-utilities";
+import { cliux, flags } from "@contentstack/cli-utilities";
 import { $t, commonMsg, deleteAppMsg } from "../../messages";
 import { getOrg, fetchAppInstallations, deleteApp, getApp } from "../../util";
 
@@ -40,15 +40,25 @@ export default class Delete extends BaseCommand<typeof Delete> {
         { managementSdk: this.managementAppSdk, log: this.log }
       );
       if (appInstallations.length === 0) {
-        await deleteApp(this.flags, this.sharedConfig.org, {
-          managementSdk: this.managementAppSdk,
-          log: this.log,
-        });
-        this.log(
-          $t(deleteAppMsg.APP_DELETED_SUCCESSFULLY, {
-            app: app?.name || (this.flags["app-uid"] as string),
-          })
-        );
+        const userConfirmation = this.flags['yes'] || await cliux.inquire({
+          type: "confirm",
+          message: deleteAppMsg.DELETE_CONFIRMATION,
+          name: "confirmation"
+        })
+        
+        if (userConfirmation) {
+          await deleteApp(this.flags, this.sharedConfig.org, {
+            managementSdk: this.managementAppSdk,
+            log: this.log,
+          });
+          this.log(
+            $t(deleteAppMsg.APP_DELETED_SUCCESSFULLY, {
+              app: app?.name || (this.flags["app-uid"] as string),
+            }), "info"
+          );
+        } else {
+          this.log(commonMsg.USER_TERMINATION, "error")
+        }
       } else {
         this.log(deleteAppMsg.APP_IS_INSTALLED, "error");
       }

src/messages/index.ts

@@ -63,7 +63,7 @@ const getApp = {
   FILE_WRITTEN_SUCCESS: "App data has been written to {file} successfully.",
   APPS_NOT_FOUND: "No apps found!",
   FILE_ALREADY_EXISTS:
-    "{file} already exists. Would you like to save the app to a new file? (Selecting No will over-write {file}) (y/n)",
+    "{file} already exists. Do you want to overwrite this file? (y/n) (Selecting 'n' creates a new file)",
 };
 
 const appUpdate = {
@@ -79,6 +79,7 @@ const deleteAppMsg = {
   APP_DELETED_SUCCESSFULLY: "{app} deleted successfully.",
   APP_UID_INVALID: "App UID must be valid.",
   PLEASE_SELECT_APP_FROM_LIST: "Please select an app from the list",
+  DELETE_CONFIRMATION: "Are you sure you want to delete this app?"
 }
 
 const installAppMsg = {

src/util/fs.ts

@@ -13,9 +13,9 @@ export async function writeFile(dir: string=process.cwd(), force: boolean=false,
   if (existsSync(target)) {
     const userConfirmation: boolean = force || (await cliux.confirm($t(messages.FILE_ALREADY_EXISTS, { file: `${config.defaultAppFileName}.json` })))
     if (userConfirmation) {
-      target = resolve(dir, `${incrementName(latestFileName)}.json`);
-    } else {
       target = resolve(dir, `${config.defaultAppFileName}.json`);
+    } else {
+      target = resolve(dir, `${incrementName(latestFileName)}.json`);
     }
   }
   await writeFileSync(target, JSON.stringify(data))

test/unit/commands/app/delete.test.ts

@@ -17,6 +17,14 @@ describe("app:delete", () => {
         .stdout({ print: process.env.PRINT === "true" || false })
         .stub(ux.action, "stop", () => {})
         .stub(ux.action, "start", () => {})
+        .stub(cliux, "inquire", async (...args: any) => {
+            const [prompt]: any = args;
+            const cases = {
+                confirmation: true,
+            };
+
+            return (cases as Record<string, any>)[prompt.name];
+        })
         .nock(region.cma, (api) =>
             api
             .get("/v3/organizations?limit=100&asc=name&include_count=true&skip=0")
@@ -46,7 +54,8 @@ describe("app:delete", () => {
             const [prompt]: any = args;
             const cases = {
                 Organization: 'test org 1',
-                App: 'App 1'
+                App: 'App 1',
+                confirmation: true
             }
             return (cases as Record<string, any>)[prompt.name];
         })
@@ -93,7 +102,8 @@ describe("app:delete", () => {
             const [prompt]: any = args;
             const cases = {
                 Organization: 'test org 1',
-                App: 'App 1'
+                App: 'App 1',
+                confirmation: true
             }
             return (cases as Record<string, any>)[prompt.name];
         })

test/unit/commands/app/get.test.ts

@@ -119,7 +119,7 @@ describe("app:get", () => {
 
         return (cases as Record<string, any>)[prompt.name];
       })
-      .stub(cliux, "confirm", async () => true)
+      .stub(cliux, "confirm", async () => false)
       .nock(region.cma, (api) =>
         api
           .get("/v3/organizations?limit=100&asc=name&include_count=true&skip=0")
@@ -171,7 +171,7 @@ describe("app:get", () => {
 
         return (cases as Record<string, any>)[prompt.name];
       })
-      .stub(cliux, "confirm", async () => false)
+      .stub(cliux, "confirm", async () => true)
       .nock(region.cma, (api) =>
         api
           .get("/v3/organizations?limit=100&asc=name&include_count=true&skip=0")