Compare commits

..

1 Commits

Author SHA1 Message Date
gpt-engineer-app[bot]
bf4b05bb18 Changes 2025-11-12 14:42:20 +00:00
8 changed files with 51 additions and 198 deletions

View File

@@ -1,4 +1,4 @@
import { ChevronDown } 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 { Badge } from '@/components/ui/badge';
@@ -10,7 +10,6 @@ interface DetailedViewCollapsibleProps {
children: React.ReactNode; children: React.ReactNode;
fieldCount?: number; fieldCount?: number;
className?: string; className?: string;
staggerIndex?: number;
} }
/** /**
@@ -22,11 +21,8 @@ export function DetailedViewCollapsible({
onToggle, onToggle,
children, children,
fieldCount, fieldCount,
className, className
staggerIndex = 0
}: DetailedViewCollapsibleProps) { }: DetailedViewCollapsibleProps) {
// Calculate stagger delay: 50ms per item, max 300ms
const staggerDelay = Math.min(staggerIndex * 50, 300);
return ( return (
<Collapsible open={!isCollapsed} onOpenChange={() => onToggle()}> <Collapsible open={!isCollapsed} onOpenChange={() => onToggle()}>
<div className={cn("mt-6 pt-6 border-t", className)}> <div className={cn("mt-6 pt-6 border-t", className)}>
@@ -53,23 +49,16 @@ export function DetailedViewCollapsible({
<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>
<ChevronDown {isCollapsed ? (
className={cn( <ChevronDown className="h-4 w-4 text-muted-foreground transition-transform duration-200" />
"h-4 w-4 text-muted-foreground transition-all duration-300 ease-out", ) : (
!isCollapsed && "rotate-180" <ChevronUp className="h-4 w-4 text-muted-foreground transition-transform duration-200" />
)} )}
/>
</div> </div>
</Button> </Button>
</CollapsibleTrigger> </CollapsibleTrigger>
<CollapsibleContent <CollapsibleContent className="mt-3 data-[state=closed]:animate-accordion-up data-[state=open]:animate-accordion-down">
className="mt-3"
style={{
animationDelay: `${staggerDelay}ms`,
transitionDelay: `${staggerDelay}ms`
}}
>
{children} {children}
</CollapsibleContent> </CollapsibleContent>
</div> </div>

View File

@@ -4,7 +4,6 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@
import { Button } from '@/components/ui/button'; import { Button } from '@/components/ui/button';
import { Badge } from '@/components/ui/badge'; import { Badge } from '@/components/ui/badge';
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible'; import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible';
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip';
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';
@@ -81,40 +80,25 @@ export const QueueFilters = ({
</div> </div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
{/* Global toggle for detailed views */} {/* Global toggle for detailed views */}
<TooltipProvider> <Button
<Tooltip> variant="ghost"
<TooltipTrigger asChild> size="sm"
<Button onClick={toggleDetails}
variant="ghost" className="h-8 gap-2 text-xs text-muted-foreground hover:text-foreground transition-colors"
size="sm" title={detailsCollapsed ? "Expand all detailed views" : "Collapse all detailed views"}
onClick={toggleDetails} >
className="h-8 gap-2 text-xs text-muted-foreground hover:text-foreground transition-colors" {detailsCollapsed ? (
> <>
{detailsCollapsed ? ( <Maximize2 className="h-3.5 w-3.5" />
<> {!isMobile && <span>Expand All</span>}
<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>}
<Minimize2 className="h-3.5 w-3.5" /> </>
{!isMobile && <span>Collapse All</span>} )}
</> </Button>
)}
</Button>
</TooltipTrigger>
<TooltipContent side="bottom" className="max-w-xs">
<p className="text-xs">
{detailsCollapsed
? "Show detailed field-by-field view for all items in the queue"
: "Hide detailed field-by-field view for all items in the queue"}
</p>
<p className="text-xs text-muted-foreground mt-1">
This preference is saved to your account
</p>
</TooltipContent>
</Tooltip>
</TooltipProvider>
{isMobile && ( {isMobile && (
<CollapsibleTrigger asChild> <CollapsibleTrigger asChild>
<Button variant="ghost" size="sm" className="h-8 w-8 p-0"> <Button variant="ghost" size="sm" className="h-8 w-8 p-0">

View File

@@ -135,7 +135,7 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
} }
// Render item with appropriate display component // Render item with appropriate display component
const renderItem = (item: SubmissionItemData, index: number = 0) => { const renderItem = (item: SubmissionItemData) => {
// SubmissionItemData from submissions.ts has item_data property // SubmissionItemData from submissions.ts has item_data property
const entityData = item.item_data; const entityData = item.item_data;
const actionType = item.action_type || 'create'; const actionType = item.action_type || 'create';
@@ -201,7 +201,6 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
isCollapsed={isCollapsed} isCollapsed={isCollapsed}
onToggle={toggle} onToggle={toggle}
fieldCount={countFields(entityData)} fieldCount={countFields(entityData)}
staggerIndex={index}
> >
<SubmissionChangesDisplay <SubmissionChangesDisplay
item={item} item={item}
@@ -226,7 +225,6 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
isCollapsed={isCollapsed} isCollapsed={isCollapsed}
onToggle={toggle} onToggle={toggle}
fieldCount={countFields(entityData)} fieldCount={countFields(entityData)}
staggerIndex={index}
> >
<SubmissionChangesDisplay <SubmissionChangesDisplay
item={item} item={item}
@@ -251,7 +249,6 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
isCollapsed={isCollapsed} isCollapsed={isCollapsed}
onToggle={toggle} onToggle={toggle}
fieldCount={countFields(entityData)} fieldCount={countFields(entityData)}
staggerIndex={index}
> >
<SubmissionChangesDisplay <SubmissionChangesDisplay
item={item} item={item}
@@ -276,7 +273,6 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
isCollapsed={isCollapsed} isCollapsed={isCollapsed}
onToggle={toggle} onToggle={toggle}
fieldCount={countFields(entityData)} fieldCount={countFields(entityData)}
staggerIndex={index}
> >
<SubmissionChangesDisplay <SubmissionChangesDisplay
item={item} item={item}
@@ -301,7 +297,6 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
isCollapsed={isCollapsed} isCollapsed={isCollapsed}
onToggle={toggle} onToggle={toggle}
fieldCount={countFields(entityData)} fieldCount={countFields(entityData)}
staggerIndex={index}
> >
<SubmissionChangesDisplay <SubmissionChangesDisplay
item={item} item={item}
@@ -339,9 +334,9 @@ export const SubmissionItemsList = memo(function SubmissionItemsList({
)} )}
{/* Show regular submission items */} {/* Show regular submission items */}
{items.map((item, index) => ( {items.map((item) => (
<div key={item.id} className={view === 'summary' ? 'border-l-2 border-primary/20 pl-3' : ''}> <div key={item.id} className={view === 'summary' ? 'border-l-2 border-primary/20 pl-3' : ''}>
{renderItem(item, index)} {renderItem(item)}
</div> </div>
))} ))}

View File

@@ -1,30 +1,9 @@
import * as React from "react";
import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"; import * as CollapsiblePrimitive from "@radix-ui/react-collapsible";
import { cn } from "@/lib/utils";
const Collapsible = CollapsiblePrimitive.Root; const Collapsible = CollapsiblePrimitive.Root;
const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger; const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger;
const CollapsibleContent = React.forwardRef< const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent;
React.ElementRef<typeof CollapsiblePrimitive.Content>,
React.ComponentPropsWithoutRef<typeof CollapsiblePrimitive.Content>
>(({ className, children, ...props }, ref) => (
<CollapsiblePrimitive.Content
ref={ref}
className={cn(
"overflow-hidden transition-all duration-300 ease-out",
"data-[state=closed]:animate-accordion-up",
"data-[state=open]:animate-accordion-down",
className
)}
{...props}
>
<div className="animate-fade-in">
{children}
</div>
</CollapsiblePrimitive.Content>
));
CollapsibleContent.displayName = "CollapsibleContent";
export { Collapsible, CollapsibleTrigger, CollapsibleContent }; export { Collapsible, CollapsibleTrigger, CollapsibleContent };

View File

@@ -1,129 +1,48 @@
import { useState, useEffect } from 'react'; import { useState, useEffect } from 'react';
import { logger } from '@/lib/logger'; import { logger } from '@/lib/logger';
import { useAuth } from '@/hooks/useAuth';
import { supabase } from '@/lib/supabaseClient';
import { handleNonCriticalError } from '@/lib/errorHandler';
import type { Json } from '@/integrations/supabase/types';
const STORAGE_KEY = 'detailed-view-collapsed'; const STORAGE_KEY = 'detailed-view-collapsed';
interface ModerationPreferences {
detailed_view_collapsed: boolean;
}
interface UseDetailedViewStateReturn { interface UseDetailedViewStateReturn {
isCollapsed: boolean; isCollapsed: boolean;
toggle: () => void; toggle: () => void;
setCollapsed: (value: boolean) => void; setCollapsed: (value: boolean) => void;
loading: boolean;
} }
/** /**
* Hook to manage detailed view collapsed/expanded state * Hook to manage detailed view collapsed/expanded state
* Persists to database for authenticated users, localStorage for guests * Syncs with localStorage for persistence across sessions
* Defaults to collapsed to reduce visual clutter * Defaults to collapsed to reduce visual clutter
*/ */
export function useDetailedViewState(): UseDetailedViewStateReturn { export function useDetailedViewState(): UseDetailedViewStateReturn {
const { user } = useAuth(); const [isCollapsed, setIsCollapsed] = useState<boolean>(() => {
const [isCollapsed, setIsCollapsed] = useState<boolean>(true); // Initialize from localStorage on mount
const [loading, setLoading] = useState(true); try {
const stored = localStorage.getItem(STORAGE_KEY);
// Default to collapsed (true) to reduce visual clutter
return stored ? JSON.parse(stored) : true;
} catch (error) {
logger.warn('Error reading detailed view state from localStorage', { error });
return true;
}
});
// Load preferences on mount // Sync to localStorage when state changes
useEffect(() => { useEffect(() => {
loadPreferences();
}, [user]);
const loadPreferences = async () => {
try { try {
if (user) { localStorage.setItem(STORAGE_KEY, JSON.stringify(isCollapsed));
// Load from database for authenticated users
const { data, error } = await supabase
.from('user_preferences')
.select('moderation_preferences')
.eq('user_id', user.id)
.maybeSingle();
if (error && error.code !== 'PGRST116') {
handleNonCriticalError(error, {
action: 'Load moderation preferences',
userId: user.id,
});
}
// Type assertion needed until Supabase regenerates types after migration
const preferences = (data as any)?.moderation_preferences;
if (preferences) {
const prefs = preferences as ModerationPreferences;
setIsCollapsed(prefs.detailed_view_collapsed ?? true);
}
} else {
// Load from localStorage for guests
try {
const stored = localStorage.getItem(STORAGE_KEY);
setIsCollapsed(stored ? JSON.parse(stored) : true);
} catch (error) {
logger.warn('Error reading detailed view state from localStorage', { error });
}
}
} catch (error) { } catch (error) {
logger.warn('Error loading detailed view preferences', { error }); logger.warn('Error saving detailed view state to localStorage', { error });
} finally {
setLoading(false);
} }
}; }, [isCollapsed]);
const savePreferences = async (collapsed: boolean) => { const toggle = () => setIsCollapsed(prev => !prev);
try {
if (user) {
// Save to database for authenticated users
const moderationPrefs: ModerationPreferences = {
detailed_view_collapsed: collapsed,
};
const { error } = await supabase
.from('user_preferences')
.upsert({
user_id: user.id,
moderation_preferences: moderationPrefs as unknown as Json,
updated_at: new Date().toISOString(),
}, {
onConflict: 'user_id',
});
if (error) {
handleNonCriticalError(error, {
action: 'Save moderation preferences',
userId: user.id,
});
}
} else {
// Save to localStorage for guests
try {
localStorage.setItem(STORAGE_KEY, JSON.stringify(collapsed));
} catch (error) {
logger.warn('Error saving detailed view state to localStorage', { error });
}
}
} catch (error) {
logger.warn('Error saving detailed view preferences', { error });
}
};
const toggle = () => {
const newValue = !isCollapsed;
setIsCollapsed(newValue);
savePreferences(newValue);
};
const setCollapsed = (value: boolean) => { const setCollapsed = (value: boolean) => setIsCollapsed(value);
setIsCollapsed(value);
savePreferences(value);
};
return { return {
isCollapsed, isCollapsed,
toggle, toggle,
setCollapsed, setCollapsed,
loading,
}; };
} }

View File

@@ -7,7 +7,6 @@ import { twMerge } from "tailwind-merge";
* *
* @param inputs - Class values to combine (strings, objects, arrays) * @param inputs - Class values to combine (strings, objects, arrays)
* @returns Merged class string with Tailwind conflicts resolved * @returns Merged class string with Tailwind conflicts resolved
* @example cn('px-2 py-1', 'px-4') // Returns 'py-1 px-4'
*/ */
export function cn(...inputs: ClassValue[]) { export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs)); return twMerge(clsx(inputs));

View File

@@ -207,8 +207,8 @@ const handler = async (req: Request, context: { supabase: any; user: any; span:
p_moderator_id: user.id, p_moderator_id: user.id,
p_submitter_id: submission.user_id, p_submitter_id: submission.user_id,
p_request_id: requestId, p_request_id: requestId,
p_approval_mode: 'selective', p_trace_id: rootSpan.traceId,
p_idempotency_key: idempotencyKey p_parent_span_id: rpcSpan.spanId
} }
); );

View File

@@ -1,12 +0,0 @@
-- Add moderation_preferences column to user_preferences table
-- This stores moderator UI preferences like detailed view collapsed state
ALTER TABLE public.user_preferences
ADD COLUMN IF NOT EXISTS moderation_preferences JSONB NOT NULL DEFAULT '{}'::jsonb;
COMMENT ON COLUMN public.user_preferences.moderation_preferences IS
'Stores moderator UI preferences like detailed view collapsed state';
-- Add GIN index for efficient JSONB queries
CREATE INDEX IF NOT EXISTS idx_user_preferences_moderation_prefs
ON public.user_preferences USING gin(moderation_preferences);