Merge pull request cangzhang#9 from cangzhang/feat/adjust

feat: add depot quick pick component

Author: uniquemo

src/extension.ts

@@ -17,12 +17,9 @@ async function activate(context: IContext) {
     toast.warn(`请先登录 CODING`);
   }
 
-  const codingServer = new CodingServer(
-    {
-      accessToken: token,
-    },
-    repoInfo,
-  );
+  const codingServer = new CodingServer({
+    accessToken: token,
+  });
 
   dispatch(ACTIONS.SET_CTX, {
     context,
@@ -31,6 +28,7 @@ async function activate(context: IContext) {
       codingServer,
       depots: [],
       selectedDepot: null,
+      selectedMR: null,
       token,
       userInfo: null,
       repoInfo,

src/init.ts

@@ -8,15 +8,36 @@ import toast from './utils/toast';
 import ACTIONS, { dispatch } from './utils/actions';
 import { IDepot, IMRItem, IUserInfo } from './typings/common';
 import * as DCloudService from './services/dcloud';
+import CodingServer from './services/codingServer';
 
 const { registerCommand } = hx.commands;
-const { createTreeView } = hx.window;
+const { createTreeView, showQuickPick } = hx.window;
 
 export function registerCommands(context: IContext) {
   const { codingServer, token } = context;
 
+  context.subscriptions.push(
+    registerCommand('codingPlugin.pickDepot', async function () {
+      const options: IQuickPickOption[] = [];
+      context.depots.forEach((depot: IDepot) => {
+        options.push({
+          label: depot.name,
+          depot,
+        });
+      });
+
+      const result = await showQuickPick(options);
+      dispatch(ACTIONS.SET_SELECTED_DEPOT, {
+        context,
+        value: result.depot,
+      });
+    }),
+  );
+
   context.subscriptions.push(
     registerCommand('codingPlugin.mrTreeItemClick', async function ([userInfo, mrItem]: [IUserInfo, IMRItem]) {
+      if (context.selectedMR?.id === mrItem.id) return;
+
       const matchRes = mrItem.path.match(/\/p\/([^/]+)\/d\/([^/]+)\/git\/merge\/([0-9]+)/);
       if (matchRes) {
         const [, project, repo, mergeRequestIId] = matchRes;
@@ -30,6 +51,10 @@ export function registerCommands(context: IContext) {
             repo,
           },
         });
+        dispatch(ACTIONS.SET_SELECTED_MR, {
+          context,
+          value: mrItem,
+        });
       }
     }),
   );
@@ -58,7 +83,13 @@ export function registerCommands(context: IContext) {
       const team = context.userInfo.team;
       const result = await codingServer.createDepot(team, depot, depot);
       if (result) {
-        toast.info('仓库创建成功');
+        const res = await toast.info('仓库创建成功，是否切换到该仓库？', ['是', '否']);
+        if (res === '是') {
+          dispatch(ACTIONS.SET_SELECTED_DEPOT, {
+            context,
+            value: result,
+          });
+        }
       }
     }),
   );
@@ -87,15 +118,13 @@ export function createTreeViews(context: IContext) {
   );
 }
 
