addressing comments

Signed-off-by: Sean Li <[email protected]>
opensearch-project · Mar 25, 2024 · ade9057 · ade9057
1 parent 8dd316f
commit ade9057
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/...ts/datasources/components/manage/associated_objects/associated_objects_details_flyout.tsx b/...ts/datasources/components/manage/associated_objects/associated_objects_details_flyout.tsx
@@ -69,7 +69,6 @@ export const AssociatedObjectsDetailsFlyout = ({
   const { setToast } = useToast();
 
   const DiscoverButton = () => {
-    // TODO: display button if can be sent to discover
     return (
       <EuiButtonEmpty
         onClick={() => {
@@ -234,6 +233,7 @@ export const AssociatedObjectsDetailsFlyout = ({
         ).columns;
         setTableColumns(columns);
       } catch (error) {
+        console.error(error);
         setToast('Your cache is outdated, refresh databases and tables', 'warning');
       }
     }

diff --git a/...ic/components/datasources/components/manage/associated_objects/associated_objects_tab.tsx b/...ic/components/datasources/components/manage/associated_objects/associated_objects_tab.tsx
@@ -15,7 +15,7 @@ import {
   EuiSelectable,
 } from '@elastic/eui';
 import { i18n } from '@osd/i18n';
-import { useToast } from 'public/components/common/toast';
+import { useToast } from '../../../../../../public/components/common/toast';
 import { ACCELERATION_INDEX_TYPES } from '../../../../../../common/constants/data_sources';
 import {
   AssociatedObject,
@@ -209,8 +209,9 @@ export const AssociatedObjectsTab: React.FC<AssociatedObjectsTabProps> = (props)
     if (datasource.name && selectedDatabase) {
       let databaseCache;
       try {
-        databaseCache = CatalogCacheManager.getOrCreateDataSource(datasource.name);
+        databaseCache = CatalogCacheManager.getDatabase(datasource.name, selectedDatabase);
       } catch (error) {
+        console.error(error);
         setToast('Your cache is outdated, refresh databases and tables', 'warning');
         return;
       }
@@ -249,6 +250,8 @@ export const AssociatedObjectsTab: React.FC<AssociatedObjectsTabProps> = (props)
       try {
         databaseCache = CatalogCacheManager.getDatabase(datasource.name, selectedDatabase);
       } catch (error) {
+        console.error(error);
+        setToast('Your cache is outdated, refresh databases and tables', 'warning');
         return;
       }
       const accelerationsStatus = accelerationsLoadStatus.toLowerCase();

diff --git a/...nts/datasources/components/manage/associated_objects/modules/associated_objects_table.tsx b/...nts/datasources/components/manage/associated_objects/modules/associated_objects_table.tsx
@@ -199,8 +199,6 @@ export const AssociatedObjectsTable = (props: AssociatedObjectsTableProps) => {
         if (clause.field !== ASSC_OBJ_TABLE_ACC_COLUMN_NAME) {
           return associatedObject[clause.field] === clause.value;
         } else if (clause.field === ASSC_OBJ_TABLE_ACC_COLUMN_NAME) {
-          console.log('in here');
-          console.log(associatedObject);
           return associatedObject.type !== 'table' && associatedObject.name === clause.value;
         }
 

diff --git a/public/framework/catalog_cache/cache_loader.tsx b/public/framework/catalog_cache/cache_loader.tsx
@@ -164,14 +164,12 @@ export const updateTableColumnsToCache = (
     ts.name === tableName ? { ...ts, columns: tableColumns } : { ...ts }
   );
 
-  if (cachedDatabase.status === CachedDataSourceStatus.Updated) {
-    CatalogCacheManager.updateDatabase(dataSourceName, {
-      ...cachedDatabase,
-      tables: newTables,
-      lastUpdated: currentTime,
-      status: CachedDataSourceStatus.Updated,
-    });
-  }
+  CatalogCacheManager.updateDatabase(dataSourceName, {
+    ...cachedDatabase,
+    tables: newTables,
+    lastUpdated: currentTime,
+    status: CachedDataSourceStatus.Updated,
+  });
 };
 
 export const updateToCache = (