Merge pull request #47 from workfloworchestrator/1719-fixes

1719: Adds better way to reset at the end of a form

Author: DutchBen

frontend/packages/pydantic-forms/src/components/render/RenderForm.tsx

@@ -27,13 +27,11 @@ const RenderForm = (contextProps: PydanticFormContextProps) => {
         headerComponent,
         skipSuccessNotice,
         loadingComponent,
-        clearForm,
     } = contextProps;
     const {
         formRenderer,
         footerRenderer,
         componentMatcher: customComponentMatcher,
-        resetAfterSubmit,
     } = config || {};
 
     const LoadingComponent = loadingComponent ?? (
@@ -49,10 +47,6 @@ const RenderForm = (contextProps: PydanticFormContextProps) => {
     }
 
     if (isFullFilled) {
-        if (resetAfterSubmit) {
-            clearForm();
-        }
-
         if (skipSuccessNotice) {
             return <></>;
         }

frontend/packages/pydantic-forms/src/core/PydanticFormContextProvider.tsx

@@ -156,6 +156,7 @@ function PydanticFormContextProvider({
         mode: 'all',
     });
 
+    // Adds watch subscripton on form values
     useEffect(() => {
         const sub = rhf.watch((values) => {
             setSaveToLeavePageInCurrentState(false);
@@ -181,18 +182,22 @@ function PydanticFormContextProvider({
     */
     // handle successfull submits
     useEffect(() => {
-        if (!isFullFilled || !onSuccess) {
+        if (!isFullFilled) {
             return;
         }
-        const values = rhf.getValues();
-
-        if (skipSuccessNotice) {
-            onSuccess(values, apiResponse || {});
-        } else {
-            setTimeout(() => {
-                onSuccess?.(values, apiResponse || {});
-            }, 1500); // Delay to allow notice to show first
+
+        if (onSuccess) {
+            const values = rhf.getValues();
+            if (skipSuccessNotice) {
+                onSuccess(values, apiResponse || {});
+            } else {
+                setTimeout(() => {
+                    onSuccess?.(values, apiResponse || {});
+                }, 1500); // Delay to allow notice to show first
+            }
         }
+
+        rhf.reset();
     }, [apiResponse, isFullFilled, onSuccess, rhf, skipSuccessNotice]);
 
     // a useeffect for whenever the error response updates
@@ -367,4 +372,5 @@ export function usePydanticFormContext() {
 
     return context;
 }
+
 export default PydanticFormContextProvider;

frontend/packages/pydantic-forms/src/types.ts

@@ -75,7 +75,6 @@ export interface PydanticFormContextProps {
     formKey: string;
     formIdKey?: string;
     clearForm: () => void;
-    resetAfterSubmit?: boolean;
 }
 
 export enum PydanticFormState {
@@ -308,8 +307,6 @@ export interface PydanticFormsContextConfig {
 
     // have an option to change the layout columns of fields
     formStructureMutator?: PydanticFormStructureMutator;
-
-    resetAfterSubmit?: boolean;
 }
 
 export type FormRenderer = React.JSXElementConstructor<{