Skip to content

Commit 05d1ace

Browse files
committed
#1287 - fix weird state stuff for finance config tools
1 parent 321185e commit 05d1ace

4 files changed

Lines changed: 12 additions & 5 deletions

File tree

src/frontend/src/components/NERFormModal.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,17 @@ const NERFormModal = ({
2828
*/
2929
const onSubmitWrapper = async (data: any) => {
3030
await onFormSubmit(data);
31-
reset({ confirmDone: false });
31+
console.log('reset');
32+
reset();
3233
};
3334

3435
return (
3536
<NERModal
3637
open={open}
37-
onHide={onHide}
38+
onHide={() => {
39+
onHide();
40+
reset();
41+
}}
3842
formId={formId}
3943
title={title}
4044
cancelText={cancelText ? cancelText : 'Cancel'}

src/frontend/src/pages/AdminToolsPage/FinanceConfig/AccountCodeFormModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const AccountCodeFormModal = ({ showModal, handleClose, defaultValues, onSubmit
4949
open={showModal}
5050
onHide={handleClose}
5151
title={!!defaultValues ? 'Edit Account Code' : 'Create Account Code'}
52-
reset={reset}
52+
reset={() => reset({ name: '', code: undefined, allowed: false })}
5353
handleUseFormSubmit={handleSubmit}
5454
onFormSubmit={onFormSubmit}
5555
formId={!!defaultValues ? 'edit-vendor-form' : 'create-vendor-form'}

src/frontend/src/pages/AdminToolsPage/FinanceConfig/AccountCodesTable.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ const AccountCodesTable = () => {
4949
{clickedAccountCode && (
5050
<EditAccountCodeModal
5151
showModal={showEditModal}
52-
handleClose={() => setShowEditModal(false)}
52+
handleClose={() => {
53+
setShowEditModal(false);
54+
setClickedAccountCode(undefined);
55+
}}
5356
accountCode={clickedAccountCode}
5457
/>
5558
)}

src/frontend/src/pages/AdminToolsPage/FinanceConfig/CreateVendorModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const CreateVendorModal = ({ showModal, handleClose }: NewVendorProps) => {
4949
open={showModal}
5050
onHide={handleClose}
5151
title="New Vendor"
52-
reset={reset}
52+
reset={() => reset({ name: '' })}
5353
handleUseFormSubmit={handleSubmit}
5454
onFormSubmit={onSubmit}
5555
formId="new-vendor-form"

0 commit comments

Comments
 (0)