mirror of
https://github.com/pacnpal/thrilltrack-explorer.git
synced 2025-12-23 12:11:13 -05:00
Refactor: Implement state machine cleanup and fixes
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
import { useState, useEffect, useReducer } from 'react';
|
||||
import { useState, useEffect } from 'react';
|
||||
import { useForm } from 'react-hook-form';
|
||||
import { zodResolver } from '@hookform/resolvers/zod';
|
||||
import * as z from 'zod';
|
||||
import { validateSubmissionHandler } from '@/lib/entityFormValidation';
|
||||
import { submissionReducer, canSubmit } from '@/lib/submissionStateMachine';
|
||||
import { getErrorMessage } from '@/lib/errorHandler';
|
||||
import type { RideTechnicalSpec, RideCoasterStat, RideNameHistory } from '@/types/database';
|
||||
import type { TempCompanyData, TempRideModelData } from '@/types/company';
|
||||
@@ -121,10 +120,6 @@ const STATUS_DB_TO_DISPLAY: Record<string, string> = {
|
||||
|
||||
export function RideForm({ onSubmit, onCancel, initialData, isEditing = false }: RideFormProps) {
|
||||
const { isModerator } = useUserRole();
|
||||
const [submissionState, dispatch] = useReducer(submissionReducer, {
|
||||
status: 'draft' as const,
|
||||
data: initialData || {}
|
||||
});
|
||||
const { preferences } = useUnitPreferences();
|
||||
const measurementSystem = preferences.measurement_system;
|
||||
|
||||
@@ -225,20 +220,8 @@ export function RideForm({ onSubmit, onCancel, initialData, isEditing = false }:
|
||||
const selectedCategory = watch('category');
|
||||
|
||||
|
||||
const handleFormSubmit = async (data: RideFormData) => {
|
||||
if (!canSubmit(submissionState)) {
|
||||
toast({
|
||||
title: 'Cannot submit',
|
||||
description: 'Please wait for the current operation to complete',
|
||||
variant: 'destructive',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
dispatch({ type: 'VALIDATE', payload: data });
|
||||
|
||||
const handleFormSubmit = async (data: RideFormData) => {
|
||||
try {
|
||||
dispatch({ type: 'SUBMIT', payload: { submissionId: crypto.randomUUID() } });
|
||||
|
||||
// Convert form values back to metric for storage
|
||||
const metricData = {
|
||||
@@ -270,8 +253,6 @@ export function RideForm({ onSubmit, onCancel, initialData, isEditing = false }:
|
||||
// Pass clean data to parent with extended fields
|
||||
await onSubmit(metricData);
|
||||
|
||||
dispatch({ type: 'SUBMISSION_COMPLETE' });
|
||||
|
||||
toast({
|
||||
title: isEditing ? "Ride Updated" : "Submission Sent",
|
||||
description: isEditing
|
||||
@@ -281,12 +262,6 @@ export function RideForm({ onSubmit, onCancel, initialData, isEditing = false }:
|
||||
: "Ride submitted for review"
|
||||
});
|
||||
} catch (error: unknown) {
|
||||
const errorMessage = getErrorMessage(error);
|
||||
if (errorMessage.includes('validation') || errorMessage.includes('required')) {
|
||||
dispatch({ type: 'VALIDATION_ERROR', payload: [{ field: 'general', message: errorMessage }] });
|
||||
} else {
|
||||
dispatch({ type: 'RESET' });
|
||||
}
|
||||
handleError(error, {
|
||||
action: isEditing ? 'Update Ride' : 'Create Ride',
|
||||
metadata: {
|
||||
@@ -806,12 +781,11 @@ export function RideForm({ onSubmit, onCancel, initialData, isEditing = false }:
|
||||
{/* Form Actions */}
|
||||
<div className="flex gap-4 pt-6">
|
||||
<Button
|
||||
type="submit"
|
||||
disabled={submissionState.status === 'validating' || submissionState.status === 'submitting' || !canSubmit(submissionState)}
|
||||
type="submit"
|
||||
className="flex-1"
|
||||
>
|
||||
<Save className="w-4 h-4 mr-2" />
|
||||
{(submissionState.status === 'validating' || submissionState.status === 'submitting') ? 'Saving...' : (isEditing ? 'Update Ride' : 'Create Ride')}
|
||||
{isEditing ? 'Update Ride' : 'Create Ride'}
|
||||
</Button>
|
||||
|
||||
{onCancel && (
|
||||
|
||||
Reference in New Issue
Block a user