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

Jump to bottom

Apply filter hook to results filter only #4705

Merged
merged 1 commit into from
Mar 21, 2024
Merged

Apply filter hook to results filter only #4705

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
21 changes: 11 additions & 10 deletions ui/v2.5/src/components/List/ItemList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ export function makeItemList<T extends QueryResult, E extends IDataItem>({

const RenderList: React.FC<IItemListProps<T, E> & IRenderListProps> = ({
filter,
filterHook,
onChangePage: _onChangePage,
updateFilter,
persistState,
Expand All @@ -156,7 +157,14 @@ export function makeItemList<T extends QueryResult, E extends IDataItem>({
const [editingCriterion, setEditingCriterion] = useState<string>();
const [showEditFilter, setShowEditFilter] = useState(false);

const result = useResult(filter);
const effectiveFilter = useMemo(() => {
if (filterHook) {
return filterHook(cloneDeep(filter));
}
return filter;
}, [filter, filterHook]);

const result = useResult(effectiveFilter);
const [totalCount, setTotalCount] = useState(0);
const [metadataByline, setMetadataByline] = useState<React.ReactNode>();
const items = useMemo(() => getItems(result), [result]);
Expand Down Expand Up @@ -525,7 +533,6 @@ export function makeItemList<T extends QueryResult, E extends IDataItem>({
persistState,
persistanceKey = filterMode,
defaultSort = filterOptions.defaultSortBy,
filterHook,
defaultZoomIndex,
alterQuery = true,
} = props;
Expand Down Expand Up @@ -712,17 +719,11 @@ export function makeItemList<T extends QueryResult, E extends IDataItem>({
[filter, updateFilter]
);

const renderFilter = useMemo(() => {
if (filterInitialised) {
return filterHook ? filterHook(cloneDeep(filter)) : filter;
}
}, [filterInitialised, filter, filterHook]);

if (!renderFilter) return null;
if (!filterInitialised) return null;

return (
<RenderList
filter={renderFilter}
filter={filter}
onChangePage={onChangePage}
updateFilter={updateFilter}
{...props}
Expand Down
Loading