Fixed : Disable Submit Button #9526
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
There was a problem hiding this comment. lets not modify the old custom Shadcn's form is built to be used with shadcn's form fields, not our form field components. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| import isEqual from "lodash/isEqual"; | ||
| import { useEffect, useMemo, useRef, useState } from "react"; | ||
|
|
||
| import { Cancel, Submit } from "@/components/Common/ButtonV2"; | ||
|
|
@@ -47,6 +48,7 @@ const Form = <T extends FormDetails>({ | |
| const [isLoading, setIsLoading] = useState(!!asyncGetDefaults); | ||
| const [state, dispatch] = useAutoSaveReducer<T>(formReducer, initial); | ||
| const formVals = useRef(props.defaults); | ||
| const [isFormModified, setIsFormModified] = useState(false); | ||
|
|
||
| useEffect(() => { | ||
| if (!asyncGetDefaults) return; | ||
|
|
@@ -82,12 +84,14 @@ const Form = <T extends FormDetails>({ | |
| }); | ||
| } else if (props.resetFormValsOnSubmit) { | ||
| dispatch({ type: "set_form", form: formVals.current }); | ||
| setIsFormModified(false); | ||
| } | ||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion Add error handling for form submission failures The form modified state is reset only on successful submission. Consider handling submission failures to maintain consistent state. } else if (props.resetFormValsOnSubmit) {
dispatch({ type: "set_form", form: formVals.current });
setIsFormModified(false);
+} else {
+ // Keep isFormModified true if submission fails
+ setIsFormModified(true);
}Also applies to: 93-95 |
||
| }; | ||
|
|
||
| const handleCancel = () => { | ||
| if (props.resetFormValsOnCancel) { | ||
| dispatch({ type: "set_form", form: formVals.current }); | ||
| setIsFormModified(false); | ||
| } | ||
| props.onCancel?.(); | ||
| }; | ||
|
|
@@ -123,13 +127,19 @@ const Form = <T extends FormDetails>({ | |
| return { | ||
| name, | ||
| id: name, | ||
| onChange: ({ name, value }: FieldChangeEvent<T[keyof T]>) => { | ||
| const newForm = { | ||
| ...state.form, | ||
| [name]: value, | ||
| }; | ||
| setIsFormModified(!isEqual(newForm, formVals.current)); | ||
| dispatch({ | ||
| type: "set_field", | ||
| name, | ||
| value, | ||
| error: validate?.(value), | ||
| }); | ||
| }, | ||
| value: state.form[name], | ||
| error: state.errors[name], | ||
| disabled, | ||
|
|
@@ -149,7 +159,7 @@ const Form = <T extends FormDetails>({ | |
| <Submit | ||
| data-testid="submit-button" | ||
| type="submit" | ||
| disabled={disabled || !isFormModified} | ||
| label={props.submitLabel ?? "Submit"} | ||
| /> | ||
| </div> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't be in the commit.
How are you committing your merge changes? Cli or GUI 🤔
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CLI