diff --git a/packages/webui/components/share-settings-sidebar.tsx b/packages/webui/components/share-settings-sidebar.tsx index 729c3b52..5a1fce29 100644 --- a/packages/webui/components/share-settings-sidebar.tsx +++ b/packages/webui/components/share-settings-sidebar.tsx @@ -4,34 +4,34 @@ import { Button } from '@/ui/components/ui/button' import { Input } from '@/ui/components/ui/input' import { Label } from '@/ui/components/ui/label' import { - Select, - SelectContent, - SelectItem, - SelectTrigger, - SelectValue, + Select, + SelectContent, + SelectItem, + SelectTrigger, + SelectValue, } from '@/ui/components/ui/select' import { Switch } from '@/ui/components/ui/switch' import { WatermarkEditorDialog } from '@/ui/components/watermark-editor-dialog' import { copyToClipboard as copyTextToClipboard } from '@/ui/lib/clipboard' import { m } from '@/ui/paraglide/messages.js' import { - ShareLinkInfo, - UpdateShareLinkRequest, - type FieldInfo as MetadataFieldInfo, + ShareLinkInfo, + UpdateShareLinkRequest, + type FieldInfo as MetadataFieldInfo, } from '@shumai/dtos' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { - ArrowDownUp, - ChevronRight, - Copy, - ExternalLink, - LayoutGrid, - List, - ListFilter, - Loader2, - Palette, - Shield, - SortAsc, + ArrowDownUp, + ChevronRight, + Copy, + ExternalLink, + LayoutGrid, + List, + ListFilter, + Loader2, + Palette, + Shield, + SortAsc, } from 'lucide-react' import React, { useState } from 'react' import { toast } from 'sonner' diff --git a/packages/webui/routes/teams/$teamId/index.lazy.tsx b/packages/webui/routes/teams/$teamId/index.lazy.tsx index 3361d094..bb2b7bc5 100644 --- a/packages/webui/routes/teams/$teamId/index.lazy.tsx +++ b/packages/webui/routes/teams/$teamId/index.lazy.tsx @@ -28,11 +28,12 @@ import { Input } from '@/ui/components/ui/input' import { Switch } from '@/ui/components/ui/switch' import { formatDateAgo } from '@/ui/lib/time' import { cn } from '@/ui/lib/utils' -import { useMutation, useQuery, useQueryClient, useSuspenseQuery } from '@tanstack/react-query' +import { useUserMetadataStore } from '@/ui/stores/user-metadata' +import { keepPreviousData, useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { useNavigate } from '@tanstack/react-router' import type { InferRequestType, InferResponseType } from 'hono/client' import { MoreHorizontal, PlusIcon } from 'lucide-react' -import { useState } from 'react' +import { useEffect, useState } from 'react' import { toast } from 'sonner' function TeamPage() { @@ -57,12 +58,29 @@ function TeamPage() { // State for Members Dialog const [isMembersDialogOpen, setIsMembersDialogOpen] = useState(false) - // Sort State - const [sortBy, setSortBy] = useState('name') - const [sortDirection, setSortDirection] = useState<'asc' | 'desc'>('asc') + // Sort State & Preference + const { metadata, setMetadata: setUserMetadata } = useUserMetadataStore() + const sortKey = `team:${teamId}:projects:sort` + const savedSort = metadata[sortKey] as + | { sortBy?: string; sortDirection?: 'asc' | 'desc' } + | undefined + + const [sortBy, setSortBy] = useState(() => savedSort?.sortBy || 'name') + const [sortDirection, setSortDirection] = useState<'asc' | 'desc'>( + () => savedSort?.sortDirection || 'asc', + ) + + useEffect(() => { + if (savedSort?.sortBy && savedSort.sortBy !== sortBy) { + setSortBy(savedSort.sortBy) + } + if (savedSort?.sortDirection && savedSort.sortDirection !== sortDirection) { + setSortDirection(savedSort.sortDirection) + } + }, [savedSort]) const $getProjects = client.api.teams[':teamId'].projects.$get - const { data: projects } = useSuspenseQuery({ + const { data: projects } = useQuery({ queryKey: ['teams', teamId, 'projects', sortBy, sortDirection], queryFn: async () => { const res = await $getProjects({ @@ -72,6 +90,7 @@ function TeamPage() { if (!res.ok) throw new Error('Failed to fetch projects') return await res.json() }, + placeholderData: keepPreviousData, }) const { data: members } = useQuery({ @@ -249,6 +268,7 @@ function TeamPage() { const handleSortChange = (newSortBy: string, newSortDirection: 'asc' | 'desc') => { setSortBy(newSortBy) setSortDirection(newSortDirection) + setUserMetadata(teamId, sortKey, { sortBy: newSortBy, sortDirection: newSortDirection }) } const safeMembers = Array.isArray(members) ? members : [] @@ -294,7 +314,7 @@ function TeamPage() {
- {projects.data?.map((project: ProjectInfo) => ( + {projects?.data?.map((project: ProjectInfo) => (