Refactor: Implement state machine cleanup and fixes

This commit is contained in:
gpt-engineer-app[bot]
2025-10-21 14:10:24 +00:00
parent 14b3305755
commit dcdb20386a
9 changed files with 55 additions and 209 deletions

View File

@@ -1,9 +1,8 @@
import { useState, useReducer } from 'react';
import { useState } from 'react';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
import * as z from 'zod';
import { entitySchemas } from '@/lib/entityValidationSchemas';
import { submissionReducer, canSubmit } from '@/lib/submissionStateMachine';
import { getErrorMessage } from '@/lib/errorHandler';
import { Button } from '@/components/ui/button';
import { Input } from '@/components/ui/input';
@@ -62,10 +61,6 @@ export function OperatorForm({ onSubmit, onCancel, initialData }: OperatorFormPr
const { headquarters } = useCompanyHeadquarters();
const { user } = useAuth();
const navigate = useNavigate();
const [submissionState, dispatch] = useReducer(submissionReducer, {
status: 'draft' as const,
data: initialData || {}
});
const {
register,
@@ -104,16 +99,7 @@ export function OperatorForm({ onSubmit, onCancel, initialData }: OperatorFormPr
return;
}
if (!canSubmit(submissionState)) {
toast.error('Cannot submit in current state');
return;
}
dispatch({ type: 'VALIDATE', payload: data });
try {
dispatch({ type: 'SUBMIT', payload: { submissionId: crypto.randomUUID() } });
try {
const formData = {
...data,
company_type: 'operator' as const,
@@ -122,20 +108,12 @@ export function OperatorForm({ onSubmit, onCancel, initialData }: OperatorFormPr
await onSubmit(formData);
dispatch({ type: 'SUBMISSION_COMPLETE' });
// Only show success toast and close if not editing through moderation queue
if (!initialData?.id) {
toast.success('Operator submitted for review');
onCancel();
}
} catch (error: unknown) {
const errorMessage = getErrorMessage(error);
if (errorMessage.includes('validation')) {
dispatch({ type: 'VALIDATION_ERROR', payload: [{ field: 'general', message: errorMessage }] });
} else {
dispatch({ type: 'RESET' });
}
handleError(error, {
action: initialData?.id ? 'Update Operator' : 'Create Operator',
metadata: { companyName: data.name }
@@ -262,18 +240,16 @@ export function OperatorForm({ onSubmit, onCancel, initialData }: OperatorFormPr
<Button
type="button"
variant="outline"
onClick={onCancel}
disabled={submissionState.status === 'validating' || submissionState.status === 'submitting'}
onClick={onCancel}
>
<X className="w-4 h-4 mr-2" />
Cancel
</Button>
<Button
type="submit"
disabled={submissionState.status === 'validating' || submissionState.status === 'submitting' || !canSubmit(submissionState)}
type="submit"
>
<Save className="w-4 h-4 mr-2" />
{(submissionState.status === 'validating' || submissionState.status === 'submitting') ? 'Submitting...' : 'Save Operator'}
Save Operator
</Button>
</div>
</form>