pacnpal/thrilltrack-explorer
1
0
Fork 0
mirror of https://github.com/pacnpal/thrilltrack-explorer.git synced 2025-12-24 12:51:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: Complete type safety migration

Browse Source
This commit is contained in:
gpt-engineer-app[bot]
2025-10-17 13:22:39 +00:00
parent 3d61d738f2
commit efc33a7dda
10 changed files with 212 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/components/auth/AuthModal.tsx
View File

@@ -8,6 +8,7 @@ import { Separator } from '@/components/ui/separator';
import { Zap, Mail, Lock, User, Eye, EyeOff } from 'lucide-react';
import { supabase } from '@/integrations/supabase/client';
import { useToast } from '@/hooks/use-toast';
import { getErrorMessage } from '@/lib/errorHandler';
import { TurnstileCaptcha } from './TurnstileCaptcha';
import { notificationService } from '@/lib/notificationService';
import { useCaptchaBypass } from '@/hooks/useCaptchaBypass';
@@ -102,12 +103,12 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
await new Promise(resolve => setTimeout(resolve, 100));
onOpenChange(false);
} catch (error: any) {
} catch (error) {
setSignInCaptchaKey(prev => prev + 1);
toast({
variant: "destructive",
title: "Sign in failed",
description: error.message
description: getErrorMessage(error)
});
} finally {
setLoading(false);
@@ -230,12 +231,12 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
description: "Please check your email to verify your account."
});
onOpenChange(false);
} catch (error: any) {
} catch (error) {
setCaptchaKey(prev => prev + 1);
toast({
variant: "destructive",
title: "Sign up failed",
description: error.message
description: getErrorMessage(error)
});
} finally {
setLoading(false);
@@ -269,11 +270,11 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
description: "Check your email for a sign-in link."
});
onOpenChange(false);
} catch (error: any) {
} catch (error) {
toast({
variant: "destructive",
title: "Failed to send magic link",
description: error.message
description: getErrorMessage(error)
});
} finally {
setMagicLinkLoading(false);
@@ -293,11 +294,11 @@ export function AuthModal({ open, onOpenChange, defaultTab = 'signin' }: AuthMod
}
});
if (error) throw error;
} catch (error: any) {
} catch (error) {
toast({
variant: "destructive",
title: "Social sign in failed",
description: error.message
description: getErrorMessage(error)
});
}
};

2
src/components/rides/SimilarRides.tsx
View File