-export function workspaceInit() {
-  hx.workspace.onDidChangeWorkspaceFolders(function (event: any) {
-    if (event.added) {
-      event.added.forEach((item: any) => console.log('新增了项目: ', item.name));
-    }
-
-    if (event.removed) {
-      event.removed.forEach((item: any) => console.log('移除了项目: ', item.name));
-    }
+export function workspaceInit(context: IContext) {
+  hx.workspace.onDidChangeWorkspaceFolders(async function () {
+    const repoInfo = await CodingServer.getRepoParams();
+    dispatch(ACTIONS.SET_REPO_INFO, {
+      context,
+      value: repoInfo,
+    });
   });
 }
 
@@ -136,6 +165,6 @@ async function initCredentials(context: IContext) {
 export default function init(context: IContext) {
   registerCommands(context);
   createTreeViews(context);
-  workspaceInit();
+  workspaceInit(context);
   initCredentials(context);
 }

src/services/codingServer.ts

@@ -9,14 +9,9 @@ import toast from '../utils/toast';
 
 export default class CodingServer {
   _session: ISessionData;
-  _repo!: IRepoInfo;
 
-  constructor(session: ISessionData, repo?: IRepoInfo) {
+  constructor(session: ISessionData) {
     this._session = session;
-
-    if (repo) {
-      this._repo = repo;
-    }
   }
 
   get session() {
@@ -104,7 +99,7 @@ export default class CodingServer {
     }
   }
 
-  async getDepotList(team: string, project: string = this._repo?.project) {
+  async getDepotList(team: string, project: string) {
     // TODO: 使用新接口
     try {
       const result = await axios({

src/trees/depotMR.ts

@@ -6,6 +6,7 @@ import { IDepot, IMRItem, IReviewer, IRepoInfo } from '../typings/common';
 
 interface IItem extends ITreeItem {
   _create: boolean;
+  _pick: boolean;
   _auth: boolean;
   _login: boolean;
   _disabled: boolean;
@@ -22,10 +23,19 @@ const LOGIN = [
   },
 ];
 
+const AUTH = [
+  {
+    name: 'CODING 授权',
+    _auth: true,
+    _isDepot: true,
+  },
+];
+
 const getCommand = (element: IElement) => {
   if (element.children || element._disabled) return '';
   if (element._login) return 'codingPlugin.login';
   if (element._auth) return 'codingPlugin.auth';
+  if (element._pick) return 'codingPlugin.pickDepot';
   if (element._create) return 'codingPlugin.createDepot';
   if (element.vcsType) return 'codingPlugin.depotTreeItemClick';
   return 'codingPlugin.mrTreeItemClick';
@@ -59,7 +69,7 @@ class DepotMRTreeDataProvider extends hx.TreeDataProvider {
 
   async getData(repoInfo?: IRepoInfo) {
     const { codingServer } = this.context;
-    const promises = [codingServer.getDepotList(this.user.team)];
+    const promises = [codingServer.getDepotList(this.user.team, this.context.repoInfo?.project)];
     if (repoInfo) {
       promises.push(codingServer.getMrList(repoInfo));
     }
@@ -91,7 +101,47 @@ class DepotMRTreeDataProvider extends hx.TreeDataProvider {
     };
   }
 
+  async getMenus(repoInfo?: IRepoInfo) {
+    const {
+      depots,
+      MRList: [createdList, reviewerList, others],
+    } = await this.getData(repoInfo);
+
+    return [
+      {
+        name: '+ 创建仓库',
+        _create: true,
+        _isDepot: true,
+      },
+      {
+        name: `切换仓库（仓库总数：${depots.length}）`,
+        _pick: true,
+        _isDepot: true,
+      },
+      {
+        title: `合并请求列表（当前仓库：${repoInfo?.repo || '-'}）`,
+        _disabled: true,
+      },
+      {
+        title: `我创建的 (${createdList?.length})`,
+        children: createdList,
+      },
+      {
+        title: `需要我 Review 的 (${reviewerList?.length})`,
+        children: reviewerList,
+      },
+      {
+        title: `其他（${others?.length}）`,
+        children: others,
+      },
+    ];
+  }
+
   async getChildren(element: IElement) {
+    if (!this.context.token) {
+      return Promise.resolve(AUTH);
+    }
+
     if (!this.user) {
       try {
         this.user = await this.getUser();
@@ -113,40 +163,8 @@ class DepotMRTreeDataProvider extends hx.TreeDataProvider {
     const repoInfo = await this.getRepoInfo();
 
     try {
-      const {
-        depots,
-        MRList: [createdList, reviewerList, others],
-      } = await this.getData(repoInfo);
-
-      return Promise.resolve([
-        {
-          name: '+ 创建仓库',
-          _create: true,
-          _isDepot: true,
-        },
-        {
-          name: '仓库列表',
-          children: depots,
-          _isDepot: true,
-        },
-        {
-          title: `合并请求列表（当前仓库：${repoInfo?.repo || '-'}）`,
-          children: [
-            {
-              title: `我创建的 (${createdList?.length})`,
-              children: createdList,
-            },
-            {
-              title: `需要我 Review 的 (${reviewerList?.length})`,
-              children: reviewerList,
-            },
-            {
-              title: `其他（${others?.length}）`,
-              children: others,
-            },
-          ],
-        },
-      ]);
+      const menus = await this.getMenus(repoInfo);
+      return Promise.resolve(menus);
     } catch (err) {
       const { code } = err;
       if (code === 1100 || code === 1400) {

src/typings/hbuilderx.d.ts

@@ -24,3 +24,9 @@ interface ITreeItem {
   name?: string;
   children?: ITreeItem[];
 }
+
+interface IQuickPickOption {
+  label: string;
+  description?: string;
+  [key: string]: any;
+}

src/utils/actions.ts

@@ -1,7 +1,9 @@
 const enum ACTIONS {
   SET_DEPOTS = 'SET_DEPOTS',
   SET_SELECTED_DEPOT = 'SET_SELECTED_DEPOT',
+  SET_SELECTED_MR = 'SET_SELECTED_MR',
   SET_USER_INFO = 'SET_USER_INFO',
+  SET_REPO_INFO = 'SET_REPO_INFO',
   SET_CTX = 'SET_CTX',
   SET_MR_CUSTOM_EDITOR = 'SET_MR_CUSTOM_EDITOR',
 }
@@ -19,9 +21,15 @@ export const dispatch = (type: ACTIONS, { context, value }: IPayload) => {
     case ACTIONS.SET_SELECTED_DEPOT:
       context.selectedDepot = value;
       break;
+    case ACTIONS.SET_SELECTED_MR:
+      context.selectedMR = value;
+      break;
     case ACTIONS.SET_USER_INFO:
       context.userInfo = value;
       break;
+    case ACTIONS.SET_REPO_INFO:
+      context.repoInfo = value;
+      break;
     case ACTIONS.SET_CTX:
       context.ctx = value;
       break;