WIP(mr): file tree.

Author: cangzhang

src/codingServer.ts

@@ -2,7 +2,14 @@ import * as vscode from 'vscode';
 import { nanoid } from 'nanoid';
 import got from 'got';
 
-import { AuthFailResult, AuthSuccessResult, CodingResponse, IRepoListResponse } from './typings/respResult';
+import {
+  AuthFailResult,
+  AuthSuccessResult,
+  CodingResponse,
+  IRepoListResponse,
+  IMRDiffResponse,
+  IMRDetailResponse,
+} from './typings/respResult';
 import { PromiseAdapter, promiseFromEvent, parseQuery, parseCloneUrl } from './common/utils';
 import { GitService } from './common/gitService';
 import { RepoInfo, SessionData, TokenType } from './typings/commonTypes';
@@ -241,7 +248,7 @@ export class CodingServer {
       const { code, data, msg }: IRepoListResponse = await got.get(`https://${repoInfo.team}.coding.net/api/user/${this._session?.user?.global_key}/depots`, {
         searchParams: {
           access_token: this._session?.accessToken,
-        }
+        },
       }).json();
       if (code) {
         return Promise.reject({ code, msg });
@@ -256,6 +263,48 @@ export class CodingServer {
     }
   }
 
+  public async getMRDiff(iid: number) {
+    try {
+      const repoInfo = this._context.workspaceState.get(`repoInfo`) as RepoInfo;
+      if (!repoInfo?.team) {
+        throw new Error(`team not exist`);
+      }
+
+      const diff: IMRDiffResponse = await got.get(`https://${repoInfo.team}.coding.net/api/user/${this._session?.user?.team}/project/${repoInfo.project}/depot/${repoInfo.repo}/git/merge/${iid}/diff`, {
+        searchParams: {
+          access_token: this._session?.accessToken,
+        },
+      }).json();
+      if (diff.code) {
+        return Promise.reject(diff);
+      }
+      return diff;
+    } catch (err) {
+      return Promise.reject(err);
+    }
+  }
+
+  public async getMRDetail(iid: number) {
+    try {
+      const repoInfo = this._context.workspaceState.get(`repoInfo`) as RepoInfo;
+      if (!repoInfo?.team) {
+        throw new Error(`team not exist`);
+      }
+
+      const diff: IMRDetailResponse = await got.get(`https://${repoInfo.team}.coding.net/api/user/${this._session?.user?.team}/project/${repoInfo.project}/depot/${repoInfo.repo}/git/merge/${iid}/detail`, {
+        searchParams: {
+          access_token: this._session?.accessToken,
+        },
+      }).json();
+      if (diff.code) {
+        return Promise.reject(diff);
+      }
+      return diff;
+    } catch (err) {
+      return Promise.reject(err);
+    }
+  }
+
   get loggedIn() {
     return this._loggedIn;
   }

src/extension.ts

@@ -14,6 +14,9 @@ export async function activate(context: vscode.ExtensionContext) {
     vscode.window.showInformationMessage(`Please open a repo hosted by coding.net.`);
   } else {
     context.workspaceState.update(`repoInfo`, repoInfo);
+    if (repoInfo?.project && repoInfo?.repo) {
+      vscode.window.showInformationMessage(`CODING: current repo is ${repoInfo?.project}/${repoInfo?.repo}`);
+    }
   }
 
   const codingSrv = new CodingServer(context);

src/tree/mr-tree.ts

@@ -4,6 +4,7 @@ import * as path from 'path';
 import { CodingServer } from '../codingServer';
 import { RepoInfo } from '../typings/commonTypes';
 import { MRData } from '../typings/respResult';
