Merge pull request #296 from contentstack/development

DX | 08-08-2024 | Release

README.md

@@ -20,7 +20,7 @@ $ npm install -g @contentstack/apps-cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/apps-cli/1.3.1 darwin-arm64 node-v18.20.2
+@contentstack/apps-cli/1.3.2 darwin-arm64 node-v18.20.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -69,7 +69,7 @@ EXAMPLES
   $ csdx app:update
 ```
 
-_See code: [src/commands/app/index.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/index.ts)_
+_See code: [src/commands/app/index.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/index.ts)_
 
 ## `csdx app:create`
 
@@ -109,7 +109,7 @@ EXAMPLES
   $ 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.1/src/commands/app/create.ts)_
+_See code: [src/commands/app/create.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/create.ts)_
 
 ## `csdx app:delete`
 
@@ -134,7 +134,7 @@ EXAMPLES
   $ csdx app:delete --app-uid <value> --org <value> -d ./boilerplate
 ```
 
-_See code: [src/commands/app/delete.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/delete.ts)_
+_See code: [src/commands/app/delete.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/delete.ts)_
 
 ## `csdx app:deploy`
 
@@ -172,7 +172,7 @@ EXAMPLES
   $ csdx app:deploy --org <UID> --app-uid <APP-UID-1> --hosting-type <Hosting with Launch> --launch-project <new> --config <config-path>
 ```
 
-_See code: [src/commands/app/deploy.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/deploy.ts)_
+_See code: [src/commands/app/deploy.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/deploy.ts)_
 
 ## `csdx app:get`
 
@@ -202,7 +202,7 @@ EXAMPLES
   $ csdx app:get --org <value> --app-uid <value> --app-type organization
 ```
 
-_See code: [src/commands/app/get.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/get.ts)_
+_See code: [src/commands/app/get.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/get.ts)_
 
 ## `csdx app:install`
 
@@ -228,7 +228,7 @@ EXAMPLES
   $ csdx app:install --org <UID> --app-uid <APP-UID-1> --stack-api-key <STACK-API-KEY-1>
 ```
 
-_See code: [src/commands/app/install.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/install.ts)_
+_See code: [src/commands/app/install.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/install.ts)_
 
 ## `csdx app:reinstall`
 
@@ -254,7 +254,7 @@ EXAMPLES
   $ csdx app:reinstall --org <UID> --app-uid <APP-UID-1> --stack-api-key <STACK-API-KEY-1>
 ```
 
-_See code: [src/commands/app/reinstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/reinstall.ts)_
+_See code: [src/commands/app/reinstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/reinstall.ts)_
 
 ## `csdx app:uninstall`
 
@@ -281,7 +281,7 @@ EXAMPLES
   $ csdx app:uninstall --org <UID> --app-uid <APP-UID-1> --installation-uid <INSTALLATION-UID-1>
 ```
 
-_See code: [src/commands/app/uninstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/uninstall.ts)_
+_See code: [src/commands/app/uninstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/uninstall.ts)_
 
 ## `csdx app:update`
 
@@ -304,5 +304,5 @@ EXAMPLES
   $ csdx app:update --app-manifest ./boilerplate/manifest.json
 ```
 
-_See code: [src/commands/app/update.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/update.ts)_
+_See code: [src/commands/app/update.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/update.ts)_
 <!-- commandsstop -->

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/apps-cli",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "App ClI",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/contentstack-apps-cli",

src/commands/app/create.ts

@@ -108,6 +108,15 @@ export default class Create extends BaseCommand<typeof Create> {
       ) {
         await this.boilerplateFlow();
       } else {
+        if(this.sharedConfig.folderPath === undefined) {
+          const dataDir = this.flags["data-dir"] ?? process.cwd();
+          let targetPath = resolve(dataDir, this.sharedConfig.defaultAppName);
+          if (existsSync(targetPath)) {
+            this.log(this.messages.DIR_EXIST, "warn");
+            targetPath = await getDirName(targetPath);
+          }
+          this.sharedConfig.folderPath = targetPath;
+        }
         this.manageManifestToggeling();
         await this.registerTheAppOnDeveloperHub(false);
       }

src/commands/app/deploy.ts

