From df5fa6a4b9ea50e81066f70d27f6130eb7d83535 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 14 Jul 2026 18:23:47 +0200
Subject: [PATCH] Task/refactor canDeleteUser() helper (#7324)

Refactor canDeleteUser()
---
 .../components/admin-users/admin-users.component.ts    |  2 ++
 .../src/app/components/admin-users/admin-users.html    |  7 ++++++-
 .../user-detail-dialog/user-detail-dialog.component.ts |  7 ++++++-
 .../user-detail-dialog/user-detail-dialog.html         |  7 ++++++-
 libs/common/src/lib/helper.ts                          | 10 ++++++++++
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/apps/client/src/app/components/admin-users/admin-users.component.ts b/apps/client/src/app/components/admin-users/admin-users.component.ts
index 4b9848cf8..305c48dcf 100644
--- a/apps/client/src/app/components/admin-users/admin-users.component.ts
+++ b/apps/client/src/app/components/admin-users/admin-users.component.ts
@@ -8,6 +8,7 @@ import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { DEFAULT_LOCALE, DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config';
 import { ConfirmationDialogType } from '@ghostfolio/common/enums';
 import {
+  canDeleteUser,
   getCountryName,
   getDateFnsLocale,
   getDateFormatString,
@@ -91,6 +92,7 @@ export class GfAdminUsersComponent implements OnInit {
   >();
   protected defaultDateFormat: string;
   protected displayedColumns: string[] = [];
+  protected readonly canDeleteUser = canDeleteUser;
   protected readonly getCountryName = getCountryName;
   protected readonly getEmojiFlag = getEmojiFlag;
   protected hasPermissionForSubscription: boolean;
diff --git a/apps/client/src/app/components/admin-users/admin-users.html b/apps/client/src/app/components/admin-users/admin-users.html
index 668f39557..7e7e5edeb 100644
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@@ -241,7 +241,12 @@
                 <hr class="m-0" />
                 <button
                   mat-menu-item
-                  [disabled]="element.id === user?.id"
+                  [disabled]="
+                    !canDeleteUser({
+                      currentUserId: user?.id,
+                      userId: element.id
+                    })
+                  "
                   (click)="onDeleteUser(element.id)"
                 >
                   <span class="align-items-center d-flex">
diff --git a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts
index 04d89c5a6..9e341037a 100644
--- a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts
+++ b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts
@@ -1,4 +1,8 @@
-import { getCountryName, getSum } from '@ghostfolio/common/helper';
+import {
+  canDeleteUser,
+  getCountryName,
+  getSum
+} from '@ghostfolio/common/helper';
 import { AdminUserResponse } from '@ghostfolio/common/interfaces';
 import { AdminService, DataService } from '@ghostfolio/ui/services';
 import { GfValueComponent } from '@ghostfolio/ui/value';
@@ -50,6 +54,7 @@ import {
 })
 export class GfUserDetailDialogComponent implements OnInit {
   protected readonly baseCurrency: string;
+  protected readonly canDeleteUser = canDeleteUser;
   protected readonly getCountryName = getCountryName;
   protected readonly subscriptionsDataSource =
     new MatTableDataSource<Subscription>();
diff --git a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html
index f549b476f..e2cdb66a5 100644
--- a/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html
+++ b/apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html
@@ -16,7 +16,12 @@
     <button
       mat-menu-item
       type="button"
-      [disabled]="this.data.currentUserId === this.data.userId"
+      [disabled]="
+        !canDeleteUser({
+          currentUserId: data.currentUserId,
+          userId: data.userId
+        })
+      "
       (click)="deleteUser()"
     >
       <ng-container i18n>Delete</ng-container>
diff --git a/libs/common/src/lib/helper.ts b/libs/common/src/lib/helper.ts
index 42aec19ac..9a32927e2 100644
--- a/libs/common/src/lib/helper.ts
+++ b/libs/common/src/lib/helper.ts
@@ -163,6 +163,16 @@ export function canDeleteAssetProfile({
   );
 }
 
+export function canDeleteUser({
+  currentUserId,
+  userId
+}: {
+  currentUserId: string;
+  userId: string;
+}): boolean {
+  return currentUserId !== userId;
+}
+
 export function capitalize(aString: string) {
   return aString.charAt(0).toUpperCase() + aString.slice(1).toLowerCase();
 }