refactor: code clean up & added reinstall msg guide

Author: aman19K

src/commands/app/install.ts

@@ -122,6 +122,12 @@ export default class Install extends AppCLIBaseCommand {
       this.displayStackUrl();
     } catch (error: any) {
       this.log(error?.errorMessage || error?.message || error, "error");
+      if (
+        error?.errorMessage === "Installation for app is already done" &&
+        error?.status === 400
+      ) {
+        this.displayReInstallMsg();
+      }
       this.exit(1);
     }
   }
@@ -136,4 +142,11 @@ export default class Install extends AppCLIBaseCommand {
       "info"
     );
   }
-}
+
+  /**
+   * @method displayStackUrl - show guid to stack after installing app successfully in the stack
+   */
+  displayReInstallMsg(): void {
+    this.log(this.messages.APP_ALREADY_INSTALLED, "info");
+  }
+}

src/commands/app/reinstall.ts

@@ -63,7 +63,7 @@ export default class Reinstall extends AppCLIBaseCommand {
       this.flags["app-uid"] = app?.uid;
 
       if (appType === "organization" && this.flags["stack-api-key"]) {
-        appType = 'organization'
+        appType = "organization";
         const confirmation =
           this.flags["yes"] ||
           (await cliux.inquire({
@@ -79,7 +79,7 @@ export default class Reinstall extends AppCLIBaseCommand {
       }
 
       if (appType === "stack" && !this.flags["stack-api-key"]) {
-        appType = 'stack'
+        appType = "stack";
 
         this.log(
           $t(reinstallAppMsg.MISSING_STACK_API_KEY, {
@@ -106,9 +106,9 @@ export default class Reinstall extends AppCLIBaseCommand {
         flags: this.flags,
         type: appType,
         developerHubBaseUrl: this.developerHubBaseUrl,
-      }, 
-      {orgUid: this.sharedConfig.org, manifestUid: this.manifestData.uid}
-      );
+        orgUid: this.sharedConfig.org,
+        manifestUid: this.manifestData.uid,
+      });
       this.log(
         $t(reinstallAppMsg.APP_REINSTALLED_SUCCESSFULLY, {
           app: app?.name || (this.flags["app-uid"] as string),

src/messages/index.ts

@@ -89,6 +89,7 @@ const installAppMsg = {
   INSTALL_ORG_APP_TO_STACK: "{app} is an organization app. It cannot be installed to a stack. Do you want to proceed?",
   MISSING_STACK_API_KEY: "As {app} is a stack app, it can only be installed in a stack. Please select a stack.",
   INSTALLING_APP_NOTICE: "Installing {app} on {type} {target}.",
+  APP_ALREADY_INSTALLED: "Please use $ csdx app:reinstall to reinstall the app.",
 }
 
 const uninstallAppMsg = {

src/util/api-request-handler.ts

@@ -27,26 +27,31 @@ export async function apiRequestHandler(params: RequestParams): Promise<any> {
 
   try {
     let response;
-    if (method === "GET") {
-      response = await httpClient.get(url);
-    } else if (method === "POST") {
-      response = await httpClient.post(url, payload);
-    } else if (method === "PUT") {
-      response = await httpClient.put(url, payload);
-    } else if (method === "DELETE") {
-      response = await httpClient.delete(url);
-    } else {
-      throw new Error(`Unsupported HTTP method: ${method}`);
+    switch (method) {
+      case "GET":
+        response = await httpClient.get(url);
+        break;
+      case "POST":
+        response = await httpClient.post(url, payload);
+        break;
+      case "PUT":
+        response = await httpClient.put(url, payload);
+        break;
+      case "DELETE":
+        response = await httpClient.delete(url);
+        break;
+      default:
+        throw new Error(`Unsupported HTTP method: ${method}`);
     }
 
     const { status, data } = response;
     if (status >= 200 && status < 300) {
       return data;
     }
-    const error_message = data?.error
+    const errorMessage = data?.error
       ? formatErrors(data)
       : data?.error_message || "Something went wrong";
-    throw error_message;
+    throw errorMessage;
   } catch (error) {
     throw error;
   }

src/util/common-utils.ts

@@ -139,11 +139,10 @@ async function reinstallApp(params: {
   flags: FlagInput;
   type: string;
   developerHubBaseUrl: string;
-}, 
-headers: { orgUid: string, manifestUid: string }
-): Promise<void> {
-  const { type, developerHubBaseUrl, flags } = params;
-  const {orgUid, manifestUid } = headers;
+  orgUid: string;
+  manifestUid: string;
+}): Promise<void> {
+  const { type, developerHubBaseUrl, flags, orgUid, manifestUid } = params;
   const payload = {
     target_type: type,
     target_uid: (flags["stack-api-key"] as any) || orgUid,
@@ -152,14 +151,14 @@ headers: { orgUid: string, manifestUid: string }
   const url = `https://${developerHubBaseUrl}/manifests/${manifestUid}/reinstall`;
   try {
     const result = await apiRequestHandler({
-      orgUid, 
+      orgUid,
       payload,
       url,
-      method: "PUT"
-    })
-    return result
+      method: "PUT",
+    });
+    return result;
   } catch (err) {
-    throw err
+    throw err;
   }
 }
 
@@ -254,9 +253,8 @@ async function fetchInstalledApps(
   return batchRequests.flat();
 }
 
-
-// To remove the relative path 
-const sanitizePath = (str: string) => str?.replace(/^(\.\.(\/|\\|$))+/, '');
+// To remove the relative path
+const sanitizePath = (str: string) => str?.replace(/^(\.\.(\/|\\|$))+/, "");
 
 export {
   getOrganizations,
@@ -271,5 +269,5 @@ export {
   uninstallApp,
   fetchInstalledApps,
   reinstallApp,
-  sanitizePath
+  sanitizePath,
 };