Fix operations not using effective filter on sub-view pages (#4896)

This commit is contained in:
WithoutPants 2024-05-29 08:01:54 +10:00 committed by GitHub
parent e4267a0d83
commit cf45ac883e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -247,12 +247,12 @@ export function makeItemList<T extends QueryResult, E extends IDataItem>({
}, [filter, onChangePage, totalCount]);
useEffect(() => {
if (addKeybinds) {
const unbindExtras = addKeybinds(result, filter, selectedIds);
const unbindExtras = addKeybinds(result, effectiveFilter, selectedIds);
return () => {
unbindExtras();
};
}
}, [addKeybinds, result, filter, selectedIds]);
}, [addKeybinds, result, effectiveFilter, selectedIds]);
function singleSelect(id: string, selected: boolean) {
setLastClickedId(id);
@ -334,7 +334,7 @@ export function makeItemList<T extends QueryResult, E extends IDataItem>({
}
async function onOperationClicked(o: IItemListOperation<T>) {
await o.onClick(result, filter, selectedIds);
await o.onClick(result, effectiveFilter, selectedIds);
if (o.postRefetch) {
result.refetch();
}
@ -347,7 +347,7 @@ export function makeItemList<T extends QueryResult, E extends IDataItem>({
},
isDisplayed: () => {
if (o.isDisplayed) {
return o.isDisplayed(result, filter, selectedIds);
return o.isDisplayed(result, effectiveFilter, selectedIds);
}
return true;