@@ -83,7 +83,7 @@ export function SimilarRides({ currentRideId, parkId, parkSlug, category }: Simi
{rides.map((ride) => (
<RideCard
key={ride.id}
ride={ride as any}
ride={ride as SimilarRide}
showParkName={false}
parkSlug={parkSlug}
/>

59
src/hooks/moderation/useEntityCache.ts
View File

@@ -1,5 +1,6 @@
import { useRef, useCallback } from 'react';
import { supabase } from '@/integrations/supabase/client';
import { createTableQuery } from '@/lib/supabaseHelpers';
import { logger } from '@/lib/logger';
import { MODERATION_CONSTANTS } from '@/lib/moderation/constants';
@@ -104,32 +105,40 @@ export function useEntityCache() {
return ids.map(id => getCached(type, id)).filter(Boolean);
}
// Determine table name and select fields based on entity type
let tableName: string;
let selectFields: string;
switch (type) {
case 'rides':
tableName = 'rides';
selectFields = 'id, name, park_id';
break;
case 'parks':
tableName = 'parks';
selectFields = 'id, name';
break;
case 'companies':
tableName = 'companies';
selectFields = 'id, name';
break;
default:
throw new Error(`Unknown entity type: ${type}`);
}
try {
const { data, error } = await supabase
.from(tableName as any)
.select(selectFields)
.in('id', uncachedIds);
let data: any[] | null = null;
let error: any = null;
// Use type-safe table queries
switch (type) {
case 'rides':
const ridesResult = await createTableQuery('rides')
.select('id, name, slug, park_id')
.in('id', uncachedIds);
data = ridesResult.data;
error = ridesResult.error;
break;
case 'parks':
const parksResult = await createTableQuery('parks')
.select('id, name, slug')
.in('id', uncachedIds);
data = parksResult.data;
error = parksResult.error;
break;
case 'companies':
const companiesResult = await createTableQuery('companies')
.select('id, name, slug, company_type')
.in('id', uncachedIds);
data = companiesResult.data;
error = companiesResult.error;
break;
default:
logger.error(`Unknown entity type: ${type}`);
return [];
}
if (error) {
logger.error(`Error fetching ${type}:`, error);

21
src/hooks/useModerationQueue.ts
View File

@@ -2,6 +2,7 @@ import { useState, useEffect, useCallback, useRef } from 'react';
import { supabase } from '@/integrations/supabase/client';
import { useAuth } from './useAuth';
import { useToast } from './use-toast';
import { getErrorMessage } from '@/lib/errorHandler';
import { getSubmissionTypeLabel } from '@/lib/moderation/entities';
interface QueuedSubmission {
@@ -163,11 +164,11 @@ export const useModerationQueue = (config?: UseModerationQueueConfig) => {
}
return false;
} catch (error: any) {
} catch (error) {
console.error('Error extending lock:', error);
toast({
title: 'Error',
description: error.message || 'Failed to extend lock',
description: getErrorMessage(error),
variant: 'destructive',
});
return false;
@@ -226,13 +227,13 @@ export const useModerationQueue = (config?: UseModerationQueueConfig) => {
}
return data;
} catch (error: any) {
} catch (error) {
console.error('Error releasing lock:', error);
// Always show error toasts even in silent mode
toast({
title: 'Failed to Release Lock',
description: error.message || 'An error occurred',
description: getErrorMessage(error),
variant: 'destructive',
});
return false;
@@ -272,11 +273,11 @@ export const useModerationQueue = (config?: UseModerationQueueConfig) => {
fetchStats();
return true;
} catch (error: any) {
} catch (error) {
console.error('Error escalating submission:', error);
toast({
title: 'Error',
description: error.message || 'Failed to escalate submission',
description: getErrorMessage(error),
variant: 'destructive',
});
return false;
@@ -342,11 +343,11 @@ export const useModerationQueue = (config?: UseModerationQueueConfig) => {
}
return true;
} catch (error: any) {
} catch (error) {
console.error('Error claiming submission:', error);
toast({
title: 'Failed to Claim Submission',
description: error.message || 'Could not claim this submission. Try again.',
description: getErrorMessage(error),
variant: 'destructive',
});
return false;
@@ -387,11 +388,11 @@ export const useModerationQueue = (config?: UseModerationQueueConfig) => {
fetchStats();
return true;
} catch (error: any) {
} catch (error) {
console.error('Error reassigning submission:', error);
toast({
title: 'Error',
description: error.message || 'Failed to reassign submission',
description: getErrorMessage(error),
variant: 'destructive',
});
return false;

22
src/hooks/useModerationStats.ts
View File

@@ -1,6 +1,14 @@
import { useEffect, useState, useRef, useCallback } from 'react';
import { supabase } from '@/integrations/supabase/client';
// Type for submission realtime payload
interface SubmissionPayload {
status?: string;
assigned_to?: string | null;
locked_until?: string | null;
escalated?: boolean;
}
interface ModerationStats {
pendingSubmissions: number;
openReports: number;
@@ -118,12 +126,14 @@ export const useModerationStats = (options: UseModerationStatsOptions = {}) => {
schema: 'public',
table: 'content_submissions'
}, (payload) => {
const oldStatus = (payload.old as any)?.status;
const newStatus = (payload.new as any)?.status;
const oldAssignedTo = (payload.old as any)?.assigned_to;
const newAssignedTo = (payload.new as any)?.assigned_to;
const oldLockedUntil = (payload.old as any)?.locked_until;
const newLockedUntil = (payload.new as any)?.locked_until;
const oldData = payload.old as SubmissionPayload;
const newData = payload.new as SubmissionPayload;
const oldStatus = oldData?.status;
const newStatus = newData?.status;
const oldAssignedTo = oldData?.assigned_to;
const newAssignedTo = newData?.assigned_to;
const oldLockedUntil = oldData?.locked_until;
const newLockedUntil = newData?.locked_until;
// Only refresh if change affects pending count or assignments
if (

20
src/hooks/useUnitPreferences.ts
View File

@@ -3,6 +3,17 @@ import { useAuth } from '@/hooks/useAuth';
import { supabase } from '@/integrations/supabase/client';
import { logger } from '@/lib/logger';
import { UnitPreferences, getMeasurementSystemFromCountry } from '@/lib/units';
import type { Json } from '@/integrations/supabase/types';
// Type guard for unit preferences
function isValidUnitPreferences(obj: unknown): obj is UnitPreferences {
return (
typeof obj === 'object' &&
obj !== null &&
'measurement_system' in obj &&
['metric', 'imperial'].includes((obj as any).measurement_system)
);
}
const DEFAULT_PREFERENCES: UnitPreferences = {
measurement_system: 'metric',
@@ -38,8 +49,9 @@ export function useUnitPreferences() {
throw error;
}
if (data?.unit_preferences && typeof data.unit_preferences === 'object') {
setPreferences({ ...DEFAULT_PREFERENCES, ...(data.unit_preferences as unknown as UnitPreferences) });
if (data?.unit_preferences && isValidUnitPreferences(data.unit_preferences)) {
const validPrefs = data.unit_preferences as UnitPreferences;
setPreferences({ ...DEFAULT_PREFERENCES, ...validPrefs });
} else {
await autoDetectPreferences();
}
@@ -85,7 +97,7 @@ export function useUnitPreferences() {
.from('user_preferences')
.upsert({
user_id: user.id,
unit_preferences: newPreferences as any,
unit_preferences: newPreferences as unknown as Json,
updated_at: new Date().toISOString()
});
@@ -124,7 +136,7 @@ export function useUnitPreferences() {
await supabase
.from('user_preferences')
.update({
unit_preferences: updated as any,
unit_preferences: updated as unknown as Json,
updated_at: new Date().toISOString()
})
.eq('user_id', user.id);

26
src/lib/moderation/actions.ts
View File

@@ -7,6 +7,7 @@
*/
import { SupabaseClient } from '@supabase/supabase-js';
import { createTableQuery } from '@/lib/supabaseHelpers';
import type { ModerationItem } from '@/types/moderation';
/**
@@ -280,7 +281,6 @@ export async function performModerationAction(
}
// Standard moderation flow
const table = item.type === 'review' ? 'reviews' : 'content_submissions';
const statusField = item.type === 'review' ? 'moderation_status' : 'status';
const timestampField = item.type === 'review' ? 'moderated_at' : 'reviewed_at';
const reviewerField = item.type === 'review' ? 'moderated_by' : 'reviewer_id';
@@ -295,11 +295,25 @@ export async function performModerationAction(
updateData.reviewer_notes = moderatorNotes;
}
const { error, data } = await supabase
.from(table as any)
.update(updateData)
.eq('id', item.id)
.select();
let error: any = null;
let data: any = null;
// Use type-safe table queries based on item type
if (item.type === 'review') {
const result = await createTableQuery('reviews')
.update(updateData)
.eq('id', item.id)
.select();
error = result.error;
data = result.data;
} else {
const result = await createTableQuery('content_submissions')
.update(updateData)
.eq('id', item.id)
.select();
error = result.error;
data = result.data;
}
if (error) {
throw error;

22
src/pages/Auth.tsx
View File

@@ -12,6 +12,7 @@ import { Separator } from '@/components/ui/separator';
import { Zap, Mail, Lock, User, AlertCircle, Eye, EyeOff } from 'lucide-react';
import { supabase } from '@/integrations/supabase/client';
import { useToast } from '@/hooks/use-toast';
import { getErrorMessage } from '@/lib/errorHandler';
import { TurnstileCaptcha } from '@/components/auth/TurnstileCaptcha';
import { notificationService } from '@/lib/notificationService';
import { StorageWarning } from '@/components/auth/StorageWarning';
@@ -146,17 +147,18 @@ export default function Auth() {
}
}, 500);
} catch (error: any) {
} catch (error) {
// Reset CAPTCHA widget to force fresh token generation
setSignInCaptchaKey(prev => prev + 1);
console.error('[Auth] Sign in error:', error);
// Enhanced error messages
let errorMessage = error.message;
if (error.message.includes('Invalid login credentials')) {
const errorMsg = getErrorMessage(error);
let errorMessage = errorMsg;
if (errorMsg.includes('Invalid login credentials')) {
errorMessage = 'Invalid email or password. Please try again.';
} else if (error.message.includes('Email not confirmed')) {
} else if (errorMsg.includes('Email not confirmed')) {
errorMessage = 'Please confirm your email address before signing in.';
} else if (error.message.includes('Too many requests')) {
errorMessage = 'Too many login attempts. Please wait a few minutes and try again.';
@@ -279,14 +281,14 @@ export default function Auth() {
title: "Welcome to ThrillWiki!",
description: "Please check your email to verify your account."
});
} catch (error: any) {
} catch (error) {
// Reset CAPTCHA widget to force fresh token generation
setCaptchaKey(prev => prev + 1);
toast({
variant: "destructive",
title: "Sign up failed",
description: error.message
description: getErrorMessage(error)
});
} finally {
setLoading(false);
@@ -319,11 +321,11 @@ export default function Auth() {
title: "Magic link sent!",
description: "Check your email for a sign-in link."
});
} catch (error: any) {
} catch (error) {
toast({
variant: "destructive",
title: "Failed to send magic link",
description: error.message
description: getErrorMessage(error)
});
} finally {
setMagicLinkLoading(false);
@@ -345,11 +347,11 @@ export default function Auth() {
}
});
if (error) throw error;
} catch (error: any) {
} catch (error) {
toast({
variant: "destructive",
title: "Social sign in failed",
description: error.message
description: getErrorMessage(error)
});
}
};

29
src/pages/Profile.tsx
View File

@@ -22,6 +22,7 @@ import { User, MapPin, Calendar, Star, Trophy, Settings, Camera, Edit3, Save, X,
import { Profile as ProfileType, ActivityEntry, ReviewActivity, SubmissionActivity, RankingActivity } from '@/types/database';
import { supabase } from '@/integrations/supabase/client';
import { useToast } from '@/hooks/use-toast';
import { getErrorMessage } from '@/lib/errorHandler';
import { PhotoUpload } from '@/components/upload/PhotoUpload';
import { profileEditSchema } from '@/lib/validation';
import { LocationDisplay } from '@/components/profile/LocationDisplay';
@@ -109,8 +110,12 @@ export default function Profile() {
coasterCount: coasterCount,
parkCount: parkCount
});
} catch (error: any) {
} catch (error) {
console.error('Error fetching calculated stats:', error);
toast({
variant: 'destructive',
description: getErrorMessage(error),
});
// Set defaults on error
setCalculatedStats({
rideCount: 0,
@@ -269,8 +274,12 @@ export default function Profile() {
.slice(0, 15) as ActivityEntry[];
setRecentActivity(combined);
} catch (error: any) {
} catch (error) {
console.error('Error fetching recent activity:', error);
toast({
variant: 'destructive',
description: getErrorMessage(error),
});
setRecentActivity([]);
} finally {
setActivityLoading(false);
@@ -326,12 +335,12 @@ export default function Profile() {
await fetchCalculatedStats(data.user_id);
await fetchRecentActivity(data.user_id);
}
} catch (error: any) {
} catch (error) {
console.error('Error fetching profile:', error);
toast({
variant: "destructive",
title: "Error loading profile",
description: error.message
description: getErrorMessage(error)
});
} finally {
setLoading(false);
@@ -367,12 +376,12 @@ export default function Profile() {
await fetchCalculatedStats(user.id);
await fetchRecentActivity(user.id);
}
} catch (error: any) {
} catch (error) {
console.error('Error fetching profile:', error);
toast({
variant: "destructive",
title: "Error loading profile",
description: error.message
description: getErrorMessage(error)
});
} finally {
setLoading(false);
@@ -440,11 +449,11 @@ export default function Profile() {
description: "Your profile has been updated successfully."
});
}
} catch (error: any) {
} catch (error) {
toast({
variant: "destructive",
title: "Error updating profile",
description: error.message
description: getErrorMessage(error)
});
}
};
@@ -485,14 +494,14 @@ export default function Profile() {
title: "Avatar updated",
description: "Your profile picture has been updated successfully."
});
} catch (error: any) {
} catch (error) {
// Revert local state on error
setAvatarUrl(profile?.avatar_url || '');
setAvatarImageId(profile?.avatar_image_id || '');
toast({
variant: "destructive",
title: "Error updating avatar",
description: error.message
description: getErrorMessage(error)
});
}
};