Refactor: Implement cleanup plan

2025-12-23 09:11:13 -05:00 · 2025-10-03 13:54:27 +00:00
parent c51c848da4
commit f061bb9d5f
9 changed files with 49 additions and 155 deletions
--- a/src/components/admin/RideForm.tsx
+++ b/src/components/admin/RideForm.tsx
@@ -25,12 +25,9 @@ import { TechnicalSpecsEditor } from './editors/TechnicalSpecsEditor';
 import { CoasterStatsEditor } from './editors/CoasterStatsEditor';
 import { FormerNamesEditor } from './editors/FormerNamesEditor';
 import { 
-  convertSpeed, 
-  convertDistance, 
-  convertHeight,
-  convertSpeedToMetric,
-  convertDistanceToMetric,
-  convertHeightToMetric,
+  convertValueToMetric,
+  convertValueFromMetric,
+  getDisplayUnit,
  getSpeedUnit,
  getDistanceUnit,
  getHeightUnit
@@ -202,26 +199,26 @@ export function RideForm({ onSubmit, onCancel, initialData, isEditing = false }:
      closing_date: initialData?.closing_date || '',
      // Convert metric values to user's preferred unit for display
      height_requirement: initialData?.height_requirement 
-        ? convertHeight(initialData.height_requirement, measurementSystem) 
+        ? convertValueFromMetric(initialData.height_requirement, getDisplayUnit('cm', measurementSystem), 'cm') 
        : undefined,
      age_requirement: initialData?.age_requirement || undefined,
      capacity_per_hour: initialData?.capacity_per_hour || undefined,
      duration_seconds: initialData?.duration_seconds || undefined,
      max_speed_kmh: initialData?.max_speed_kmh 
-        ? convertSpeed(initialData.max_speed_kmh, measurementSystem) 
+        ? convertValueFromMetric(initialData.max_speed_kmh, getDisplayUnit('km/h', measurementSystem), 'km/h') 
        : undefined,
      max_height_meters: initialData?.max_height_meters 
-        ? convertDistance(initialData.max_height_meters, measurementSystem) 
+        ? convertValueFromMetric(initialData.max_height_meters, getDisplayUnit('m', measurementSystem), 'm') 
        : undefined,
      length_meters: initialData?.length_meters 
-        ? convertDistance(initialData.length_meters, measurementSystem) 
+        ? convertValueFromMetric(initialData.length_meters, getDisplayUnit('m', measurementSystem), 'm') 
        : undefined,
      inversions: initialData?.inversions || undefined,
      coaster_type: initialData?.coaster_type || undefined,
      seating_type: initialData?.seating_type || undefined,
      intensity_level: initialData?.intensity_level || undefined,
      drop_height_meters: initialData?.drop_height_meters 
-        ? convertDistance(initialData.drop_height_meters, measurementSystem) 
+        ? convertValueFromMetric(initialData.drop_height_meters, getDisplayUnit('m', measurementSystem), 'm') 
        : undefined,
      max_g_force: initialData?.max_g_force || undefined,
      former_names: initialData?.former_names || '',
@@ -247,19 +244,19 @@ export function RideForm({ onSubmit, onCancel, initialData, isEditing = false }:
        ...data,
        status: dbStatus,
        height_requirement: data.height_requirement
-          ? convertHeightToMetric(data.height_requirement, measurementSystem) 
+          ? convertValueToMetric(data.height_requirement, getDisplayUnit('cm', measurementSystem)) 
          : undefined,
        max_speed_kmh: data.max_speed_kmh 
-          ? convertSpeedToMetric(data.max_speed_kmh, measurementSystem) 
+          ? convertValueToMetric(data.max_speed_kmh, getDisplayUnit('km/h', measurementSystem)) 
          : undefined,
        max_height_meters: data.max_height_meters 
-          ? convertDistanceToMetric(data.max_height_meters, measurementSystem) 
+          ? convertValueToMetric(data.max_height_meters, getDisplayUnit('m', measurementSystem)) 
          : undefined,
        length_meters: data.length_meters 
-          ? convertDistanceToMetric(data.length_meters, measurementSystem) 
+          ? convertValueToMetric(data.length_meters, getDisplayUnit('m', measurementSystem)) 
          : undefined,
        drop_height_meters: data.drop_height_meters 
-          ? convertDistanceToMetric(data.drop_height_meters, measurementSystem) 
+          ? convertValueToMetric(data.drop_height_meters, getDisplayUnit('m', measurementSystem)) 
          : undefined,
        // ⚠️ Remove JSON stringification - use relational tables instead
        // These fields are deprecated and should not be set
--- a/src/components/rides/RidePhotoGallery.tsx
+++ b/src/components/rides/RidePhotoGallery.tsx
@@ -1,5 +0,0 @@
-/**
- * @deprecated Use EntityPhotoGallery directly or import from RidePhotoGalleryWrapper
- * This file is kept for backwards compatibility
- */
-export { RidePhotoGallery } from './RidePhotoGalleryWrapper';
--- a/src/components/rides/RidePhotoGalleryWrapper.tsx
+++ b/src/components/rides/RidePhotoGalleryWrapper.tsx
@@ -1,22 +0,0 @@
-import { EntityPhotoGallery } from '@/components/upload/EntityPhotoGallery';
-
-interface RidePhotoGalleryProps {
-  rideId: string;
-  rideName: string;
-  parkId?: string;
-}
-
-/**
- * Backwards-compatible wrapper for RidePhotoGallery
- * Uses the generic EntityPhotoGallery component internally
- */
-export function RidePhotoGallery({ rideId, rideName, parkId }: RidePhotoGalleryProps) {
-  return (
-    <EntityPhotoGallery
-      entityId={rideId}
-      entityType="ride"
-      entityName={rideName}
-      parentId={parkId}
-    />
-  );
-}
--- a/src/components/ui/measurement-display.tsx
+++ b/src/components/ui/measurement-display.tsx
@@ -1,9 +1,8 @@
 import { useMemo } from 'react';
 import { useUnitPreferences } from '@/hooks/useUnitPreferences';
 import { 
-  convertSpeed, 
-  convertDistance, 
-  convertHeight,
+  convertValueFromMetric,
+  getDisplayUnit,
  getSpeedUnit,
  getDistanceUnit,
  getHeightUnit,
@@ -29,47 +28,36 @@ export function MeasurementDisplay({
  const { displayValue, unit, alternateDisplay, tooltipText } = useMemo(() => {
    const system = unitPreferences.measurement_system;
    
-    let displayValue: number;
-    let unit: string;
-    let alternateValue: number;
-    let alternateUnit: string;
+    let metricUnit: string;
+    let displayUnit: string;
+    let alternateSystem: MeasurementSystem;
    
    switch (type) {
      case 'speed':
-        displayValue = convertSpeed(value, system);
-        unit = getSpeedUnit(system);
-        alternateValue = convertSpeed(value, system === 'metric' ? 'imperial' : 'metric');
-        alternateUnit = getSpeedUnit(system === 'metric' ? 'imperial' : 'metric');
+        metricUnit = 'km/h';
        break;
      case 'distance':
-        displayValue = convertDistance(value, system);
-        unit = getDistanceUnit(system);
-        alternateValue = convertDistance(value, system === 'metric' ? 'imperial' : 'metric');
-        alternateUnit = getDistanceUnit(system === 'metric' ? 'imperial' : 'metric');
+      case 'short_distance':
+        metricUnit = 'm';
        break;
      case 'height':
-        displayValue = convertHeight(value, system);
-        unit = getHeightUnit(system);
-        alternateValue = convertHeight(value, system === 'metric' ? 'imperial' : 'metric');
-        alternateUnit = getHeightUnit(system === 'metric' ? 'imperial' : 'metric');
-        break;
-      case 'short_distance':
-        displayValue = convertDistance(value, system);
-        unit = getShortDistanceUnit(system);
-        alternateValue = convertDistance(value, system === 'metric' ? 'imperial' : 'metric');
-        alternateUnit = getShortDistanceUnit(system === 'metric' ? 'imperial' : 'metric');
+        metricUnit = 'cm';
        break;
      default:
-        displayValue = value;
-        unit = '';
-        alternateValue = value;
-        alternateUnit = '';
+        return { displayValue: value, unit: '', alternateDisplay: '', tooltipText: undefined };
    }
    
+    alternateSystem = system === 'metric' ? 'imperial' : 'metric';
+    displayUnit = getDisplayUnit(metricUnit, system);
+    const alternateUnit = getDisplayUnit(metricUnit, alternateSystem);
+    
+    const displayValue = convertValueFromMetric(value, displayUnit, metricUnit);
+    const alternateValue = convertValueFromMetric(value, alternateUnit, metricUnit);
+    
    const alternateDisplay = showBothUnits ? ` (${alternateValue} ${alternateUnit})` : '';
    const tooltipText = showBothUnits ? undefined : `${alternateValue} ${alternateUnit}`;
    
-    return { displayValue, unit, alternateDisplay, tooltipText };
+    return { displayValue, unit: displayUnit, alternateDisplay, tooltipText };
  }, [value, type, unitPreferences.measurement_system, showBothUnits]);

  return (
--- a/src/components/upload/UppyPhotoSubmissionUpload.tsx
+++ b/src/components/upload/UppyPhotoSubmissionUpload.tsx
@@ -20,14 +20,7 @@ export function UppyPhotoSubmissionUpload({
  entityId,
  entityType,
  parentId,
-  // Legacy props (deprecated)
-  parkId,
-  rideId,
 }: UppyPhotoSubmissionUploadProps) {
-  // Support legacy props
-  const finalEntityId = entityId || rideId || parkId || '';
-  const finalEntityType = entityType || (rideId ? 'ride' : parkId ? 'park' : 'ride');
-  const finalParentId = parentId || (rideId ? parkId : undefined);
  const [title, setTitle] = useState('');
  const [photos, setPhotos] = useState<PhotoWithCaption[]>([]);
  const [isSubmitting, setIsSubmitting] = useState(false);
@@ -203,9 +196,9 @@ export function UppyPhotoSubmissionUpload({
        .from('photo_submissions')
        .insert({
          submission_id: submissionData.id,
-          entity_type: finalEntityType,
-          entity_id: finalEntityId,
-          parent_id: finalParentId || null,
+          entity_type: entityType,
+          entity_id: entityId,
+          parent_id: parentId || null,
          title: title.trim() || null,
        })
        .select()
@@ -239,8 +232,8 @@ export function UppyPhotoSubmissionUpload({
      console.log('✅ Photo submission created:', {
        submission_id: submissionData.id,
        photo_submission_id: photoSubmissionData.id,
-        entity_type: finalEntityType,
-        entity_id: finalEntityId,
+        entity_type: entityType,
+        entity_id: entityId,
        photo_count: photoItems.length,
      });

@@ -285,12 +278,9 @@ export function UppyPhotoSubmissionUpload({

  const metadata = {
    submissionType: 'photo',
-    entityId: finalEntityId,
-    entityType: finalEntityType,
-    parentId: finalParentId,
-    // Legacy support
-    parkId: finalEntityType === 'park' ? finalEntityId : finalParentId,
-    rideId: finalEntityType === 'ride' ? finalEntityId : undefined,
+    entityId,
+    entityType,
+    parentId,
    userId: user?.id,
  };