Refactor search bar & filters to conditionally render with new applic…

…ation header

Signed-off-by: Zhongnan Su <[email protected]>

src/plugins/data/common/constants.ts

@@ -63,4 +63,5 @@ export const UI_SETTINGS = {
   QUERY_ENHANCEMENTS_ENABLED: 'query:enhancements:enabled',
   QUERY_DATAFRAME_HYDRATION_STRATEGY: 'query:dataframe:hydrationStrategy',
   SEARCH_QUERY_LANGUAGE_BLOCKLIST: 'search:queryLanguageBlocklist',
+  NEW_HOME_PAGE: 'home:useNewHomePage',
 } as const;

src/plugins/data/public/ui/filter_bar/_global_filter_group.scss

@@ -55,3 +55,12 @@
     margin-top: $euiSize * -1;
   }
 }
+
+.globalFilterGroup__removeAllFilters {
+  color: $euiColorDangerText;
+}
+
+.globalFilterGroup__filterPrefix {
+  padding-top: 10px;
+  padding-right: 10px;
+}

src/plugins/data/public/ui/filter_bar/filter_bar.tsx

@@ -35,6 +35,7 @@ import {
   EuiFlexItem,
   EuiPopover,
   EuiResizeObserver,
+  EuiText,
 } from '@elastic/eui';
 import { FormattedMessage, InjectedIntl, injectI18n } from '@osd/i18n/react';
 import classNames from 'classnames';
@@ -43,20 +44,10 @@ import { stringify } from '@osd/std';
 
 import { FilterEditor } from './filter_editor';
 import { FilterItem } from './filter_item';
-import { FilterOptions } from './filter_options';
 import { useOpenSearchDashboards } from '../../../../opensearch_dashboards_react/public';
 import { IIndexPattern } from '../..';
