Compare commits

..

2 Commits

Author SHA1 Message Date
gpt-engineer-app[bot]
c8bea4b798 Changes 2025-11-12 14:36:37 +00:00
gpt-engineer-app[bot]
250e7c488a Changes 2025-11-12 14:36:07 +00:00
3 changed files with 20 additions and 83 deletions

View File

@@ -1,14 +1,12 @@
import { ChevronDown, ChevronUp } from 'lucide-react'; import { ChevronDown, ChevronUp } from 'lucide-react';
import { Collapsible, CollapsibleTrigger, CollapsibleContent } from '@/components/ui/collapsible'; import { Collapsible, CollapsibleTrigger, CollapsibleContent } from '@/components/ui/collapsible';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { Badge } from '@/components/ui/badge';
import { cn } from '@/lib/utils'; import { cn } from '@/lib/utils';
interface DetailedViewCollapsibleProps { interface DetailedViewCollapsibleProps {
isCollapsed: boolean; isCollapsed: boolean;
onToggle: () => void; onToggle: () => void;
children: React.ReactNode; children: React.ReactNode;
fieldCount?: number;
className?: string; className?: string;
} }
@@ -20,7 +18,6 @@ export function DetailedViewCollapsible({
isCollapsed, isCollapsed,
onToggle, onToggle,
children, children,
fieldCount,
className className
}: DetailedViewCollapsibleProps) { }: DetailedViewCollapsibleProps) {
return ( return (
@@ -30,35 +27,25 @@ export function DetailedViewCollapsible({
<Button <Button
variant="ghost" variant="ghost"
size="sm" size="sm"
className="w-full flex items-center justify-between hover:bg-muted/50 p-2 h-auto transition-colors" className="w-full flex items-center justify-between hover:bg-muted/50 p-2 h-auto"
> >
<div className="flex items-center gap-2"> <div className="text-xs font-semibold text-muted-foreground uppercase tracking-wide">
<span className="text-xs font-semibold text-muted-foreground uppercase tracking-wide"> All Fields (Detailed View)
All Fields (Detailed View)
</span>
{fieldCount !== undefined && fieldCount > 0 && (
<Badge
variant="secondary"
className="h-5 px-1.5 text-xs font-normal transition-transform duration-200 hover:scale-105"
>
{fieldCount}
</Badge>
)}
</div> </div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<span className="text-xs text-muted-foreground normal-case font-normal"> <span className="text-xs text-muted-foreground normal-case font-normal">
{isCollapsed ? 'Show' : 'Hide'} {isCollapsed ? 'Show' : 'Hide'}
</span> </span>
{isCollapsed ? ( {isCollapsed ? (
<ChevronDown className="h-4 w-4 text-muted-foreground transition-transform duration-200" /> <ChevronDown className="h-4 w-4 text-muted-foreground" />
) : ( ) : (
<ChevronUp className="h-4 w-4 text-muted-foreground transition-transform duration-200" /> <ChevronUp className="h-4 w-4 text-muted-foreground" />
)} )}
</div> </div>
</Button> </Button>
</CollapsibleTrigger> </CollapsibleTrigger>
<CollapsibleContent className="mt-3 data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down"> <CollapsibleContent className="mt-3">
{children} {children}
</CollapsibleContent> </CollapsibleContent>
</div> </div>

View File

@@ -1,4 +1,4 @@
import { Filter, MessageSquare, FileText, Image, X, ChevronDown, Calendar, Maximize2, Minimize2 } from 'lucide-react'; import { Filter, MessageSquare, FileText, Image, X, ChevronDown, Calendar } from 'lucide-react';
import { Label } from '@/components/ui/label'; import { Label } from '@/components/ui/label';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
@@ -7,7 +7,6 @@ import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/component
import { RefreshButton } from '@/components/ui/refresh-button'; import { RefreshButton } from '@/components/ui/refresh-button';
import { QueueSortControls } from './QueueSortControls'; import { QueueSortControls } from './QueueSortControls';
import { useFilterPanelState } from '@/hooks/useFilterPanelState'; import { useFilterPanelState } from '@/hooks/useFilterPanelState';
import { useDetailedViewState } from '@/hooks/useDetailedViewState';
import { FilterDateRangePicker } from '@/components/filters/FilterDateRangePicker'; import { FilterDateRangePicker } from '@/components/filters/FilterDateRangePicker';
import type { EntityFilter, StatusFilter, SortConfig, QueueTab, ApprovalDateRangeFilter } from '@/types/moderation'; import type { EntityFilter, StatusFilter, SortConfig, QueueTab, ApprovalDateRangeFilter } from '@/types/moderation';
@@ -56,7 +55,6 @@ export const QueueFilters = ({
isRefreshing = false isRefreshing = false
}: QueueFiltersProps) => { }: QueueFiltersProps) => {
const { isCollapsed, toggle } = useFilterPanelState(); const { isCollapsed, toggle } = useFilterPanelState();
const { isCollapsed: detailsCollapsed, toggle: toggleDetails } = useDetailedViewState();
// Count active filters // Count active filters
const activeFilterCount = [ const activeFilterCount = [
@@ -78,36 +76,14 @@ export const QueueFilters = ({
</Badge> </Badge>
)} )}
</div> </div>
<div className="flex items-center gap-2"> {isMobile && (
{/* Global toggle for detailed views */} <CollapsibleTrigger asChild>
<Button <Button variant="ghost" size="sm" className="h-8 w-8 p-0">
variant="ghost" <ChevronDown className={`h-4 w-4 transition-transform duration-250 ${isCollapsed ? '' : 'rotate-180'}`} />
size="sm" <span className="sr-only">{isCollapsed ? 'Expand filters' : 'Collapse filters'}</span>
onClick={toggleDetails} </Button>
className="h-8 gap-2 text-xs text-muted-foreground hover:text-foreground transition-colors" </CollapsibleTrigger>
title={detailsCollapsed ? "Expand all detailed views" : "Collapse all detailed views"} )}
>
{detailsCollapsed ? (
<>
<Maximize2 className="h-3.5 w-3.5" />
{!isMobile && <span>Expand All</span>}
</>
) : (
<>
<Minimize2 className="h-3.5 w-3.5" />
{!isMobile && <span>Collapse All</span>}
</>
)}
</Button>
{isMobile && (
<CollapsibleTrigger asChild>
<Button variant="ghost" size="sm" className="h-8 w-8 p-0">
<ChevronDown className={`h-4 w-4 transition-transform duration-250 ${isCollapsed ? '' : 'rotate-180'}`} />
<span className="sr-only">{isCollapsed ? 'Expand filters' : 'Collapse filters'}</span>
</Button>
</CollapsibleTrigger>
)}
</div>
</div> </div>
<CollapsibleContent className="space-y-4"> <CollapsibleContent className="space-y-4">

View File

@@ -42,12 +42,6 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
fetchSubmissionItems(); fetchSubmissionItems();
}, [submissionId]); }, [submissionId]);
// Helper function to count non-null fields in entity data
const countFields = (data: any): number => {
if (!data || typeof data !== 'object') return 0;
return Object.values(data).filter(value => value !== null && value !== undefined).length;
};
const fetchSubmissionItems = async () => { const fetchSubmissionItems = async () => {
try { try {
// Only show skeleton on initial load, show refreshing indicator on refresh // Only show skeleton on initial load, show refreshing indicator on refresh
@@ -197,11 +191,7 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
data={entityData as unknown as ParkSubmissionData} data={entityData as unknown as ParkSubmissionData}
actionType={actionType} actionType={actionType}
/> />
<DetailedViewCollapsible <DetailedViewCollapsible isCollapsed={isCollapsed} onToggle={toggle}>
isCollapsed={isCollapsed}
onToggle={toggle}
fieldCount={countFields(entityData)}
>
<SubmissionChangesDisplay <SubmissionChangesDisplay
item={item} item={item}
view="detailed" view="detailed"
@@ -221,11 +211,7 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
data={entityData as unknown as RideSubmissionData} data={entityData as unknown as RideSubmissionData}
actionType={actionType} actionType={actionType}
/> />
<DetailedViewCollapsible <DetailedViewCollapsible isCollapsed={isCollapsed} onToggle={toggle}>
isCollapsed={isCollapsed}
onToggle={toggle}
fieldCount={countFields(entityData)}
>
<SubmissionChangesDisplay <SubmissionChangesDisplay
item={item} item={item}
view="detailed" view="detailed"
@@ -245,11 +231,7 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
data={entityData as unknown as CompanySubmissionData} data={entityData as unknown as CompanySubmissionData}
actionType={actionType} actionType={actionType}
/> />
<DetailedViewCollapsible <DetailedViewCollapsible isCollapsed={isCollapsed} onToggle={toggle}>
isCollapsed={isCollapsed}
onToggle={toggle}
fieldCount={countFields(entityData)}
>
<SubmissionChangesDisplay <SubmissionChangesDisplay
item={item} item={item}
view="detailed" view="detailed"
@@ -269,11 +251,7 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
data={entityData as unknown as RideModelSubmissionData} data={entityData as unknown as RideModelSubmissionData}
actionType={actionType} actionType={actionType}
/> />
<DetailedViewCollapsible <DetailedViewCollapsible isCollapsed={isCollapsed} onToggle={toggle}>
isCollapsed={isCollapsed}
onToggle={toggle}
fieldCount={countFields(entityData)}
>
<SubmissionChangesDisplay <SubmissionChangesDisplay
item={item} item={item}
view="detailed" view="detailed"
@@ -293,11 +271,7 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
data={entityData as unknown as TimelineSubmissionData} data={entityData as unknown as TimelineSubmissionData}
actionType={actionType} actionType={actionType}
/> />
<DetailedViewCollapsible <DetailedViewCollapsible isCollapsed={isCollapsed} onToggle={toggle}>
isCollapsed={isCollapsed}
onToggle={toggle}
fieldCount={countFields(entityData)}
>
<SubmissionChangesDisplay <SubmissionChangesDisplay
item={item} item={item}
view="detailed" view="detailed"