Disable non index pattern datasources redirection when new nav is on and query enhancement is off

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

@@ -15,6 +15,7 @@ import {
   defaultDataSourceMetadata,
   s3DataSourceMetadata,
 } from '../constants';
+import { IUiSettingsClient } from '../../../../../../src/core/public';
 
 describe('DataSourceSelectable', () => {
   let dataSourcesMock: DataSource[];
@@ -23,6 +24,7 @@ describe('DataSourceSelectable', () => {
   let setSelectedSourcesMock: (sources: DataSourceOption[]) => void = jest.fn();
   let setDataSourceOptionListMock: (sources: DataSourceGroup[]) => void = jest.fn();
   let onFetchDataSetErrorMock: (error: Error) => void = jest.fn();
+  let uiSettingsMock: IUiSettingsClient;
   const onRefresh: () => void = jest.fn();
 
   beforeEach(() => {
@@ -46,6 +48,27 @@ describe('DataSourceSelectable', () => {
     setSelectedSourcesMock = jest.fn();
     setDataSourceOptionListMock = jest.fn();
     onFetchDataSetErrorMock = jest.fn();
+    uiSettingsMock = {
+      get: jest.fn().mockImplementation((key) => {
+        switch (key) {
+          case 'home:useNewHomePage':
+            return true; // or false based on your test case
+          case 'query:enhancements:enabled':
+            return true; // or false based on your test case
+          default:
+            return undefined;
+        }
+      }),
+      get$: jest.fn(),
+      getAll: jest.fn(),
+      set: jest.fn(),
+      overrideLocalDefault: jest.fn(),
+      remove: jest.fn(),
+      removeMany: jest.fn(),
+      isDeclared: jest.fn(),
+      isDefault: jest.fn(),
+      isCustom: jest.fn(),
+    };
   });
 
   it('renders without crashing', () => {
@@ -58,6 +81,7 @@ describe('DataSourceSelectable', () => {
         setDataSourceOptionList={setDataSourceOptionListMock}
         onGetDataSetError={onFetchDataSetErrorMock}
         onRefresh={onRefresh}
+        uiSettings={uiSettingsMock}
       />
     );
   });
@@ -73,6 +97,7 @@ describe('DataSourceSelectable', () => {
           setDataSourceOptionList={setDataSourceOptionListMock}
           onGetDataSetError={onFetchDataSetErrorMock}
           onRefresh={onRefresh}
+          uiSettings={uiSettingsMock}
         />
       );
     });
@@ -93,6 +118,7 @@ describe('DataSourceSelectable', () => {
           setDataSourceOptionList={setDataSourceOptionListMock}
           onGetDataSetError={onFetchDataSetErrorMock}
           onRefresh={onRefresh}
+          uiSettings={uiSettingsMock}
         />
       );
     });
@@ -131,6 +157,7 @@ describe('DataSourceSelectable', () => {
         setDataSourceOptionList={setDataSourceOptionListMock}
         onGetDataSetError={onFetchDataSetErrorMock}
         onRefresh={onRefresh}
+        uiSettings={uiSettingsMock}
       />
     );
 
@@ -183,6 +210,7 @@ describe('DataSourceSelectable', () => {
         setDataSourceOptionList={setDataSourceOptionListMock}
         onGetDataSetError={onFetchDataSetErrorMock}
         onRefresh={onRefresh}
+        uiSettings={uiSettingsMock}
       />
     );
 
@@ -235,6 +263,7 @@ describe('DataSourceSelectable', () => {
         setDataSourceOptionList={setDataSourceOptionListMock}
         onGetDataSetError={onFetchDataSetErrorMock}
         onRefresh={onRefresh}
+        uiSettings={uiSettingsMock}
       />
     );
 
@@ -259,6 +288,7 @@ describe('DataSourceSelectable', () => {
         setDataSourceOptionList={setDataSourceOptionListMock}
         onGetDataSetError={onFetchDataSetErrorMock}
         onRefresh={onRefresh}
+        uiSettings={uiSettingsMock}
       />
     );
     const refreshButton = getByLabelText('sourceRefresh');

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

@@ -123,10 +123,13 @@
   onGetDataSetError, //   onGetDataSetError, Callback for handling get data set errors. Ensure it's memoized.
   singleSelection = { asPlainText: true },
   onRefresh,
+  uiSettings,
   ...comboBoxProps
 }: DataSourceSelectableProps) => {
   // This effect gets data sets and prepares the datasource list for UI rendering.
   useEffect(() => {
+    const newHomePageEnabled = uiSettings.get('home:useNewHomePage');
+    const queryEnhancementsEnabled = uiSettings.get('query:enhancements:enabled');
     Promise.all(
       getAllDataSets(
         dataSources.filter((ds) => ds.getMetadata().ui.selector.displayDatasetsAsSource)
@@ -136,12 +139,14 @@
         setDataSourceOptionList(
           consolidateDataSourceGroups(
             dataSetResults as DataSetWithDataSource[],
-            dataSources.filter((ds) => !ds.getMetadata().ui.selector.displayDatasetsAsSource)
+            newHomePageEnabled && !queryEnhancementsEnabled
+              ? []
+              : dataSources.filter((ds) => !ds.getMetadata().ui.selector.displayDatasetsAsSource)
           )
         );
       })
       .catch((e) => onGetDataSetError(e));
-  }, [dataSources, setDataSourceOptionList, onGetDataSetError]);
+  }, [dataSources, setDataSourceOptionList, onGetDataSetError, uiSettings]);
 
   const handleSourceChange = useCallback(
     (selectedOptions: any) => onDataSourceSelect(selectedOptions),

src/plugins/data/public/data_sources/datasource_selector/types.ts

@@ -8,6 +8,7 @@
  */
 
 import { EuiComboBoxProps, EuiComboBoxSingleSelectionShape } from '@elastic/eui';
+import { IUiSettingsClient } from 'opensearch-dashboards/public';
 import { DataSource } from '../datasource/datasource';
 
 export interface DataSourceGroup {
@@ -35,4 +36,5 @@ export interface DataSourceSelectableProps extends Pick<EuiComboBoxProps<unknown
   selectedSources: DataSourceOption[];
   setDataSourceOptionList: (dataSourceList: DataSourceGroup[]) => void;
   onRefresh: () => void;
+  uiSettings: IUiSettingsClient;
 }

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

@@ -27,6 +27,7 @@ export const Sidebar: FC = ({ children }) => {
       data: { indexPatterns, dataSources, ui },
       notifications: { toasts },
       application,
+      uiSettings,
     },
   } = useOpenSearchDashboards<DataExplorerServices>();
 
@@ -168,6 +169,7 @@ export const Sidebar: FC = ({ children }) => {
               selectedSources={selectedSources}
               onGetDataSetError={handleGetDataSetError}
               onRefresh={memorizedReload}
+              uiSettings={uiSettings}
               fullWidth
             />
           </EuiSplitPanel.Inner>