feat: remove workspace repoInfo logic

Author: uniquemo

src/extension.ts

@@ -37,7 +37,6 @@ async function activate(context: IContext) {
     value: {
       webviewProvider,
       codingServer,
-      repoInfo,
       depots: [],
       selectedDepot: null,
     },

src/init.ts

@@ -47,7 +47,7 @@ export function registerCommands(context: IContext) {
 export function createTreeViews(context: IContext) {
   context.subscriptions.push(
     hx.window.createTreeView('codingPlugin.treeMR', {
-      showCollapseAll: true,
+      showCollapseAll: false,
       treeDataProvider: new MRTreeDataProvider(context),
     }),
   );

src/trees/depot.ts

@@ -5,10 +5,12 @@ import { IDepot } from '../typings/common';
 
 interface IItem extends ITreeItem {
   _create: boolean;
+  _auth: boolean;
 }
 
 const getCommand = (element: IDepot & IItem) => {
   if (element.children) return '';
+  if (element._auth) return 'codingPlugin.auth';
   if (element._create) return 'codingPlugin.createDepot';
   return 'codingPlugin.depotTreeItemClick';
 };
@@ -19,7 +21,22 @@ class DepotTreeDataProvider extends hx.TreeDataProvider {
     this.context = context;
   }
 
+  getUser() {
+    return this.context.codingServer.session?.user;
+  }
+
   async getChildren(element: IDepot & IItem) {
+    const user = this.getUser();
+    if (!user) {
+      toast.warn('请先绑定 CODING 账户');
+      return Promise.resolve([
+        {
+          name: '绑定 CODING 账户',
+          _auth: true,
+        },
+      ]);
+    }
+
     if (element) {
       return Promise.resolve(element.children);
     }

src/trees/mr.ts

@@ -1,7 +1,7 @@
 import hx from 'hbuilderx';
 import toast from '../utils/toast';
 import { getMrListParams } from '../utils/mr';
-import { IMRItem, IRepoInfo, IReviewer } from '../typings/common';
+import { IMRItem, IReviewer } from '../typings/common';
 
 interface IItem extends ITreeItem {
   _disabled: boolean;
@@ -21,9 +21,13 @@ class MRTreeDataProvider extends hx.TreeDataProvider {
   }
 
   getRepoInfo() {
-    const { repoInfo, selectedDepot, depots, codingServer } = this.context;
+    const { selectedDepot, depots, codingServer } = this.context;
     const user = codingServer.session?.user;
-    return getMrListParams(repoInfo, selectedDepot, depots, user);
+    return getMrListParams(selectedDepot, depots, user);
+  }
+
+  getUser() {
+    return this.context.codingServer.session?.user;
   }
 
   async getChildren(element?: IMRItem & IItem) {
@@ -32,16 +36,16 @@ class MRTreeDataProvider extends hx.TreeDataProvider {
     }
 
     try {
-      const user = this.context.codingServer.session?.user;
+      const user = this.getUser();
       const userId = user?.id;
 
       const repoInfo = this.getRepoInfo();
 
       if (!repoInfo) {
         return Promise.resolve([
           {
-            title: '+ 创建仓库',
-            _create: true,
+            title: '请先从「CODING 仓库」列表指定仓库',
+            _disabled: true,
           },
         ]);
       }
@@ -73,14 +77,14 @@ class MRTreeDataProvider extends hx.TreeDataProvider {
   }
 
   getTreeItem(element: IMRItem & IItem) {
-    const repoInfo = this.getRepoInfo() as IRepoInfo;
+    const user = this.getUser();
 
     return {
       label: element.title,
       collapsibleState: element.children ? 1 : 0,
       command: {
         command: getCommand(element),
-        arguments: [repoInfo?.team, element],
+        arguments: [user?.team, element],
       },
     };
   }

src/utils/mr.ts

@@ -1,12 +1,7 @@
 import { IRepoInfo, IDepot, IUserInfo } from '../typings/common';
 
-export const getMrListParams = (
-  repoInfo: IRepoInfo,
-  selectedDepot: IDepot,
-  depots: IDepot[],
-  user: IUserInfo,
-): IRepoInfo | undefined => {
-  const { team } = user;
+export const getMrListParams = (selectedDepot: IDepot, depots: IDepot[], user: IUserInfo): IRepoInfo | undefined => {
+  const team = user?.team;
   let depot = selectedDepot;
 
   if (!depot) {
@@ -21,6 +16,4 @@ export const getMrListParams = (
       return { team, project, repo };
     }
   }
-
-  if (repoInfo) return repoInfo;
 };