antebudimir/feishin
1
0
Fork 0
mirror of https://github.com/antebudimir/feishin.git synced 2026-01-01 02:13:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix custom filter implementation

Browse source
This commit is contained in:
jeffvli 2023-08-03 19:03:23 -07:00
parent 5896d886d7
commit 505974320f
3 changed files with 51 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/renderer/store/list.store.ts
View file

@ -188,14 +188,30 @@ export const useListStore = create<ListSlice>()(
}
});
return {
...get()._actions.getFilter({
id,
itemType: args.itemType,
key: args.key,
}),
const filter = get()._actions.getFilter({
id,
itemType: args.itemType,
key: args.key,
});
const mergedFilters = {
...filter,
...args.customFilters,
_custom: {
...filter._custom,
...args.customFilters?._custom,
jellyfin: {
...filter._custom?.jellyfin,
...args.customFilters?._custom?.jellyfin,
},
navidrome: {
...filter._custom?.navidrome,
...args.customFilters?._custom?.navidrome,
},
},
};
return mergedFilters;
},
setGrid: (args) => {
const [page, id] = args.key.split('_');
@ -622,13 +638,33 @@ export const useListStoreByKey = <TFilter>(args: { filter?: Partial<TFilter>; ke
);
};
export const useListFilterByKey = <TFilter>(args: { filter?: Partial<TFilter>; key: string }) => {
export const useListFilterByKey = <TFilter>(args: {
filter?: Partial<TFilter> | any;
key: string;
}) => {
const key = args.key as keyof ListState['item'];
return useListStore(
(state) => ({
...state.item[key].filter,
...args.filter,
}),
(state) => {
return {
...state.item[key].filter,
...(args.filter && {
...args.filter,
_custom: {
...state.item[key].filter._custom,
...args.filter?._custom,
jellyfin: {
...state.item[key].filter._custom?.jellyfin,
...args.filter?._custom?.jellyfin,
},
navidrome: {
...state.item[key].filter._custom?.navidrome,
...args.filter?._custom?.navidrome,
},
},
}),
};
},
shallow,
);
};