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

[Uptime] Enable deselection of stale filters #65523

Merged
merged 4 commits into from
May 12, 2020
Merged

[Uptime] Enable deselection of stale filters #65523

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb03b50
enable unselection
shahzad31 May 6, 2020
d28eaba
Merge branch 'master' into stale-filters
elasticmachine May 11, 2020
14667f2
rename
shahzad31 May 11, 2020
bc6e7fe
Merge branch 'stale-filters' of https://github.com/shahzad31/kibana i…
shahzad31 May 11, 2020
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
4 changes: 2 additions & 2 deletions x-pack/plugins/uptime/public/components/overview/alerts/add_filter_btn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ interface Props {
export const AddFilterButton: React.FC<Props> = ({ newFilters, onNewFilter }) => {
const [isPopoverOpen, setPopover] = useState(false);

const currentFilters = useFilterUpdate();
const { selectedFilters } = useFilterUpdate();

const getSelectedItems = (fieldName: string) => currentFilters.get(fieldName) || [];
const getSelectedItems = (fieldName: string) => selectedFilters.get(fieldName) || [];

const onButtonClick = () => {
setPopover(!isPopoverOpen);
Expand Down
41 changes: 21 additions & 20 deletions ...ptime/public/components/overview/alerts/monitor_expressions/filters_expression_select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ export const FiltersExpressionsSelect: React.FC<Props> = ({
values: string[];
}>({ fieldName: '', values: [] });

const currentFilters = useFilterUpdate(updatedFieldValues.fieldName, updatedFieldValues.values);
const { selectedLocations, selectedPorts, selectedSchemes, selectedTags } = useFilterUpdate(
updatedFieldValues.fieldName,
updatedFieldValues.values
);

useEffect(() => {
if (updatedFieldValues.fieldName === 'observer.geo.name') {
Expand All @@ -45,13 +48,6 @@ export const FiltersExpressionsSelect: React.FC<Props> = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);

const selectedTags = currentFilters.get('tags');
const selectedPorts = currentFilters.get('url.port');
const selectedScheme = currentFilters.get('monitor.type');
const selectedLocation = currentFilters.get('observer.geo.name');

const getSelectedItems = (fieldName: string) => currentFilters.get(fieldName) || [];

const onFilterFieldChange = (fieldName: string, values: string[]) => {
setUpdatedFieldValues({ fieldName, values });
};
Expand All @@ -64,10 +60,11 @@ export const FiltersExpressionsSelect: React.FC<Props> = ({
id: 'filter_port',
disabled: ports?.length === 0,
items: ports?.map((p: number) => p.toString()) ?? [],
selectedItems: getSelectedItems('url.port'),
selectedItems: selectedPorts,
title: filterLabels.PORT,
description: selectedPorts ? alertFilterLabels.USING_PORT : alertFilterLabels.USING,
value: selectedPorts?.join(',') ?? alertFilterLabels.ANY_PORT,
description:
selectedPorts.length === 0 ? alertFilterLabels.USING : alertFilterLabels.USING_PORT,
value: selectedPorts.length === 0 ? alertFilterLabels.ANY_PORT : selectedPorts?.join(','),
},
{
onFilterFieldChange,
Expand All @@ -76,10 +73,10 @@ export const FiltersExpressionsSelect: React.FC<Props> = ({
id: 'filter_tags',
disabled: tags?.length === 0,
items: tags ?? [],
selectedItems: getSelectedItems('tags'),
selectedItems: selectedTags,
title: filterLabels.TAGS,
description: selectedTags ? alertFilterLabels.WITH_TAG : alertFilterLabels.WITH,
value: selectedTags?.join(',') ?? alertFilterLabels.ANY_TAG,
description: selectedTags.length === 0 ? alertFilterLabels.WITH : alertFilterLabels.WITH_TAG,
value: selectedTags.length === 0 ? alertFilterLabels.ANY_TAG : selectedTags?.join(','),
},
{
onFilterFieldChange,
Expand All @@ -88,10 +85,10 @@ export const FiltersExpressionsSelect: React.FC<Props> = ({
id: 'filter_scheme',
disabled: schemes?.length === 0,
items: schemes ?? [],
selectedItems: getSelectedItems('monitor.type'),
selectedItems: selectedSchemes,
title: filterLabels.SCHEME,
description: selectedScheme ? alertFilterLabels.OF_TYPE : alertFilterLabels.OF,
value: selectedScheme?.join(',') ?? alertFilterLabels.ANY_TYPE,
description: selectedSchemes.length === 0 ? alertFilterLabels.OF : alertFilterLabels.OF_TYPE,
value: selectedSchemes.length === 0 ? alertFilterLabels.ANY_TYPE : selectedSchemes?.join(','),
},
{
onFilterFieldChange,
Expand All @@ -100,10 +97,14 @@ export const FiltersExpressionsSelect: React.FC<Props> = ({
id: 'filter_location',
disabled: locations?.length === 0,
items: locations ?? [],
selectedItems: getSelectedItems('observer.geo.name'),
selectedItems: selectedLocations,
title: filterLabels.SCHEME,
description: selectedLocation ? alertFilterLabels.FROM_LOCATION : alertFilterLabels.FROM,
value: selectedLocation?.join(',') ?? alertFilterLabels.ANY_LOCATION,
description:
selectedLocations.length === 0 ? alertFilterLabels.FROM : alertFilterLabels.FROM_LOCATION,
value:
selectedLocations.length === 0
? alertFilterLabels.ANY_LOCATION
: selectedLocations?.join(','),
},
];

Expand Down
12 changes: 6 additions & 6 deletions ...lic/components/overview/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions x-pack/plugins/uptime/public/components/overview/filter_group/filter_group.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,22 +27,23 @@ export const FilterGroupComponent: React.FC<PresentationalComponentProps> = ({
values: string[];
}>({ fieldName: '', values: [] });

const currentFilters = useFilterUpdate(updatedFieldValues.fieldName, updatedFieldValues.values);
const { selectedLocations, selectedPorts, selectedSchemes, selectedTags } = useFilterUpdate(
updatedFieldValues.fieldName,
updatedFieldValues.values
);

const onFilterFieldChange = (fieldName: string, values: string[]) => {
setUpdatedFieldValues({ fieldName, values });
};

const getSelectedItems = (fieldName: string) => currentFilters.get(fieldName) || [];

const filterPopoverProps: FilterPopoverProps[] = [
{
loading,
onFilterFieldChange,
fieldName: 'observer.geo.name',
id: 'location',
items: locations,
selectedItems: getSelectedItems('observer.geo.name'),
selectedItems: selectedLocations,
title: filterLabels.LOCATION,
},
{
Expand All @@ -52,7 +53,7 @@ export const FilterGroupComponent: React.FC<PresentationalComponentProps> = ({
id: 'port',
disabled: ports.length === 0,
items: ports.map((p: number) => p.toString()),
selectedItems: getSelectedItems('url.port'),
selectedItems: selectedPorts,
title: filterLabels.PORT,
},
{
Expand All @@ -62,7 +63,7 @@ export const FilterGroupComponent: React.FC<PresentationalComponentProps> = ({
id: 'scheme',
disabled: schemes.length === 0,
items: schemes,
selectedItems: getSelectedItems('monitor.type'),
selectedItems: selectedSchemes,
title: filterLabels.SCHEME,
},
{
Expand All @@ -72,7 +73,7 @@ export const FilterGroupComponent: React.FC<PresentationalComponentProps> = ({
id: 'tags',
disabled: tags.length === 0,
items: tags,
selectedItems: getSelectedItems('tags'),
selectedItems: selectedTags,
title: filterLabels.TAGS,
},
];
Expand Down
14 changes: 12 additions & 2 deletions x-pack/plugins/uptime/public/components/overview/filter_group/filter_popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export const FilterPopover = ({
id,
disabled,
loading,
items,
items: allItems,
onFilterFieldChange,
selectedItems,
title,
Expand All @@ -46,6 +46,16 @@ export const FilterPopover = ({
const [searchQuery, setSearchQuery] = useState<string>('');
const [tempSelectedItems, setTempSelectedItems] = useState<string[]>(selectedItems);

const [items, setItems] = useState<string[]>([]);

useEffect(() => {
// Merge incoming items with selected items, to enable un-selection

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// Merge incoming items with selected items, to enable un-selection
// Merge incoming items with selected items, to enable deselection

Small english nitpick.

const mItems = selectedItems.concat(allItems ?? []);
const newItems = mItems.filter((item, index) => mItems.indexOf(item) === index);
setItems(newItems);
}, [allItems, selectedItems]);

useEffect(() => {
if (searchQuery !== '') {
const toDisplay = items.filter(item => item.indexOf(searchQuery) >= 0);
Expand All @@ -60,7 +70,7 @@ export const FilterPopover = ({
button={
btnContent ?? (
<UptimeFilterButton
isDisabled={disabled}
isDisabled={disabled && selectedItems.length === 0}
isSelected={tempSelectedItems.length > 0}
numFilters={items.length}
numActiveFilters={tempSelectedItems.length}
Expand Down
17 changes: 15 additions & 2 deletions x-pack/plugins/uptime/public/hooks/use_filter_update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,15 @@ import { useUrlParams } from './use_url_params';
* @param fieldName the name of the field to filter against
* @param values the list of values to use when filter a field
*/
interface SelectedFilters {
selectedTags: string[];
selectedPorts: string[];
selectedSchemes: string[];
selectedLocations: string[];
selectedFilters: Map<string, string[]>;
}

export const useFilterUpdate = (fieldName?: string, values?: string[]) => {
export const useFilterUpdate = (fieldName?: string, values?: string[]): SelectedFilters => {
const [getUrlParams, updateUrl] = useUrlParams();

const { filters: currentFilters } = getUrlParams();
Expand Down Expand Up @@ -52,5 +59,11 @@ export const useFilterUpdate = (fieldName?: string, values?: string[]) => {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [fieldName, values]);

return filterKueries;
return {
selectedTags: filterKueries.get('tags') || [],
selectedPorts: filterKueries.get('url.port') || [],
selectedSchemes: filterKueries.get('monitor.type') || [],
selectedLocations: filterKueries.get('observer.geo.name') || [],
selectedFilters: filterKueries,
};
};