Merge branch 'master' of https://github.com/cangzhang/coding-hbuilderx into feat/oauth

Author: cangzhang

package.json

@@ -68,7 +68,7 @@
       "rightside": [
         {
           "id": "WebviewContainerId",
-          "title": "WEBVIEW"
+          "title": "CODING 合并请求详情"
         }
       ]
     },
@@ -88,7 +88,7 @@
       "WebviewContainerId": [
         {
           "id": "codingPlugin.webview",
-          "title": "WEBVIEW"
+          "title": "CODING 合并请求详情"
         }
       ]
     },
@@ -135,12 +135,14 @@
   },
   "dependencies": {
     "axios": "^0.21.0",
+    "classnames": "^2.2.6",
     "isomorphic-git": "^1.8.0",
     "querystring": "^0.2.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1"
   },
   "devDependencies": {
+    "@types/classnames": "^2.2.11",
     "@types/node": "^14.14.7",
     "@types/react": "^16.9.56",
     "@types/react-dom": "^16.9.9",

src/extension.ts

@@ -5,7 +5,7 @@ import ACTIONS, { dispatch } from './utils/actions';
 import { proxyCtx } from './utils/proxy';
 import toast from './utils/toast';
 
-const accessToken = '1b7fca3bd7594a89b0f5e2a0250c1147';
+const accessToken = '7e4d9d17f87875e731d536d13635a700ddf52b12';
 const user = {
   id: 8005956,
   avatar: 'https://coding-net-production-static-ci.codehub.cn/WM-TEXT-AVATAR-lvVeBfbGLtCPdcsAOPod.jpg',

src/init.ts

@@ -3,15 +3,14 @@ import DepotTreeDataProvider from './trees/depot';
 import MRTreeDataProvider from './trees/mr';
 
 import toast from './utils/toast';
-import { getMRUrl } from './utils/repo';
 import ACTIONS, { dispatch } from './utils/actions';
 import { IDepot, IMRItem } from './typings/common';
 import * as DCloudService from './services/dcloud';
 
 const { registerCommand } = hx.commands;
 
 export function registerCommands(context: IContext) {
-  const { codingServer } = context;
+  const { codingServer, webviewProvider } = context;
 
   context.subscriptions.push(
     registerCommand('codingPlugin.helloWorld', () => {
@@ -20,8 +19,21 @@ export function registerCommands(context: IContext) {
   );
 
   context.subscriptions.push(
-    registerCommand('codingPlugin.mrTreeItemClick', function ([team, mrItem]: [string, IMRItem]) {
-      hx.env.openExternal(getMRUrl(team, mrItem));
+    registerCommand('codingPlugin.mrTreeItemClick', async function ([team, mrItem]: [string, IMRItem]) {
+      const matchRes = mrItem.path.match(/\/p\/([^/]+)\/d\/([^/]+)\/git\/merge\/([0-9]+)/);
+      if (matchRes) {
+        const [, project, repo, mergeRequestIId] = matchRes;
+        const result = await codingServer.getMrDetail({ team, project, repo, mergeRequestIId });
+        webviewProvider.update({
+          session: codingServer.session,
+          mrItem: result,
+          repoInfo: {
+            team,
+            project,
+            repo,
+          },
+        });
+      }
     }),
   );
 
@@ -41,8 +53,8 @@ export function registerCommands(context: IContext) {
         prompt: '请输入仓库名',
       });
       const team = codingServer.session?.user?.team;
-      const result = await codingServer.createDepot(team, depot, depot);
-      // TODO: 拉取代码，更新workspace
+      await codingServer.createDepot(team, depot, depot);
+      toast.info('仓库创建成功');
     }),
   );
 }

src/services/codingServer.ts

@@ -24,9 +24,9 @@ export default class CodingServer {
     return this._session;
   }
 
-  get repo() {
-    return this._repo;
-  }
+  getHeaders = (token?: string) => ({
+    Authorization: `token ${token || this._session.accessToken}`,
+  });
 
   static async getRepoParams() {
     const folders = await hx.workspace.getWorkspaceFolders();
@@ -49,9 +49,7 @@ export default class CodingServer {
       const result = await axios({
         method: 'get',
         url: `https://${team}.coding.net/api/current_user`,
-        params: {
-          access_token: token,
-        },
+        headers: this.getHeaders(),
       });
 
       return result?.data;
@@ -66,13 +64,13 @@ export default class CodingServer {
       const result = await axios({
         method: 'get',
         url,
+        headers: this.getHeaders(),
         params: {
           status: `open`,
           sort: `action_at`,
           page: 1,
           PageSize: 100,
           sortDirection: `DESC`,
-          access_token: this._session.accessToken,
         },
       });
       return result?.data?.list || [];
@@ -81,15 +79,27 @@ export default class CodingServer {
     }
   }
 
+  async getMrDetail({ team, project, repo, mergeRequestIId }: IRepoInfo & { mergeRequestIId: number }) {
+    try {
+      const result = await axios({
+        method: 'get',
+        url: `https://${team}.coding.net/api/user/${team}/project/${project}/depot/${repo}/git/merge/${mergeRequestIId}/detail`,
+        headers: this.getHeaders(),
+      });
+
+      return result.data;
+    } catch (err) {
+      console.error(err);
+    }
+  }
+
   async getDepotList(team: string = this._repo?.team, project: string = this._repo?.project) {
     // TODO: 使用新接口
     try {
       const result = await axios({
         method: 'get',
         url: `https://${team}.coding.net/api/user/${team}/project/${project}/repos`,
-        params: {
-          access_token: this._session.accessToken,
-        },
+        headers: this.getHeaders(),
       });
 
       return result?.data?.depots || [];
@@ -102,7 +112,8 @@ export default class CodingServer {
     try {
       const result = await axios({
         method: 'post',
-        url: `https://${team}.coding.net/api/team/${team}/template-project?access_token=${this._session.accessToken}`,
+        url: `https://${team}.coding.net/api/team/${team}/template-project`,
+        headers: this.getHeaders(),
         data: {
           name: project,
           displayName: project,
@@ -123,9 +134,10 @@ export default class CodingServer {
 
       const result = await axios({
         method: 'post',
-        url: `https://${team}.coding.net/api/user/${team}/project/${project}/depot?access_token=${this._session.accessToken}`,
+        url: `https://${team}.coding.net/api/user/${team}/project/${project}/depot`,
         headers: {
           'content-type': 'application/x-www-form-urlencoded;charset=UTF-8',
+          ...this.getHeaders(),
         },
         data: qs.stringify({
           name: depot,

src/webview.ts

@@ -1,6 +1,11 @@
 import hx from 'hbuilderx';
-import fs from 'fs';
 import path from 'path';
+import toast from './utils/toast';
+
+interface IMessage {
+  command: string;
+  data: any;
+}
 
 export default class WebviewProvider {
   panel: IWebviewPanel;
@@ -11,8 +16,21 @@ export default class WebviewProvider {
   }
 
   listen() {
-    this.panel.webView.onDidReceiveMessage((message: any) => {
+    this.panel.webView.onDidReceiveMessage((message: IMessage) => {
       console.log('webview receive message => ', message);
+      const { command, data } = message;
+
+      switch (command) {
+        case 'webview.mrDetail':
+          hx.env.openExternal(data);
+          break;
+        case 'webview.toast':
+          toast.error(data);
+          break;
+        default:
+          hx.commands.executeCommand(command);
+          return;
+      }
     });
   }
 
@@ -24,35 +42,17 @@ export default class WebviewProvider {
     return webviewPanel;
   }
 
-  update(itemId: string) {
+  update(data: any) {
     const webview = this.panel.webView;
     const fileInfo = hx.Uri.file(path.resolve(__dirname, '../out/webviews/main.js'));
 
     webview.html = `
       <body>
-        <div style="max-width:200px;">
+        <div>
           <div id='root'></div>
-          <button onclick="test()">测试</button>
-          <div>${itemId}</div>
         </div>
         <script>
-          window.__TEXT__ = '${itemId}'
-          function test() {
-            alert('abc')
-
-            window.fetch("https://api.github.com/search/repositories?q=react", {
-              "method": "GET",
-              "mode": "cors",
-              "credentials": "include"
-            }).then((res) => {
-              res.json().then(data => alert(JSON.stringify(data.items[0])))
-            })
-          }
-        </script>
-        <script>
-          window.addEventListener("message", (msg) => {
-            console.log(msg);
-          });
+          window.__CODING__ = '${JSON.stringify(data)}'
         </script>
         <script src='${fileInfo}'></script>
       </body>

webpack.config.js

@@ -27,6 +27,11 @@ module.exports = {
           },
           {
             loader: 'css-loader',
+            options: {
+              modules: {
+                localIdentName: '[path][name]__[local]--[hash:base64:5]',
+              },
+            },
           },
         ],
       },