Merge branch 'main' into release

Author: gary-Shen

apps/frontend/src/api/constant.ts

@@ -22,7 +22,6 @@ export const ErrorMessages = {
   [TASK_INIT_CODE + 1000]: i18n.t('fileUploadFailed'),
   [TASK_INIT_CODE + 1001]: i18n.t('fileNotFound'),
   [TASK_INIT_CODE + 1002]: i18n.t('duplicatedFile'),
-  [TASK_INIT_CODE + 5000]: i18n.t('参数错误：after,before,pageNo,只能选一个，pageNo 可以说是0'),
   [TASK_INIT_CODE + 5001]: i18n.t('noSample'),
   [TASK_INIT_CODE + 5003]: i18n.t('sampleNameExists'),
   [EXPORT_INIT_CODE + 1000]: i18n.t('noDataExport'),

apps/frontend/src/api/mutations/task.ts

@@ -1,6 +1,13 @@
 import { useMutation } from '@tanstack/react-query';
 
-import { createTaskWithBasicConfig, updateTaskConfig } from '@/api/services/task';
+import {
+  addCollaborator,
+  batchAddCollaborators,
+  batchRemoveCollaborators,
+  createTaskWithBasicConfig,
+  removeCollaborator,
+  updateTaskConfig,
+} from '@/api/services/task';
 
 import type { UpdateCommand } from '../types';
 
@@ -15,3 +22,27 @@ export function useUpdateTaskConfigMutation(taskId: number | string) {
     mutationFn: (payload: UpdateCommand) => updateTaskConfig(+taskId, payload),
   });
 }
+
+export function useAddCollaborator(taskId: number) {
+  return useMutation({
+    mutationFn: (userId: number) => addCollaborator(taskId, userId),
+  });
+}
+
+export function useRemoveCollaborator(taskId: number) {
+  return useMutation({
+    mutationFn: (userId: number) => removeCollaborator(taskId, userId),
+  });
+}
+
+export function useBatchAddCollaborators(taskId: number) {
+  return useMutation({
+    mutationFn: (userIds: number[]) => batchAddCollaborators(taskId, userIds),
+  });
+}
+
+export function useBatchRemoveCollaborators(taskId: number) {
+  return useMutation({
+    mutationFn: (userIds: number[]) => batchRemoveCollaborators(taskId, userIds),
+  });
+}

apps/frontend/src/api/queries/task.ts

@@ -0,0 +1,13 @@
+import { useQuery } from '@tanstack/react-query';
+
+import { getTaskCollaborators } from '../services/task';
+import { taskKey } from '../queryKeyFactories';
+
+export function useCollaborators(taskId: number, enabled: boolean) {
+  return useQuery({
+    queryKey: taskKey.collaborators(),
+    queryFn: () => getTaskCollaborators(taskId),
+    enabled: enabled && taskId > 0,
+    select: (data) => data?.data,
+  });
+}

apps/frontend/src/api/queries/user.ts

@@ -0,0 +1,12 @@
+import { useQuery } from '@tanstack/react-query';
+
+import { userKey } from '../queryKeyFactories/user';
+import { getUsers } from '../services/user';
+import type { GetUsersApiV1UsersGetParams } from '../types';
+
+export function useUsers(params: GetUsersApiV1UsersGetParams) {
+  return useQuery({
+    queryKey: userKey.list(params),
+    queryFn: () => getUsers(params),
+  });
+}

apps/frontend/src/api/queryKeyFactories/task.ts

@@ -7,4 +7,5 @@ export const taskKey = {
   list: (filter: ListByApiV1TasksGetParams) => [...taskKey.lists(), filter] as const,
   details: () => [...taskKey.all, 'details'] as const,
   detail: (id: string | number) => [...taskKey.details(), id] as const,
+  collaborators: () => [...taskKey.all, 'collaborators'] as const,
 };

apps/frontend/src/api/queryKeyFactories/user.ts

@@ -0,0 +1,8 @@
+import type { GetUsersApiV1UsersGetParams } from '../types';
+
+export const userKey = {
+  all: ['user'] as const,
+  me: () => [...userKey.all, 'me'] as const,
+  lists: () => [...userKey.all, 'list'] as const,
+  list: (filter: GetUsersApiV1UsersGetParams) => [...userKey.lists(), filter] as const,
+};

apps/frontend/src/api/services/preAnnotations.ts

