feat: take workspace project into account

Author: uniquemo

src/webviews/depot.ts

@@ -24,6 +24,7 @@ export default class WebviewProvider {
     this.update({
       token: this.context.token,
       userInfo: this.context.userInfo,
+      repoInfo: this.context.repoInfo,
     });
   }
 

webviews/components/DepotSelect/index.tsx

@@ -1,18 +1,20 @@
 import React, { useContext, useEffect } from 'react';
 import Select from 'react-select';
+
 import { DataContext } from '../../reducers/context';
 import { ACTIONS } from '../../reducers';
 import { getDepotList } from '../../services';
 import useAsyncFn from '../../hooks/useAsyncFn';
-
+import { IDepot } from '../../typings/common';
+import { getDepotProject } from '../../utils/depot';
 import style from './style.css';
 
 const DepotSelect = () => {
   const { state, dispatch } = useContext(DataContext);
   const { token, userInfo, refetchDepotList, selectedDepot } = state;
 
   const [getDepotListState, getDepotListFn] = useAsyncFn(getDepotList);
-  const { loading, value = [] } = getDepotListState;
+  const { loading, value: depotList = [] } = getDepotListState;
 
   const fetchData = async () => {
     try {
@@ -36,6 +38,11 @@ const DepotSelect = () => {
     }
   }, [refetchDepotList]);
 
+  const getOptionLabel = ({ name, depotPath }: IDepot) => {
+    const project = getDepotProject(depotPath);
+    return name === project ? name : `${name} (${project})`;
+  };
+
   return (
     <div className={style.root}>
       <span>当前仓库：</span>
@@ -50,9 +57,9 @@ const DepotSelect = () => {
               payload: item
             });
           }}
-          options={value}
-          getOptionLabel={(item) => `${item.name}`}
-          getOptionValue={(item) => item.id}
+          options={depotList}
+          getOptionLabel={getOptionLabel}
+          getOptionValue={(item) => item.depotPath}
           isLoading={loading}
         />
       </div>

webviews/reducers/index.ts

@@ -1,11 +1,13 @@
-import { IDepot, IMRItem } from '../typings/common';
+import { getDepotProject } from '../utils/depot';
+import { IDepot, IMRItem, IRepoInfo } from '../typings/common';
 
 export interface IState {
   token: string;
   userInfo: Record<string, any>;
+  repoInfo: IRepoInfo | null;
   refetchDepotList: boolean;
   selectedDepot: IDepot | null;
-  selectedProjectName: string;
+  selectedProjectName: string | undefined;
   selectedMR: IMRItem | null;
 }
 
@@ -20,14 +22,28 @@ export const enum ACTIONS {
   SET_SELECTED_MR = 'SET_SELECTED_MR',
 }
 
-export const initialState = {
-  ...JSON.parse(window.__CODING__),
-  refetchDepotList: false,
-  selectedDepot: null,
-  selectedProjectName: '',
-  selectedMR: null
+const getInitialState = (): IState => {
+  const CODING_DATA = JSON.parse(window.__CODING__);
+  const { repoInfo, userInfo } = CODING_DATA;
+  const selectedDepot = repoInfo && userInfo && repoInfo.team === userInfo.team
+    ? {
+      name: repoInfo.repo,
+      depotPath: `/p/${repoInfo.project}/d/${repoInfo.repo}/git`,
+      vcsType: 'git'
+    }
+    : null;
+
+  return {
+    ...CODING_DATA,
+    refetchDepotList: false,
+    selectedDepot,
+    selectedProjectName: repoInfo ? repoInfo.project : '',
+    selectedMR: null
+  };
 };
 
+export const initialState = getInitialState();
+
 const appReducer = (state: IState, { type, payload }: IAction) => {
   switch (type) {
     case ACTIONS.REFETCH_DEPOT_LIST:
@@ -36,11 +52,10 @@ const appReducer = (state: IState, { type, payload }: IAction) => {
         refetchDepotList: payload
       };
     case ACTIONS.SET_SELECTED_DEPOT:
-      const matchRes = payload.depotPath.match(/\/p\/([^/]+)/);
       return {
         ...state,
         selectedDepot: payload,
-        selectedProjectName: matchRes?.[1],
+        selectedProjectName: getDepotProject(payload.depotPath),
         selectedMR: null
       };
     case ACTIONS.SET_SELECTED_MR:

webviews/typings/common.ts

@@ -40,3 +40,9 @@ export interface IMRItem {
   author: IUserInfo;
   reviewers: IReviewer[];
 }
+
+export interface IRepoInfo {
+  team: string;
+  project: string;
+  repo: string;
+}

webviews/utils/depot.ts

@@ -0,0 +1,4 @@
+export const getDepotProject = (depotPath: string) => {
+  const matchRes = depotPath.match(/\/p\/([^/]+)/);
+  return matchRes?.[1];
+};