feat: project member list.

Author: cangzhang

package.json

@@ -2,7 +2,7 @@
   "name": "coding-plugin",
   "description": "Coding plugin for VS Code.",
   "version": "1.0.0",
-  "publisher": "alcheung",
+  "publisher": "coding",
   "license": "MIT",
   "engines": {
     "vscode": "^1.47.0"

src/codingServer.ts

@@ -14,6 +14,7 @@ import {
   ICreateMRBody,
   ICreateMRResp,
   IBranchListResp,
+  IMemberListResp,
 } from 'src/typings/respResult';
 import { PromiseAdapter, promiseFromEvent, parseQuery, parseCloneUrl } from 'src/common/utils';
 import { GitService } from 'src/common/gitService';
@@ -25,7 +26,7 @@ const AUTH_SERVER = `https://x5p7m.csb.app`;
 const ClientId = `ff768664c96d04235b1cc4af1e3b37a8`;
 const ClientSecret = `d29ebb32cab8b5f0a643b5da7dcad8d1469312c7`;
 
-export const ScopeList = [`user`, `user:email`, `project`, `project:depot`];
+export const ScopeList = [`user`, `user:email`, `project`, `project:depot`, `project:members`];
 const SCOPES = ScopeList.join(`,`);
 const NETWORK_ERROR = 'network error';
 
@@ -591,6 +592,28 @@ export class CodingServer {
     }
   }
 
+  public async getProjectMembers() {
+    try {
+      const { projectApiPrefix } = await this.getApiPrefix();
+      const resp: IMemberListResp = await got
+        .get(`${projectApiPrefix}/members`, {
+          searchParams: {
+            pageSize: 9999,
+            access_token: this._session?.accessToken,
+          },
+        })
+        .json();
+
+      if (resp.code) {
+        return Promise.reject(resp);
+      }
+
+      return resp;
+    } catch (err) {
+      return Promise.reject(err);
+    }
+  }
+
   get loggedIn() {
     return this._loggedIn;
   }

src/extension.ts

@@ -200,9 +200,6 @@ export async function activate(context: vscode.ExtensionContext) {
       );
     }),
   );
