Skip to content

refactored useForm for manufacturers dialog #1551

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-units-and-usage-statuses-fix
Choose a base branch
from
Open

refactored useForm for manufacturers dialog #1551

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
20 changes: 15 additions & 5 deletions src/manufacturer/manufacturerDialog.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,13 @@ import {
} from '../api/manufacturers';
import { ManufacturerSchema, RequestType } from '../form.schemas';
import handleIMS_APIError from '../handleIMS_APIError';
import { createFormControlWithRootErrorClearing } from '../utils';
import { createFormControlWithRootErrorClearingUpdated } from '../utils';
import z from 'zod';

const formControl = createFormControlWithRootErrorClearing<ManufacturerPost>();
const formControl = createFormControlWithRootErrorClearingUpdated<
z.input<ReturnType<typeof ManufacturerSchema>>,
z.output<ReturnType<typeof ManufacturerSchema>>
>();
export interface ManufacturerDialogProps {
open: boolean;
onClose: () => void;
Expand Down Expand Up @@ -84,7 +88,13 @@ function ManufacturerDialog(props: ManufacturerDialogProps) {
setError,
clearErrors,
reset,
} = useForm<ManufacturerPost>({
} = useForm<
// is the ReturnType as `ManufacturerSchema` is a parametised zodObject, therefore it needs to evaluated
// to be used as a type, otherwise it is techincally a function call.
z.input<ReturnType<typeof ManufacturerSchema>>,
undefined,
z.output<ReturnType<typeof ManufacturerSchema>>
>({
formControl,
resolver: zodResolver(ManufacturerSchema(type)),
defaultValues: initialManufacturer,
Expand All @@ -102,7 +112,7 @@ function ManufacturerDialog(props: ManufacturerDialogProps) {
}, [clearErrors, onClose, reset]);

const handleAddManufacturer = React.useCallback(
(manufacturerData: ManufacturerPost) => {
(manufacturerData: z.output<ReturnType<typeof ManufacturerSchema>>) => {
postManufacturer(manufacturerData)
.then(() => handleClose())
.catch((error: AxiosError) => {
Expand All @@ -120,7 +130,7 @@ function ManufacturerDialog(props: ManufacturerDialogProps) {
);

const handleEditManufacturer = React.useCallback(
(manufacturerData: ManufacturerPost) => {
(manufacturerData: z.output<ReturnType<typeof ManufacturerSchema>>) => {
if (selectedManufacturer) {
const isNameUpdated =
manufacturerData.name !== selectedManufacturer.name;
Expand Down
Loading