public/tubearchivist
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/tubearchivist.git synced 2026-08-05 01:49:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Filterbar causing userconfig to be overwritten on page view

Browse Source
This commit is contained in:
MerlinScheurer
2024-12-27 18:13:58 +01:00
parent 815dac618a
commit bb67c7e1ab
2 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
frontend/src/components/Filterbar.tsx
View File

@@ -1,4 +1,5 @@
import { useEffect } from 'react';
import { useRevalidator } from 'react-router-dom';
import iconSort from '/img/icon-sort.svg';
import iconAdd from '/img/icon-add.svg';
import iconSubstract from '/img/icon-substract.svg';
@@ -46,20 +47,33 @@ const Filterbar = ({
setGridItems,
setRefresh,
}: FilterbarProps) => {
const revalidator = useRevalidator();
useEffect(() => {
(async () => {
const userConfig: UserConfigType = {
hide_watched: hideWatched,
[viewStyleName.toString()]: view,
grid_items: gridItems,
sort_by: sortBy,
sort_order: sortOrder,
};
if (
userMeConfig.hide_watched !== hideWatched ||
userMeConfig.grid_items !== gridItems ||
userMeConfig.sort_by !== sortBy ||
userMeConfig.sort_order !== sortOrder ||
// @ts-ignore
userMeConfig[viewStyleName.toString()] !== view
) {
const userConfig: UserConfigType = {
hide_watched: hideWatched,
[viewStyleName.toString()]: view,
grid_items: gridItems,
sort_by: sortBy,
sort_order: sortOrder,
};
await updateUserConfig(userConfig);
setRefresh?.(true);
await updateUserConfig(userConfig);
setRefresh?.(true);
revalidator.revalidate();
}
})();
}, [hideWatched, view, gridItems, sortBy, sortOrder, viewStyleName, setRefresh, userMeConfig]);
}, [hideWatched, view, gridItems, sortBy, sortOrder, viewStyleName]);
return (
<div className="view-controls three">

21
frontend/src/pages/Download.tsx
View File

@@ -89,14 +89,21 @@ const Download = () => {
useEffect(() => {
(async () => {
const userConfig: UserConfigType = {
show_ignored_only: showIgnored,
[ViewStyleNames.downloads]: view,
grid_items: gridItems,
};
if (
userMeConfig.show_ignored_only !== showIgnored ||
userMeConfig.grid_items !== gridItems ||
// @ts-ignore
userMeConfig[ViewStyleNames.downloads] !== view
) {
const userConfig: UserConfigType = {
show_ignored_only: showIgnored,
[ViewStyleNames.downloads]: view,
grid_items: gridItems,
};
await updateUserConfig(userConfig);
setRefresh(true);
await updateUserConfig(userConfig);
setRefresh(true);
}
})();
}, [
view,