diff --git a/i18n/en.json b/i18n/en.json index 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.ts index 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.ts index 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.svelte index d5a1fe0089..307fbe1ba4 100644 --- a/web/src/routes/admin/users/+page.svelte +++ b/web/src/routes/admin/users/+page.svelte @@ -1,46 +1,36 @@ - + {#snippet buttons()}