Add option to disable server update checks

This commit is contained in:
schroda
2024-05-07 00:37:01 +02:00
parent 51a0173927
commit 63543a48e3
5 changed files with 71 additions and 6 deletions

View File

@@ -11,16 +11,26 @@ import { requestManager } from '@/lib/requests/RequestManager.ts';
import { getVersion } from '@/screens/settings/About.tsx'; import { getVersion } from '@/screens/settings/About.tsx';
import { useUpdateChecker } from '@/util/useUpdateChecker.tsx'; import { useUpdateChecker } from '@/util/useUpdateChecker.tsx';
import { VersionUpdateInfoDialog } from '@/components/util/VersionUpdateInfoDialog.tsx'; import { VersionUpdateInfoDialog } from '@/components/util/VersionUpdateInfoDialog.tsx';
import { useMetadataServerSettings } from '@/lib/metadata/metadataServerSettings.ts';
const disabledUpdateCheck = () => Promise.resolve();
export const ServerUpdateChecker = () => { export const ServerUpdateChecker = () => {
const { t } = useTranslation(); const { t } = useTranslation();
const {
settings: { serverInformAvailableUpdate },
} = useMetadataServerSettings();
const { const {
data: serverUpdateCheckData, data: serverUpdateCheckData,
loading: isCheckingForServerUpdate, loading: isCheckingForServerUpdate,
error: serverUpdateCheckError, error: serverUpdateCheckError,
refetch: checkForUpdate, refetch: checkForUpdate,
} = requestManager.useCheckForServerUpdate({ notifyOnNetworkStatusChange: true, fetchPolicy: 'cache-only' }); } = requestManager.useCheckForServerUpdate({
notifyOnNetworkStatusChange: true,
fetchPolicy: 'cache-only',
});
const { data } = requestManager.useGetAbout(); const { data } = requestManager.useGetAbout();
const { aboutServer } = data ?? {}; const { aboutServer } = data ?? {};
@@ -31,7 +41,15 @@ export const ServerUpdateChecker = () => {
const version = aboutServer ? getVersion(aboutServer) : undefined; const version = aboutServer ? getVersion(aboutServer) : undefined;
const isServerUpdateAvailable = !!selectedServerChannelInfo?.tag && selectedServerChannelInfo.tag !== version; const isServerUpdateAvailable = !!selectedServerChannelInfo?.tag && selectedServerChannelInfo.tag !== version;
const updateChecker = useUpdateChecker('server', checkForUpdate, selectedServerChannelInfo?.tag); const updateChecker = useUpdateChecker(
'server',
serverInformAvailableUpdate ? checkForUpdate : disabledUpdateCheck,
selectedServerChannelInfo?.tag,
);
if (!serverInformAvailableUpdate) {
return null;
}
if (isCheckingForServerUpdate) { if (isCheckingForServerUpdate) {
return null; return null;

View File

@@ -53,6 +53,7 @@ const GLOBAL_METADATA_KEYS: AppMetadataKeys[] = [
// updates // updates
'webUIInformAvailableUpdate', 'webUIInformAvailableUpdate',
'serverInformAvailableUpdate',
]; ];
/** /**

View File

@@ -49,6 +49,7 @@ export const getDefaultSettings = (): MetadataServerSettings => ({
// updates // updates
webUIInformAvailableUpdate: true, webUIInformAvailableUpdate: true,
serverInformAvailableUpdate: true,
}); });
export const convertSettingsToMetadata = ( export const convertSettingsToMetadata = (

View File

@@ -18,12 +18,17 @@ import { NavBarContext, useSetDefaultBackTo } from '@/components/context/NavbarC
import { requestManager } from '@/lib/requests/RequestManager.ts'; import { requestManager } from '@/lib/requests/RequestManager.ts';
import { useLocalStorage } from '@/util/useStorage.tsx'; import { useLocalStorage } from '@/util/useStorage.tsx';
import { TextSetting } from '@/components/settings/text/TextSetting.tsx'; import { TextSetting } from '@/components/settings/text/TextSetting.tsx';
import { ServerSettings as GqlServerSettings } from '@/typings.ts'; import { MetadataUpdateSettings, ServerSettings as GqlServerSettings } from '@/typings.ts';
import { NumberSetting } from '@/components/settings/NumberSetting.tsx'; import { NumberSetting } from '@/components/settings/NumberSetting.tsx';
import { SelectSetting } from '@/components/settings/SelectSetting.tsx'; import { SelectSetting } from '@/components/settings/SelectSetting.tsx';
import { LoadingPlaceholder } from '@/components/util/LoadingPlaceholder.tsx'; import { LoadingPlaceholder } from '@/components/util/LoadingPlaceholder.tsx';
import { EmptyViewAbsoluteCentered } from '@/components/util/EmptyViewAbsoluteCentered.tsx'; import { EmptyViewAbsoluteCentered } from '@/components/util/EmptyViewAbsoluteCentered.tsx';
import { defaultPromiseErrorHandler } from '@/util/defaultPromiseErrorHandler.ts'; import { defaultPromiseErrorHandler } from '@/util/defaultPromiseErrorHandler.ts';
import {
createUpdateMetadataServerSettings,
useMetadataServerSettings,
} from '@/lib/metadata/metadataServerSettings.ts';
import { makeToast } from '@/components/util/Toast.tsx';
type ServerSettingsType = Pick< type ServerSettingsType = Pick<
GqlServerSettings, GqlServerSettings,
@@ -86,7 +91,21 @@ export const ServerSettings = () => {
}; };
}, [t]); }, [t]);
const { data, loading, error, refetch } = requestManager.useGetServerSettings({ const {
settings: { serverInformAvailableUpdate },
loading: areMetadataServerSettingsLoading,
request: { error: metadataServerSettingsError, refetch: refetchServerMetadataSettings },
} = useMetadataServerSettings();
const updateMetadataServerSettings = createUpdateMetadataServerSettings<
keyof Pick<MetadataUpdateSettings, 'serverInformAvailableUpdate'>
>(() => makeToast(t('global.error.label.failed_to_save_changes'), 'error'));
const {
data,
loading: areServerSettingsLoading,
error: serverSettingsError,
refetch: refetchServerSettings,
} = requestManager.useGetServerSettings({
notifyOnNetworkStatusChange: true, notifyOnNetworkStatusChange: true,
}); });
const [mutateSettings] = requestManager.useUpdateServerSettings(); const [mutateSettings] = requestManager.useUpdateServerSettings();
@@ -121,11 +140,23 @@ export const ServerSettings = () => {
value={serverAddress} value={serverAddress}
placeholder="http://localhost:4567" placeholder="http://localhost:4567"
/> />
<ListItem>
<ListItemText
primary={t('global.update.settings.inform.label.title')}
secondary={t('global.update.settings.inform.label.description')}
/>
<Switch
edge="end"
checked={serverInformAvailableUpdate}
onChange={(e) => updateMetadataServerSettings('serverInformAvailableUpdate', e.target.checked)}
/>
</ListItem>
</List> </List>
), ),
[], [serverAddress, serverInformAvailableUpdate],
); );
const loading = areMetadataServerSettingsLoading || areServerSettingsLoading;
if (loading) { if (loading) {
return ( return (
<> <>
@@ -135,6 +166,7 @@ export const ServerSettings = () => {
); );
} }
const error = metadataServerSettingsError ?? serverSettingsError;
if (error) { if (error) {
return ( return (
<> <>
@@ -142,7 +174,19 @@ export const ServerSettings = () => {
<EmptyViewAbsoluteCentered <EmptyViewAbsoluteCentered
message={t('global.error.label.failed_to_load_data')} message={t('global.error.label.failed_to_load_data')}
messageExtra={error.message} messageExtra={error.message}
retry={() => refetch().catch(defaultPromiseErrorHandler('ServerSettings::refetch'))} retry={() => {
if (metadataServerSettingsError) {
refetchServerMetadataSettings().catch(
defaultPromiseErrorHandler('ServerSettings::refetchServerMetadataSettings'),
);
}
if (serverSettingsError) {
refetchServerSettings().catch(
defaultPromiseErrorHandler('ServerSettings::refetchServerSettings'),
);
}
}}
/> />
</> </>
); );

View File

@@ -257,6 +257,7 @@ export type MetadataTrackingSettings = {
export type MetadataUpdateSettings = { export type MetadataUpdateSettings = {
webUIInformAvailableUpdate: boolean; webUIInformAvailableUpdate: boolean;
serverInformAvailableUpdate: boolean;
}; };
export type MetadataServerSettings = MetadataDownloadSettings & export type MetadataServerSettings = MetadataDownloadSettings &