From 516bfc244397749fb3d19bcb5054d87c6ba38df8 Mon Sep 17 00:00:00 2001 From: gary-Shen Date: Fri, 19 Apr 2024 14:11:12 +0800 Subject: [PATCH] fix(frontend): add inner id and updated_at sorter --- apps/frontend/src/loaders/task.loader.ts | 3 +++ apps/frontend/src/pages/tasks.[id]/index.tsx | 9 +++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/frontend/src/loaders/task.loader.ts b/apps/frontend/src/loaders/task.loader.ts index e0d66bfbf..e8abe0e6f 100644 --- a/apps/frontend/src/loaders/task.loader.ts +++ b/apps/frontend/src/loaders/task.loader.ts @@ -67,6 +67,9 @@ export async function taskLoader({ params, request }: LoaderFunctionArgs) { if (searchParams.get('isNew') !== 'true') { const preAnnotationQueryKey = preAnnotationKey.list({ task_id: +params.taskId }); + // @ts-ignore + delete queryParams.sort; + result.preAnnotations = await queryClient.fetchQuery({ queryKey: preAnnotationQueryKey, queryFn: () => getPreAnnotations(queryParams), diff --git a/apps/frontend/src/pages/tasks.[id]/index.tsx b/apps/frontend/src/pages/tasks.[id]/index.tsx index b9ea77146..57544d841 100644 --- a/apps/frontend/src/pages/tasks.[id]/index.tsx +++ b/apps/frontend/src/pages/tasks.[id]/index.tsx @@ -73,6 +73,7 @@ const Samples = () => { dataIndex: 'inner_id', key: 'inner_id', align: 'left', + sorter: true, }, { title: '文件名', @@ -222,6 +223,7 @@ const Samples = () => { dataIndex: 'updated_at', key: 'updated_at', align: 'left', + sorter: true, render: (updated_at, record) => { if (record.file?.filename?.endsWith('.jsonl')) { return '-'; @@ -349,12 +351,7 @@ const Samples = () => { }, [task?.media_type]); const data = useMemo(() => { - return [ - ...(preAnnotations ?? []), - ...(samples ?? []).sort( - (a, b) => new Date(b.created_at ?? '').valueOf() - new Date(a.created_at ?? '').valueOf(), - ), - ]; + return [...(preAnnotations ?? []), ...(samples ?? [])]; }, [preAnnotations, samples]); return (