[MDS] Fix showing DQS sources list in workspaces

changelogs/fragments/8838.yml

@@ -0,0 +1,2 @@
+fix:
+- [MDS] Fix showing DQS sources list in workspaces ([#8838](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8838))

src/plugins/data_source_management/public/components/direct_query_data_sources_components/direct_query_data_connection/manage_direct_query_data_connections_table.tsx

@@ -41,11 +41,13 @@
   deleteMultipleDataSources,
   setFirstDataSourceAsDefault,
   getHideLocalCluster,
+  getDataConnections,
 } from '../../utils';
 import { LoadingMask } from '../../loading_mask';
 import { useOpenSearchDashboards } from '../../../../../opensearch_dashboards_react/public';
 import { DATACONNECTIONS_BASE, LOCAL_CLUSTER } from '../../../constants';
 import { DEFAULT_DATA_SOURCE_UI_SETTINGS_ID } from '../../constants';
+import { DataConnectionType } from '../../../../../data_source/common';
 
 interface DirectQueryDataConnectionsProps extends RouteComponentProps {
   featureFlagStatus: boolean;
@@ -128,50 +130,68 @@
   const fetchDataSources = useCallback(() => {
     setIsLoading(true);
 
-    const fetchConnections = featureFlagStatus
-      ? getDataSources(savedObjects.client)
-      : http.get(`${DATACONNECTIONS_BASE}`);
-
-    return fetchConnections
-      .then((response) => {
-        return featureFlagStatus
-          ? fetchDataSourceConnections(
-              response,
-              http,
-              notifications,
-              true,
-              getHideLocalCluster().enabled
-            )
-          : response.map((dataConnection: DirectQueryDatasourceDetails) => ({
-              id: dataConnection.name,
-              title: dataConnection.name,
-              type:
-                {
-                  S3GLUE: 'Amazon S3',
-                  PROMETHEUS: 'Prometheus',
-                }[dataConnection.connector] || dataConnection.connector,
-              connectionType: dataConnection.connector,
-              description: dataConnection.description,
-            }));
-      })
-      .then((finalData) => {
-        setData(
-          featureFlagStatus
+    const fetchOpenSearchConnections = async (): Promise<DataSourceTableItem[]> => {
+      const fetchConnections = featureFlagStatus
+        ? getDataSources(savedObjects.client)
+        : http.get(`${DATACONNECTIONS_BASE}`);
+
+      return fetchConnections
+        .then((response) => {
+          return featureFlagStatus
+            ? fetchDataSourceConnections(
+                response,
+                http,
+                notifications,
+                true,
+                getHideLocalCluster().enabled
+              )
+            : response.map((dataConnection: DirectQueryDatasourceDetails) => ({
+                id: dataConnection.name,
+                title: dataConnection.name,
+                type:
+                  {
+                    S3GLUE: 'Amazon S3',
+                    PROMETHEUS: 'Prometheus',
+                  }[dataConnection.connector] || dataConnection.connector,
+                connectionType: dataConnection.connector,
+                description: dataConnection.description,
+              }));
+        })
+        .then((finalData) => {
+          return featureFlagStatus
             ? finalData.filter((item) => item.relatedConnections?.length > 0)
-            : finalData
-        );
-      })
-      .catch(() => {
-        setData([]);
-        notifications.toasts.addDanger(
-          i18n.translate('dataSourcesManagement.directQueryTable.fetchDataSources', {
-            defaultMessage: 'Could not fetch data sources',
-          })
-        );
-      })
-      .finally(() => {
-        setIsLoading(false);
-      });
+            : finalData;
+        })
+        .catch(() => {
+          notifications.toasts.addDanger(
+            i18n.translate('dataSourcesManagement.directQueryTable.fetchDataSources', {
+              defaultMessage: 'Could not fetch data sources',
+            })
+          );
+          return [];
+        });
+    };
+
+    const fetchDirectQueryConnections = async (): Promise<DataSourceTableItem[]> => {
+      try {
+        const dataConnectionSavedObjects = await getDataConnections(savedObjects.client);
+        return dataConnectionSavedObjects.map((obj) => ({
+          id: obj.id,
+          title: obj.attributes.connectionId,
+          type: obj.attributes.type,
+        }));
+      } catch (error: any) {
+        return [];
+      }
+    };
+
+    const fetchAllData = async () => {
+      const newData = await fetchOpenSearchConnections();
+      setData(newData.concat(await fetchDirectQueryConnections()));
+      setIsLoading(false);
+    };
+
+    fetchAllData();
   }, [http, savedObjects, notifications, featureFlagStatus]);
 
   /* Delete selected data sources*/
@@ -385,17 +405,25 @@
           record.connectionType !== DataSourceConnectionType.OpenSearchConnection
             ? { marginLeft: '20px' }
             : {};
-        return (
-          <EuiButtonEmpty
-            size="xs"
-            href={`${window.location.href.replace(/\/$/, '')}/${path}`}
-            style={indentStyle}
-            disabled={record.id === LOCAL_CLUSTER}
-            flush="left"
-          >
-            {name}
-          </EuiButtonEmpty>
-        );
+        if (
+          record.type === DataConnectionType.SecurityLake ||
+          record.type === DataConnectionType.CloudWatch
+        ) {
+          // TODO: link to details page for security lake and cloudwatch
+          return <span style={indentStyle}> {name}</span>;
+        } else {
+          return (
+            <EuiButtonEmpty
+              size="xs"
+              href={`${window.location.href.replace(/\/$/, '')}/${path}`}
+              style={indentStyle}
+              disabled={record.id === LOCAL_CLUSTER}
+              flush="left"
+            >
+              {name}
+            </EuiButtonEmpty>
+          );
+        }
       },
     },
     {

src/plugins/data_source_management/public/components/utils.ts

@@ -37,6 +37,7 @@
 } from '../service/data_source_selection_service';
 import { DataSourceError } from '../types';
 import { DATACONNECTIONS_BASE, LOCAL_CLUSTER } from '../constants';
+import { DataConnectionSavedObjectAttributes } from '../../../data_source/common/data_connections';
 
 export const getDirectQueryConnections = async (dataSourceId: string, http: HttpSetup) => {
   const endpoint = `${DATACONNECTIONS_BASE}/dataSourceMDSId=${dataSourceId}`;
@@ -181,6 +182,17 @@
     );
 }
 
+export async function getDataConnections(savedObjectsClient: SavedObjectsClientContract) {
+  return savedObjectsClient
+    .find<DataConnectionSavedObjectAttributes>({
+      type: 'data-connection',
+      perPage: 10000,
+    })
+    .then((response) => {
+      return response?.savedObjects;
+    });
+}
+
 export async function getDataSourcesWithFields(
   savedObjectsClient: SavedObjectsClientContract,
   fields: string[]