[data_source] - refactor: remove DataSourceDetailsModal component

- DataSourceDetailsModal component removed to simplify data source management flow - Various related hooks and states for showing the modal have been cleaned up - Adjusted ManagedDataSourceView to reflect the removal of the modal - Data source management now relies on the ConnectorPermissionsModal for permissions management exclusively
dust-tt · Aug 9, 2024 · 35f88a8 · 35f88a8
1 parent ca9c5ff
commit 35f88a8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 146 deletions.
diff --git a/front/components/data_source/DataSourceDetailsModal.tsx b/front/components/data_source/DataSourceDetailsModal.tsx
diff --git a/front/pages/w/[wId]/builder/data-sources/[name]/index.tsx b/front/pages/w/[wId]/builder/data-sources/[name]/index.tsx
@@ -39,7 +39,6 @@ import { useContext, useEffect, useMemo, useRef, useState } from "react";
 
 import ConnectorPermissionsModal from "@app/components/ConnectorPermissionsModal";
 import { PermissionTree } from "@app/components/ConnectorPermissionsTree";
-import DataSourceDetailsModal from "@app/components/data_source/DataSourceDetailsModal";
 import ConnectorSyncingChip from "@app/components/data_source/DataSourceSyncChip";
 import { subNavigationBuild } from "@app/components/navigation/config";
 import AppLayout from "@app/components/sparkle/AppLayout";
@@ -1000,8 +999,6 @@ function ManagedDataSourceView({
   const sendNotification = useContext(SendNotificationsContext);
 
   const [showPermissionModal, setShowPermissionModal] = useState(false);
-  const [showDataSourceDetailsModal, setShowDataSourceDetailsModal] =
-    useState(false);
 
   const connectorProvider = dataSource.connectorProvider;
   if (!connectorProvider) {
@@ -1096,7 +1093,6 @@ function ManagedDataSourceView({
   };
 
   const {
-    displayDataSourceDetailsModal,
     displayManagePermissionButton,
     addDataButtonLabel,
     displaySettingsButton,
@@ -1123,19 +1119,6 @@ function ManagedDataSourceView({
           <span>{postPermissionsUpdateMessage}</span>
         </Dialog>
       )}
-      <DataSourceDetailsModal
-        dataSource={dataSource}
-        visible={showDataSourceDetailsModal}
-        onClose={() => {
-          setShowDataSourceDetailsModal(false);
-        }}
-        onClick={() => {
-          void handleUpdatePermissions().then(() => {
-            postPermissionsUpdateMessage &&
-              setPostPermissionsUpdateDialogIsOpen(true);
-          });
-        }}
-      />
       <ConnectorPermissionsModal
         owner={owner}
         connector={connector}
@@ -1164,24 +1147,6 @@ function ManagedDataSourceView({
             })()}
             icon={CONNECTOR_CONFIGURATIONS[connectorProvider].logoComponent}
           />
-          {isAdmin && displayManagePermissionButton ? (
-            <Button
-              className="ml-auto"
-              label="Manage permissions"
-              variant="tertiary"
-              icon={LockIcon}
-              disabled={readOnly || !isAdmin}
-              onClick={() => {
-                if (displayDataSourceDetailsModal) {
-                  setShowDataSourceDetailsModal(true);
-                } else {
-                  void handleUpdatePermissions();
-                }
-              }}
-            />
-          ) : (
-            <></>
-          )}
           {isBuilder && displaySettingsButton ? (
             <Link
               className="ml-auto"
@@ -1217,22 +1182,16 @@ function ManagedDataSourceView({
                     label={addDataButtonLabel}
                     variant="primary"
                     icon={ListCheckIcon}
-                    disabled={readOnly || !isAdmin}
+                    disabled={readOnly}
                     onClick={() => {
-                      if (
-                        !displayManagePermissionButton &&
-                        displayDataSourceDetailsModal
-                      ) {
-                        setShowDataSourceDetailsModal(true);
-                      } else if (displayManagePermissionButton) {
+                      if (displayManagePermissionButton) {
                         setShowPermissionModal(true);
                       } else {
                         void handleUpdatePermissions();
                       }
                     }}
                   />
                 )}
-
                 {guideLink && (
                   <Button
                     label="Read our guide"

diff --git a/front/pages/w/[wId]/builder/data-sources/managed.tsx b/front/pages/w/[wId]/builder/data-sources/managed.tsx
@@ -682,7 +682,7 @@ function getTableColumns(): ColumnDef<RowData, unknown>[] {
       ),
     },
     {
-      header: "Manage",
+      id: "manage",
       cell: (info: Info) => {
         const original = info.row.original;
         const disabled = original.isLoading || !original.isAdmin;
@@ -700,17 +700,18 @@ function getTableColumns(): ColumnDef<RowData, unknown>[] {
             </DataTable.Cell>
           );
         } else {
+          if (original.isAdmin) {
           return (
             <DataTable.Cell className="relative">
               <Button
                 variant="secondary"
                 icon={Cog6ToothIcon}
-                disabled={disabled}
                 onClick={original.buttonOnClick}
-                label={original.isAdmin ? "Manage" : "View"}
+                label="Manage"
               />
             </DataTable.Cell>
           );
+          }
         }
       },
     },