Browse Source

Refactor canDeleteUser()

pull/7324/head
Thomas Kaul 2 days ago
parent
commit
af8983ff02
  1. 2
      apps/client/src/app/components/admin-users/admin-users.component.ts
  2. 7
      apps/client/src/app/components/admin-users/admin-users.html
  3. 7
      apps/client/src/app/components/user-detail-dialog/user-detail-dialog.component.ts
  4. 7
      apps/client/src/app/components/user-detail-dialog/user-detail-dialog.html

2
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;

7
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">

7
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>();

7
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>

Loading…
Cancel
Save