diff --git a/web/src/lib/services/user-admin.service.ts b/web/src/lib/services/user-admin.service.ts index f266a0c72..70c471aaa 100644 --- a/web/src/lib/services/user-admin.service.ts +++ b/web/src/lib/services/user-admin.service.ts @@ -44,6 +44,7 @@ export const getUserAdminActions = ($t: MessageFormatter, user: UserAdminRespons const Update: ActionItem = { icon: mdiPencilOutline, title: $t('edit'), + $if: () => !user.deletedAt, onAction: () => goto(Route.editUser(user)), }; @@ -74,13 +75,14 @@ export const getUserAdminActions = ($t: MessageFormatter, user: UserAdminRespons const ResetPassword: ActionItem = { icon: mdiLockReset, title: $t('reset_password'), - $if: () => authManager.user.id !== user.id, + $if: () => authManager.user.id !== user.id && !user.deletedAt, onAction: () => handleResetPasswordUserAdmin(user), }; const ResetPinCode: ActionItem = { icon: mdiLockSmart, title: $t('reset_pin_code'), + $if: () => !user.deletedAt, onAction: () => handleResetPinCodeUserAdmin(user), }; diff --git a/web/src/routes/admin/users/(list)/+layout.svelte b/web/src/routes/admin/users/(list)/+layout.svelte index 04d245e31..2b31d3c0b 100644 --- a/web/src/routes/admin/users/(list)/+layout.svelte +++ b/web/src/routes/admin/users/(list)/+layout.svelte @@ -39,8 +39,8 @@ const { Create } = $derived(getUserAdminsActions($t)); const getActionsForUser = (user: UserAdminResponseDto) => { - const { Detail, Update, Delete, ResetPassword, ResetPinCode } = getUserAdminActions($t, user); - return [Detail, Update, ResetPassword, ResetPinCode, MenuItemType.Divider, Delete]; + const { Detail, Update, Delete, Restore, ResetPassword, ResetPinCode } = getUserAdminActions($t, user); + return [Detail, Update, ResetPassword, ResetPinCode, MenuItemType.Divider, Restore, Delete]; }; const classes = {