Fix everything in mds refresh

Signed-off-by: Ryan Liang <jiallian@amazon.com>
RyanL1997 · Jul 19, 2024 · 77b3d5e · 77b3d5e
1 parent 074b959
commit 77b3d5e
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 33 deletions.
diff --git a/src/plugins/data_source_management/framework/catlog_cache/cache_loader.tsx b/src/plugins/data_source_management/framework/catlog_cache/cache_loader.tsx
@@ -413,15 +413,7 @@ export const useLoadToCache = (
     }
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [
-    pollingResult,
-    pollingError,
-    currentDataSourceName,
-    currentDatabaseName,
-    currentTableName,
-    loadCacheType,
-    stopLoading,
-  ]);
+  }, [pollingResult, pollingError]);
 
   return { loadStatus, startLoading, stopLoading };
 };

diff --git a/src/plugins/data_source_management/framework/catlog_cache/cache_manager.ts b/src/plugins/data_source_management/framework/catlog_cache/cache_manager.ts
@@ -88,7 +88,7 @@ export class CatalogCacheManager {
     dataSource: CachedAccelerationByDataSource,
     dataSourceMDSId?: string
   ): void {
-    let index;
+    let index = -1;
     const accCacheData = this.getAccelerationsCache();
     if (dataSourceMDSId) {
       index = accCacheData.dataSources.findIndex(
@@ -97,8 +97,7 @@ export class CatalogCacheManager {
       );
     } else {
       index = accCacheData.dataSources.findIndex(
-        (ds: CachedAccelerationByDataSource) =>
-          ds.name === dataSource.name && ds.dataSourceMDSId === dataSourceMDSId
+        (ds: CachedAccelerationByDataSource) => ds.name === dataSource.name
       );
     }
     if (index !== -1) {
@@ -128,7 +127,6 @@ export class CatalogCacheManager {
     } else {
       cachedDataSource = accCacheData.dataSources.find((ds) => ds.name === dataSourceName);
     }
-
     if (cachedDataSource) return cachedDataSource;
     else {
       let defaultDataSourceObject: CachedAccelerationByDataSource = {

diff --git a/...query_data_sources_components/direct_query_acceleration_management/acceleration_table.tsx b/...query_data_sources_components/direct_query_acceleration_management/acceleration_table.tsx
@@ -90,7 +90,8 @@ export const AccelerationTable = ({
 
   useEffect(() => {
     const cachedDataSource = CatalogCacheManager.getOrCreateAccelerationsByDataSource(
-      dataSourceName
+      dataSourceName,
+      dataSourceMDSId
     );
     if (
       cachedDataSource.status === CachedDataSourceStatus.Empty &&
@@ -102,12 +103,14 @@ export const AccelerationTable = ({
       setAccelerations(cachedDataSource.accelerations);
       setUpdatedTime(cachedDataSource.lastUpdated);
     }
-  }, [accelerationsLoadStatus, dataSourceName, startLoadingAccelerations]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   useEffect(() => {
     if (accelerationsLoadStatus === DirectQueryLoadingStatus.SUCCESS) {
       const cachedDataSource = CatalogCacheManager.getOrCreateAccelerationsByDataSource(
-        dataSourceName
+        dataSourceName,
+        dataSourceMDSId
       );
       setAccelerations(cachedDataSource.accelerations);
       setUpdatedTime(cachedDataSource.lastUpdated);

diff --git a/...a_sources_components/direct_query_associated_object_management/associated_objects_tab.tsx b/...a_sources_components/direct_query_associated_object_management/associated_objects_tab.tsx
@@ -231,6 +231,7 @@ export const AssociatedObjectsTab: React.FC<AssociatedObjectsTabProps> = (props)
       }
       const accelerationsCache = CatalogCacheManager.getOrCreateAccelerationsByDataSource(
         datasource.name
+        // dataSourceMDSId
       );
       if (
         (databaseCache.status === CachedDataSourceStatus.Empty ||
@@ -273,6 +274,7 @@ export const AssociatedObjectsTab: React.FC<AssociatedObjectsTabProps> = (props)
       const accelerationsStatus = accelerationsLoadStatus.toLowerCase();
       const accelerationsCache = CatalogCacheManager.getOrCreateAccelerationsByDataSource(
         datasource.name
+        // dataSourceMDSId
       );
       if (tablesStatus === DirectQueryLoadingStatus.SUCCESS) {
         setCachedTables(databaseCache.tables);

diff --git a/...irect_query_data_sources_components/direct_query_connection_detail/access_control_tab.tsx b/...irect_query_data_sources_components/direct_query_connection_detail/access_control_tab.tsx
@@ -34,16 +34,16 @@ export const AccessControlTab = (props: AccessControlTabProps) => {
   const { http } = useOpenSearchDashboards<DataSourceManagementContext>().services;
 
   useEffect(() => {
-    http!
-      .get(SECURITY_ROLES)
-      .then((data) =>
-        setRoles(
-          Object.keys(data.data).map((key) => {
-            return { label: key };
-          })
-        )
-      )
-      .catch((err) => setHasSecurityAccess(false));
+    // http!
+    //   .get(SECURITY_ROLES)
+    //   .then((data) =>
+    //     setRoles(
+    //       Object.keys(data.data).map((key) => {
+    //         return { label: key };
+    //       })
+    //     )
+    //   )
+    // .catch((err) => setHasSecurityAccess(false));
   }, [http]);
 
   const [selectedQueryPermissionRoles, setSelectedQueryPermissionRoles] = useState<Role[]>(

diff --git a/src/plugins/data_source_management/public/management_app/mount_management_section.tsx b/src/plugins/data_source_management/public/management_app/mount_management_section.tsx
@@ -64,21 +64,20 @@ export async function mountManagementSection(
         <Route path={['/configure/:type']}>
           <ConfigureDirectQueryDataSourceWithRouter notifications={notifications} />
         </Route>
-        {featureFlagStatus && (
-          <Route path={['/:id']}>
-            <EditDataSourceWithRouter />
-          </Route>
-        )}
         <Route path={['/manage/:dataSourceName']}>
           <DirectQueryDataConnectionDetail
             featureFlagStatus={featureFlagStatus}
             http={http}
             notifications={notifications}
-            savedObjects={savedObjects}
-            uiSettings={uiSettings}
             setBreadcrumbs={params.setBreadcrumbs}
+            application={application}
           />
         </Route>
+        {featureFlagStatus && (
+          <Route path={['/:id']}>
+            <EditDataSourceWithRouter />
+          </Route>
+        )}
         <Route path={['/']}>
           <DataSourceHomePanel history={params.history} featureFlagStatus={featureFlagStatus} />
         </Route>