tbelway/immich-quadlet
1
0
Fork 0
forked from Cutlery/immich
Code Pull Requests Activity

feat(web): ws - on_config_update (#4378)

Browse Source
This commit is contained in:
shenlong 2023-10-07 10:21:05 +00:00 committed by GitHub
parent c48d4f01dc
commit 104880a729
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/lib/components/admin-page/settings/map-settings/map-settings.svelte
View File

@ -12,7 +12,6 @@
import SettingInputField, { SettingInputFieldType } from '../setting-input-field.svelte'; import SettingInputField, { SettingInputFieldType } from '../setting-input-field.svelte';
import SettingSwitch from '../setting-switch.svelte'; import SettingSwitch from '../setting-switch.svelte';
import SettingSelect from '../setting-select.svelte'; import SettingSelect from '../setting-select.svelte';
import { loadConfig } from '$lib/stores/server-config.store';
export let config: SystemConfigDto; // this is the config that is being edited export let config: SystemConfigDto; // this is the config that is being edited
export let disabled = false; export let disabled = false;
@ -48,9 +47,6 @@
savedConfig = cloneDeep(updated); savedConfig = cloneDeep(updated);
notificationController.show({ message: 'Settings saved', type: NotificationType.Info }); notificationController.show({ message: 'Settings saved', type: NotificationType.Info });
// TODO: Use websockets to reload feature params instead once websocket for client is merged
// Reload feature params in the background
loadConfig();
} catch (error) { } catch (error) {
handleError(error, 'Unable to save settings'); handleError(error, 'Unable to save settings');
} }

4
web/src/lib/components/admin-page/settings/trash-settings/trash-settings.svelte
View File

@ -10,7 +10,6 @@
import SettingButtonsRow from '../setting-buttons-row.svelte'; import SettingButtonsRow from '../setting-buttons-row.svelte';
import SettingSwitch from '../setting-switch.svelte'; import SettingSwitch from '../setting-switch.svelte';
import SettingInputField, { SettingInputFieldType } from '../setting-input-field.svelte'; import SettingInputField, { SettingInputFieldType } from '../setting-input-field.svelte';
import { loadConfig } from '$lib/stores/server-config.store';
export let trashConfig: SystemConfigTrashDto; // this is the config that is being edited export let trashConfig: SystemConfigTrashDto; // this is the config that is being edited
export let disabled = false; export let disabled = false;
@ -36,9 +35,6 @@
savedConfig = { ...updated.trash }; savedConfig = { ...updated.trash };
notificationController.show({ message: 'Settings saved', type: NotificationType.Info }); notificationController.show({ message: 'Settings saved', type: NotificationType.Info });
// TODO: Use websockets to reload feature params instead once websocket for client is merged
// Reload feature params in the background
loadConfig();
} catch (error) { } catch (error) {
handleError(error, 'Unable to save settings'); handleError(error, 'Unable to save settings');
} }

2
web/src/lib/stores/websocket.ts
View File

@ -1,6 +1,7 @@
import type { AssetResponseDto, ServerVersionResponseDto } from '@api'; import type { AssetResponseDto, ServerVersionResponseDto } from '@api';
import { io } from 'socket.io-client'; import { io } from 'socket.io-client';
import { writable } from 'svelte/store'; import { writable } from 'svelte/store';
import { loadConfig } from './server-config.store';
export const websocketStore = { export const websocketStore = {
onUploadSuccess: writable<AssetResponseDto>(), onUploadSuccess: writable<AssetResponseDto>(),
@ -29,6 +30,7 @@ export const openWebsocketConnection = () => {
.on('on_asset_trash', (data) => websocketStore.onAssetTrash.set(JSON.parse(data) as string[])) .on('on_asset_trash', (data) => websocketStore.onAssetTrash.set(JSON.parse(data) as string[]))
.on('on_person_thumbnail', (data) => websocketStore.onPersonThumbnail.set(JSON.parse(data) as string)) .on('on_person_thumbnail', (data) => websocketStore.onPersonThumbnail.set(JSON.parse(data) as string))
.on('on_server_version', (data) => websocketStore.serverVersion.set(JSON.parse(data) as ServerVersionResponseDto)) .on('on_server_version', (data) => websocketStore.serverVersion.set(JSON.parse(data) as ServerVersionResponseDto))
.on('on_config_update', () => loadConfig())
.on('error', (e) => console.log('Websocket Error', e)); .on('error', (e) => console.log('Websocket Error', e));
return () => websocket?.close(); return () => websocket?.close();