@@ -27,7 +27,7 @@ export async function getPreAnnotationFiles({
   return await request.get(`/v1/tasks/${task_id}/pre_annotations/files`, {
     params: {
       ...params,
-      pageNo: typeof params.pageNo === 'undefined' ? 0 : params.pageNo - 1,
+      page: typeof params.page === 'undefined' ? 0 : params.page - 1,
     },
   });
 }
@@ -41,7 +41,7 @@ export async function getPreAnnotations({
   return await request.get(`/v1/tasks/${task_id}/pre_annotations`, {
     params: {
       ...params,
-      pageNo: typeof params.pageNo === 'undefined' ? 0 : params.pageNo - 1,
+      page: typeof params.page === 'undefined' ? 0 : params.page - 1,
     },
   });
 }

apps/frontend/src/api/services/samples.ts

@@ -36,7 +36,7 @@ export async function getSamples({
   return await request.get(`/v1/tasks/${task_id}/samples`, {
     params: {
       ...params,
-      pageNo: typeof params.pageNo === 'undefined' ? 0 : params.pageNo - 1,
+      page: typeof params.page === 'undefined' ? 0 : params.page - 1,
     },
   });
 }
@@ -138,7 +138,7 @@ export async function outputSample(taskId: number, sampleIds: number[], activeTx
 }
 
 export async function outputSamples(taskId: number, activeTxt: ExportType) {
-  const samplesRes = await getSamples({ task_id: taskId, pageNo: 1, pageSize: 100000 });
+  const samplesRes = await getSamples({ task_id: taskId, page: 1, size: 100000 });
   const sampleIdArrays = samplesRes.data;
   const sampleIds = [];
 

apps/frontend/src/api/services/task.ts

@@ -11,6 +11,9 @@ import type {
   CreateApiV1TasksTaskIdAttachmentsPostParams,
   DeleteApiV1TasksTaskIdAttachmentsDeleteParams,
   AttachmentDeleteCommand,
+  ListResponseWithMeta,
+  UserResponse,
+  OkResponse,
 } from '../types';
 
 export async function getTask(taskId: number): Promise<OkRespTaskResponseWithStatics> {
@@ -21,6 +24,32 @@ export async function getTask(taskId: number): Promise<OkRespTaskResponseWithSta
   });
 }
 
+export async function getTaskCollaborators(taskId: number): Promise<ListResponseWithMeta<UserResponse>> {
+  return await request.get(`/v1/tasks/${taskId}/collaborators`);
+}
+
+export async function removeCollaborator(taskId: number, userId: number) {
+  return await request.delete(`/v1/tasks/${taskId}/collaborators/${userId}`);
+}
+
+export async function addCollaborator(taskId: number, userId: number) {
+  return await request.post(`/v1/tasks/${taskId}/collaborators`, {
+    user_id: userId,
+  });
+}
+
+export async function batchAddCollaborators(taskId: number, userIds: number[]): Promise<OkResponse<UserResponse>> {
+  return await request.post(`/v1/tasks/${taskId}/collaborators/batch_add`, {
+    user_ids: userIds,
+  });
+}
+
+export async function batchRemoveCollaborators(taskId: number, userIds: number[]): Promise<OkRespCommonDataResp> {
+  return await request.post(`/v1/tasks/${taskId}/collaborators/batch_remove`, {
+    user_ids: userIds,
+  });
+}
+
 export async function createTaskWithBasicConfig(data: BasicConfigCommand): Promise<OkRespTaskResponse> {
   return await request.post('/v1/tasks', data);
 }

apps/frontend/src/api/services/user.ts

@@ -2,12 +2,15 @@ import * as storage from '@/utils/storage';
 
 import request from '../request';
 import type {
+  GetUsersApiV1UsersGetParams,
+  ListResponseWithMeta,
   LoginCommand,
   OkRespLoginResponse,
   OkRespLogoutResponse,
   OkRespSignupResponse,
   OkRespUserInfo,
   SignupCommand,
+  UserResponse,
 } from '../types';
 
 export async function login(params: LoginCommand): Promise<OkRespLoginResponse> {
@@ -28,7 +31,13 @@ export async function ssoLogin(code: string) {
 }
 
 export async function getUserInfo(): Promise<OkRespUserInfo> {
-  return await request.post('/v1/users/me');
+  return await request.get('/v1/users/me');
+}
+
+export async function getUsers(params: GetUsersApiV1UsersGetParams): Promise<ListResponseWithMeta<UserResponse>> {
+  return await request.get('/v1/users', {
+    params,
+  });
 }
 
 export async function logout(): Promise<OkRespLogoutResponse> {