-  context.subscriptions.push(
-    vscode.commands.registerCommand(`codingPlugin.mr.addReviewer`, async (file: IFileNode) => {}),
-  );
 
   if (vscode.window.registerWebviewPanelSerializer) {
     // Make sure we register a serializer in activation event

src/panel.ts

@@ -122,6 +122,26 @@ export class Panel {
               const getActivitiesRes = await this._codingSrv.getMRActivities(args);
               this.replyMessage(message, getActivitiesRes.data);
               break;
+            case 'mr.update.addReviewer': {
+              try {
+                const {
+                  data: { list: memberList },
+                } = await codingSrv.getProjectMembers();
+                const list = memberList.map((i) => ({
+                  label: i.user.name,
+                  description: i.user.global_key,
+                }));
+                const selection = await vscode.window.showQuickPick(list, {
+                  canPickMany: true,
+                });
+                if (!selection) {
+                  return;
+                }
+              } catch (err) {}
+              break;
+            }
+            default:
+              break;
           }
         } catch (err) {
           this.throwError(message, err.msg);

src/typings/commonTypes.ts

@@ -1,4 +1,4 @@
-import { IMRDetail, UserResponse } from './respResult';
+import { IMRDetail, IUserItem } from './respResult';
 
 export interface IRepoInfo {
   team: string;
@@ -13,7 +13,7 @@ export enum TokenType {
 
 export interface ISessionData {
   id: string;
-  user: UserResponse | null;
+  user: IUserItem | null;
   accessToken: string;
   refreshToken: string;
 }
@@ -37,5 +37,5 @@ export interface IMRWebViewDetail {
   data: IMRDetail & {
     loading: boolean;
   };
-  user: UserResponse;
+  user: IUserItem;
 }

src/typings/respResult.ts

@@ -15,7 +15,7 @@ export interface AuthFailResult {
   };
 }
 
-export interface UserResponse {
+export interface IUserItem {
   id: number;
   avatar: string;
   global_key: string;
@@ -30,8 +30,8 @@ export interface IMRData {
   title: string;
   merge_status: string;
   path: string;
-  author: UserResponse;
-  action_author: UserResponse;
+  author: IUserItem;
+  action_author: IUserItem;
   created_at: number;
   updated_at: number;
 }
@@ -42,6 +42,16 @@ export interface CodingResponse {
   msg?: string;
 }
 
+export interface IListResponse<T> extends CodingResponse {
+  data: {
+    list: T[];
+    page: number;
+    pageSize: number;
+    totalPage: number;
+    totalRow: number;
+  };
+}
+
 export interface IRepoItem {
   id: number;
   name: string;
@@ -139,7 +149,7 @@ export interface IActivity {
   action: string;
   created_at: number;
   id: number;
-  author: UserResponse;
+  author: IUserItem;
   comment?: {
     commits: any[];
   };
@@ -150,7 +160,7 @@ export interface IMRActivitiesResponse extends CodingResponse {
 }
 
 export interface IReviewer {
-  reviewer: UserResponse;
+  reviewer: IUserItem;
   value: number;
   volunteer: string;
 }
@@ -163,7 +173,7 @@ export interface IMRReviewersResponse extends CodingResponse {
 }
 
 export interface IComment {
-  author: UserResponse;
+  author: IUserItem;
   childComments?: IComment[];
   content: string;
   created_at: number;
@@ -205,3 +215,17 @@ export interface IBranchItem {
 export interface IBranchListResp extends CodingResponse {
   data: IBranchItem[];
 }
+
+export interface IMemberItem {
+  id: number;
+  project_id: number;
+  user_id: number;
+  type: number;
+  alias: string;
+  team_alias: string;
+  created_at: number;
+  last_visit_at: number;
+  user: IUserItem;
+}
+
+export interface IMemberListResp extends IListResponse<IMemberItem> {}

webviews/App.tsx

@@ -55,7 +55,7 @@ function App() {
     return <EmptyWrapper>Please select an merge request first.</EmptyWrapper>;
   }
 
-  if (data.loading) {
+  if (data?.loading) {
     return <EmptyWrapper>Loading...</EmptyWrapper>;
   }
 

webviews/components/Reviewers.tsx

@@ -4,9 +4,9 @@ import { view } from '@risingstack/react-easy-state';
 
 import appStore from 'webviews/store/appStore';
 import { Avatar, AuthorLink } from 'webviews/components/User';
-import { ReactComponent as PlusIcon } from 'webviews/assets/plus.svg';
-import { ReactComponent as CheckIcon } from 'webviews/assets/check.svg';
-import { ReactComponent as DeleteIcon } from 'webviews/assets/delete.svg';
+import PlusIcon from 'webviews/assets/plus.svg';
+import CheckIcon from 'webviews/assets/check.svg';
+import DeleteIcon from 'webviews/assets/delete.svg';
 
 const Title = styled.div`
   margin-top: 15px;
@@ -61,12 +61,13 @@ function Reviewers() {
   const { reviewers } = appStore;
   const { reviewers: rReviewers = [], volunteer_reviewers: volunteerReviewers = [] } = reviewers;
   const allReviewers = [...rReviewers, ...volunteerReviewers];
+  const { addReviewers } = appStore;
 
   return (
     <div>
       <Title>
         Reviewers
-        <IconButton>
+        <IconButton onClick={addReviewers}>
           <PlusIcon />
         </IconButton>
       </Title>

webviews/global.d.ts

@@ -5,4 +5,6 @@ declare module '*.svg' {
   import * as React from 'react';
 
   export const ReactComponent: React.FunctionComponent<React.SVGProps<SVGSVGElement>>;
+
+  export default ReactComponent;
 }

webviews/store/appStore.ts

@@ -113,6 +113,13 @@ const appStore = store({
     appStore.comments.push([result] as any);
     return result;
   },
+  async addReviewers() {
+    const result = await vscode.postMessage({
+      command: actions.MR_ADD_REVIEWER,
+      args: {},
+    });
+    return result;
+  },
 });
 
 export const persistData = () =>