High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor(web): user delete websocket event (#24015)
Jason Rasmussen9a403d5886bb
diff --git a/i18n/en.json b/i18n/en.jsonindex 276ca92891..210e05459d 100644--- a/i18n/en.json+++ b/i18n/en.json@@ -407,7 +407,6 @@"user_restore_scheduled_removal": "Restore user - scheduled removal on {date, date, long}","user_settings": "User Settings","user_settings_description": "Manage user settings",- "user_successfully_removed": "User {email} has been successfully removed.","version_check_enabled_description": "Enable version check","version_check_implications": "The version check feature relies on periodic communication with github.com","version_check_settings": "Version Check",diff --git a/web/src/lib/managers/event-manager.svelte.ts b/web/src/lib/managers/event-manager.svelte.tsindex a9e7b25f38..effc5325ed 100644--- a/web/src/lib/managers/event-manager.svelte.ts+++ b/web/src/lib/managers/event-manager.svelte.ts@@ -27,8 +27,11 @@ export type Events = {UserAdminCreate: [UserAdminResponseDto];UserAdminUpdate: [UserAdminResponseDto];- UserAdminDelete: [UserAdminResponseDto];UserAdminRestore: [UserAdminResponseDto];+ // soft deleted+ UserAdminDelete: [UserAdminResponseDto];+ // confirmed permanently deleted from server+ UserAdminDeleted: [{ id: string }];SystemConfigUpdate: [SystemConfigDto];diff --git a/web/src/lib/stores/websocket.ts b/web/src/lib/stores/websocket.tsindex 342313d906..534fcd6a48 100644--- a/web/src/lib/stores/websocket.ts+++ b/web/src/lib/stores/websocket.ts@@ -56,6 +56,7 @@ websocket.on('AppRestartV1', (mode) => websocketStore.serverRestarting.set(mode)).on('on_new_release', (event) => eventManager.emit('ReleaseEvent', event)).on('on_session_delete', () => authManager.logout())+ .on('on_user_delete', (id) => eventManager.emit('UserAdminDeleted', { id })).on('on_notification', () => notificationManager.refresh()).on('connect_error', (e) => console.log('Websocket Connect Error', e));diff --git a/web/src/routes/admin/users/+page.svelte b/web/src/routes/admin/users/+page.svelteindex d5a1fe0089..307fbe1ba4 100644--- a/web/src/routes/admin/users/+page.svelte+++ b/web/src/routes/admin/users/+page.svelte@@ -1,46 +1,36 @@<script lang="ts">- import { page } from '$app/stores';import HeaderButton from '$lib/components/HeaderButton.svelte';import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';import OnEvents from '$lib/components/OnEvents.svelte';import TableButton from '$lib/components/TableButton.svelte';import { getUserAdminActions, getUserAdminsActions } from '$lib/services/user-admin.service';import { locale } from '$lib/stores/preferences.store';- import { websocketEvents } from '$lib/stores/websocket';import { getByteUnitString } from '$lib/utils/byte-units';import { searchUsersAdmin, type UserAdminResponseDto } from '@immich/sdk';- import { HStack, Icon, toastManager } from '@immich/ui';+ import { HStack, Icon } from '@immich/ui';import { mdiInfinity } from '@mdi/js';- import { onMount } from 'svelte';import { t } from 'svelte-i18n';import type { PageData } from './$types';- interface Props {+ type Props = {data: PageData;- }+ };let { data }: Props = $props();- let allUsers: UserAdminResponseDto[] = $state([]);+ let allUsers: UserAdminResponseDto[] = $derived(data.allUsers);const refresh = async () => {allUsers = await searchUsersAdmin({ withDeleted: true });};- const onDeleteSuccess = (userId: string) => {+ const onUserAdminDeleted = ({ id: userId }: { id: string }) => {const user = allUsers.find(({ id }) => id === userId);if (user) {allUsers = allUsers.filter((user) => user.id !== userId);- toastManager.success($t('admin.user_successfully_removed', { values: { email: user.email } }));}};- onMount(() => {- allUsers = $page.data.allUsers;-- return websocketEvents.on('on_user_delete', onDeleteSuccess);- });-const UserAdminsActions = $derived(getUserAdminsActions($t));const onUpdate = async () => {@@ -53,6 +43,7 @@onUserAdminUpdate={onUpdate}onUserAdminDelete={onUpdate}onUserAdminRestore={onUpdate}+ {onUserAdminDeleted}/><AdminPageLayout title={data.meta.title}>diff --git a/web/src/routes/admin/users/[id]/+page.svelte b/web/src/routes/admin/users/[id]/+page.svelteindex a8b2264b6b..434d58c56c 100644--- a/web/src/routes/admin/users/[id]/+page.svelte+++ b/web/src/routes/admin/users/[id]/+page.svelte@@ -1,4 +1,5 @@<script lang="ts">+ import { goto } from '$app/navigation';import HeaderButton from '$lib/components/HeaderButton.svelte';import AdminPageLayout from '$lib/components/layouts/AdminPageLayout.svelte';import OnEvents from '$lib/components/OnEvents.svelte';@@ -6,6 +7,7 @@import UserAvatar from '$lib/components/shared-components/user-avatar.svelte';import DeviceCard from '$lib/components/user-settings-page/device-card.svelte';import FeatureSetting from '$lib/components/users/FeatureSetting.svelte';+ import { AppRoute } from '$lib/constants';import { getUserAdminActions } from '$lib/services/user-admin.service';import { locale } from '$lib/stores/preferences.store';import { createDateFormatter, findLocale } from '$lib/utils';@@ -82,9 +84,20 @@user = update;}};++ const onUserAdminDeleted = async ({ id }: { id: string }) => {+ if (id === user.id) {+ await goto(AppRoute.ADMIN_USERS);+ }+ };</script>-<OnEvents onUserAdminUpdate={onUpdate} onUserAdminDelete={onUpdate} onUserAdminRestore={onUpdate} />+<OnEvents+ onUserAdminUpdate={onUpdate}+ onUserAdminDelete={onUpdate}+ onUserAdminRestore={onUpdate}+ {onUserAdminDeleted}+/><AdminPageLayout title={data.meta.title}>{#snippet buttons()}