Skip to content

refactored useForm for units and usage statuses dialogs #1550

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
MatteoGuarnaccia5 wants to merge 2 commits into
base: react-hook-form-editFileDialog-fix
Choose a base branch
from
Open

refactored useForm for units and usage statuses dialogs #1550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd668a1
refactored useForm for units and usage statuses dialogs
MatteoGuarnaccia5 Oct 27, 2025
ceb35f4
change handleAdd func to take zod output schema
MatteoGuarnaccia5 Dec 2, 2025
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
16 changes: 8 additions & 8 deletions src/admin/units/unitsDialog.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import {
import { AxiosError } from 'axios';
import React from 'react';
import { useForm } from 'react-hook-form';
import { UnitPost } from '../../api/api.types';
import { usePostUnit } from '../../api/units';
import { UnitSchema } from '../../form.schemas';
import handleIMS_APIError from '../../handleIMS_APIError';
import z from 'zod';

export interface UnitsDialogProps {
open: boolean;
Expand All @@ -33,7 +33,11 @@ function UnitsDialog(props: UnitsDialogProps) {
setError,
clearErrors,
reset,
} = useForm<UnitPost>({
} = useForm<
z.input<typeof UnitSchema>,
undefined,
z.output<typeof UnitSchema>
>({
resolver: zodResolver(UnitSchema),
});

Expand All @@ -46,7 +50,7 @@ function UnitsDialog(props: UnitsDialogProps) {
}, [clearErrors, onClose, reset]);

const handleAddUnit = React.useCallback(
(unitData: UnitPost) => {
(unitData: z.output<typeof UnitSchema>) => {
postUnit(unitData)
.then(() => handleClose())
.catch((error: AxiosError) => {
Expand All @@ -63,10 +67,6 @@ function UnitsDialog(props: UnitsDialogProps) {
[postUnit, handleClose, setError]
);

const onSubmit = (data: UnitPost) => {
handleAddUnit(data);
};

return (
<Dialog open={open} maxWidth="sm" fullWidth>
<DialogTitle>Add Unit</DialogTitle>
Expand Down Expand Up @@ -111,7 +111,7 @@ function UnitsDialog(props: UnitsDialogProps) {
<Button
variant="outlined"
sx={{ width: '50%', mx: 1 }}
onClick={handleSubmit(onSubmit)}
onClick={handleSubmit(handleAddUnit)}
disabled={isAddPending || Object.values(errors).length !== 0}
endIcon={isAddPending ? <CircularProgress size={20} /> : null}
>
Expand Down
15 changes: 8 additions & 7 deletions src/admin/usageStatuses/usageStatusDialog.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import {
import { AxiosError } from 'axios';
import React from 'react';
import { useForm } from 'react-hook-form';
import { UsageStatusPost } from '../../api/api.types';
import { usePostUsageStatus } from '../../api/usageStatuses';
import { UsageStatusSchema } from '../../form.schemas';
import handleIMS_APIError from '../../handleIMS_APIError';
import z from 'zod';

export interface UsageStatusDialogProps {
open: boolean;
Expand All @@ -33,7 +33,11 @@ function UsageStatusDialog(props: UsageStatusDialogProps) {
setError,
clearErrors,
reset,
} = useForm<UsageStatusPost>({
} = useForm<
z.input<typeof UsageStatusSchema>,
undefined,
z.output<typeof UsageStatusSchema>
>({
resolver: zodResolver(UsageStatusSchema),
});

Expand All @@ -47,7 +51,7 @@ function UsageStatusDialog(props: UsageStatusDialogProps) {
}, [clearErrors, onClose, reset]);

const handleAddUsageStatus = React.useCallback(
(usageStatusData: UsageStatusPost) => {
(usageStatusData: z.output<typeof UsageStatusSchema>) => {
postUsageStatus(usageStatusData)
.then(() => handleClose())
.catch((error: AxiosError) => {
Expand All @@ -63,9 +67,6 @@ function UsageStatusDialog(props: UsageStatusDialogProps) {
},
[postUsageStatus, handleClose, setError]
);
const onSubmit = (data: UsageStatusPost) => {
handleAddUsageStatus(data);
};

return (
<Dialog open={open} maxWidth="sm" fullWidth>
Expand Down Expand Up @@ -111,7 +112,7 @@ function UsageStatusDialog(props: UsageStatusDialogProps) {
<Button
variant="outlined"
sx={{ width: '50%', mx: 1 }}
onClick={handleSubmit(onSubmit)}
onClick={handleSubmit(handleAddUsageStatus)}
disabled={isAddPending || Object.values(errors).length !== 0}
endIcon={isAddPending ? <CircularProgress size={20} /> : null}
>
Expand Down
Loading