@@ -71,7 +71,7 @@ export default class Deploy extends AppCLIBaseCommand {
       const apolloClient = await this.getApolloClient();
       const projects = await getProjects(apolloClient);
       await this.handleAppDisconnect(projects);
-      
+
       flags["hosting-type"] = flags["hosting-type"] || (await getHostingType());
       const updateHostingPayload: UpdateHostingParams = {
         provider: "external",
@@ -90,14 +90,18 @@ export default class Deploy extends AppCLIBaseCommand {
           config["name"] = config["name"] || app?.name;
           this.flags["launch-project"] =
             this.flags["launch-project"] || (await askProjectType());
-          await this.handleHostingWithLaunch(config, updateHostingPayload, projects);
+          await this.handleHostingWithLaunch(
+            config,
+            updateHostingPayload,
+            projects
+          );
           break;
         default:
           this.log("Please provide a valid Hosting Type.", "error");
           return;
       }
 
-      if(this.flags["app-uid"]){
+      if (this.flags["app-uid"]) {
         await updateApp(
           flags,
           this.sharedConfig.org,
@@ -285,11 +289,10 @@ export default class Deploy extends AppCLIBaseCommand {
       if (!this.flags["yes"]) {
         throw new Error(deployAppMsg.APP_UPDATE_TERMINATION_MSG);
       }
-      await disconnectApp(
-        this.flags,
-        this.sharedConfig.org,
-        this.developerHubBaseUrl
-      );
+      await disconnectApp(this.flags, this.sharedConfig.org, {
+        marketplaceSdk: this.marketplaceAppSdk,
+        log: this.log,
+      });
     }
   }
-}
+}

src/commands/app/reinstall.ts

@@ -103,12 +103,9 @@ export default class Reinstall extends AppCLIBaseCommand {
         }),
         "info"
       );
-      await reinstallApp({
-        flags: this.flags,
-        type: appType,
-        developerHubBaseUrl: this.developerHubBaseUrl,
-        orgUid: this.sharedConfig.org,
-        manifestUid: this.flags["app-uid"],
+      await reinstallApp(this.flags, this.sharedConfig.org, appType, {
+        marketplaceSdk: this.marketplaceAppSdk,
+        log: this.log,
       });
       this.log(
         $t(reinstallAppMsg.APP_REINSTALLED_SUCCESSFULLY, {
@@ -121,7 +118,7 @@ export default class Reinstall extends AppCLIBaseCommand {
       this.displayStackUrl();
     } catch (error: any) {
       this.log(error?.errorMessage || error?.message || error, "error");
-      process.exit(1);
+      this.exit(1);
     }
   }
 

src/util/common-utils.ts

@@ -10,7 +10,6 @@ import {
   HttpClient,
 } from "@contentstack/cli-utilities";
 import { projectsQuery } from "../graphql/queries";
-import { apiRequestHandler } from "./api-request-handler";
 import {
   AppLocation,
   Extension,
@@ -166,34 +165,23 @@ function installApp(
     });
 }
 
-async function reinstallApp(params: {
-  flags: FlagInput;
-  type: string;
-  developerHubBaseUrl: string;
-  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,
-  };
-
-  const url = `https://${developerHubBaseUrl}/manifests/${manifestUid}/reinstall`;
-  try {
-    const result = await apiRequestHandler({
-      orgUid,
-      payload,
-      url,
-      method: "PUT",
+function reinstallApp(
+  flags: FlagInput,
+  orgUid: string,
+  type: string,
+  options: MarketPlaceOptions
+) {
+  const { marketplaceSdk } = options;
+  return marketplaceSdk
+    .marketplace(orgUid)
+    .app(flags["app-uid"] as any)
+    .reinstall({
+      targetUid: (flags["stack-api-key"] as any) || orgUid,
+      targetType: type as any,
     });
-    return result;
-  } catch (err) {
-    throw err;
-  }
 }
 
-function fetchStack(flags: FlagInput, options: CommonOptions) {
+function fetchStack(flags: FlagInput, options: CommonOptions): Promise<any> {
   const { managementSdk } = options;
   return managementSdk
     .stack({ api_key: flags["stack-api-key"] as any })
@@ -363,21 +351,14 @@ function setupConfig(configPath: string) {
 async function disconnectApp(
   flags: FlagInput,
   orgUid: string,
-  developerHubBaseUrl: string
-) {
-  const appUid: any = flags["app-uid"];
-  const url = `https://${developerHubBaseUrl}/manifests/${appUid}/hosting/disconnect`;
-  try {
-    const result = await apiRequestHandler({
-      orgUid,
-      payload: { provider: "launch" },
-      url,
-      method: "PATCH",
-    });
-    return result;
-  } catch (err) {
-    throw err;
-  }
+  options: MarketPlaceOptions
+): Promise<any> {
+  const { marketplaceSdk } = options;
+  return marketplaceSdk
+    .marketplace(orgUid)
+    .app(flags["app-uid"] as any)
+    .hosting()
+    .disconnect({ provider: "launch" });
 }
 
 function formatUrl(url: string): string {