Merge pull request #1272 from contentstack/fix/CS-43461

fix: Project query and mutation update
contentstack · Jan 30, 2024 · 585237a · 585237a
2 parents 287d189 + bd2553a
commit 585237a
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/contentstack-launch/README.md b/packages/contentstack-launch/README.md
@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-launch
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-launch/1.0.15 darwin-arm64 node-v20.8.0
+@contentstack/cli-launch/1.0.16 darwin-arm64 node-v20.10.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

diff --git a/packages/contentstack-launch/package.json b/packages/contentstack-launch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/cli-launch",
-  "version": "1.0.15",
+  "version": "1.0.16",
   "description": "Launch related operations",
   "author": "Contentstack CLI",
   "bin": {

diff --git a/packages/contentstack-launch/src/graphql/mutation.ts b/packages/contentstack-launch/src/graphql/mutation.ts
@@ -33,10 +33,7 @@ const createSignedUploadUrlMutation: DocumentNode = gql`
 `;
 
 const importProjectMutation: DocumentNode = gql`
-  mutation importProject(
-    $project: ImportProjectInput!
-    $skipGitData: Boolean = false
-  ) {
+  mutation importProject($project: ImportProjectInput!, $skipGitData: Boolean = false) {
     project: importProject(project: $project) {
       uid
       name
@@ -63,8 +60,12 @@ const importProjectMutation: DocumentNode = gql`
       }
       repository @skip(if: $skipGitData) {
         username
-        gitProvider
         repositoryName
+        gitProviderMetadata {
+          ... on GitHubMetadata {
+            gitProvider
+          }
+        }
       }
     }
   }

diff --git a/packages/contentstack-launch/src/graphql/queries.ts b/packages/contentstack-launch/src/graphql/queries.ts
@@ -90,11 +90,15 @@ const projectsQuery: DocumentNode = gql`
           cmsStackApiKey
           organizationUid
           repository {
-            gitProvider
-            gitProviderConnectionUid
             repositoryName
             repositoryUrl
             username
+            gitProviderMetadata {
+              ... on GitHubMetadata {
+                connectionUid
+                gitProvider
+              }
+            }
           }
         }
       }

diff --git a/packages/contentstack/README.md b/packages/contentstack/README.md
@@ -18,7 +18,7 @@ $ npm install -g @contentstack/cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli/1.13.0 darwin-arm64 node-v20.8.0
+@contentstack/cli/1.13.0 darwin-arm64 node-v20.10.0
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -3228,7 +3228,7 @@ Launch related operations
 ```
 USAGE
   $ csdx launch [-d <value>] [-c <value>] [--type GitHub|FileUpload] [--framework Gatsby|NextJs|Other]
-    [--org <value>] [-n <value>] [-e <value>] [--branch <value>] [--build-command <value>] [--out-dir <value>] [--init]
+    [--org <value>] [-n <value>] [-e <value>] [--branch <value>] [--build-command <value>] [--out-dir <value>]
 
 FLAGS
   -c, --config=<value>       Path to the local '.cs-launch.json' file
@@ -3239,7 +3239,6 @@ FLAGS
   --build-command=<value>    [Optional] Build Command
   --framework=<option>       [Optional] Type of framework
                              <options: Gatsby|NextJs|Other>
-  --init                     [Optional, Hidden] Reinitialize the project if it is an existing launch project.
   --org=<value>              [Optional] Provide the organization UID to create a new project or deployment
   --out-dir=<value>          [Optional] Output Directory
   --type=<option>            [Optional] Choose the type of adapters

diff --git a/packages/contentstack/package.json b/packages/contentstack/package.json
@@ -35,7 +35,7 @@
     "@contentstack/cli-cm-seed": "~1.7.1",
     "@contentstack/cli-command": "~1.2.17",
     "@contentstack/cli-config": "~1.6.0",
-    "@contentstack/cli-launch": "~1.0.15",
+    "@contentstack/cli-launch": "~1.0.16",
     "@contentstack/cli-migration": "~1.4.2",
     "@contentstack/cli-utilities": "~1.5.11",
     "@contentstack/management": "~1.13.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml