mirror of
https://github.com/pacnpal/thrilltrack-explorer.git
synced 2025-12-24 20:11:14 -05:00
Refactor: Implement type safety plan
This commit is contained in:
@@ -49,13 +49,18 @@ import { VersionIndicator } from '@/components/versioning/VersionIndicator';
|
||||
import { EntityHistoryTabs } from '@/components/history/EntityHistoryTabs';
|
||||
import { useAuthModal } from '@/hooks/useAuthModal';
|
||||
|
||||
// Extended Ride type with additional properties for easier access
|
||||
interface RideWithParkId extends Ride {
|
||||
currentParkId?: string;
|
||||
}
|
||||
|
||||
export default function RideDetail() {
|
||||
const { parkSlug, rideSlug } = useParams<{ parkSlug: string; rideSlug: string }>();
|
||||
const navigate = useNavigate();
|
||||
const { user } = useAuth();
|
||||
const { isModerator } = useUserRole();
|
||||
const { requireAuth } = useAuthModal();
|
||||
const [ride, setRide] = useState<Ride | null>(null);
|
||||
const [ride, setRide] = useState<RideWithParkId | null>(null);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [activeTab, setActiveTab] = useState("overview");
|
||||
const [isEditModalOpen, setIsEditModalOpen] = useState(false);
|
||||
@@ -100,11 +105,15 @@ export default function RideDetail() {
|
||||
|
||||
if (rideData) {
|
||||
// Store park_id for easier access
|
||||
(rideData as any).currentParkId = parkData.id;
|
||||
const extendedRide: RideWithParkId = {
|
||||
...rideData,
|
||||
currentParkId: parkData.id
|
||||
};
|
||||
setRide(extendedRide);
|
||||
fetchPhotoCount(rideData.id);
|
||||
} else {
|
||||
setRide(null);
|
||||
}
|
||||
|
||||
setRide(rideData);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error fetching ride data:', error);
|
||||
@@ -451,7 +460,7 @@ export default function RideDetail() {
|
||||
|
||||
<SimilarRides
|
||||
currentRideId={ride.id}
|
||||
parkId={(ride as any).currentParkId}
|
||||
parkId={ride.currentParkId}
|
||||
parkSlug={parkSlug || ''}
|
||||
category={ride.category}
|
||||
/>
|
||||
@@ -692,7 +701,7 @@ export default function RideDetail() {
|
||||
entityId={ride.id}
|
||||
entityType="ride"
|
||||
entityName={ride.name}
|
||||
parentId={(ride as any).currentParkId}
|
||||
parentId={ride.currentParkId}
|
||||
/>
|
||||
</TabsContent>
|
||||
|
||||
|
||||
@@ -66,6 +66,31 @@ export default function SearchPage() {
|
||||
});
|
||||
}
|
||||
|
||||
// Type-safe helpers for sorting
|
||||
const getReviewCount = (data: unknown): number => {
|
||||
if (data && typeof data === 'object' && 'review_count' in data) {
|
||||
const count = (data as { review_count?: number }).review_count;
|
||||
return typeof count === 'number' ? count : 0;
|
||||
}
|
||||
return 0;
|
||||
};
|
||||
|
||||
const getRideCount = (data: unknown): number => {
|
||||
if (data && typeof data === 'object' && 'ride_count' in data) {
|
||||
const count = (data as { ride_count?: number }).ride_count;
|
||||
return typeof count === 'number' ? count : 0;
|
||||
}
|
||||
return 0;
|
||||
};
|
||||
|
||||
const getOpeningDate = (data: unknown): number => {
|
||||
if (data && typeof data === 'object' && 'opening_date' in data) {
|
||||
const dateStr = (data as { opening_date?: string }).opening_date;
|
||||
return dateStr ? new Date(dateStr).getTime() : 0;
|
||||
}
|
||||
return 0;
|
||||
};
|
||||
|
||||
// Sort results
|
||||
filtered.sort((a, b) => {
|
||||
const direction = sort.direction === 'asc' ? 1 : -1;
|
||||
@@ -76,13 +101,11 @@ export default function SearchPage() {
|
||||
case 'rating':
|
||||
return direction * ((b.rating || 0) - (a.rating || 0));
|
||||
case 'reviews':
|
||||
return direction * (((b.data as any)?.review_count || 0) - ((a.data as any)?.review_count || 0));
|
||||
return direction * (getReviewCount(b.data) - getReviewCount(a.data));
|
||||
case 'rides':
|
||||
return direction * (((b.data as any)?.ride_count || 0) - ((a.data as any)?.ride_count || 0));
|
||||
return direction * (getRideCount(b.data) - getRideCount(a.data));
|
||||
case 'opening':
|
||||
const aDate = (a.data as any)?.opening_date ? new Date((a.data as any).opening_date).getTime() : 0;
|
||||
const bDate = (b.data as any)?.opening_date ? new Date((b.data as any).opening_date).getTime() : 0;
|
||||
return direction * (bDate - aDate);
|
||||
return direction * (getOpeningDate(b.data) - getOpeningDate(a.data));
|
||||
default: // relevance
|
||||
return 0; // Keep original order for relevance
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user