From 7352228c607ad97f4a24aa9dace7a3677efc2eb2 Mon Sep 17 00:00:00 2001 From: hailt Date: Thu, 12 Nov 2026 17:31:42 +0700 Subject: [PATCH] feat: add dataset import and upload flow --- package-lock.json | 95 +++- package.json | 19 +- src/hooks/useProjects.ts | 25 +- src/hooks/useUsers.ts | 10 + src/layouts/components/Header/Breadcrumb.tsx | 21 +- .../components/Header/NotificationBell.tsx | 16 + src/layouts/components/Header/UserMenu.tsx | 19 +- .../components/Sidebar/RecentProjects.tsx | 19 +- src/layouts/components/Sidebar/SidebarNav.tsx | 29 +- .../components/Sidebar/StorageUsage.tsx | 37 +- src/layouts/components/Sidebar/UserInfo.tsx | 28 +- src/pages/annotator/AnnotatorPage.tsx | 14 +- src/pages/annotator/annotatorStore.ts | 209 +++++++-- .../components/canvas/AnnotationCanvas.tsx | 224 ++++++++- .../components/canvas/ImageViewer.tsx | 74 ++- .../components/canvas/PolygonTool.tsx | 6 + .../annotator/components/canvas/ToolBar.tsx | 13 + .../components/navigator/ImageNavigator.tsx | 5 + .../components/navigator/ThumbnailStrip.tsx | 119 +++-- .../sidebar-right/ClassificationPanel.tsx | 16 +- .../sidebar-right/SegmentationPanel.tsx | 19 + src/pages/projects/ProjectDetailPage.tsx | 26 +- .../projects/components/detail/DataTab.tsx | 441 +++++++++++++++--- src/pages/users/UserManagementPage.tsx | 63 ++- .../users/components/InviteUserModal.tsx | 16 +- .../users/components/UserTableFilters.tsx | 14 +- src/services/datasetImportService.ts | 141 ++++++ src/services/imageService.ts | 10 + src/services/uploadQueue.ts | 311 ++++++++++++ src/services/userService.ts | 11 + src/types/annotation.ts | 2 +- src/utils/datasetImport.ts | 216 +++++++++ src/utils/maskTrace.ts | 145 ++++++ 33 files changed, 2161 insertions(+), 252 deletions(-) create mode 100644 src/services/datasetImportService.ts create mode 100644 src/services/uploadQueue.ts create mode 100644 src/utils/datasetImport.ts create mode 100644 src/utils/maskTrace.ts diff --git a/package-lock.json b/package-lock.json index 1d399d8..dec57d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,6 +11,7 @@ "@tanstack/react-query": "^5.60.0", "axios": "^1.7.0", "clsx": "^2.1.1", + "jszip": "^3.10.2", "konva": "^9.3.0", "react": "^18.3.1", "react-dom": "^18.3.1", @@ -2019,6 +2020,12 @@ "dev": true, "license": "MIT" }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "license": "MIT" + }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -2751,6 +2758,12 @@ "node": ">= 4" } }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "license": "MIT" + }, "node_modules/import-fresh": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", @@ -2778,6 +2791,12 @@ "node": ">=0.8.19" } }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -2840,6 +2859,12 @@ "node": ">=0.12.0" } }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "license": "MIT" + }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -2945,6 +2970,18 @@ "node": ">=6" } }, + "node_modules/jszip": { + "version": "3.10.2", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.2.tgz", + "integrity": "sha512-3l+rb15IOWtUhU0H5MFqES/T6Kh7abYwjosBey/vD6hDt8zoEffkSC5Ws5SGtgVw3gBx2NEbhTeSW1+kWkpyTQ==", + "license": "(MIT OR GPL-3.0-or-later)", + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, "node_modules/keyv": { "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", @@ -2989,6 +3026,15 @@ "node": ">= 0.8.0" } }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "license": "MIT", + "dependencies": { + "immediate": "~3.0.5" + } + }, "node_modules/lilconfig": { "version": "3.1.4", "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.4.tgz", @@ -3255,6 +3301,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "license": "(MIT AND Zlib)" + }, "node_modules/parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -3498,6 +3550,12 @@ "node": ">= 0.8.0" } }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "license": "MIT" + }, "node_modules/proxy-from-env": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz", @@ -3686,6 +3744,21 @@ "dev": true, "license": "MIT" }, + "node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, "node_modules/readdirp": { "version": "3.6.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", @@ -3819,6 +3892,12 @@ "queue-microtask": "^1.2.2" } }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "license": "MIT" + }, "node_modules/scheduler": { "version": "0.23.2", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", @@ -3838,6 +3917,12 @@ "semver": "bin/semver.js" } }, + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "license": "MIT" + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -3871,6 +3956,15 @@ "node": ">=0.10.0" } }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", @@ -4134,7 +4228,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true, "license": "MIT" }, "node_modules/vite": { diff --git a/package.json b/package.json index bdb3b56..9bfc633 100644 --- a/package.json +++ b/package.json @@ -10,26 +10,27 @@ "preview": "vite preview" }, "dependencies": { - "react": "^18.3.1", - "react-dom": "^18.3.1", - "react-router-dom": "^6.28.0", - "zustand": "^5.0.0", "@tanstack/react-query": "^5.60.0", "axios": "^1.7.0", - "react-konva": "^18.2.10", - "konva": "^9.3.0", "clsx": "^2.1.1", - "react-hot-toast": "^2.4.1" + "jszip": "^3.10.2", + "konva": "^9.3.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", + "react-hot-toast": "^2.4.1", + "react-konva": "^18.2.10", + "react-router-dom": "^6.28.0", + "zustand": "^5.0.0" }, "devDependencies": { "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", "@vitejs/plugin-react": "^4.3.4", "autoprefixer": "^10.4.20", + "eslint": "^9.13.0", "postcss": "^8.4.49", "tailwindcss": "^3.4.15", "typescript": "~5.6.2", - "vite": "^6.0.0", - "eslint": "^9.13.0" + "vite": "^6.0.0" } } diff --git a/src/hooks/useProjects.ts b/src/hooks/useProjects.ts index 7f31151..47c5913 100644 --- a/src/hooks/useProjects.ts +++ b/src/hooks/useProjects.ts @@ -1,7 +1,21 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import * as projectService from '@/services/projectService' import { useProjectStore } from '@/stores/projectStore' -import { CreateProjectInput, Project } from '@/types' +import { ActivityLog, CreateProjectInput, Project } from '@/types' + +// Shared activity feed: one cache key for the page, the bell and mutations. +// NOTE: the empty fallback is a module-level constant — a fresh [] literal +// here would change identity every render and loop any effect watching it. +const EMPTY_ACTIVITIES: ActivityLog[] = [] + +export function useActivities() { + const { data } = useQuery({ + queryKey: ['activities'], + queryFn: () => projectService.getRecentActivities(), + staleTime: 60 * 1000, + }) + return data ?? EMPTY_ACTIVITIES +} export function useProjects() { const queryClient = useQueryClient() @@ -25,17 +39,16 @@ export function useProjects() { taskType: taskTypeFilter, status: statusFilter, }), + staleTime: 60 * 1000, }) const allProjectsQuery = useQuery({ queryKey: ['projects', 'all'], queryFn: () => projectService.getProjects(), + staleTime: 60 * 1000, }) - const activitiesQuery = useQuery({ - queryKey: ['activities'], - queryFn: () => projectService.getRecentActivities(), - }) + const activities = useActivities() const createProjectMutation = useMutation({ mutationFn: (input: CreateProjectInput) => projectService.createProject(input), @@ -71,7 +84,7 @@ export function useProjects() { return { projects, allProjects, - activities: activitiesQuery.data ?? [], + activities, isLoading: projectsQuery.isLoading, isError: projectsQuery.isError, searchQuery, diff --git a/src/hooks/useUsers.ts b/src/hooks/useUsers.ts index 1ee1145..62aeade 100644 --- a/src/hooks/useUsers.ts +++ b/src/hooks/useUsers.ts @@ -11,6 +11,7 @@ export function useUsers() { const membersQuery = useQuery({ queryKey: ['members', { search, role: roleFilter, status: statusFilter }], + staleTime: 60 * 1000, queryFn: () => userService.getMembers({ search, @@ -21,6 +22,7 @@ export function useUsers() { const allMembersQuery = useQuery({ queryKey: ['members', 'all'], + staleTime: 60 * 1000, queryFn: () => userService.getMembers(), }) @@ -51,6 +53,13 @@ export function useUsers() { }, }) + const deleteMemberMutation = useMutation({ + mutationFn: (memberId: string) => userService.deleteMember(memberId), + onSuccess: () => { + queryClient.invalidateQueries({ queryKey: ['members'] }) + }, + }) + const allMembers = allMembersQuery.data ?? [] return { @@ -68,6 +77,7 @@ export function useUsers() { isInviting: inviteMutation.isPending, updateMemberRole: updateRoleMutation.mutateAsync, toggleMemberStatus: toggleStatusMutation.mutateAsync, + deleteMember: deleteMemberMutation.mutateAsync, counts: { total: allMembers.length, admins: allMembers.filter((m) => m.role === 'admin').length, diff --git a/src/layouts/components/Header/Breadcrumb.tsx b/src/layouts/components/Header/Breadcrumb.tsx index a598af7..e8abc99 100644 --- a/src/layouts/components/Header/Breadcrumb.tsx +++ b/src/layouts/components/Header/Breadcrumb.tsx @@ -1,5 +1,8 @@ import React from 'react' import { Link, useLocation } from 'react-router-dom' +import { useQuery } from '@tanstack/react-query' +import { USE_MOCK_DATA } from '@/app/constants' +import { getProjectById } from '@/services/projectService' export interface BreadcrumbItem { label: string @@ -10,6 +13,7 @@ export interface BreadcrumbProps { items?: BreadcrumbItem[] } +// Mock-mode fallback names (real mode resolves from the API below). const PROJECT_NAMES: Record = { urban_vehicles_v2: 'Phương tiện đô thị', traffic_camera_v2: 'Giao thông đô thị', @@ -23,6 +27,15 @@ export const Breadcrumb: React.FC = ({ items }) => { const location = useLocation() const isProjectWorkspaceScreen = /^\/projects(?:\/[^/]+)?$/.test(location.pathname) + const parts = location.pathname.split('/').filter(Boolean) + const routeProjectId = parts[0] === 'projects' ? parts[1] : undefined + const { data: crumbProject } = useQuery({ + queryKey: ['project', routeProjectId, 'crumb'], + queryFn: () => getProjectById(routeProjectId!), + enabled: !USE_MOCK_DATA && Boolean(routeProjectId), + staleTime: 5 * 60 * 1000, + }) + const resolvedItems: BreadcrumbItem[] = React.useMemo(() => { if (items && items.length > 0) return items @@ -35,11 +48,12 @@ export const Breadcrumb: React.FC = ({ items }) => { ] } - const parts = path.split('/').filter(Boolean) if (parts[0] === 'projects') { const list: BreadcrumbItem[] = [{ label: 'Dự án', to: '/projects' }] if (parts[1]) { - const projName = PROJECT_NAMES[parts[1]] || 'Giao thông đô thị' + const projName = USE_MOCK_DATA + ? (PROJECT_NAMES[parts[1]] ?? parts[1]) + : (crumbProject?.name ?? '…') list.push({ label: projName, to: `/projects/${parts[1]}` }) if (parts[2] === 'annotate') { list.push({ label: 'Người gán nhãn' }) @@ -53,7 +67,8 @@ export const Breadcrumb: React.FC = ({ items }) => { } return [{ label: 'Dự án', to: '/projects' }, { label: 'Tổng quan' }] - }, [items, location.pathname]) + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [items, location.pathname, crumbProject?.name]) return (