From e2a19cfd1005d0d967530931287c0a125595eef7 Mon Sep 17 00:00:00 2001
From: Ushran Gouhar <ushran987@gmail.com>
Date: Wed, 24 Sep 2025 22:47:35 +0530
Subject: [PATCH] Reset form on submit and cancel

---
 .../AddDomainForm/AddDomainForm.component.tsx     |  2 +-
 .../common/atoms/drawer/useFormDrawer.tsx         | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.component.tsx
index 0e938dcf516..b40fb0eb01a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/AddDomainForm/AddDomainForm.component.tsx
@@ -303,7 +303,7 @@ const AddDomainForm = ({
       delete (data as CreateDomain & { domains?: unknown }).domains;
     }
 
-    onSubmit(data).then(() => form.resetFields());
+    onSubmit(data);
   };
 
   return (
diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/drawer/useFormDrawer.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/drawer/useFormDrawer.tsx
index 76c44a0463a..872b59ba461 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/drawer/useFormDrawer.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/common/atoms/drawer/useFormDrawer.tsx
@@ -24,6 +24,7 @@ export interface FormDrawerConfig<T = any>
   form: ReactNode;
   onSubmit: (data: T) => Promise<void> | void;
   onCancel?: () => void;
+  onReset?: () => void;
   submitLabel?: string;
   cancelLabel?: string;
   loading?: boolean;
@@ -84,6 +85,7 @@ export const useFormDrawer = <T = any,>(config: FormDrawerConfig<T>) => {
     form,
     onSubmit,
     onCancel,
+    onReset,
     submitLabel = t('label.save'),
     cancelLabel = t('label.cancel'),
     loading = false,
@@ -114,7 +116,10 @@ export const useFormDrawer = <T = any,>(config: FormDrawerConfig<T>) => {
         label: cancelLabel,
         variant: 'text',
         testId: cancelTestId,
-        onClick: () => closeRef.current(),
+        onClick: () => {
+          closeRef.current();
+          onReset?.(); // Reset form on cancel
+        },
       },
       primaryButton: {
         label: submitLabel,
@@ -131,6 +136,7 @@ export const useFormDrawer = <T = any,>(config: FormDrawerConfig<T>) => {
             // Form submission error handled by caller
           } finally {
             setIsSubmitting(false);
+            onReset?.(); // Reset form on submit
           }
         },
       },
@@ -173,7 +179,11 @@ export const useFormDrawer = <T = any,>(config: FormDrawerConfig<T>) => {
  */
 export const useFormDrawerWithRef = <T = any,>(
   config: FormDrawerConfig<T> & {
-    formRef?: { submit: () => void; validateFields?: () => Promise<any> };
+    formRef?: {
+      submit: () => void;
+      validateFields?: () => Promise<any>;
+      resetFields: () => void;
+    };
   }
 ) => {
   const { formRef, onSubmit, ...restConfig } = config;
@@ -198,6 +208,7 @@ export const useFormDrawerWithRef = <T = any,>(
   const drawer = useFormDrawer({
     ...restConfig,
     onSubmit: handleSubmit,
+    onReset: formRef?.resetFields,
   });
 
   const submitForm = useCallback(() => {