Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 20:34:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix endless toast errors in Settings (#2146)

Browse Source
This commit is contained in:
WithoutPants
2021-12-22 10:43:30 +11:00
committed by GitHub
parent cfcc6aff6a
commit 523edfb575
2 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
ui/v2.5/src/components/Settings/context.tsx
View File

@@ -92,10 +92,24 @@ export const SettingsContext: React.FC = ({ children }) => {
>();
const [updateDLNAConfig] = useConfigureDLNA();
const [updateSuccess, setUpdateSuccess] = useState(false);
const [updateSuccess, setUpdateSuccess] = useState<boolean | undefined>();
const [apiKey, setApiKey] = useState("");
// cannot use Toast.error directly with the debounce functions
// since they are refreshed every time the Toast context is updated.
const [saveError, setSaveError] = useState<unknown>();
useEffect(() => {
if (!saveError) {
return;
}
Toast.error(saveError);
setSaveError(undefined);
setUpdateSuccess(false);
}, [saveError, Toast]);
useEffect(() => {
// only initialise once - assume we have control over these settings and
// they aren't modified elsewhere
@@ -113,7 +127,7 @@ export const SettingsContext: React.FC = ({ children }) => {
const resetSuccess = useMemo(
() =>
debounce(() => {
setUpdateSuccess(false);
setUpdateSuccess(undefined);
}, 4000),
[]
);
@@ -128,6 +142,7 @@ export const SettingsContext: React.FC = ({ children }) => {
() =>
debounce(async (input: GQL.ConfigGeneralInput) => {
try {
setUpdateSuccess(undefined);
await updateGeneralConfig({
variables: {
input,
@@ -137,10 +152,10 @@ export const SettingsContext: React.FC = ({ children }) => {
setPendingGeneral(undefined);
onSuccess();
} catch (e) {
Toast.error(e);
setSaveError(e);
}
}, 500),
[Toast, updateGeneralConfig, onSuccess]
[updateGeneralConfig, onSuccess]
);
useEffect(() => {
@@ -177,6 +192,7 @@ export const SettingsContext: React.FC = ({ children }) => {
() =>
debounce(async (input: GQL.ConfigInterfaceInput) => {
try {
setUpdateSuccess(undefined);
await updateInterfaceConfig({
variables: {
input,
@@ -186,10 +202,10 @@ export const SettingsContext: React.FC = ({ children }) => {
setPendingInterface(undefined);
onSuccess();
} catch (e) {
Toast.error(e);
setSaveError(e);
}
}, 500),
[Toast, updateInterfaceConfig, onSuccess]
[updateInterfaceConfig, onSuccess]
);
useEffect(() => {
@@ -226,6 +242,7 @@ export const SettingsContext: React.FC = ({ children }) => {
() =>
debounce(async (input: GQL.ConfigDefaultSettingsInput) => {
try {
setUpdateSuccess(undefined);
await updateDefaultsConfig({
variables: {
input,
@@ -235,10 +252,10 @@ export const SettingsContext: React.FC = ({ children }) => {
setPendingDefaults(undefined);
onSuccess();
} catch (e) {
Toast.error(e);
setSaveError(e);
}
}, 500),
[Toast, updateDefaultsConfig, onSuccess]
[updateDefaultsConfig, onSuccess]
);
useEffect(() => {
@@ -275,6 +292,7 @@ export const SettingsContext: React.FC = ({ children }) => {
() =>
debounce(async (input: GQL.ConfigScrapingInput) => {
try {
setUpdateSuccess(undefined);
await updateScrapingConfig({
variables: {
input,
@@ -284,10 +302,10 @@ export const SettingsContext: React.FC = ({ children }) => {
setPendingScraping(undefined);
onSuccess();
} catch (e) {
Toast.error(e);
setSaveError(e);
}
}, 500),
[Toast, updateScrapingConfig, onSuccess]
[updateScrapingConfig, onSuccess]
);
useEffect(() => {
@@ -324,6 +342,7 @@ export const SettingsContext: React.FC = ({ children }) => {
() =>
debounce(async (input: GQL.ConfigDlnaInput) => {
try {
setUpdateSuccess(undefined);
await updateDLNAConfig({
variables: {
input,
@@ -333,10 +352,10 @@ export const SettingsContext: React.FC = ({ children }) => {
setPendingDLNA(undefined);
onSuccess();
} catch (e) {
Toast.error(e);
setSaveError(e);
}
}, 500),
[Toast, updateDLNAConfig, onSuccess]
[updateDLNAConfig, onSuccess]
);
useEffect(() => {
@@ -369,6 +388,14 @@ export const SettingsContext: React.FC = ({ children }) => {
}
function maybeRenderLoadingIndicator() {
if (updateSuccess === false) {
return (
<div className="loading-indicator failed">
<Icon icon="times-circle" className="fa-fw" />
</div>
);
}
if (
pendingGeneral ||
pendingInterface ||
@@ -387,7 +414,7 @@ export const SettingsContext: React.FC = ({ children }) => {
if (updateSuccess) {
return (
<div className="loading-indicator">
<div className="loading-indicator success">
<Icon icon="check-circle" className="fa-fw" />
</div>
);