feat(mr): change reviewers.

Author: cangzhang

src/extension.ts

@@ -61,7 +61,7 @@ export async function activate(context: vscode.ExtensionContext) {
         Panel.currentPanel?.broadcast(`mr.update.activities`, activityResp.data);
       });
       codingSrv.getMRReviewers(mr.iid).then((reviewerResp) => {
-        Panel.currentPanel?.broadcast(`mr.update.reviewers`, reviewerResp.data);
+        Panel.currentPanel?.broadcast(`mr.reviewers.init`, reviewerResp.data);
       });
       codingSrv.getMRComments(mr.iid).then((commentResp) => {
         Panel.currentPanel?.broadcast(`mr.udpate.comments`, commentResp.data);

src/panel.ts

@@ -106,7 +106,7 @@ export class Panel {
           break;
         case 'mr.update.reviewers': {
           try {
-            const [iid, selected]: [string, number[]] = args;
+            const { iid, list: selected }: { iid: string; list: number[] } = args;
             const {
               data: { list: memberList },
             } = await this._codingSrv.getProjectMembers();
@@ -140,7 +140,7 @@ export class Panel {
 
             await Promise.all(tasks);
             const resp = await this._codingSrv.getMRReviewers(iid);
-            this.broadcast(command, resp.data);
+            this._replyMessage(message, resp.data);
           } catch (err) {}
           break;
         }

src/typings/respResult.ts

@@ -165,11 +165,13 @@ export interface IReviewer {
   volunteer: string;
 }
 
+export interface IMRReviewers {
+  volunteer_reviewers: IReviewer[];
+  reviewers: IReviewer[];
+}
+
 export interface IMRReviewersResponse extends CodingResponse {
-  data: {
-    volunteer_reviewers: IReviewer[];
-    reviewers: IReviewer[];
-  };
+  data: IMRReviewers;
 }
 
 export interface IComment {

webviews/hooks/messageTransferHook.tsx

@@ -5,7 +5,7 @@ import { actions } from 'webviews/store/constants';
 export default function messageTransferHook() {
   useEffect(() => {
     window.addEventListener('message', (ev) => {
-      const { updateCurrentMR, toggleMRLoading } = appStore;
+      const { updateCurrentMR, toggleMRLoading, initMRReviewers } = appStore;
       const { command, res } = ev?.data;
 
       switch (command) {
@@ -17,6 +17,10 @@ export default function messageTransferHook() {
           updateCurrentMR(res);
           break;
         }
+        case actions.MR_REVIEWERS_INIT: {
+          initMRReviewers(res);
+          break;
+        }
         default:
           break;
       }

webviews/store/appStore.ts

@@ -1,31 +1,26 @@
 import { autoEffect, clearEffect, store } from '@risingstack/react-easy-state';
 import { IMRWebViewDetail } from 'src/typings/commonTypes';
-import { IActivity, IReviewer, IComment } from 'src/typings/respResult';
+import { IActivity, IComment, IMRReviewers } from 'src/typings/respResult';
 import { vscode } from 'webviews/constants/vscode';
 import { actions } from 'webviews/store/constants';
 import { MERGE_STATUS } from 'webviews/constants/mergeRequest';
 import { getMessageHandler } from 'webviews/utils/message';
 
-interface IReviewers {
-  volunteer_reviewers: IReviewer[];
-  reviewers: IReviewer[];
-}
-
 const appStore = store({
   currentMR: (vscode.getState()?.currentMR || {}) as IMRWebViewDetail,
   activities: (vscode.getState()?.activities || []) as IActivity[],
   reviewers: (vscode.getState()?.reviewers || {
     volunteer_reviewers: [],
     reviewers: [],
-  }) as IReviewers,
+  }) as IMRReviewers,
   comments: (vscode.getState()?.comments || []) as IComment[],
   updateCurrentMR(data: IMRWebViewDetail) {
     appStore.currentMR = data;
   },
   updateMRActivities(data: IActivity[]) {
     appStore.activities = data;
   },
-  updateMRReviewers(data: IReviewers) {
+  updateMRReviewers(data: IMRReviewers) {
     appStore.reviewers = data;
   },
   updateMRComments(data: IComment[]) {
@@ -115,11 +110,12 @@ const appStore = store({
     return result;
   },
   async updateReviewers(iid: string, list: number[]) {
-    const result = await getMessageHandler(appStore.messageHandler)().postMessage({
+    const resp = await getMessageHandler(appStore.messageHandler)().postMessage({
       command: actions.MR_UPDATE_REVIEWERS,
-      args: [iid, list],
+      args: { iid, list },
     });
-    return result;
+    appStore.reviewers = resp;
+    return;
   },
   toggleUpdatingDesc(status?: boolean) {
     if (typeof status === `undefined`) {
@@ -149,8 +145,11 @@ const appStore = store({
   addComment(comment: IComment) {
     appStore.comments.push(comment);
   },
+  initMRReviewers(list: IMRReviewers) {
+    appStore.reviewers = list;
+  },
   messageHandler(message: any) {
-    const { updateMRActivities, updateMRReviewers, updateMRComments } = appStore;
+    const { updateMRActivities, updateMRComments } = appStore;
     const { command, res } = message;
 
     switch (command) {
@@ -162,10 +161,6 @@ const appStore = store({
         updateMRComments(res);
         break;
       }
-      case actions.MR_UPDATE_REVIEWERS: {
-        res && updateMRReviewers(res);
-        break;
-      }
       case actions.MR_ADD_COMMENT: {
       }
       default:

webviews/store/constants.ts

@@ -12,4 +12,5 @@ export enum actions {
   MR_TOGGLE_LOADING = `mr.update.toggleLoading`,
   MR_UPDATE_REVIEWERS = `mr.update.reviewers`,
   MR_UPDATE_DESC = `mr.update.desc`,
+  MR_REVIEWERS_INIT = `mr.reviewers.init`,
 }