Fix: Test Connection button disabled after save (getredash#5666)

Closes getredash#5455
michifrey · Feb 1, 2022 · ea07e7e · ea07e7e
1 parent 26ac8ab
commit ea07e7e
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/client/app/components/dynamic-form/DynamicForm.jsx b/client/app/components/dynamic-form/DynamicForm.jsx
@@ -151,6 +151,7 @@ export default function DynamicForm({
   onSubmit,
 }) {
   const [isSubmitting, setIsSubmitting] = useState(false);
+  const [isTouched, setIsTouched] = useState(false);
   const [showExtraFields, setShowExtraFields] = useState(defaultShowExtraFields);
   const [form] = Form.useForm();
   const extraFields = filter(fields, { extra: true });
@@ -163,9 +164,8 @@ export default function DynamicForm({
       onSubmit(
         values,
         msg => {
-          const { setFieldsValue, getFieldsValue } = form;
           setIsSubmitting(false);
-          setFieldsValue(getFieldsValue()); // reset form touched state
+          setIsTouched(false); // reset form touched state
           notification.success(msg);
         },
         msg => {
@@ -174,7 +174,7 @@ export default function DynamicForm({
         }
       );
     },
-    [form, fields, onSubmit]
+    [fields, onSubmit]
   );
 
   const handleFinishFailed = useCallback(
@@ -187,6 +187,9 @@ export default function DynamicForm({
   return (
     <Form
       form={form}
+      onFieldsChange={() => {
+        setIsTouched(true);
+      }}
       id={id}
       className="dynamic-form"
       layout="vertical"
@@ -216,7 +219,7 @@ export default function DynamicForm({
           {saveText}
         </Button>
       )}
-      <DynamicFormActions actions={actions} isFormDirty={form.isFieldsTouched()} />
+      <DynamicFormActions actions={actions} isFormDirty={isTouched} />
     </Form>
   );
 }