Discover Flint datasource selector implementation

src/plugins/data/common/search/search_source/fetch/get_search_params.ts

@@ -60,9 +60,11 @@
   const searchParams = getSearchParams(getConfig);
   const dataFrame = getDataFrame();
   const indexTitle = searchRequest.index.title || searchRequest.index;
+  const dataSource = searchRequest.dataSource;
 
   return {
     index: indexTitle,
+    dataSource,
     body: {
       ...searchRequest.body,
       ...(dataFrame && dataFrame?.name === indexTitle ? { df: dataFrame } : {}),

src/plugins/data/common/search/search_source/search_source.ts

@@ -506,6 +506,7 @@ export class SearchSource {
         const fields = uniq((data[key] || []).concat(val));
         return addToRoot(key, fields);
       case 'index':
+      case 'dataSource':
       case 'type':
       case 'highlightAll':
         return key && data[key] == null && addToRoot(key, val);

src/plugins/data/common/search/search_source/types.ts

@@ -29,6 +29,7 @@
  */
 
 import { NameList } from 'elasticsearch';
+import { DataSource } from 'src/plugins/data/public';
 import { Filter, IDataFrame, IndexPattern, Query } from '../..';
 import { SearchSource } from './search_source';
 
@@ -104,6 +105,7 @@ export interface SearchSourceFields {
   timeout?: string;
   terminate_after?: number;
   df?: IDataFrame;
+  dataSource: DataSource;
 }
 
 export interface SearchSourceOptions {

src/plugins/data/public/data_sources/constants.tsx

@@ -6,9 +6,7 @@
 import { i18n } from '@osd/i18n';
 import { DataSourceUIGroupType } from './datasource/types';
 
-export const S3_GLUE_DATA_SOURCE_DISPLAY_NAME = 'Amazon S3';
-export const S3_GLUE_DATA_SOURCE_TYPE = 's3glue';
-export const DEFAULT_DATA_SOURCE_TYPE = 'DEFAULT_INDEX_PATTERNS';
+export const DEFAULT_DATA_SOURCE_TYPE = 'default';
 export const DEFAULT_DATA_SOURCE_NAME = i18n.translate('data.datasource.type.openSearchDefault', {
   defaultMessage: 'OpenSearch Default',
 });
@@ -30,17 +28,5 @@ export const defaultDataSourceMetadata = {
   },
 };
 
-export const s3DataSourceMetadata = {
-  ui: {
-    label: S3_GLUE_DATA_SOURCE_DISPLAY_NAME,
-    typeLabel: S3_GLUE_DATA_SOURCE_TYPE,
-    groupType: DataSourceUIGroupType.s3glue,
-    selector: {
-      displayDatasetsAsSource: false,
-    },
-  },
-};
-
 export const DATA_SELECTOR_REFRESHER_POPOVER_TEXT = 'Refresh data selector';
 export const DATA_SELECTOR_DEFAULT_PLACEHOLDER = 'Select a data source';
-export const DATA_SELECTOR_S3_DATA_SOURCE_GROUP_HINT_LABEL = ' - Opens in Log Explorer';

src/plugins/data/public/data_sources/datasource_selector/datasource_selectable.tsx

@@ -12,7 +12,6 @@ import { DataSelectorRefresher } from './data_selector_refresher';
 import {
   DATA_SELECTOR_DEFAULT_PLACEHOLDER,
   DATA_SELECTOR_REFRESHER_POPOVER_TEXT,
-  DATA_SELECTOR_S3_DATA_SOURCE_GROUP_HINT_LABEL,
 } from '../constants';
 
 // Asynchronously retrieves and formats dataset from a given data source.
@@ -68,18 +67,12 @@ const addOrUpdateGroup = (
 ) => {
   const metadata = dataSource.getMetadata();
   const groupType = metadata.ui.groupType;
-  let groupName =
+  const groupName =
     metadata.ui.typeLabel ||
     i18n.translate('dataExplorer.dataSourceSelector.defaultGroupTitle', {
       defaultMessage: 'Default Group',
     });
 
-  if (dataSource.getType() !== 'DEFAULT_INDEX_PATTERNS') {
-    groupName += i18n.translate('dataExplorer.dataSourceSelector.redirectionHint', {
-      defaultMessage: DATA_SELECTOR_S3_DATA_SOURCE_GROUP_HINT_LABEL,
-    });
-  }
-
   const group = existingGroups.find((g: DataSourceGroup) => g.id === groupType);
   if (group && !group.options.some((opt) => opt.key === option.key)) {
     group.options.push(option);

src/plugins/data_explorer/public/components/sidebar/index.tsx

@@ -12,6 +12,7 @@
 import { DataExplorerServices } from '../../types';
 import { setIndexPattern, useTypedDispatch, useTypedSelector } from '../../utils/state_management';
 import './index.scss';
+import { setDataSource } from '../../utils/state_management/metadata_slice';
 
 export const Sidebar: FC = ({ children }) => {
   const { indexPattern: indexPatternId } = useTypedSelector((state) => state.metadata);
@@ -25,7 +26,6 @@
     services: {
       data: { indexPatterns, dataSources, ui },
       notifications: { toasts },
-      application,
     },
   } = useOpenSearchDashboards<DataExplorerServices>();
 
@@ -77,31 +77,19 @@
     }
   }, [indexPatternId, activeDataSources, dataSourceOptionList]);
 
-  const redirectToLogExplorer = useCallback(
-    (dsName: string, dsType: string) => {
-      return application.navigateToUrl(
-        `../observability-logs#/explorer?datasourceName=${dsName}&datasourceType=${dsType}`
-      );
-    },
-    [application]
-  );
-
   const handleSourceSelection = useCallback(
     (selectedDataSources: DataSourceOption[]) => {
+      setSelectedSources(selectedDataSources);
       if (selectedDataSources.length === 0) {
-        setSelectedSources(selectedDataSources);
         return;
       }
-      // Temporary redirection solution for 2.11, where clicking non-index-pattern data sources
-      // will prompt users with modal explaining they are being redirected to Observability log explorer
-      if (selectedDataSources[0]?.ds?.getType() !== 'DEFAULT_INDEX_PATTERNS') {
-        redirectToLogExplorer(selectedDataSources[0].label, selectedDataSources[0].type);
-        return;
+
+      if (selectedDataSources[0].type === 'default') {
+        dispatch(setIndexPattern(selectedDataSources[0].value));
       }
-      setSelectedSources(selectedDataSources);
-      dispatch(setIndexPattern(selectedDataSources[0].value));
+      dispatch(setDataSource(selectedDataSources[0].ds.getId()));
     },
-    [dispatch, redirectToLogExplorer, setSelectedSources]
+    [dispatch, setSelectedSources]
   );
 
   const handleGetDataSetError = useCallback(

src/plugins/data_explorer/public/utils/state_management/metadata_slice.ts

@@ -8,6 +8,7 @@
 
 export interface MetadataState {
   indexPattern?: string;
+  dataSource?: string;
   originatingApp?: string;
   view?: string;
 }
@@ -40,6 +41,9 @@
     setIndexPattern: (state, action: PayloadAction<string>) => {
       state.indexPattern = action.payload;
     },
+    setDataSource: (state, action: PayloadAction<string>) => {
+      state.dataSource = action.payload;
+    },
     setOriginatingApp: (state, action: PayloadAction<string | undefined>) => {
       state.originatingApp = action.payload;
     },
@@ -53,4 +57,10 @@
 });
 
 export const { reducer } = slice;
-export const { setIndexPattern, setOriginatingApp, setView, setState } = slice.actions;
+export const {
+  setIndexPattern,
+  setDataSource,
+  setOriginatingApp,
+  setView,
+  setState,
+} = slice.actions;

src/plugins/discover/public/application/view_components/utils/update_search_source.ts

@@ -8,13 +8,15 @@ import {
   ISearchSource,
   indexPatterns as indexPatternUtils,
   AggConfigs,
+  DataSource,
 } from '../../../../../data/public';
 import { DiscoverServices } from '../../../build_services';
 import { SortOrder } from '../../../saved_searches/types';
 import { getSortForSearchSource } from './get_sort_for_search_source';
 import { SORT_DEFAULT_ORDER_SETTING, SAMPLE_SIZE_SETTING } from '../../../../common';
 
 interface Props {
+  dataSource: DataSource | undefined;
   indexPattern: IndexPattern;
   services: DiscoverServices;
   sort: SortOrder[] | undefined;
@@ -23,6 +25,7 @@ interface Props {
 }
 
 export const updateSearchSource = async ({
+  dataSource,
   indexPattern,
   services,
   searchSource,
@@ -67,6 +70,7 @@ export const updateSearchSource = async ({
   searchSourceInstance.setParent(timeRangeSearchSource);
 
   searchSourceInstance.setFields({
+    dataSource,
     index: dataSet,
     sort: sortForSearchSource,
     size,

src/plugins/discover/public/application/view_components/utils/use_datasource.ts

@@ -0,0 +1,40 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { useEffect, useState } from 'react';
+import { DataSource, IDataSourceFilter } from '../../../../../data/public';
+import { useSelector } from '../../utils/state_management';
+import { DiscoverViewServices } from '../../../build_services';
+
+export const useDataSource = (services: DiscoverViewServices) => {
+  const dataSourceId = useSelector((state) => state.metadata.dataSource);
+  const [dataSource, setDataSource] = useState<DataSource | undefined>(undefined);
+  const { data } = services;
+
+  useEffect(() => {
+    let isMounted = true;
+    let subscription;
+
+    if (dataSourceId) {
+      // get the data source object from the id
+      subscription = data.dataSources.dataSourceService
+        .getDataSources$([dataSourceId] as IDataSourceFilter)
+        .subscribe((ds) => {
+          if (isMounted) {
+            setDataSource(ds[dataSourceId]);
+          }
+        });
+    } else {
+      subscription = data.dataSources.dataSourceService.getDataSources$().subscribe(() => {});
+    }
+
+    return () => {
+      subscription.unsubscribe();
+      isMounted = false;
+    };
+  }, [dataSourceId, data.dataSources]);
+
+  return dataSource;
+};

src/plugins/discover/public/application/view_components/utils/use_search.ts

@@ -31,6 +31,7 @@ import {
   getResponseInspectorStats,
 } from '../../../opensearch_dashboards_services';
 import { SEARCH_ON_PAGE_LOAD_SETTING } from '../../../../common';
+import { useDataSource } from './use_datasource';
 
 export enum ResultStatus {
   UNINITIALIZED = 'uninitialized',
@@ -73,6 +74,7 @@ export const useSearch = (services: DiscoverViewServices) => {
   const { savedSearch: savedSearchId, sort, interval } = useSelector((state) => state.discover);
   const { data, filterManager, getSavedSearchById, core, toastNotifications, chrome } = services;
   const indexPattern = useIndexPattern(services);
+  const dataSource = useDataSource(services);
   const timefilter = data.query.timefilter.timefilter;
   const fetchStateRef = useRef<{
     abortController: AbortController | undefined;
@@ -128,6 +130,7 @@ export const useSearch = (services: DiscoverViewServices) => {
       ? createHistogramConfigs(dataSet, interval || 'auto', data)
       : undefined;
     const searchSource = await updateSearchSource({
+      dataSource,
       indexPattern: dataSet,
       services,
       sort,
@@ -220,6 +223,7 @@ export const useSearch = (services: DiscoverViewServices) => {
     }
   }, [
     indexPattern,
+    dataSource,
     interval,
     timefilter,
     toastNotifications,