fix(account-actions): Remove action box in the card of account user (#…

…726) * fix(account-actions): Remove action box in the card of account user * fix(account-actions): Remove action box in the card of account user - review fixes
bwsw · Dec 5, 2017 · 542df61 · 542df61
1 parent 4ab0bde
commit 542df61
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/src/app/account/account-sidebar/account-sidebar.component.html b/src/app/account/account-sidebar/account-sidebar.component.html
@@ -2,7 +2,7 @@
   <div class="title-container">
     <h4 class="details-header">{{ entity.name }}</h4>
     <button
-      *ngIf="isAdmin()"
+      *ngIf="isAdmin() && !isSelf"
       mat-icon-button
       [matMenuTriggerFor]="actionsMenu"
     >

diff --git a/src/app/account/account-sidebar/account-sidebar.component.ts b/src/app/account/account-sidebar/account-sidebar.component.ts
@@ -10,9 +10,14 @@ import { AuthService } from '../../shared/services/auth.service';
   styleUrls: ['account-sidebar.component.scss']
 })
 export class AccountSidebarComponent {
-  @Input() public entity: any;
+  @Input() public entity: Account;
   @Output() public onAccountChanged = new EventEmitter<Account>();
 
+  public get isSelf() {
+    return this.authService.user.username === this.entity.name
+      && this.authService.user.domainid === this.entity.domainid;
+  }
+
   constructor(
     protected notificationService: NotificationService,
     protected route: ActivatedRoute,
@@ -30,5 +35,4 @@ export class AccountSidebarComponent {
   public isAdmin() {
     return this.authService.isAdmin();
   }
-
 }
diff --git a/src/app/account/account/account-item.component.ts b/src/app/account/account/account-item.component.ts
@@ -13,6 +13,11 @@ export class AccountItemComponent {
 
   readonly stateTranslations = stateTranslations;
 
+  public get isSelf() {
+    return this.authService.user.username === this.item.name
+      && this.authService.user.domainid === this.item.domainid;
+  }
+
   constructor(protected authService: AuthService) {
   }
 

diff --git a/src/app/account/account/card-item/account-card-item.component.html b/src/app/account/account/card-item/account-card-item.component.html
@@ -18,7 +18,7 @@
         > {{ item.name }} </span>
       </h2>
     </mat-card-title>
-    <div class="mat-card-header-menu" *ngIf="isAdmin()">
+    <div class="mat-card-header-menu" *ngIf="isAdmin() && !isSelf">
       <button mat-icon-button [matMenuTriggerFor]="actionsMenu">
         <mat-icon>more_vert</mat-icon>
       </button>

diff --git a/src/app/account/account/row-item/account-row-item.component.html b/src/app/account/account/row-item/account-row-item.component.html
@@ -23,7 +23,7 @@ <h2 class="row-title">
     {{ 'ACCOUNT_PAGE.CARD.DOMAIN' | translate }}: {{item.domain}}
   </div>
 
-  <button *ngIf="isAdmin()"
+  <button *ngIf="isAdmin() && !isSelf"
           class="row-action"
           mat-icon-button
           [matMenuTriggerFor]="actionsMenu">