Merge pull request #1458 from flanksource/1400-notifications-template…

…-left-empty-saved 1400-notifications-template-left-empty-saved
flanksource · Oct 24, 2023 · 1eef6e5 · 1eef6e5
2 parents 984bdfc + e9de6a8
commit 1eef6e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/src/components/Forms/Formik/FormikCodeEditor.tsx b/src/components/Forms/Formik/FormikCodeEditor.tsx
@@ -2,8 +2,8 @@ import { useField, useFormikContext } from "formik";
 import { isEmpty } from "lodash";
 import dynamic from "next/dynamic";
 import { useEffect, useMemo, useState } from "react";
-import useDebounce from "../../../hooks/useDebounce";
 import YAML from "yaml";
+import useDebounce from "../../../hooks/useDebounce";
 
 const CodeEditor = dynamic(
   () => import("../../CodeEditor").then((m) => m.CodeEditor),
@@ -55,21 +55,23 @@ export function FormikCodeEditor({
   const debouncedValues = useDebounce(codeEditorValue, 300);
 
   useEffect(() => {
-    if (debouncedValues) {
-      try {
-        if (format === "yaml" || format === "json") {
+    try {
+      if (format === "yaml" || format === "json") {
+        if (debouncedValues) {
           setFieldValue(
             fieldName,
             format === "yaml"
               ? YAML.parse(debouncedValues)
               : JSON.parse(debouncedValues)
           );
         } else {
-          setFieldValue(fieldName, debouncedValues);
+          setFieldValue(fieldName, undefined);
         }
-      } catch (e) {
-        // do nothing, we don't want to set the values if the user is typing
+      } else {
+        setFieldValue(fieldName, debouncedValues);
       }
+    } catch (e) {
+      // do nothing, we don't want to set the values if the user is typing
     }
   }, [debouncedValues, fieldName, format, setFieldValue]);
 
@@ -106,8 +108,9 @@ export function FormikCodeEditor({
           if (v) {
             setCodeEditorValue(v);
           } else {
-            // if the value is empty, we want to reset the form
-            setFieldValue(fieldName, {});
+            setCodeEditorValue(undefined);
+            // if the value is empty, we want to set to undefined
+            setFieldValue(fieldName, undefined);
           }
         }}
         value={value}

diff --git a/src/components/Forms/Formik/FormikSelectDropdown.tsx b/src/components/Forms/Formik/FormikSelectDropdown.tsx
@@ -70,7 +70,6 @@ export default function FormikSelectDropdown({
         options={options}
         value={value}
         onChange={(value: any) => {
-          console.log({ value: value });
           field.onChange({
             target: {
               name: field.name,