Merge main back to develop (#9864)

* fix : form csa for onsubmit not getting triggered (#9862) * Bump version to v2.50.0 (#9863) --------- Co-authored-by: Kiran Ashok <stepinfwd@gmail.com>
ToolJet · May 24, 2024 · f2ed28f · f2ed28f
1 parent 879201f
commit f2ed28f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-2.45.0
+2.50.0
diff --git a/frontend/.version b/frontend/.version
@@ -1 +1 @@
-2.45.0
+2.50.0
diff --git a/frontend/src/Editor/Components/Form/Form.jsx b/frontend/src/Editor/Components/Form/Form.jsx
@@ -66,19 +66,16 @@ export const Form = function Form(props) {
   const mounted = useMounted();
 
   useEffect(() => {
-    const exposedVariables = {
-      resetForm: async function () {
-        resetComponent();
-      },
-      submitForm: async function () {
-        if (isValid) {
-          onEvent('onSubmit', formEvents).then(() => resetComponent());
-        } else {
-          fireEvent('onInvalid');
-        }
-      },
-    };
-    setExposedVariables(exposedVariables);
+    setExposedVariable('resetForm', async function () {
+      resetComponent();
+    });
+    setExposedVariable('submitForm', async function () {
+      if (isValid) {
+        onEvent('onSubmit', formEvents).then(() => resetComponent());
+      } else {
+        fireEvent('onInvalid');
+      }
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);

diff --git a/server/.version b/server/.version
@@ -1 +1 @@
-2.45.0
+2.50.0