-import {
-  buildEmptyFilter,
-  Filter,
-  enableFilter,
-  disableFilter,
-  pinFilter,
-  toggleFilterDisabled,
-  toggleFilterNegated,
-  unpinFilter,
-  UI_SETTINGS,
-} from '../../../common';
+import { buildEmptyFilter, Filter, UI_SETTINGS } from '../../../common';
+import { FilterOptions } from './filter_options';
 
 interface Props {
   filters: Filter[];
@@ -74,6 +65,7 @@ function FilterBarUI(props: Props) {
   const [filterWidth, setFilterWidth] = useState(maxFilterWidth);
 
   const uiSettings = opensearchDashboards.services.uiSettings;
+  const useNewHeader = Boolean(uiSettings!.get(UI_SETTINGS.NEW_HOME_PAGE));
   if (!uiSettings) return null;
 
   function onFiltersUpdated(filters: Filter[]) {
@@ -177,40 +169,6 @@ function FilterBarUI(props: Props) {
     onFiltersUpdated(filters);
   }
 
-  function onEnableAll() {
-    const filters = props.filters.map(enableFilter);
-    onFiltersUpdated(filters);
-  }
-
-  function onDisableAll() {
-    const filters = props.filters.map(disableFilter);
-    onFiltersUpdated(filters);
-  }
-
-  function onPinAll() {
-    const filters = props.filters.map(pinFilter);
-    onFiltersUpdated(filters);
-  }
-
-  function onUnpinAll() {
-    const filters = props.filters.map(unpinFilter);
-    onFiltersUpdated(filters);
-  }
-
-  function onToggleAllNegated() {
-    const filters = props.filters.map(toggleFilterNegated);
-    onFiltersUpdated(filters);
-  }
-
-  function onToggleAllDisabled() {
-    const filters = props.filters.map(toggleFilterDisabled);
-    onFiltersUpdated(filters);
-  }
-
-  function onRemoveAll() {
-    onFiltersUpdated([]);
-  }
-
   const classes = classNames('globalFilterBar', props.className);
 
   return (
@@ -221,15 +179,18 @@ function FilterBarUI(props: Props) {
       responsive={false}
     >
       <EuiFlexItem className="globalFilterGroup__branch" grow={false}>
-        <FilterOptions
-          onEnableAll={onEnableAll}
-          onDisableAll={onDisableAll}
-          onPinAll={onPinAll}
-          onUnpinAll={onUnpinAll}
-          onToggleAllNegated={onToggleAllNegated}
-          onToggleAllDisabled={onToggleAllDisabled}
-          onRemoveAll={onRemoveAll}
-        />
+        {useNewHeader ? (
+          <EuiText size="s" className="globalFilterGroup__filterPrefix">
+            Filters:
+          </EuiText>
+        ) : (
+          <FilterOptions
+            filters={props.filters!}
+            onFiltersUpdated={props.onFiltersUpdated}
+            intl={props.intl}
+            indexPatterns={props.indexPatterns}
+          />
+        )}
       </EuiFlexItem>
 
       <EuiFlexItem className="globalFilterGroup__filterFlexItem">

src/plugins/data/public/ui/filter_bar/filter_options.test.tsx

@@ -0,0 +1,99 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import React from 'react';
+import { FilterOptions } from './filter_options';
+import { SavedQueryAttributes } from '../../query';
+import { mountWithIntl } from 'test_utils/enzyme_helpers';
+import { Query } from 'src/plugins/data/common';
+import { useOpenSearchDashboards } from '../../../../opensearch_dashboards_react/public';
+
+// Mock useOpenSearchDashboards hook
+jest.mock('../../../../opensearch_dashboards_react/public', () => ({
+  useOpenSearchDashboards: jest.fn(),
+  withOpenSearchDashboards: (Component: any) => (props: any) => <Component {...props} />,
+}));
+
+const mockProps = () => ({
+  savedQueryService: {
+    saveQuery: jest.fn(),
+    getAllSavedQueries: jest.fn(),
+    findSavedQueries: jest.fn().mockResolvedValue({ total: 0, queries: [] }),
+    getSavedQuery: jest.fn(),
+    deleteSavedQuery: jest.fn(),
+    getSavedQueryCount: jest.fn(),
+  },
+  onSave: jest.fn(),
+  onSaveAsNew: jest.fn(),
+  onLoad: jest.fn(),
+  onClearSavedQuery: jest.fn(),
+  onFiltersUpdated: jest.fn(),
+  showSaveQuery: true,
+  loadedSavedQuery: {
+    id: '1',
+    attributes: {
+      name: 'Test Query',
+      title: '',
+      description: '',
+      query: { query: '', language: 'kuery' } as Query,
+    } as SavedQueryAttributes,
+  },
+  filters: [],
+  indexPatterns: [],
+  useSaveQueryMenu: false,
+});
+
+describe('FilterOptions', () => {
+  beforeEach(() => {
+    // Mocking `uiSettings.get` to return true for `useNewHeader`
+    (useOpenSearchDashboards as jest.Mock).mockReturnValue({
+      services: {
+        uiSettings: {
+          get: jest.fn((key) => {
+            if (key === 'home:useNewHomePage') {
+              return true;
+            }
+            return false;
+          }),
+        },
+      },
+    });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('render menu panel', () => {
+    const wrapper = mountWithIntl(<FilterOptions {...mockProps()} />);
+    const button = wrapper.find('[data-test-subj="showFilterActions"]').at(0);
+
+    button.simulate('click');
+    expect(wrapper.find('[data-test-subj="filter-options-menu-panel"]').exists()).toBeTruthy();
+  });
+
+  it("render filter options with 'Add filter' button", () => {
+    const wrapper = mountWithIntl(<FilterOptions {...mockProps()} />);
+    const button = wrapper.find('[data-test-subj="showFilterActions"]').at(0);
+    button.simulate('click');
+    wrapper.update();
+    const addFilterButton = wrapper.find('[data-test-subj="addFilters"]').at(0);
+    addFilterButton.simulate('click');
+    expect(wrapper.find('[data-test-subj="add-filter-panel"]').exists()).toBeTruthy();
+  });
+
+  it("render filter options with 'Save Query' button", () => {
+    const wrapper = mountWithIntl(<FilterOptions {...mockProps()} />);
+    const button = wrapper.find('[data-test-subj="showFilterActions"]').at(0);
+    button.simulate('click');
+    wrapper.update();
+    const saveQueryButton = wrapper
+      .find('[data-test-subj="saved-query-management-save-button"]')
+      .at(0);
+    expect(saveQueryButton.exists()).toBeTruthy();
+    saveQueryButton.simulate('click');
+    expect(wrapper.find('[data-test-subj="save-query-panel"]').exists()).toBeTruthy();
+  });
+});