Merge pull request cangzhang#7 from cangzhang/feat/create-mr

cangzhang · web-flow · commit 7ed7da9cd49d · 2020-12-07T15:45:12.000+08:00
diff --git a/package.json b/package.json
@@ -37,6 +37,17 @@
         "title": "Logout coding.net",
         "category": "Coding plugin"
       },
+      {
+        "command": "codingPlugin.newMrDesc",
+        "title": "New Merge Request",
+        "category": "Coding plugin",
+        "icon": "$(add)"
+      },
+      {
+        "command": "codingPlugin.createMr",
+        "title": "Create Merge Request from current document",
+        "category": "Coding plugin"
+      },
       {
         "command": "codingPlugin.refresh",
         "title": "Refresh",
@@ -51,6 +62,11 @@
     ],
     "menus": {
       "view/title": [
+        {
+          "command": "codingPlugin.newMrDesc",
+          "when": "view == mrTreeView",
+          "group": "navigation"
+        },
         {
           "command": "codingPlugin.refresh",
           "when": "view == mrTreeView",
@@ -61,8 +77,13 @@
     "viewsWelcome": [
       {
         "view": "mrTreeView",
-        "contents": "Please login first.\n[Login](command:codingPlugin.login)",
-        "when": "!loggedIn"
+        "contents": "Please open a repo hosted by [coding.net](https://coding.net).\n [Open folder](command:vscode.openFolder)",
+        "when": "!hasTeam"
+      },
+      {
+        "view": "mrTreeView",
+        "contents": "Please login first.\n [Login](command:codingPlugin.login)",
+        "when": "!loggedIn && hasTeam"
       },
       {
         "view": "mrTreeView",
diff --git a/src/codingServer.ts b/src/codingServer.ts
@@ -11,6 +11,9 @@ import {
   IMRDetailResponse,
   IMRActivitiesResponse,
   IMRReviewersResponse,
+  ICreateMRBody,
+  ICreateMRResp,
+  IBranchListResp,
 } from 'src/typings/respResult';
 import { PromiseAdapter, promiseFromEvent, parseQuery, parseCloneUrl } from 'src/common/utils';
 import { GitService } from 'src/common/gitService';
@@ -87,10 +90,7 @@ export class CodingServer {
   ): Promise<ISessionData> {
     try {
       const repoInfo = this._context.workspaceState.get(`repoInfo`) as IRepoInfo;
-      if (!repoInfo?.team) {
-        throw new Error(`team not exist`);
-      }
-
+      vscode.commands.executeCommand('setContext', 'hasTeam', !!repoInfo?.team);
       const result = await this.getUserInfo(repoInfo.team || ``, accessToken);
       const { data: userInfo } = result;
       const ret: ISessionData = {
@@ -209,7 +209,7 @@ export class CodingServer {
   public async getUserInfo(team: string, token: string = this._session?.accessToken || ``) {
     try {
       const result: CodingResponse = await got
-        .get(`https://codingcorp.coding.net/api/current_user`, {
+        .get(`https://${team || `codingcorp`}.coding.net/api/current_user`, {
           searchParams: {
             access_token: token,
           },
@@ -233,42 +233,35 @@ export class CodingServer {
 
   public static async getRepoParams() {
     const urls = await GitService.getRemoteURLs();
-    // TODO: multiple working repos
-    const url = urls?.[0];
-    return parseCloneUrl(url || ``);
+    const result = urls?.map((i) => parseCloneUrl(i || ``));
+    return result?.[0];
   }
 
   public getApiPrefix() {
     const repoInfo = this._context.workspaceState.get(`repoInfo`) as IRepoInfo;
     if (!repoInfo?.team) {
+      vscode.commands.executeCommand('setContext', 'hasTeam', false);
       throw new Error(`team not exist`);
     }
+
+    vscode.commands.executeCommand('setContext', 'hasTeam', true);
     return `https://${repoInfo.team}.coding.net/api/user/${this._session?.user?.team}/project/${repoInfo.project}/depot/${repoInfo.repo}`;
   }
 
   public async getMRList(repo?: string, status?: string): Promise<CodingResponse> {
     try {
-      const repoInfo = this._context.workspaceState.get(`repoInfo`) as IRepoInfo;
-      if (!repoInfo?.team) {
-        throw new Error(`team not exist`);
-      }
-
+      const url = this.getApiPrefix();
       const result: CodingResponse = await got
-        .get(
-          `https://${repoInfo.team}.coding.net/api/user/${repoInfo.team}/project/${
-            repoInfo.project
-          }/depot/${repo || repoInfo.repo}/git/merges/query`,
-          {
-            searchParams: {
-              status,
-              sort: `action_at`,
-              page: 1,
-              PageSize: 9999,
-              sortDirection: `DESC`,
-              access_token: this._session?.accessToken,
-            },
+        .get(`${url}/git/merges/query`, {
+          searchParams: {
+            status,
+            sort: `action_at`,
+            page: 1,
+            PageSize: 9999,
+            sortDirection: `DESC`,
+            access_token: this._session?.accessToken,
           },
-        )
+        })
         .json();
       return result;
     } catch (err) {
@@ -328,19 +321,19 @@ export class CodingServer {
   public async getMRDetail(iid: string) {
     try {
       const url = this.getApiPrefix();
-      const diff: IMRDetailResponse = await got
+      const resp: IMRDetailResponse = await got
         .get(`${url}/git/merge/${iid}/detail`, {
           searchParams: {
             access_token: this._session?.accessToken,
           },
         })
         .json();
 
-      if (diff.code) {
-        return Promise.reject(diff);
+      if (resp.code) {
+        return Promise.reject(resp);
       }
 
-      return diff;
+      return resp;
     } catch (err) {
       return Promise.reject(err);
     }
@@ -563,6 +556,45 @@ export class CodingServer {
     }
   }
 
+  public async createMR(data: ICreateMRBody) {
+    try {
+      const url = this.getApiPrefix();
+      const resp: ICreateMRResp = await got.post(`${url}/git/merge`, {
+        resolveBodyOnly: true,
+        responseType: `json`,
+        searchParams: {
+          access_token: this._session?.accessToken,
+        },
+        form: data,
+      });
+      if (resp.code) {
+        return Promise.reject(resp);
+      }
+      return resp;
+    } catch (err) {
+      return Promise.reject(err);
+    }
+  }
+
+  public async getBranchList() {
+    try {
+      const url = this.getApiPrefix();
+      const resp: IBranchListResp = await got
+        .get(`${url}/git/list_branches`, {
+          searchParams: {
+            access_token: this._session?.accessToken,
+          },
+        })
+        .json();
+      if (resp.code) {
+        return Promise.reject(resp);
+      }
+      return resp;
+    } catch (err) {
+      return Promise.reject(err);
+    }
+  }
+
   get loggedIn() {
     return this._loggedIn;
   }
diff --git a/src/common/gitService.ts b/src/common/gitService.ts
@@ -1,35 +1,49 @@
 import * as vscode from 'vscode';
 import * as cp from 'child_process';
-import { promisify } from 'util';
 
-import { GitExtension } from 'src/typings/git';
-
-const exec = promisify(cp.exec);
+import { Git, GitExtension } from 'src/typings/git';
 
 export class GitService {
+  static git: Git;
+
+  static async init() {
+    const extension = vscode.extensions.getExtension(
+      `vscode.git`,
+    ) as vscode.Extension<GitExtension>;
+    if (extension !== undefined) {
+      const gitExtension = extension.isActive ? extension.exports : await extension.activate();
+      const model = gitExtension.getAPI(1);
+      GitService.git = model.git;
+    }
+  }
+
   static async getRemoteURLs(): Promise<string[] | null> {
     try {
-      const extension = vscode.extensions.getExtension(
-        `vscode.git`,
-      ) as vscode.Extension<GitExtension>;
-      if (extension !== undefined) {
-        const gitExtension = extension.isActive ? extension.exports : await extension.activate();
-        const model = gitExtension.getAPI(1);
-
-        if (vscode.workspace.workspaceFolders?.length) {
-          const tasks = vscode.workspace.workspaceFolders.map((f) =>
-            exec(`${model.git.path} config --get remote.origin.url`, {
-              cwd: f.uri.path,
-            }),
-          );
-          const result = await Promise.all(tasks);
-          const urls = result.map(({ stdout, stderr }) => {
-            return stdout.trim();
-          });
-
-          return urls;
-        }
+      if (!GitService.git || !vscode.workspace.workspaceFolders?.length) {
+        return null;
       }
+
+      const tasks = vscode.workspace.workspaceFolders.map(
+        (f) =>
+          new Promise((resolve) => {
+            cp.exec(
+              `${GitService.git.path} -C "${f.uri.path}" config --get remote.origin.url`,
+              {
+                cwd: f.uri.path,
+              },
+              (err, stdout, stderr) => {
+                resolve({ stdout, stderr });
+              },
+            );
+          }),
+      );
+
+      const result = await Promise.all(tasks);
+      const urls = result.map((o) => {
+        return (o as { stdout: string; stderr: string }).stdout?.trim();
+      });
+
+      return urls;
     } catch (err) {
       console.error(err);
     }
diff --git a/src/extension.ts b/src/extension.ts
@@ -6,13 +6,17 @@ import { Panel } from 'src/panel';
 import { IFileNode, MRTreeDataProvider } from 'src/tree/mrTree';
 import { ReleaseTreeDataProvider } from 'src/tree/releaseTree';
 import { IRepoInfo, IMRWebViewDetail, ISessionData } from 'src/typings/commonTypes';
+import { GitService } from 'src/common/gitService';
 
 export async function activate(context: vscode.ExtensionContext) {
+  await GitService.init();
   const repoInfo = await CodingServer.getRepoParams();
 
   if (!repoInfo?.team) {
+    vscode.commands.executeCommand('setContext', 'hasTeam', false);
     vscode.window.showInformationMessage(`Please open a repo hosted by coding.net.`);
   } else {
+    vscode.commands.executeCommand('setContext', 'hasTeam', true);
     context.workspaceState.update(`repoInfo`, repoInfo);
   }
 
@@ -32,7 +36,7 @@ export async function activate(context: vscode.ExtensionContext) {
 
   const mrDataProvider = new MRTreeDataProvider(context, codingSrv);
   const releaseDataProvider = new ReleaseTreeDataProvider(context);
-  vscode.window.createTreeView(`mrTreeView`, {
+  const mrTree = vscode.window.createTreeView(`mrTreeView`, {
     treeDataProvider: mrDataProvider,
     showCollapseAll: true,
   });
@@ -89,6 +93,71 @@ export async function activate(context: vscode.ExtensionContext) {
       mrDataProvider.refresh();
     }),
   );
+  context.subscriptions.push(
+    vscode.commands.registerCommand('codingPlugin.newMrDesc', async () => {
+      const doc = await vscode.workspace.openTextDocument({
+        language: `markdown`,
+      });
+      await vscode.window.showTextDocument(doc);
+    }),
+  );
+  context.subscriptions.push(
+    vscode.commands.registerCommand('codingPlugin.createMr', async () => {
+      const editor = vscode.window.activeTextEditor;
+      if (!editor) {
+        return;
+      }
+
+      let content = editor.document.getText().trimStart();
+      if (!content) {
+        return;
+      }
+
+      const firstLineBreak = content.indexOf(`\n`);
+      const defaultTitle = content.slice(0, firstLineBreak).trim();
+
+      const { data } = await codingSrv.getBranchList();
+      const list = data.map((i) => ({
+        label: i.name,
+        description: ``,
+      }));
+
+      const src = await vscode.window.showQuickPick(list, {
+        placeHolder: `Please choose source branch`,
+      });
+      if (!src) return;
+
+      const des = await vscode.window.showQuickPick(list, {
+        placeHolder: `Please choose target branch`,
+      });
+      if (!des) return;
+
+      const title = await vscode.window.showInputBox({
+        placeHolder: `By default it's the first line of this document.`,
+        prompt: `Please input title for this merge request.`,
+        value: defaultTitle,
+      });
+      if (!title) {
+        return;
+      }
+      if (title === defaultTitle) {
+        content = content.slice(firstLineBreak + 1).trimStart() || ``;
+      }
+
+      try {
+        const newMr = await codingSrv.createMR({
+          content,
+          title,
+          srcBranch: src.label,
+          desBranch: des.label,
+        });
+        vscode.window.showInformationMessage(
+          `Merge request ${newMr.data.merge_request.title} was created successfully.`,
+        );
+        mrDataProvider.refresh();
+      } catch (err) {}
+    }),
+  );
   context.subscriptions.push(
     vscode.commands.registerCommand('codingPlugin.switchRepo', async () => {
       try {
diff --git a/src/tree/mrTree.ts b/src/tree/mrTree.ts
diff --git a/src/typings/respResult.ts b/src/typings/respResult.ts
