mirror of
https://github.com/pacnpal/thrilltrack-explorer.git
synced 2025-12-27 06:06:58 -05:00
Compare commits
1 Commits
edit/edt-5
...
edit/edt-6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e89483b604 |
@@ -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>
|
||||||
|
|||||||
@@ -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>
|
||||||
))}
|
))}
|
||||||
|
|
||||||
|
|||||||
@@ -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 };
|
||||||
|
|||||||
@@ -50,10 +50,8 @@ export function useDetailedViewState(): UseDetailedViewStateReturn {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// Type assertion needed until Supabase regenerates types after migration
|
if (data?.moderation_preferences) {
|
||||||
const preferences = (data as any)?.moderation_preferences;
|
const prefs = data.moderation_preferences as ModerationPreferences;
|
||||||
if (preferences) {
|
|
||||||
const prefs = preferences as ModerationPreferences;
|
|
||||||
setIsCollapsed(prefs.detailed_view_collapsed ?? true);
|
setIsCollapsed(prefs.detailed_view_collapsed ?? true);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -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));
|
||||||
|
|||||||
@@ -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
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
|
||||||
Reference in New Issue
Block a user