Browse Source

UI: Fixed show user action

pull/12292/head
Vladyslav_Prykhodko 2 years ago
parent
commit
3bdd7524b9
  1. 8
      ui-ngx/src/app/modules/home/pages/user/user.component.html
  2. 6
      ui-ngx/src/app/modules/home/pages/user/user.component.ts
  3. 14
      ui-ngx/src/app/shared/models/user.model.ts

8
ui-ngx/src/app/modules/home/pages/user/user.component.html

@ -25,25 +25,25 @@
<button mat-raised-button color="primary" <button mat-raised-button color="primary"
[disabled]="(isLoading$ | async)" [disabled]="(isLoading$ | async)"
(click)="onEntityAction($event, 'disableAccount')" (click)="onEntityAction($event, 'disableAccount')"
[class.!hidden]="isEdit || !isUserCredentialPresent() || !isUserCredentialsEnabled()"> [class.!hidden]="isEdit || !isUserActivated() || !isUserCredentialsEnabled()">
{{'user.disable-account' | translate }} {{'user.disable-account' | translate }}
</button> </button>
<button mat-raised-button color="primary" <button mat-raised-button color="primary"
[disabled]="(isLoading$ | async)" [disabled]="(isLoading$ | async)"
(click)="onEntityAction($event, 'enableAccount')" (click)="onEntityAction($event, 'enableAccount')"
[class.!hidden]="isEdit || !isUserCredentialPresent() || isUserCredentialsEnabled()"> [class.!hidden]="isEdit || !isUserActivated() || isUserCredentialsEnabled()">
{{'user.enable-account' | translate }} {{'user.enable-account' | translate }}
</button> </button>
<button mat-raised-button color="primary" <button mat-raised-button color="primary"
[disabled]="(isLoading$ | async)" [disabled]="(isLoading$ | async)"
(click)="onEntityAction($event, 'displayActivationLink')" (click)="onEntityAction($event, 'displayActivationLink')"
[class.!hidden]="isEdit || isUserCredentialPresent()"> [class.!hidden]="isEdit || isUserActivated()">
{{'user.display-activation-link' | translate }} {{'user.display-activation-link' | translate }}
</button> </button>
<button mat-raised-button color="primary" <button mat-raised-button color="primary"
[disabled]="(isLoading$ | async)" [disabled]="(isLoading$ | async)"
(click)="onEntityAction($event, 'resendActivation')" (click)="onEntityAction($event, 'resendActivation')"
[class.!hidden]="isEdit || isUserCredentialPresent()"> [class.!hidden]="isEdit || isUserActivated()">
{{'user.resend-activation' | translate }} {{'user.resend-activation' | translate }}
</button> </button>
<button mat-raised-button color="primary" <button mat-raised-button color="primary"

6
ui-ngx/src/app/modules/home/pages/user/user.component.ts

@ -60,11 +60,11 @@ export class UserComponent extends EntityComponent<User> {
} }
isUserCredentialsEnabled(): boolean { isUserCredentialsEnabled(): boolean {
return this.entity.additionalInfo.userCredentialsEnabled === true; return this.entity?.additionalInfo?.userCredentialsEnabled === true;
} }
isUserCredentialPresent(): boolean { isUserActivated(): boolean {
return isDefinedAndNotNull(this.entity?.additionalInfo?.userCredentialsEnabled); return this.entity?.additionalInfo?.userActivated === true;
} }
buildForm(entity: User): UntypedFormGroup { buildForm(entity: User): UntypedFormGroup {

14
ui-ngx/src/app/shared/models/user.model.ts

@ -29,7 +29,19 @@ export interface User extends BaseData<UserId>, HasTenantId {
authority: Authority; authority: Authority;
firstName: string; firstName: string;
lastName: string; lastName: string;
additionalInfo: any; additionalInfo: Partial<UserAdditionalInfo>;
}
export interface UserAdditionalInfo {
userCredentialsEnabled: boolean;
userActivated: boolean;
description: string;
defaultDashboardId: string;
defaultDashboardFullscreen: boolean;
homeDashboardId: string;
homeDashboardHideToolbar: boolean;
lang: string;
[key: string]: any;
} }
export enum ActivationMethod { export enum ActivationMethod {

Loading…
Cancel
Save