[Discover 2.0] Loading fix for databases (opensearch-project#7567)

* add back in useeffect for loading databases Signed-off-by: Sean Li <[email protected]> * Changeset file for PR opensearch-project#7567 created/updated --------- Signed-off-by: Sean Li <[email protected]> Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com>
ananzh · Jul 30, 2024 · 63917ef · 63917ef
1 parent ea4071c
commit 63917ef
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/changelogs/fragments/7567.yml b/changelogs/fragments/7567.yml
@@ -0,0 +1,2 @@
+fix:
+- Fixes databases not being displayed upon success ([#7567](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/7567))
diff --git a/src/plugins/data/public/ui/dataset_navigator/dataset_navigator.tsx b/src/plugins/data/public/ui/dataset_navigator/dataset_navigator.tsx
@@ -286,6 +286,29 @@ export const DataSetNavigator: React.FC<DataSetNavigatorProps> = ({
     [selectedDataSetState?.dataSourceRef, tablesLoadStatus, startLoadingTables]
   );
 
+  useEffect(() => {
+    const status = databasesLoadStatus.toLowerCase();
+    if (
+      selectedDataSetState?.dataSourceRef &&
+      selectedDataSetState.dataSourceRef.type === SIMPLE_DATA_SOURCE_TYPES.EXTERNAL
+    ) {
+      const dataSourceCache = CatalogCacheManager.getOrCreateDataSource(
+        selectedDataSetState.dataSourceRef.name,
+        selectedDataSetState.dataSourceRef.id
+      );
+      if (status === DirectQueryLoadingStatus.SUCCESS) {
+        setCachedDatabases(
+          dataSourceCache.databases.map((db) => ({ id: db.name, title: db.name }))
+        );
+      } else if (
+        status === DirectQueryLoadingStatus.CANCELED ||
+        status === DirectQueryLoadingStatus.FAILED
+      ) {
+        notifications.toasts.addWarning('Error loading databases');
+      }
+    }
+  }, [databasesLoadStatus, selectedDataSetState?.dataSourceRef, notifications.toasts]);
+
   useEffect(() => {
     if (
       selectedDataSetState?.dataSourceRef &&