feat: optimize mr list logic

Author: uniquemo

package.json

@@ -62,7 +62,7 @@
       "activitybar": [
         {
           "id": "CODING-MR",
-          "title": "CODING MR"
+          "title": "CODING 合并请求"
         },
         {
           "id": "CODING-DEPOT",
@@ -80,7 +80,7 @@
       "CODING-MR": [
         {
           "id": "codingPlugin.treeMR",
-          "name": "CODING MR"
+          "name": "CODING 合并请求"
         }
       ],
       "CODING-DEPOT": [

src/extension.ts

@@ -1,10 +1,17 @@
-import hx from 'hbuilderx';
 import init from './init';
 import WebviewProvider from './webview';
 import CodingServer from './services/codingServer';
 import { proxyCtx } from './utils/proxy';
 
 const accessToken = '1b7fca3bd7594a89b0f5e2a0250c1147';
+const user = {
+  id: 8005956,
+  avatar: 'https://coding-net-production-static-ci.codehub.cn/WM-TEXT-AVATAR-lvVeBfbGLtCPdcsAOPod.jpg',
+  global_key: 'PDCOwrBjib',
+  name: 'uniquemo',
+  path: '/u/PDCOwrBjib',
+  team: 'uniquemo',
+};
 
 async function activate(context: IContext) {
   // TODO: 认证，拿到用户信息
@@ -13,41 +20,22 @@ async function activate(context: IContext) {
   const repoInfo = await CodingServer.getRepoParams();
   console.log('repoInfo ==> ', repoInfo);
 
-  if (!repoInfo) {
-    hx.window.showWarningMessage('workspace中没有CODING的代码仓库');
-    return;
-  }
-
   const codingServer = new CodingServer(
     {
-      id: '123',
-      user: {
-        avatar: 'string',
-        global_key: 'string',
-        name: 'string',
-        path: 'string',
-        team: 'string'
-      },
+      id: 'abc',
+      user,
       accessToken,
-      refreshToken: 'abc'
+      refreshToken: 'abc',
     },
-    repoInfo || {
-      team: 'codingcorp',
-      project: 'mo-test',
-      repo: 'mo-test'
-    }
+    repoInfo,
   );
 
-  let userInfo = null;
-  if (repoInfo) {
-    userInfo = await codingServer.getUserInfo(repoInfo.team);
-  }
-
   context.ctx = {
     webviewProvider,
     codingServer,
     repoInfo,
-    userInfo
+    depots: [],
+    selectedDepot: null,
   };
 
   proxyCtx(context);
@@ -58,7 +46,4 @@ function deactivate() {
   console.log('plugin deactivate');
 }
 
-export {
-  activate,
-  deactivate
-};
+export { activate, deactivate };

src/init.ts

@@ -2,57 +2,71 @@ import hx from 'hbuilderx';
 import DepotTreeDataProvider from './trees/depot';
 import MRTreeDataProvider from './trees/mr';
 import { getMRUrl } from './utils/repo';
+import toast from './utils/toast';
 import { IDepot, IMRItem } from './typings/common';
 
 export function registerCommands(context: IContext) {
-  const { webviewProvider, repoInfo, codingServer } = context;
-  const { team, project } = repoInfo;
+  const { repoInfo, codingServer } = context;
+  const { team } = repoInfo;
 
-  context.subscriptions.push(hx.commands.registerCommand('codingPlugin.helloWorld', () => {
-    hx.window.showInformationMessage('你好，这是我的第一个插件扩展。');
-  }));
+  context.subscriptions.push(
+    hx.commands.registerCommand('codingPlugin.helloWorld', () => {
+      toast.info('hello');
+    }),
+  );
 
-  context.subscriptions.push(hx.commands.registerCommand('codingPlugin.mrTreeItemClick', function(param: IMRItem) {
-    // webviewProvider.update(param[0]);
-    hx.env.openExternal(getMRUrl(team, param));
-  }));
+  context.subscriptions.push(
+    hx.commands.registerCommand('codingPlugin.mrTreeItemClick', function ([team, mrItem]: [string, IMRItem]) {
+      hx.env.openExternal(getMRUrl(team, mrItem));
+    }),
+  );
 
-  context.subscriptions.push(hx.commands.registerCommand('codingPlugin.depotTreeItemClick', function(param: IDepot) {
-    console.log('选中了: ', param);
-  }));
+  context.subscriptions.push(
+    hx.commands.registerCommand('codingPlugin.depotTreeItemClick', function (param: IDepot) {
+      toast.info(param.name);
+    }),
+  );
 
-  context.subscriptions.push(hx.commands.registerCommand('codingPlugin.createProjectAndDepot', async function() {
-    const project = await hx.window.showInputBox({
-      prompt: '请输入项目名'
-    });
-    const depot = await hx.window.showInputBox({
-      prompt: '请输入仓库名'
-    });
-  }));
+  context.subscriptions.push(
+    hx.commands.registerCommand('codingPlugin.createProjectAndDepot', async function () {
+      const project = await hx.window.showInputBox({
+        prompt: '请输入项目名',
+      });
+      const depot = await hx.window.showInputBox({
+        prompt: '请输入仓库名',
+      });
+    }),
+  );
 
-  context.subscriptions.push(hx.commands.registerCommand('codingPlugin.createDepot', async function(param: any) {
-    const depot = await hx.window.showInputBox({
-      prompt: '请输入仓库名'
-    });
-    const result = await codingServer.createDepot(team, depot, depot);
-    // TODO: 拉取代码，更新workspace
-  }));
+  context.subscriptions.push(
+    hx.commands.registerCommand('codingPlugin.createDepot', async function (param: any) {
+      const depot = await hx.window.showInputBox({
+        prompt: '请输入仓库名',
+      });
+      const result = await codingServer.createDepot(team, depot, depot);
+      // TODO: 拉取代码，更新workspace
+    }),
+  );
 }
 
 export function createTreeViews(context: IContext) {
-  context.subscriptions.push(hx.window.createTreeView('codingPlugin.treeMR', {
-    showCollapseAll: true,
-    treeDataProvider: new MRTreeDataProvider(context)
-  }));
+  context.subscriptions.push(
+    hx.window.createTreeView('codingPlugin.treeMR', {
+      showCollapseAll: true,
+      treeDataProvider: new MRTreeDataProvider(context),
+    }),
+  );
 
-  context.subscriptions.push(hx.window.createTreeView('codingPlugin.treeDepot', {
-    showCollapseAll: true,
-    treeDataProvider: new DepotTreeDataProvider(context)
-  }));
+  context.subscriptions.push(
+    hx.window.createTreeView('codingPlugin.treeDepot', {
+      showCollapseAll: true,
+      treeDataProvider: new DepotTreeDataProvider(context),
+    }),
+  );
 }
 
 export function workspaceInit() {
-  hx.workspace.onDidChangeWorkspaceFolders(function(event: any) {
+  hx.workspace.onDidChangeWorkspaceFolders(function (event: any) {
     if (event.added) {
       event.added.forEach((item: any) => console.log('新增了项目: ', item.name));
     }

src/services/codingServer.ts

@@ -5,11 +5,10 @@ import axios from '../utils/axios';
 import git from 'isomorphic-git';
 import { IRepoInfo, ISessionData } from '../typings/common';
 import { parseCloneUrl } from '../utils/repo';
-import MOCK from '../mock';
 
 export default class CodingServer {
   _session!: ISessionData;
-  _repo: IRepoInfo = {} as IRepoInfo;
+  _repo!: IRepoInfo;
 
   constructor(session?: ISessionData, repo?: IRepoInfo) {
     if (session) {
@@ -20,6 +19,14 @@ export default class CodingServer {
     }
   }
 
+  get session() {
+    return this._session;
+  }
+
+  get repo() {
+    return this._repo;
+  }
+
   static async getRepoParams() {
     const folders = await hx.workspace.getWorkspaceFolders();
 
@@ -57,11 +64,7 @@ export default class CodingServer {
     }
   }
 
-  async getMrList(
-    team: string = this._repo.team,
-    project: string = this._repo.project,
-    repo: string = this._repo.repo,
-  ) {
+  async getMrList({ team, project, repo }: IRepoInfo) {
     try {
       const url = `https://${team}.coding.net/api/user/${team}/project/${project}/depot/${repo}/git/merges/query`;
       const result = await axios({
@@ -82,7 +85,8 @@ export default class CodingServer {
     }
   }
 
-  async getDepotList(team: string = this._repo.team, project: string = this._repo.project) {
+  async getDepotList(team: string = this._repo?.team, project: string = this._repo?.project) {
+    // TODO: 使用新接口
     try {
       const result = await axios({
         method: 'get',
@@ -101,7 +105,7 @@ export default class CodingServer {
     return 'createProjectAndDepot';
   }
 
-  async createDepot(team: string = this._repo.team, project: string = this._repo.project, depot: string) {
+  async createDepot(team: string = this._repo?.team, project: string = this._repo?.project, depot: string) {
     try {
       const result = await axios({
         method: 'post',

src/trees/depot.ts

@@ -24,15 +24,17 @@ class DepotTreeDataProvider extends hx.TreeDataProvider {
 
     try {
       const depots = await this.context.codingServer.getDepotList();
+      this.context.depots = depots;
+
       return Promise.resolve([
         {
           name: '创建仓库',
           _create: true,
         },
         {
           name: '仓库列表',
-          children: depots
-        }
+          children: depots,
+        },
       ]);
     } catch {
       console.error('获取仓库列表失败');
@@ -45,9 +47,9 @@ class DepotTreeDataProvider extends hx.TreeDataProvider {
       collapsibleState: element.children ? 1 : 0,
       command: {
         command: getCommand(element),
-        arguments: element
+        arguments: element,
       },
-      contextValue: 'createDepot'
+      contextValue: 'createDepot',
     };
   }
 }

src/trees/mr.ts

@@ -1,48 +1,78 @@
 import hx from 'hbuilderx';
-import { IMRItem, IReviewer } from '../typings/common';
+import toast from '../utils/toast';
+import { getMrListParams } from '../utils/mr';
+import { IMRItem, IRepoInfo, IReviewer } from '../typings/common';
+
+interface IItem extends ITreeItem {
+  _disabled: boolean;
+}
 
 class MRTreeDataProvider extends hx.TreeDataProvider {
   constructor(context: IContext) {
     super();
     this.context = context;
   }
 
-  async getChildren(element?: IMRItem & ITreeItem) {
+  getRepoInfo() {
+    const user = this.context.codingServer.session?.user;
+
+    const repoInfo = getMrListParams(this.context.repoInfo, this.context.selectedDepot, this.context.depots, user);
+
+    return repoInfo;
+  }
+
+  async getChildren(element?: IMRItem & IItem) {
     if (element) {
       return Promise.resolve(element.children);
     }
 
     try {
-      const list = await this.context.codingServer.getMrList();
+      const user = this.context.codingServer.session?.user;
+      const userId = user?.id;
+
+      const repoInfo = this.getRepoInfo();
 
-      const userId = this.context.userInfo.id;
+      if (!repoInfo) {
+        toast.warn('请先到扩展视图`CODING 仓库`中创建仓库');
+        return;
+      }
+
+      const list = await this.context.codingServer.getMrList(repoInfo);
       const createdList = list.filter((item: IMRItem) => item.author.id === userId);
-      const reviewerList = list.filter((item: IMRItem) => item.reviewers.find((r: IReviewer) => r.reviewer.id === userId));
+      const reviewerList = list.filter((item: IMRItem) =>
+        item.reviewers.find((r: IReviewer) => r.reviewer.id === userId),
+      );
 
       return Promise.resolve([
+        {
+          title: `当前代码仓库：${repoInfo.repo}`,
+          _disabled: true,
+        },
         {
           title: `Created By Me (${createdList.length})`,
-          children: createdList
+          children: createdList,
         },
         {
           title: `Waiting For My Review (${reviewerList.length})`,
-          children: reviewerList
-        }
+          children: reviewerList,
+        },
       ]);
     } catch {
       console.error('获取MR列表失败');
       Promise.resolve([]);
     }
   }
 
-  getTreeItem(element: IMRItem & ITreeItem) {
+  getTreeItem(element: IMRItem & IItem) {
+    const repoInfo = this.getRepoInfo() as IRepoInfo;
+
     return {
       label: element.title,
       collapsibleState: element.children ? 1 : 0,
       command: {
-        command: element.children ? '' : 'codingPlugin.mrTreeItemClick',
-        arguments: element
-      }
+        command: element.children || element._disabled ? '' : 'codingPlugin.mrTreeItemClick',
+        arguments: [repoInfo.team, element],
+      },
     };
   }
 }