Merge pull request cangzhang#8 from cangzhang/feat/perfect

feat: optimize logic, add depotMR tree view

Author: uniquemo

package.json

@@ -13,6 +13,7 @@
   "main": "./out/extension",
   "activationEvents": [
     "onCustomEditor:customEditor.mrDetail",
+    "onView:codingPlugin.treeDepotMR",
     "onView:codingPlugin.treeMR",
     "onView:codingPlugin.treeDepot",
     "onView:codingPlugin.webview"
@@ -55,12 +56,8 @@
     "viewsContainers": {
       "activitybar": [
         {
-          "id": "CODING-MR",
-          "title": "CODING 合并请求"
-        },
-        {
-          "id": "CODING-DEPOT",
-          "title": "CODING 仓库"
+          "id": "CODING-DEPOT-MR",
+          "title": "CODING 代码仓库"
         }
       ],
       "rightside": [
@@ -71,16 +68,10 @@
       ]
     },
     "views": {
-      "CODING-MR": [
-        {
-          "id": "codingPlugin.treeMR",
-          "name": "CODING 合并请求"
-        }
-      ],
-      "CODING-DEPOT": [
+      "CODING-DEPOT-MR": [
         {
-          "id": "codingPlugin.treeDepot",
-          "name": "CODING 仓库"
+          "id": "codingPlugin.treeDepotMR",
+          "name": "CODING 代码仓库"
         }
       ],
       "WebviewContainerId": [

src/extension.ts

@@ -6,29 +6,9 @@ import { proxyCtx } from './utils/proxy';
 import toast from './utils/toast';
 import { readConfig } from './services/dcloud';
 
-// const accessToken = '7e4d9d17f87875e731d536d13635a700ddf52b12';
-// 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',
-// };
-
-const accessToken = '6e15bbb9960810111c90086a6efc07a923dea5a3';
-const user = {
-  id: 8003868,
-  avatar: 'https://coding-net-production-static-ci.codehub.cn/WM-TEXT-AVATAR-lvVeBfbGLtCPdcsAOPod.jpg',
-  global_key: 'dHzOCagiSb',
-  name: '莫泳欣',
-  path: '/u/dHzOCagiSb',
-  team: 'codingcorp',
-};
-
 async function activate(context: IContext) {
   // TODO: 认证，拿到用户信息
-  const webviewProvider = new WebviewProvider();
+  const webviewProvider = new WebviewProvider(context);
 
   const repoInfo = await CodingServer.getRepoParams();
   console.log('repoInfo ==> ', repoInfo);
@@ -39,10 +19,7 @@ async function activate(context: IContext) {
 
   const codingServer = new CodingServer(
     {
-      id: 'abc',
-      user,
-      accessToken,
-      refreshToken: 'abc',
+      accessToken: token,
     },
     repoInfo,
   );
@@ -55,6 +32,7 @@ async function activate(context: IContext) {
       depots: [],
       selectedDepot: null,
       token,
+      userInfo: null,
       repoInfo,
     },
   });

src/init.ts

@@ -1,28 +1,31 @@
 import hx from 'hbuilderx';
 import DepotTreeDataProvider from './trees/depot';
 import MRTreeDataProvider from './trees/mr';
+import DepotMRTreeDataProvider from './trees/depotMR';
 import MRCustomEditorProvider from './customEditors/mergeRequest';
 
 import toast from './utils/toast';
 import ACTIONS, { dispatch } from './utils/actions';
-import { IDepot, IMRItem } from './typings/common';
+import { IDepot, IMRItem, IUserInfo } from './typings/common';
 import * as DCloudService from './services/dcloud';
 
 const { registerCommand } = hx.commands;
+const { createTreeView } = hx.window;
 
 export function registerCommands(context: IContext) {
-  const { codingServer } = context;
+  const { codingServer, token } = context;
 
   context.subscriptions.push(
-    registerCommand('codingPlugin.mrTreeItemClick', async function ([team, mrItem]: [string, IMRItem]) {
+    registerCommand('codingPlugin.mrTreeItemClick', async function ([userInfo, mrItem]: [IUserInfo, IMRItem]) {
       const matchRes = mrItem.path.match(/\/p\/([^/]+)\/d\/([^/]+)\/git\/merge\/([0-9]+)/);
       if (matchRes) {
         const [, project, repo, mergeRequestIId] = matchRes;
         context.webviewProvider.update({
-          session: codingServer.session,
+          token,
+          userInfo,
           mergeRequestIId,
           repoInfo: {
-            team,
+            team: userInfo.team,
             project,
             repo,
           },
@@ -52,27 +55,36 @@ export function registerCommands(context: IContext) {
         return;
       }
 
-      const team = codingServer.session?.user?.team;
-      await codingServer.createDepot(team, depot, depot);
-      toast.info('仓库创建成功');
+      const team = context.userInfo.team;
+      const result = await codingServer.createDepot(team, depot, depot);
+      if (result) {
+        toast.info('仓库创建成功');
+      }
     }),
   );
 }
 
 export function createTreeViews(context: IContext) {
   context.subscriptions.push(
-    hx.window.createTreeView('codingPlugin.treeMR', {
+    createTreeView('codingPlugin.treeMR', {
       showCollapseAll: false,
       treeDataProvider: new MRTreeDataProvider(context),
     }),
   );
 
   context.subscriptions.push(
-    hx.window.createTreeView('codingPlugin.treeDepot', {
-      showCollapseAll: true,
+    createTreeView('codingPlugin.treeDepot', {
+      showCollapseAll: false,
       treeDataProvider: new DepotTreeDataProvider(context),
     }),
   );
+
+  context.subscriptions.push(
+    createTreeView('codingPlugin.treeDepotMR', {
+      showCollapseAll: false,
+      treeDataProvider: new DepotMRTreeDataProvider(context),
+    }),
+  );
 }
 
 export function workspaceInit() {
@@ -114,7 +126,7 @@ async function initCredentials(context: IContext) {
     const {
       ctx: { codingServer, repoInfo, token },
     } = context;
-    const userData = await codingServer.getUserInfo(repoInfo.team, token);
+    const userData = await codingServer.getUserInfo(token);
     toast.info(`logged in as coding user: ${userData.name} @ ${userData.team}`);
   } catch (err) {
     console.error(err);

src/services/codingServer.ts

@@ -8,13 +8,12 @@ import { parseCloneUrl } from '../utils/repo';
 import toast from '../utils/toast';
 
 export default class CodingServer {
-  _session!: ISessionData;
+  _session: ISessionData;
   _repo!: IRepoInfo;
 
-  constructor(session?: ISessionData, repo?: IRepoInfo) {
-    if (session) {
-      this._session = session;
-    }
+  constructor(session: ISessionData, repo?: IRepoInfo) {
+    this._session = session;
+
     if (repo) {
       this._repo = repo;
     }
@@ -32,23 +31,22 @@ export default class CodingServer {
     const folders = await hx.workspace.getWorkspaceFolders();
 
     if (!folders.length) {
-      toast.warn('workspace 中没有目录');
       return;
     }
 
     try {
       const remotes = await git.listRemotes({ fs, dir: folders[0].uri.path });
       return parseCloneUrl(remotes[0].url);
     } catch {
-      toast.error('该目录没有进行 git 初始化');
+      console.error('该目录没有进行 git 初始化');
     }
   }
 
-  async getUserInfo(team: string, token: string = this._session?.accessToken || ``) {
+  async getUserInfo(token: string) {
     try {
       const result = await axios({
         method: 'get',
-        url: `https://${team}.coding.net/api/current_user`,
+        url: `https://e.coding.net/api/current_user`,
         headers: this.getHeaders(token),
       });
 
@@ -77,6 +75,11 @@ export default class CodingServer {
           sortDirection: `DESC`,
         },
       });
+
+      if (result.code) {
+        return Promise.reject(result);
+      }
+
       return result?.data?.list || [];
     } catch (err) {
       console.error(err);
@@ -91,13 +94,17 @@ export default class CodingServer {
         headers: this.getHeaders(),
       });
 
+      if (result.code) {
+        return Promise.reject(result);
+      }
+
       return result.data;
     } catch (err) {
       console.error(err);
     }
   }
 
-  async getDepotList(team: string = this._repo?.team, project: string = this._repo?.project) {
+  async getDepotList(team: string, project: string = this._repo?.project) {
     // TODO: 使用新接口
     try {
       const result = await axios({
@@ -106,6 +113,10 @@ export default class CodingServer {
         headers: this.getHeaders(),
       });
 
+      if (result.code) {
+        return Promise.reject(result);
+      }
+
       return result?.data?.depots || [];
     } catch (err) {
       console.error(err);
@@ -126,6 +137,10 @@ export default class CodingServer {
         },
       });
 
+      if (result.code) {
+        return Promise.reject(result);
+      }
+
       return result.data;
     } catch (err) {
       console.error(err);
@@ -134,7 +149,9 @@ export default class CodingServer {
 
   async createDepot(team: string, project: string, depot: string) {
     try {
-      await this.createProject(team, project);
+      const projectRes = await this.createProject(team, project);
+
+      if (!projectRes) return;
 
       const result = await axios({
         method: 'post',
@@ -150,6 +167,12 @@ export default class CodingServer {
           shared: false,
         }),
       });
+
+      if (result.code) {
+        return Promise.reject(result);
+      }
+
+      return result.data;
     } catch (err) {
       console.error(err);
     }