+import { PromiseOnly } from 'got';
 
 enum MRType {
   Open = `open`,
@@ -14,6 +15,8 @@ enum MRType {
 enum ItemType {
   ListItem = `listItem`,
   CategoryItem = `categoryItem`,
+  MRItem = `mrItem`,
+  Node = `node`,
 }
 
 export class MRTreeDataProvider implements vscode.TreeDataProvider<ListItem> {
@@ -70,21 +73,34 @@ export class MRTreeDataProvider implements vscode.TreeDataProvider<ListItem> {
             }
 
             return list.map((i: MRData) => {
-              return new MRItem(i.title, i.iid, vscode.TreeItemCollapsibleState.None, {
-                command: 'codingPlugin.showDetail',
-                title: `${i.iid} ${i.title}`,
-                arguments: [{
-                  ...repoInfo,
-                  iid: i.iid,
-                  type: `mr`,
-                  accessToken: this._service.session?.accessToken,
-                }],
-              });
+              return new MRItem(
+                i.title,
+                i.iid,
+                vscode.TreeItemCollapsibleState.Collapsed,
+                {
+                  command: 'codingPlugin.showDetail',
+                  title: `${i.iid} ${i.title}`,
+                  arguments: [{
+                    ...repoInfo,
+                    iid: i.iid,
+                    type: `mr`,
+                    accessToken: this._service.session?.accessToken,
+                  }],
+                },
+              );
             });
           })
           .catch(() => {
             return [];
           });
+      } else if (element.contextValue === ItemType.MRItem) {
+        return this._service.getMRDiff(element.value as number)
+          .then(({ data: { diffStat } }) => {
+            return [
+              new ListItem(`Description`, `mr-desc`, vscode.TreeItemCollapsibleState.None),
+              new NodeItem(`node`, `node`, vscode.TreeItemCollapsibleState.Expanded),
+            ];
+          });
       }
 
       return Promise.resolve([]);
@@ -123,8 +139,28 @@ export class CategoryItem extends ListItem {
 }
 
 export class MRItem extends ListItem {
+  contextValue = ItemType.MRItem;
+
   iconPath = {
     light: path.join(__filename, '../../../src/assets/star.light.svg'),
     dark: path.join(__filename, '../../../src/assets/star.dark.svg'),
   };
 }
+
+export class NodeItem extends ListItem {
+  contextValue = ItemType.Node;
+
+  children = [
+    new ListItem(`children-1`, 1, vscode.TreeItemCollapsibleState.None),
+  ];
+
+  async getChildren(): Promise<ListItem[]> {
+    return this.children;
+  }
+
+  getTreeItem(): vscode.TreeItem {
+    return this;
+  }
+}
+
+

src/typings/respResult.ts

@@ -47,3 +47,77 @@ export interface IRepoItem {
 export interface IRepoListResponse extends CodingResponse {
   data: IRepoItem[];
 }
+
+export interface IMRPathItem {
+  changeType: string;
+  insertions: number;
+  deletions: number;
+  name: string;
+  path: string;
+  size: number;
+  mode: number;
+  objectId: string;
+  commitId: string;
+}
+
+export interface IMRDiffStat {
+  commitId: string;
+  oldSha: string;
+  newSha: string;
+  insertions: number;
+  deletions: number;
+  paths: IMRPathItem[];
+}
+
+export interface IMRDiffResponse extends CodingResponse {
+  data: {
+    isLarge: boolean;
+    diffStat: IMRDiffStat;
+  }
+}
+
+export interface IMRDetail {
+  merged_sha: string;
+  body: string;
+  body_plan: string;
+  source_sha: string;
+  target_sha: string;
+  base_sha: string;
+  id: number;
+  srcBranch: string;
+  desBranch: string;
+  title: string;
+  iid: number;
+  merge_status: string;
+  path: string;
+  created_at: number;
+  updated_at: number;
+  action_at: number;
+  granted: string;
+  comment_count: string;
+  reminded: string;
+  author: {
+    avatar: string;
+    name: string;
+    global_key: string;
+  };
+  action_author: {
+    avatar: string;
+    name: string;
+    global_key: string;
+  };
+  depot: {
+    id: number;
+    name: string;
+    isDefault: boolean;
+    projectId: number;
+    vcsType: string;
+  };
+}
+
+export interface IMRDetailResponse extends CodingResponse {
+  data: {
+    merge_request: IMRDetail;
+    can_merge: boolean;
+  }
+}