Skip to content

LLM-Driven Extraction of Unstructured Data — Built for API Deployments & ETL Pipeline Workflows

connector modal issue fixes (#59)

vishnuszipstack7d6489693ad3
diff --git a/frontend/src/components/agency/configure-connector-modal/ConfigureConnectorModal.jsx b/frontend/src/components/agency/configure-connector-modal/ConfigureConnectorModal.jsx
index 49e9cc959..ae8269be5 100644
--- a/frontend/src/components/agency/configure-connector-modal/ConfigureConnectorModal.jsx
+++ b/frontend/src/components/agency/configure-connector-modal/ConfigureConnectorModal.jsx
@@ -21,6 +21,7 @@ function ConfigureConnectorModal({
formDataConfig,
setFormDataConfig,
isSpecConfigLoading,
+ connDetails,
connType,
}) {
const [activeKey, setActiveKey] = useState("1");
@@ -32,13 +33,17 @@ function ConfigureConnectorModal({
{
key: "2",
label: "File System",
- disabled: !connectorId || connType === "DATABASE",
+ disabled:
+ !connectorId ||
+ connDetails?.connector_id !== selectedId ||
+ connType === "DATABASE",
},
];
const handleSelectItem = (e) => {
const id = e.key;
setSelectedId(id?.toString());
+ setActiveKey("1");
};
const onTabChange = (key) => {
@@ -88,6 +93,7 @@ function ConfigureConnectorModal({
formDataConfig={formDataConfig}
setFormDataConfig={setFormDataConfig}
isSpecConfigLoading={isSpecConfigLoading}
+ connDetails={connDetails}
/>
)}
{activeKey === "2" && <ManageFiles selectedItem={connectorId} />}
@@ -112,6 +118,7 @@ ConfigureConnectorModal.propTypes = {
formDataConfig: PropTypes.object,
setFormDataConfig: PropTypes.func.isRequired,
isSpecConfigLoading: PropTypes.bool.isRequired,
+ connDetails: PropTypes.object,
connType: PropTypes.string.isRequired,
};
diff --git a/frontend/src/components/agency/configure-forms-layout/ConfigureFormsLayout.jsx b/frontend/src/components/agency/configure-forms-layout/ConfigureFormsLayout.jsx
index 0544f8d3e..1baf3256b 100644
--- a/frontend/src/components/agency/configure-forms-layout/ConfigureFormsLayout.jsx
+++ b/frontend/src/components/agency/configure-forms-layout/ConfigureFormsLayout.jsx
@@ -15,6 +15,7 @@ function ConfigureFormsLayout({
formDataConfig,
setFormDataConfig,
isSpecConfigLoading,
+ connDetails,
}) {
return (
<Row className="conn-modal-tab-body">
@@ -38,6 +39,7 @@ function ConfigureFormsLayout({
type={type}
editItemId={editItemId}
handleUpdate={handleUpdate}
+ connDetails={connDetails}
/>
)}
</div>
@@ -78,6 +80,7 @@ ConfigureFormsLayout.propTypes = {
formDataConfig: PropTypes.object,
setFormDataConfig: PropTypes.func.isRequired,
isSpecConfigLoading: PropTypes.bool.isRequired,
+ connDetails: PropTypes.object,
};
export { ConfigureFormsLayout };
diff --git a/frontend/src/components/agency/ds-settings-card/DsSettingsCard.jsx b/frontend/src/components/agency/ds-settings-card/DsSettingsCard.jsx
index 5a24ed3e8..f4d2659b1 100644
--- a/frontend/src/components/agency/ds-settings-card/DsSettingsCard.jsx
+++ b/frontend/src/components/agency/ds-settings-card/DsSettingsCard.jsx
@@ -396,6 +396,7 @@ function DsSettingsCard({ type, endpointDetails, message }) {
formDataConfig={formDataConfig}
setFormDataConfig={setFormDataConfig}
isSpecConfigLoading={isSpecConfigLoading}
+ connDetails={connDetails}
connType={connType}
/>
</>
diff --git a/frontend/src/components/input-output/add-source/AddSource.jsx b/frontend/src/components/input-output/add-source/AddSource.jsx
index 2a7d0e9e5..05b1b92bd 100644
--- a/frontend/src/components/input-output/add-source/AddSource.jsx
+++ b/frontend/src/components/input-output/add-source/AddSource.jsx
@@ -17,6 +17,7 @@ function AddSource({
editItemId,
metadata,
handleUpdate,
+ connDetails,
}) {
const [spec, setSpec] = useState({});
const [formData, setFormData] = useState({});
@@ -100,6 +101,8 @@ function AddSource({
: Object.keys(sourceTypes)[1]
}
handleUpdate={handleUpdate}
+ connDetails={connDetails}
+ metadata={metadata}
/>
);
}
@@ -112,6 +115,7 @@ AddSource.propTypes = {
editItemId: PropTypes.string,
metadata: PropTypes.object,
handleUpdate: PropTypes.func,
+ connDetails: 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
index 255229513..7c7d4702e 100644
--- a/frontend/src/components/input-output/configure-ds/ConfigureDs.jsx
+++ b/frontend/src/components/input-output/configure-ds/ConfigureDs.jsx
@@ -28,6 +28,8 @@ function ConfigureDs({
editItemId,
sourceType,
handleUpdate,
+ connDetails,
+ metadata,
}) {
const formRef = createRef(null);
const axiosPrivate = useAxiosPrivate();
@@ -47,6 +49,14 @@ function ConfigureDs({
}
}, [formData]);
+ useEffect(() => {
+ if (connDetails.connector_id !== selectedSourceId) {
+ setFormData({});
+ } else {
+ setFormData(metadata);
+ }
+ }, [selectedSourceId]);
+
const isFormValid = () => {
if (formRef) {
formRef?.current?.validateFields((errors, values) => {
@@ -281,6 +291,8 @@ ConfigureDs.propTypes = {
editItemId: PropTypes.string,
sourceType: PropTypes.string.isRequired,
handleUpdate: PropTypes.func,
+ connDetails: PropTypes.object,
+ metadata: PropTypes.object,
};
export { ConfigureDs };
diff --git a/frontend/src/routes/Router.jsx b/frontend/src/routes/Router.jsx
index 68635eb51..84295697e 100644
--- a/frontend/src/routes/Router.jsx
+++ b/frontend/src/routes/Router.jsx
@@ -95,13 +95,13 @@ function Router() {
element={<ToolsSettingsPage type="ocr" />}
/>
<Route path="settings" element={<SettingsPage />} />
- <Route path="settings/platform" element={<PlatformSettings />} />
- <Route path="settings/triad" element={<DefaultTriad />} />
<Route element={<RequireAdmin />}>
+ <Route path="settings/platform" element={<PlatformSettings />} />
<Route path="users" element={<UsersPage />} />
<Route path="users/invite" element={<InviteEditUserPage />} />
<Route path="users/edit" element={<InviteEditUserPage />} />
</Route>
+ <Route path="settings/triad" element={<DefaultTriad />} />
</Route>
</Route>
<Route path="*" element={<NotFound />} />