Submit fix

Zipstack · Jul 17, 2024 · ca52841 · ca52841
1 parent f4a01d4
commit ca52841
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/frontend/src/components/agency/configure-connector-modal/ConfigureConnectorModal.jsx b/frontend/src/components/agency/configure-connector-modal/ConfigureConnectorModal.jsx
@@ -1,6 +1,6 @@
 import { Col, Modal, Row, Tabs, Typography } from "antd";
 import PropTypes from "prop-types";
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 import { ListOfConnectors } from "../list-of-connectors/ListOfConnectors";
 import "./ConfigureConnectorModal.css";
@@ -28,6 +28,13 @@ function ConfigureConnectorModal({
   setSelectedItemName,
 }) {
   const [activeKey, setActiveKey] = useState("1");
+  useEffect(() => {
+    if (connectorMetadata) {
+      setActiveKey("2"); // If connector is already configured
+    } else {
+      setActiveKey("1"); // default value
+    }
+  }, [open, connectorMetadata]);
   const { setPostHogCustomEvent, posthogConnectorEventText } =
     usePostHogEvents();
   const tabItems = [

diff --git a/frontend/src/components/agency/configure-forms-layout/ConfigureFormsLayout.jsx b/frontend/src/components/agency/configure-forms-layout/ConfigureFormsLayout.jsx
@@ -45,6 +45,7 @@ function ConfigureFormsLayout({
                 connDetails={connDetails}
                 connType={connType}
                 selectedSourceName={selectedItemName}
+                formDataConfig={formDataConfig}
               />
             )}
           </div>

diff --git a/frontend/src/components/input-output/add-source/AddSource.jsx b/frontend/src/components/input-output/add-source/AddSource.jsx
@@ -21,6 +21,7 @@ function AddSource({
   handleUpdate,
   connDetails,
   connType,
+  formDataConfig,
 }) {
   const [spec, setSpec] = useState({});
   const [formData, setFormData] = useState({});
@@ -54,6 +55,7 @@ function AddSource({
     axiosPrivate(requestOptions)
       .then((res) => {
         const data = res?.data;
+        setFormData(metadata || {});
         setSpec(data?.json_schema || {});
         if (data?.oauth) {
           setOAuthProvider(data?.python_social_auth_backend);
@@ -110,6 +112,7 @@ function AddSource({
       metadata={metadata}
       selectedSourceName={selectedSourceName}
       connType={connType}
+      formDataConfig={formDataConfig}
     />
   );
 }
@@ -125,6 +128,7 @@ AddSource.propTypes = {
   handleUpdate: PropTypes.func,
   connDetails: PropTypes.object,
   connType: PropTypes.string,
+  formDataConfig: PropTypes.object,
 };
 
 export { AddSource };
diff --git a/frontend/src/components/input-output/configure-ds/ConfigureDs.jsx b/frontend/src/components/input-output/configure-ds/ConfigureDs.jsx
@@ -31,6 +31,7 @@ function ConfigureDs({
   metadata,
   selectedSourceName,
   connType,
+  formDataConfig,
 }) {
   const formRef = createRef(null);
   const axiosPrivate = useAxiosPrivate();
@@ -252,7 +253,11 @@ function ConfigureDs({
       .then((res) => {
         const data = res?.data;
         if (sourceTypes.connectors.includes(type)) {
-          handleUpdate({ connector_instance: data?.id });
+          handleUpdate(
+            { connector_instance: data?.id, configuration: formDataConfig },
+            true
+          );
+          setIsTcSuccessful(false);
           return;
         }
         if (data) {
@@ -351,6 +356,7 @@ ConfigureDs.propTypes = {
   metadata: PropTypes.object,
   selectedSourceName: PropTypes.string.isRequired,
   connType: PropTypes.string,
+  formDataConfig: PropTypes.object,
 };
 
 export { ConfigureDs };