Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Page Header]Make saved queries a context menu item in filter options instead of a button #7788

Merged
merged 1 commit into from
Aug 21, 2024
Merged

[Page Header]Make saved queries a context menu item in filter options instead of a button #7788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/plugins/data/public/ui/filter_bar/filter_options.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,12 @@ describe('Filter options menu', () => {
expect(wrapper.find('[data-test-subj="add-filter-panel"]').exists()).toBeTruthy();
});

it("render filter options with 'Save Query' button", () => {
it("render saved query panel with 'saved queries' 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);
const saveQueryButton = wrapper.find('[data-test-subj="savedQueries"]').at(0);
expect(saveQueryButton.exists()).toBeTruthy();
saveQueryButton.simulate('click');
expect(wrapper.find('[data-test-subj="save-query-panel"]').exists()).toBeTruthy();
Expand Down
62 changes: 26 additions & 36 deletions src/plugins/data/public/ui/filter_bar/filter_options.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,13 @@ import {
EuiContextMenu,
EuiPopover,
EuiToolTip,
EuiButton,
EuiPopoverFooter,
EuiFlexGroup,
EuiFlexItem,
EuiSmallButtonEmpty,
EuiIcon,
EuiResizeObserver,
EuiContextMenuPanelItemDescriptor,
EuiContextMenuPanel,
EuiContextMenuPanelDescriptor,
} from '@elastic/eui';
import { stringify } from '@osd/std';
import { InjectedIntl, injectI18n } from '@osd/i18n/react';
Expand Down Expand Up @@ -83,7 +82,6 @@ const FilterOptionsUI = (props: Props) => {
const [isPopoverOpen, setIsPopoverOpen] = React.useState(false);
const [renderedComponent, setRenderedComponent] = React.useState('menu');
const [filterWidth, setFilterWidth] = React.useState(maxFilterWidth);
const [showSaveQueryButton, setShowSaveQueryButton] = React.useState(true);
const opensearchDashboards = useOpenSearchDashboards();
const uiSettings = opensearchDashboards.services.uiSettings;
const isPinned = uiSettings!.get(UI_SETTINGS.FILTERS_PINNED_BY_DEFAULT);
Expand All @@ -94,7 +92,6 @@ const FilterOptionsUI = (props: Props) => {

const togglePopover = () => {
setRenderedComponent('menu');
setShowSaveQueryButton(true);
setIsPopoverOpen((prevState) => !prevState);
};

Expand Down Expand Up @@ -152,23 +149,40 @@ const FilterOptionsUI = (props: Props) => {
setFilterWidth(dimensions.width);
}

const addFilterPanelItem = {
const addFilterPanelItem: EuiContextMenuPanelItemDescriptor = {
name: props.intl.formatMessage({
id: 'data.filter.options.addFiltersButtonLabel',
defaultMessage: 'Add filters',
}),
icon: 'plusInCircle',
onClick: () => {
setRenderedComponent('addFilter');
setShowSaveQueryButton(false);
},
'data-test-subj': 'addFilters',
disabled: false,
};

const savedQueriesPanelItem: EuiContextMenuPanelItemDescriptor = {
name: props.intl.formatMessage({
id: 'data.filter.options.savedQueriesButtonLabel',
defaultMessage: 'Saved queries',
}),
icon: 'folderOpen',
onClick: () => {
setRenderedComponent('saveQuery');
},
'data-test-subj': 'savedQueries',
disabled: false,
};

const menuOptionsSeparator: EuiContextMenuPanelItemDescriptor = {
isSeparator: true,
key: 'sep',
};

const disableMenuOption = props.filters.length === 0 && useNewHeader;

const panelTree = [
const panelTree: EuiContextMenuPanelDescriptor[] = [
{
id: 0,
title: 'Filters',
Expand Down Expand Up @@ -339,7 +353,10 @@ const FilterOptionsUI = (props: Props) => {
};

if (useNewHeader) {
panelTree[0].items.unshift(addFilterPanelItem);
panelTree[0].items?.unshift(addFilterPanelItem);
panelTree[0].items?.push(menuOptionsSeparator);
panelTree[0].items?.push(savedQueriesPanelItem);
panelTree[0].title = '';
}

const label = i18n.translate('data.search.searchBar.savedQueryPopoverButtonText', {
Expand Down Expand Up @@ -395,33 +412,6 @@ const FilterOptionsUI = (props: Props) => {
repositionOnScroll
>
{useNewHeader ? renderComponent() : props.useSaveQueryMenu ? saveQueryPanel : menuPanel}
{useNewHeader && showSaveQueryButton && (
<EuiPopoverFooter>
<EuiFlexGroup justifyContent="spaceAround">
<EuiFlexItem>
<EuiButton
size="s"
fill={false}
aria-label={i18n.translate(
'data.search.searchBar.savedQueryPopoverSaveButtonAriaLabel',
{
defaultMessage: 'Save a new saved query',
}
)}
data-test-subj="saved-query-management-save-button"
onClick={() => {
setRenderedComponent('saveQuery');
setShowSaveQueryButton(false);
}}
>
{i18n.translate('data.search.searchBar.savedQueryPopoverSaveButtonText', {
defaultMessage: 'Save query',
})}
</EuiButton>
</EuiFlexItem>
</EuiFlexGroup>
</EuiPopoverFooter>
)}
</EuiPopover>
);
};
Expand Down
Loading