Merge branch 'dev' of https://github.com/TranHoan2004/LabVerse into fix/fix-annotation

longld · longld · commit 61f747c683c4 · 2025-11-14T11:52:55.000+07:00
diff --git a/services/paper-service/src/main/kotlin/com/se1853_jv/controller/PaperController.kt b/services/paper-service/src/main/kotlin/com/se1853_jv/controller/PaperController.kt
@@ -97,7 +97,7 @@ class PaperController(
         @RequestParam authors: String,
         @RequestParam journal: String,
         @RequestParam publicationYear: Int,
-        @RequestParam doi: String,
+        @RequestParam(required = false) doi: String,
         @RequestParam(required = false) description: String?,
         @RequestParam(required = false) keywords: String?,
         @RequestParam(required = false) tags: String?,
diff --git a/web/src/App.tsx b/web/src/App.tsx
@@ -6,16 +6,16 @@ import { BrowserRouter, Routes, Route } from "react-router-dom";
 import { AuthProvider } from "@/contexts/AuthContext";
 import { ProtectedRoute } from "@/components/ProtectedRoute";
 import Index from "./pages/Index";
-import Auth from "./pages/Auth";
 import Dashboard from "./pages/dashboard/Dashboard";
 import PaperDetail from "./pages/paper/PaperDetail";
-import Collections from "./pages/Collections";
-import CollectionDetails from "./pages/CollectionDetails";
 import Profile from "./pages/profile/Profile";
 import Discover from "./pages/Discover";
-import ReadingLists from "./pages/ReadingLists";
-import Teams from "./pages/Teams";
 import NotFound from "./components/NotFound";
+import Teams from "./pages/team/Teams";
+import ReadingLists from "./pages/reading-list/ReadingLists";
+import Collections from "./pages/collection/Collections";
+import Auth from "./pages/auth/Auth";
+import CollectionDetails from "./pages/collection/CollectionDetails";
 
 const queryClient = new QueryClient();
 
diff --git a/web/src/pages/Collections.tsx b/web/src/pages/Collections.tsx
diff --git a/web/src/pages/Teams.tsx b/web/src/pages/Teams.tsx
@@ -17,14 +17,14 @@ import {
     getTeams,
     createTeam,
     deleteTeam,
-    type TeamResponse
 } from "@/services/team.service";
 import {
     DropdownMenu,
     DropdownMenuContent,
     DropdownMenuItem,
     DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
+import { TeamResponse } from "@/types/team.types";
 
 const Teams = () => {
     const {user} = useAuth();
@@ -231,17 +231,17 @@ const Teams = () => {
                                 />
                             </div>
                             <Select
-                                value={privacyFilter}
-                                onValueChange={(value: 'PUBLIC' | 'PRIVATE' | '') => {
-                                    setPrivacyFilter(value);
+                                value={privacyFilter === '' ? 'ALL' : privacyFilter}
+                                onValueChange={(value: string) => {
+                                    setPrivacyFilter(value === 'ALL' ? '' : (value as 'PUBLIC' | 'PRIVATE'));
                                     setPage(0);
                                 }}
                             >
                                 <SelectTrigger className="w-full sm:w-[180px]">
                                     <SelectValue placeholder="All teams"/>
                                 </SelectTrigger>
                                 <SelectContent>
-                                    <SelectItem value="">All teams</SelectItem>
+                                    <SelectItem value="ALL">All teams</SelectItem>
                                     <SelectItem value="PUBLIC">Public</SelectItem>
                                     <SelectItem value="PRIVATE">Private</SelectItem>
                                 </SelectContent>
diff --git a/web/src/pages/collection/CollectionDetails.tsx b/web/src/pages/collection/CollectionDetails.tsx
diff --git a/web/src/pages/dashboard/Dashboard.tsx b/web/src/pages/dashboard/Dashboard.tsx
@@ -11,10 +11,13 @@ import { getPaginatedPapers, importPaper, getFavoritePapers } from "@/services/p
 import Header from "@/components/Header";
 import DashboardHeader from "./components/DashboardHeader";
 import SearchAndFilter from "./components/SearchAndFilter";
-import { CreatePaperRequest } from "@/types/paper.type";
+import { CreatePaperRequest } from "@/types/paper.types";
 import { getWorkflowsByUser } from "@/services/progress.service";
 import { getPaperDetails } from "@/services/paper.service.ts";
 import { Tabs, TabsList, TabsTrigger } from "@/components/ui/tabs";
+import { supabase } from "@/integrations/supabase/client";
+
+
 const Dashboard = () => {
     const { user } = useAuth();
     const queryClient = useQueryClient();
@@ -54,7 +57,7 @@ const Dashboard = () => {
                 // Apply search filter if provided
                 if (searchQuery) {
                     const searchLower = searchQuery.toLowerCase();
-                    favorites = favorites.filter((paper: any) =>
+                    favorites = favorites.filter((paper) =>
                         paper.title?.toLowerCase().includes(searchLower) ||
                         paper.authors?.toLowerCase().includes(searchLower) ||
                         paper.journal?.toLowerCase().includes(searchLower)
@@ -63,22 +66,22 @@ const Dashboard = () => {
 
                 // Apply filters
                 if (filters.author) {
-                    favorites = favorites.filter((paper: any) =>
+                    favorites = favorites.filter((paper) =>
                         paper.authors?.toLowerCase().includes(filters.author.toLowerCase())
                     );
                 }
                 if (filters.journal) {
-                    favorites = favorites.filter((paper: any) =>
+                    favorites = favorites.filter((paper) =>
                         paper.journal?.toLowerCase().includes(filters.journal.toLowerCase())
                     );
                 }
                 if (filters.yearFrom) {
-                    favorites = favorites.filter((paper: any) =>
+                    favorites = favorites.filter((paper) =>
                         paper.publicationYear >= parseInt(filters.yearFrom)
                     );
                 }
                 if (filters.yearTo) {
-                    favorites = favorites.filter((paper: any) =>
+                    favorites = favorites.filter((paper) =>
                         paper.publicationYear <= parseInt(filters.yearTo)
                     );
                 }
diff --git a/web/src/pages/team/Teams.tsx b/web/src/pages/team/Teams.tsx
@@ -12,12 +12,12 @@ import {
     getTeams,
     createTeam,
     deleteTeam,
-    type TeamResponse
 } from "@/services/team.service";
 import CreateTeamDialog from "./components/CreateTeamDialog";
 import TeamsSearchFilter from "./components/TeamsSearchFilter";
 import TeamsGrid from "./components/TeamsGrid";
 import PaginationControls from "./components/PaginationControls";
+import { TeamResponse } from "@/types/team.types";
 
 const Teams = () => {
     const {user} = useAuth();
@@ -48,7 +48,9 @@ const Teams = () => {
         },
     });
 
-    const teams = teamsData?.content || [];
+    // teams can be null when the API returns no content field or the resource is missing
+    // keep null distinct from empty array so we can show a "data not found" message
+    const teams: TeamResponse[] | null = teamsData?.content ?? null;
     const totalPages = teamsData?.totalPages || 0;
 
     const createMutation = useMutation({
@@ -177,6 +179,14 @@ const Teams = () => {
                             <div className="flex justify-center py-12">
                                 <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-primary"></div>
                             </div>
+                        ) : teams === null ? (
+                            <Card className="text-center py-12">
+                                <CardContent>
+                                    <Users className="h-12 w-12 mx-auto mb-4 text-muted-foreground"/>
+                                    <h3 className="text-lg font-semibold mb-2">Data not found</h3>
+                                    <p className="text-muted-foreground mb-4">The requested teams data does not exist.</p>
+                                </CardContent>
+                            </Card>
                         ) : teams.length > 0 ? (
                             <>
                                 <TeamsGrid
diff --git a/web/src/pages/team/components/TeamCard.tsx b/web/src/pages/team/components/TeamCard.tsx
@@ -8,7 +8,7 @@ import {
     DropdownMenuItem,
     DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
-import type { TeamResponse } from '@/services/team.service';
+import { TeamResponse } from '@/types/team.types';
 
 type Props = {
     team: TeamResponse;
diff --git a/web/src/pages/team/components/TeamsGrid.tsx b/web/src/pages/team/components/TeamsGrid.tsx
@@ -3,7 +3,7 @@ import {Card, CardContent} from '@/components/ui/card';
 import {Button} from '@/components/ui/button';
 import {Plus, Users} from 'lucide-react';
 import TeamCard from './TeamCard';
-import type { TeamResponse } from '@/services/team.service';
+import { TeamResponse } from '@/types/team.types';
 
 type Props = {
     teams: TeamResponse[];
diff --git a/web/src/pages/team/components/TeamsSearchFilter.tsx b/web/src/pages/team/components/TeamsSearchFilter.tsx
@@ -28,14 +28,14 @@ const TeamsSearchFilter: React.FC<Props> = ({
                 />
             </div>
             <Select
-                value={privacyFilter}
-                onValueChange={(value: 'PUBLIC' | 'PRIVATE' | '') => onPrivacyFilterChange(value)}
+                value={privacyFilter === '' ? 'ALL' : privacyFilter}
+                onValueChange={(value: string) => onPrivacyFilterChange(value === 'ALL' ? '' : (value as 'PUBLIC' | 'PRIVATE'))}
             >
                 <SelectTrigger className="w-full sm:w-[180px]">
                     <SelectValue placeholder="All teams"/>
                 </SelectTrigger>
                 <SelectContent>
-                    <SelectItem value="">All teams</SelectItem>
+                    <SelectItem value="ALL">All teams</SelectItem>
                     <SelectItem value="PUBLIC">Public</SelectItem>
                     <SelectItem value="PRIVATE">Private</SelectItem>
                 </SelectContent>
diff --git a/web/src/services/paper.service.ts b/web/src/services/paper.service.ts
@@ -1,5 +1,5 @@
 import { BASE_API_URL, METHOD, PAPER_SERVICE_PREDICATE } from "@/type/constant.ts";
-import { CreatePaperRequest } from "@/types/paper.type";
+import { CreatePaperRequest } from "@/types/paper.types";
 
 const endpoints = ["papers", "references", "tags"] as const;
 export type Endpoints = (typeof endpoints)[number];
diff --git a/web/src/services/team.service.ts b/web/src/services/team.service.ts
@@ -1,66 +1,9 @@
-import {BASE_API_URL, GROUP_SERVICE_PREDICATE, METHOD} from "@/type/constant.ts";
-import {tokenStorage} from "@/utils/token";
+import { BASE_API_URL, GROUP_SERVICE_PREDICATE, METHOD } from "@/type/constant.ts";
+import { AddTeamMemberRequest, CreateTeamRequest, TeamMemberResponse, TeamResponse, TeamsPageResponse, UpdateMemberRoleRequest, UpdateTeamRequest } from "@/types/team.types";
+import { tokenStorage } from "@/utils/token";
 
 const endpoints = ["teams"] as const;
 
-// Types
-export interface TeamResponse {
-    id: string;
-    name: string;
-    description?: string;
-    researchField?: string;
-    privacy: 'PUBLIC' | 'PRIVATE';
-    iconUrl?: string;
-    memberCount?: number;
-    paperCount?: number;
-    createdAt?: string;
-    updatedAt?: string;
-}
-
-export interface TeamMemberResponse {
-    memberId: string;
-    memberName: string;
-    memberEmail: string;
-    memberAvatarUrl?: string;
-    role: 'OWNER' | 'ADMIN' | 'MEMBER';
-    joinedAt?: string;
-}
-
-export interface TeamsPageResponse {
-    content: TeamResponse[];
-    totalElements: number;
-    totalPages: number;
-    currentPage: number;
-    size: number;
-}
-
-export interface CreateTeamRequest {
-    name: string;
-    description?: string;
-    researchField?: string;
-    privacy: 'PUBLIC' | 'PRIVATE';
-    iconUrl?: string;
-    userId: string;
-}
-
-export interface UpdateTeamRequest {
-    name?: string;
-    description?: string;
-    researchField?: string;
-    privacy?: 'PUBLIC' | 'PRIVATE';
-    iconUrl?: string;
-    userId: string;
-}
-
-export interface AddTeamMemberRequest {
-    memberId: string;
-    role?: 'ADMIN' | 'MEMBER';
-}
-
-export interface UpdateMemberRoleRequest {
-    role: 'OWNER' | 'ADMIN' | 'MEMBER';
-}
-
 interface ApiResponse<T> {
     success: boolean;
     data: T;
diff --git a/web/src/types/paper.types.ts b/web/src/types/paper.types.ts
diff --git a/web/src/types/team.types.ts b/web/src/types/team.types.ts
@@ -0,0 +1,56 @@
+export interface TeamResponse {
+    id: string;
+    name: string;
+    description?: string;
+    researchField?: string;
+    privacy: 'PUBLIC' | 'PRIVATE';
+    iconUrl?: string;
+    memberCount?: number;
+    paperCount?: number;
+    createdAt?: string;
+    updatedAt?: string;
+}
+
+export interface TeamMemberResponse {
+    memberId: string;
+    memberName: string;
+    memberEmail: string;
+    memberAvatarUrl?: string;
+    role: 'OWNER' | 'ADMIN' | 'MEMBER';
+    joinedAt?: string;
+}
+
+export interface TeamsPageResponse {
+    content: TeamResponse[];
+    totalElements: number;
+    totalPages: number;
+    currentPage: number;
+    size: number;
+}
+
+export interface CreateTeamRequest {
+    name: string;
+    description?: string;
+    researchField?: string;
+    privacy: 'PUBLIC' | 'PRIVATE';
+    iconUrl?: string;
+    userId: string;
+}
+
+export interface UpdateTeamRequest {
+    name?: string;
+    description?: string;
+    researchField?: string;
+    privacy?: 'PUBLIC' | 'PRIVATE';
+    iconUrl?: string;
+    userId: string;
+}
+
+export interface AddTeamMemberRequest {
+    memberId: string;
+    role?: 'ADMIN' | 'MEMBER';
+}
+
+export interface UpdateMemberRoleRequest {
+    role: 'OWNER' | 'ADMIN' | 'MEMBER';
+}
