fix: empty workspace logic

Author: uniquemo

src/extension.ts

@@ -3,6 +3,7 @@ import WebviewProvider from './webview';
 import CodingServer from './services/codingServer';
 import ACTIONS, { dispatch } from './utils/actions';
 import { proxyCtx } from './utils/proxy';
+import toast from './utils/toast';
 
 const accessToken = '1b7fca3bd7594a89b0f5e2a0250c1147';
 const user = {
@@ -47,7 +48,7 @@ async function activate(context: IContext) {
 }
 
 function deactivate() {
-  console.log('plugin deactivate');
+  toast.info('plugin deactivate');
 }
 
 export { activate, deactivate };

src/init.ts

@@ -8,8 +8,7 @@ import ACTIONS, { dispatch } from './utils/actions';
 import { IDepot, IMRItem } from './typings/common';
 
 export function registerCommands(context: IContext) {
-  const { repoInfo, codingServer } = context;
-  const { team } = repoInfo;
+  const { codingServer } = context;
 
   context.subscriptions.push(
     hx.commands.registerCommand('codingPlugin.helloWorld', () => {
@@ -38,6 +37,7 @@ export function registerCommands(context: IContext) {
       const depot = await hx.window.showInputBox({
         prompt: '请输入仓库名',
       });
+      const team = codingServer.session?.user?.team;
       const result = await codingServer.createDepot(team, depot, depot);
       // TODO: 拉取代码，更新workspace
     }),

src/services/codingServer.ts

@@ -5,6 +5,7 @@ import axios from '../utils/axios';
 import git from 'isomorphic-git';
 import { IRepoInfo, ISessionData } from '../typings/common';
 import { parseCloneUrl } from '../utils/repo';
+import toast from '../utils/toast';
 
 export default class CodingServer {
   _session!: ISessionData;
@@ -31,15 +32,15 @@ export default class CodingServer {
     const folders = await hx.workspace.getWorkspaceFolders();
 
     if (!folders.length) {
-      console.warn('workspace中没有目录');
+      toast.warn('workspace中没有目录');
       return;
     }
 
     try {
       const remotes = await git.listRemotes({ fs, dir: folders[0].uri.path });
       return parseCloneUrl(remotes[0].url);
     } catch {
-      console.error('该目录没有进行git初始化');
+      toast.error('该目录没有进行git初始化');
     }
   }
 
@@ -54,7 +55,7 @@ export default class CodingServer {
       });
 
       if (result.code) {
-        console.error(result.msg);
+        toast.error(result.msg);
         return Promise.reject(result.msg);
       }
 
@@ -95,16 +96,18 @@ export default class CodingServer {
           access_token: this._session.accessToken,
         },
       });
+
+      if (result.code) {
+        toast.error(result.msg);
+        return Promise.reject(result.msg);
+      }
+
       return result?.data?.depots || [];
     } catch (err) {
       throw new Error(err);
     }
   }
 
-  async createProjectAndDepot(team: string, payload: { project: string; depot: string }) {
-    return 'createProjectAndDepot';
-  }
-
   async createDepot(team: string = this._repo?.team, project: string = this._repo?.project, depot: string) {
     try {
       const result = await axios({
@@ -120,7 +123,6 @@ export default class CodingServer {
           shared: false,
         }),
       });
-      console.log('result => ', result);
     } catch (err) {
       throw new Error(err);
     }

src/trees/depot.ts

@@ -1,5 +1,6 @@
 import hx from 'hbuilderx';
 import ACTIONS, { dispatch } from '../utils/actions';
+import toast from '../utils/toast';
 import { IDepot } from '../typings/common';
 
 interface IItem extends ITreeItem {
@@ -33,16 +34,13 @@ class DepotTreeDataProvider extends hx.TreeDataProvider {
 
       return Promise.resolve([
         {
-          name: '创建仓库',
+          name: '+ 创建仓库',
           _create: true,
         },
-        {
-          name: '仓库列表',
-          children: depots,
-        },
+        ...depots,
       ]);
     } catch {
-      console.error('获取仓库列表失败');
+      toast.error('获取仓库列表失败');
     }
   }
 

src/trees/mr.ts

@@ -5,8 +5,15 @@ import { IMRItem, IRepoInfo, IReviewer } from '../typings/common';
 
 interface IItem extends ITreeItem {
   _disabled: boolean;
+  _create: boolean;
 }
 
+const getCommand = (element: IMRItem & IItem) => {
+  if (element.children || element._disabled) return '';
+  if (element._create) return 'codingPlugin.createDepot';
+  return 'codingPlugin.mrTreeItemClick';
+};
+
 class MRTreeDataProvider extends hx.TreeDataProvider {
   constructor(context: IContext) {
     super();
@@ -31,8 +38,12 @@ class MRTreeDataProvider extends hx.TreeDataProvider {
       const repoInfo = this.getRepoInfo();
 
       if (!repoInfo) {
-        toast.warn('请先到扩展视图`CODING 仓库`中创建仓库');
-        return;
+        return Promise.resolve([
+          {
+            title: '+ 创建仓库',
+            _create: true,
+          },
+        ]);
       }
 
       const list = await this.context.codingServer.getMrList(repoInfo);
@@ -47,16 +58,16 @@ class MRTreeDataProvider extends hx.TreeDataProvider {
           _disabled: true,
         },
         {
-          title: `Created By Me (${createdList.length})`,
+          title: `Created By Me (${createdList?.length})`,
           children: createdList,
         },
         {
-          title: `Waiting For My Review (${reviewerList.length})`,
+          title: `Waiting For My Review (${reviewerList?.length})`,
           children: reviewerList,
         },
       ]);
     } catch {
-      console.error('获取MR列表失败');
+      toast.error('获取MR列表失败');
       Promise.resolve([]);
     }
   }
@@ -68,8 +79,8 @@ class MRTreeDataProvider extends hx.TreeDataProvider {
       label: element.title,
       collapsibleState: element.children ? 1 : 0,
       command: {
-        command: element.children || element._disabled ? '' : 'codingPlugin.mrTreeItemClick',
-        arguments: [repoInfo.team, element],
+        command: getCommand(element),
+        arguments: [repoInfo?.team, element],
       },
     };
   }

src/webview.ts

@@ -18,7 +18,7 @@ export default class WebviewProvider {
 
   createPanel() {
     const webviewPanel: IWebviewPanel = hx.window.createWebView('codingPlugin.webview', {
-      enableScripts: true
+      enableScripts: true,
     });
 
     return webviewPanel;
@@ -51,7 +51,7 @@ export default class WebviewProvider {
         </script>
         <script>
           window.addEventListener("message", (msg) => {
-            console.log('msg 222 => ', msg);
+            console.log(msg);
           });
         </script>
         <script src='${fileInfo}'></script>