Skip to content

Limit recent global filters to the top 10 results #3627

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

Open
flomillot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Limit recent global filters to the top 10 results #3627

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
47 changes: 23 additions & 24 deletions src/components/results/common/global-filter/global-filter-autocomplete.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import { useLocalizedCountries } from 'components/utils/localized-countries-hook
import { useSelector } from 'react-redux';
import { AppState } from '../../../../redux/reducer';
import { FilterType } from '../utils';
import { OverflowableText, OverflowableChip } from '@gridsuite/commons-ui';
import { OverflowableChip, OverflowableText } from '@gridsuite/commons-ui';
import { EQUIPMENT_TYPES } from '../../../utils/equipment-types';
import { GlobalFilter } from './global-filter-types';
import { getResultsGlobalFiltersChipStyle, resultsGlobalFilterStyles } from './global-filter-styles';
Expand Down Expand Up @@ -160,29 +160,28 @@ function GlobalFilterAutocomplete({

const filterOptions = useCallback(
(options: GlobalFilter[], state: FilterOptionsState<GlobalFilter>) => {
return (
options
// Allows to find the translated countries (and not their countryCodes) when the user inputs a search value
.filter((option: GlobalFilter) => {
const labelToMatch: string =
option.filterType === FilterType.COUNTRY ? translate(option.label) : option.label;
return labelToMatch.toLowerCase().includes(state.inputValue.toLowerCase());
})
.filter((option: GlobalFilter) =>
// recent filters are a group in itself
option?.recent
? filterGroupSelected === RECENT_FILTER
: // if the filter has a subtype it should be filtered through it instead of filterType
option.filterSubtype
? option.filterSubtype === filterGroupSelected
: option.filterType === filterGroupSelected
)
.filter((option: GlobalFilter) =>
genericFiltersStrictMode && option.filterType === FilterType.GENERIC_FILTER
? filterableEquipmentTypes.includes(option.equipmentType as EQUIPMENT_TYPES)
: true
)
);
const filteredOptions = options
// Allows to find the translated countries (and not their countryCodes) when the user inputs a search value
.filter((option: GlobalFilter) => {
const labelToMatch: string =
option.filterType === FilterType.COUNTRY ? translate(option.label) : option.label;
return labelToMatch.toLowerCase().includes(state.inputValue.toLowerCase());
})
.filter((option: GlobalFilter) =>
// recent filters are a group in itself
option?.recent
? filterGroupSelected === RECENT_FILTER
: // if the filter has a subtype it should be filtered through it instead of filterType
option.filterSubtype
? option.filterSubtype === filterGroupSelected
: option.filterType === filterGroupSelected
)
.filter((option: GlobalFilter) =>
genericFiltersStrictMode && option.filterType === FilterType.GENERIC_FILTER
? filterableEquipmentTypes.includes(option.equipmentType as EQUIPMENT_TYPES)
: true
);
return filterGroupSelected === RECENT_FILTER ? filteredOptions.slice(0, 10) : filteredOptions;
},
[filterGroupSelected, filterableEquipmentTypes, genericFiltersStrictMode, translate]
);
Expand Down
Loading