Merge pull request cangzhang#11 from cangzhang/feat/refresh-tree

refactor: use webview

Author: uniquemo

.eslintrc.js

@@ -16,5 +16,7 @@ module.exports = {
     '@typescript-eslint/no-explicit-any': 0,
     '@typescript-eslint/explicit-module-boundary-types': 0,
     '@typescript-eslint/no-non-null-assertion': 0,
+    '@typescript-eslint/no-empty-function': 0,
+    'no-case-declarations': 0
   }
 };

package.json

@@ -54,30 +54,18 @@
       ]
     },
     "viewsContainers": {
-      "activitybar": [
-        {
-          "id": "CODING-DEPOT-MR",
-          "title": "CODING 代码仓库"
-        }
-      ],
       "rightside": [
         {
           "id": "WebviewContainerId",
-          "title": "CODING 合并请求详情"
+          "title": "CODING 代码仓库"
         }
       ]
     },
     "views": {
-      "CODING-DEPOT-MR": [
-        {
-          "id": "codingPlugin.treeDepotMR",
-          "name": "CODING 代码仓库"
-        }
-      ],
       "WebviewContainerId": [
         {
           "id": "codingPlugin.webview",
-          "title": "CODING 合并请求详情"
+          "title": "CODING 代码仓库"
         }
       ]
     },
@@ -97,7 +85,6 @@
           "type": "string",
           "description": "请勿修改"
         }
-
       }
     }
   },
@@ -128,13 +115,15 @@
     "isomorphic-git": "^1.8.0",
     "querystring": "^0.2.0",
     "react": "^17.0.1",
-    "react-dom": "^17.0.1"
+    "react-dom": "^17.0.1",
+    "react-select": "^3.1.1"
   },
   "devDependencies": {
     "@types/classnames": "^2.2.11",
     "@types/node": "^14.14.7",
     "@types/react": "^16.9.56",
     "@types/react-dom": "^16.9.9",
+    "@types/react-select": "^3.0.26",
     "@typescript-eslint/eslint-plugin": "^4.7.0",
     "@typescript-eslint/parser": "^4.7.0",
     "css-loader": "^5.0.1",

src/extension.ts

@@ -1,23 +1,20 @@
 import initialize from './initialize';
 import CodingServer from './services/codingServer';
-import WebviewProvider from './webviews';
 import ACTIONS, { dispatch } from './utils/actions';
 import { proxyCtx } from './utils/proxy';
 import toast from './utils/toast';
 import { readConfig } from './services/dcloud';
 
 async function activate(context: IContext) {
-  const webviewProvider = new WebviewProvider(context);
+  const codingServer = new CodingServer(context);
   const repoInfo = await CodingServer.getRepoParams();
-  console.log('repoInfo: ', repoInfo);
+  console.warn('repoInfo: ', repoInfo);
   const token = await readConfig(`token`);
 
-  const codingServer = new CodingServer(context);
-
   dispatch(ACTIONS.SET_CTX, {
     context,
     value: {
-      webviewProvider,
+      webviewProvider: null,
       codingServer,
       depots: [],
       selectedDepot: null,

src/init/createWebview.ts

@@ -0,0 +1,15 @@
+import WebviewProvider from '../webviews/depot';
+import ACTIONS, { dispatch } from '../utils/actions';
+import toast from '../utils/toast';
+
+function createWebview(context: IContext) {
+  const webviewProvider = new WebviewProvider(context);
+  dispatch(ACTIONS.SET_WEBVIEW, {
+    context,
+    value: webviewProvider,
+  });
+
+  toast.info('温馨提示，若页面没有渲染，请重新打开`插件扩展视图 - CODING 代码仓库`');
+}
+
+export default createWebview;

src/init/initCredentials.ts

@@ -2,6 +2,7 @@ import hx from 'hbuilderx';
 import * as DCloudService from '../services/dcloud';
 import toast from '../utils/toast';
 import { refreshTree } from './registerCommands';
+import ACTIONS, { dispatch } from '../utils/actions';
 
 const { executeCommand } = hx.commands;
 
@@ -17,7 +18,7 @@ export async function initCredentials(context: IContext) {
     }
 
     const resp = await DCloudService.fetchUser(hbToken);
-    toast.info(`logged in as DCloud user: ${resp.data.nickname} ${resp.data.email}`);
+    console.warn(`logged in as DCloud user: ${resp.data.nickname} ${resp.data.email}`);
 
     if (!token) {
       await executeCommand('codingPlugin.createTeam');
@@ -29,6 +30,11 @@ export async function initCredentials(context: IContext) {
     if (accessToken) {
       const userData = await codingServer.getUserInfo(accessToken);
       toast.info(`logged in as CODING user: ${userData.name} @ ${userData.team}`);
+
+      dispatch(ACTIONS.SET_USER_INFO, {
+        context: context,
+        value: userData,
+      });
     }
   } catch (err) {
     if (Number(err) === 1) {

src/init/initLoginLogout.ts

@@ -7,6 +7,7 @@ export default function initLoginLogout(context: IContext) {
   onUserLogin(() => {
     console.warn('login');
     refreshTree();
+    context.webviewProvider.refresh();
   });
 
   onUserLogout(() => {

src/init/registerCommands.ts

@@ -72,7 +72,7 @@ export default function registerCommands(context: IContext) {
   );
 
   context.subscriptions.push(
-    registerCommand('codingPlugin.createDepot', async function (param: any) {
+    registerCommand('codingPlugin.createDepot', async function (callback: any) {
       const depot = await showInputBox({
         prompt: '请输入仓库名',
       });
@@ -84,13 +84,22 @@ export default function registerCommands(context: IContext) {
 
       const team = context.userInfo.team;
       const result = await codingServer.createDepot(team, depot, depot);
+      const webview = context.webviewProvider?.panel.webView;
       if (result) {
+        webview.postMessage({
+          command: 'create.depot.success',
+          data: result,
+        });
         const res = await toast.info('仓库创建成功，是否切换到该仓库？', ['是', '否']);
         if (res === '是') {
           dispatch(ACTIONS.SET_SELECTED_DEPOT, {
             context,
             value: result,
           });
+          webview.postMessage({
+            command: 'create.depot.switch',
+            data: result,
+          });
         }
         refreshTree();
       }
@@ -122,6 +131,7 @@ export default function registerCommands(context: IContext) {
             value: newToken,
           });
           refreshTree();
+          context.webviewProvider.refresh();
         }
       } catch {
         toast.error(`个人令牌无效`);
@@ -166,6 +176,7 @@ export default function registerCommands(context: IContext) {
             value: result.Token,
           });
           refreshTree();
+          context.webviewProvider.refresh();
         }
       } catch (err) {
         toast.error(`创建团队失败`);

src/initialize.ts

@@ -1,4 +1,5 @@
 import createTreeViews from './init/createTreeViews';
+import createWebview from './init/createWebview';
 import initWorkspace from './init/initWorkspace';
 import { initCredentials } from './init/initCredentials';
 import registerCommands from './init/registerCommands';
@@ -13,5 +14,6 @@ export default function initialize(context: IContext) {
   initCredentials(context);
   registerCommands(context);
   createTreeViews(context);
+  createWebview(context);
   initWorkspace(context);
 }