ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature/add manga to library category select dialog (#519)

Browse Source 
* Move "SearchSettings" into "LibrarySettings"

* Change property "setOpen" to "onClose" for "CategorySelect"

* Optionally show category selection when adding manga to library

* Update "ignore filters" translation

* Move "ignore_filters" setting to "metadataServerSettings"
This commit is contained in:
schroda
2023-12-27 18:08:16 +01:00
committed by GitHub
parent 1345cfe624
commit e025efb9dc
12 changed files with 199 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/screens/settings/LibrarySettings.tsx
View File

@@ -8,9 +8,14 @@
import { useTranslation } from 'react-i18next';
import { useContext, useEffect } from 'react';
import { List, ListItem, ListItemText, Switch } from '@mui/material';
import ListSubheader from '@mui/material/ListSubheader';
import { NavBarContext, useSetDefaultBackTo } from '@/components/context/NavbarContext.tsx';
import { GlobalUpdateSettings } from '@/components/settings/globalUpdate/GlobalUpdateSettings.tsx';
import { SearchSettings } from '@/screens/settings/SearchSettings.tsx';
import { MetadataServerSettingKeys, MetadataServerSettings } from '@/typings.ts';
import { convertToGqlMeta, requestUpdateServerMetadata } from '@/util/metadata.ts';
import { makeToast } from '@/components/util/Toast.tsx';
import { useMetadataServerSettings } from '@/util/metadataServerSettings.ts';
export function LibrarySettings() {
const { t } = useTranslation();
@@ -23,10 +28,50 @@ export function LibrarySettings() {
useSetDefaultBackTo('settings');
const { metadata, settings } = useMetadataServerSettings();
const setSettingValue = <Setting extends MetadataServerSettingKeys>(
setting: Setting,
value: MetadataServerSettings[Setting],
) => {
requestUpdateServerMetadata(convertToGqlMeta(metadata)! ?? {}, [[setting, value]]).catch(() =>
makeToast(t('search.error.label.failed_to_save_settings'), 'warning'),
);
};
return (
<>
<SearchSettings />
<List>
<List
subheader={
<ListSubheader component="div" id="library-general-settings">
{t('global.label.general')}
</ListSubheader>
}
>
<ListItem>
<ListItemText
primary={t('library.settings.general.search.ignore_filters.label.title')}
secondary={t('library.settings.general.search.ignore_filters.label.description')}
/>
<Switch
edge="end"
checked={settings.ignoreFilters}
onChange={(e) => setSettingValue('ignoreFilters', e.target.checked)}
/>
</ListItem>
<ListItem>
<ListItemText
primary={t('library.settings.general.add_to_library.category_selection.label.title')}
secondary={t('library.settings.general.add_to_library.category_selection.label.description')}
/>
<Switch
edge="end"
checked={settings.showAddToLibraryCategorySelectDialog}
onChange={(e) => setSettingValue('showAddToLibraryCategorySelectDialog', e.target.checked)}
/>
</ListItem>
</List>
<GlobalUpdateSettings />
</>
</List>
);
}

47
src/screens/settings/SearchSettings.tsx
View File

@@ -1,47 +0,0 @@
/*
* Copyright (C) Contributors to the Suwayomi project
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
import { List, ListItem, ListItemText, Switch } from '@mui/material';
import { useTranslation } from 'react-i18next';
import ListSubheader from '@mui/material/ListSubheader';
import { SearchMetadataKeys } from '@/typings';
import { convertToGqlMeta, requestUpdateServerMetadata } from '@/util/metadata';
import { useSearchSettings } from '@/util/searchSettings';
import { makeToast } from '@/components/util/Toast';
import { useSetDefaultBackTo } from '@/components/context/NavbarContext';
export function SearchSettings() {
const { t } = useTranslation();
const { metadata, settings } = useSearchSettings();
useSetDefaultBackTo('settings');
const setSettingValue = (key: SearchMetadataKeys, value: boolean) => {
requestUpdateServerMetadata(convertToGqlMeta(metadata)! ?? {}, [[key, value]]).catch(() =>
makeToast(t('search.error.label.failed_to_save_settings'), 'warning'),
);
};
return (
<List
subheader={
<ListSubheader component="div" id="library-search-filter">
{t('search.title.search')}
</ListSubheader>
}
>
<ListItem>
<ListItemText primary={t('search.label.ignore_filters')} />
<Switch
edge="end"
checked={settings.ignoreFilters}
onChange={(e) => setSettingValue('ignoreFilters', e.target.checked)}
/>
</ListItem>
</List>
);
}