Skip to content

refactor useForm for system dialog #1552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: react-hook-form-manufactures-dialog-fix
Choose a base branch
from
Open

refactor useForm for system dialog #1552

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/systems/systemDialog.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ import {
} from '../api/systems';
import { RequestType, SystemsSchema } from '../form.schemas';
import handleIMS_APIError from '../handleIMS_APIError';
import { createFormControlWithRootErrorClearing } from '../utils';
import { createFormControlWithRootErrorClearingUpdated } from '../utils';
import z from 'zod';

export interface SystemDialogProps {
open: boolean;
Expand Down Expand Up @@ -89,7 +90,10 @@ const SystemDialog = (props: SystemDialogProps) => {
[isNotCreating, parentSystemTypeId, selectedSystem]
);
// This is within the React Component as this dialog is used in multiple places in the systems page
const formControl = createFormControlWithRootErrorClearing<SystemPost>();
const formControl = createFormControlWithRootErrorClearingUpdated<
z.input<ReturnType<typeof SystemsSchema>>,
z.output<ReturnType<typeof SystemsSchema>>
>();

const {
handleSubmit,
Expand All @@ -99,7 +103,11 @@ const SystemDialog = (props: SystemDialogProps) => {
setError,
clearErrors,
reset,
} = useForm<SystemPost>({
} = useForm<
z.input<ReturnType<typeof SystemsSchema>>,
undefined,
z.output<ReturnType<typeof SystemsSchema>>
>({
formControl,
resolver: zodResolver(SystemsSchema(requestType)),
defaultValues: initialSystem,
Expand All @@ -117,6 +125,7 @@ const SystemDialog = (props: SystemDialogProps) => {
}, [clearErrors, onClose, reset]);

const handleAddSaveSystem = React.useCallback(
// stays as system post as onSubmit uses spread to map to post type from z.output
(system: SystemPost) => {
postSystem(system)
.then(() => handleClose())
Expand Down Expand Up @@ -152,7 +161,7 @@ const SystemDialog = (props: SystemDialogProps) => {
);

const handleEditSystem = React.useCallback(
(systemData: SystemPost) => {
(systemData: z.output<ReturnType<typeof SystemsSchema>>) => {
// Validate the entered fields
if (selectedSystem) {
// Now ensure there is actually something to update
Expand Down Expand Up @@ -241,7 +250,7 @@ const SystemDialog = (props: SystemDialogProps) => {
[selectedSystem, setError, patchSystem, handleClose]
);

const onSubmit = (data: SystemPost) => {
const onSubmit = (data: z.output<ReturnType<typeof SystemsSchema>>) => {
if (requestType === 'patch') {
handleEditSystem(data);
} else {
Expand Down
Loading