From ac836298249527fe95e1b82c8fa14526490356a0 Mon Sep 17 00:00:00 2001
From: HardiReady <hardi@noarch.de>
Date: Sat, 20 Oct 2018 22:50:46 +0200
Subject: [PATCH] Restrict delete visibiity for user to MT+ level (CC-67)

---
 static/src/app/manage/ranks/rank-list/rank-item.component.ts | 2 +-
 .../src/app/manage/ranks/rank-list/rank-list.component.html  | 4 ++--
 .../src/app/manage/squads/squad-list/squad-item.component.ts | 2 +-
 .../app/manage/squads/squad-list/squad-list.component.html   | 4 ++--
 .../src/app/manage/users/user-list/user-item.component.html  | 1 +
 static/src/app/manage/users/user-list/user-item.component.ts | 5 +++--
 .../src/app/manage/users/user-list/user-list.component.html  | 4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/static/src/app/manage/ranks/rank-list/rank-item.component.ts b/static/src/app/manage/ranks/rank-list/rank-item.component.ts
index 44b3ea3..f94a29d 100644
--- a/static/src/app/manage/ranks/rank-list/rank-item.component.ts
+++ b/static/src/app/manage/ranks/rank-list/rank-item.component.ts
@@ -3,7 +3,7 @@ import {Rank} from '../../../models/model-interfaces';
 import {Fraction} from '../../../utils/fraction.enum';
 
 @Component({
-  selector: 'pjm-rank-item',
+  selector: 'cc-rank-item',
   templateUrl: './rank-item.component.html',
   styleUrls: ['./rank-item.component.css', '../../../style/list-entry.css'],
   changeDetection: ChangeDetectionStrategy.OnPush
diff --git a/static/src/app/manage/ranks/rank-list/rank-list.component.html b/static/src/app/manage/ranks/rank-list/rank-list.component.html
index 7c5ac4a..625e54b 100644
--- a/static/src/app/manage/ranks/rank-list/rank-list.component.html
+++ b/static/src/app/manage/ranks/rank-list/rank-list.component.html
@@ -12,11 +12,11 @@
                   (executeSearch)="filterRanks()">
   </cc-list-search>
 
-  <pjm-rank-item *ngFor="let rank of ranks$ | async"
+  <cc-rank-item *ngFor="let rank of ranks$ | async"
                  [rank]="rank"
                  (rankDelete)="deleteRank(rank)"
                  (rankSelected)="selectRank($event)"
                  [selected]="rank._id == selectedRankId">
-  </pjm-rank-item>
+  </cc-rank-item>
 
 </div>
diff --git a/static/src/app/manage/squads/squad-list/squad-item.component.ts b/static/src/app/manage/squads/squad-list/squad-item.component.ts
index b877f98..646e5a0 100644
--- a/static/src/app/manage/squads/squad-list/squad-item.component.ts
+++ b/static/src/app/manage/squads/squad-list/squad-item.component.ts
@@ -3,7 +3,7 @@ import {Squad} from '../../../models/model-interfaces';
 import {Fraction} from '../../../utils/fraction.enum';
 
 @Component({
-  selector: 'pjm-squad-item',
+  selector: 'cc-squad-item',
   templateUrl: './squad-item.component.html',
   styleUrls: ['./squad-item.component.css', '../../../style/list-entry.css'],
   changeDetection: ChangeDetectionStrategy.OnPush
diff --git a/static/src/app/manage/squads/squad-list/squad-list.component.html b/static/src/app/manage/squads/squad-list/squad-list.component.html
index 5639924..79741c4 100644
--- a/static/src/app/manage/squads/squad-list/squad-list.component.html
+++ b/static/src/app/manage/squads/squad-list/squad-list.component.html
@@ -12,10 +12,10 @@
                   (executeSearch)="filterSquads()">
   </cc-list-search>
 
-  <pjm-squad-item *ngFor="let squad of squads$ | async"
+  <cc-squad-item *ngFor="let squad of squads$ | async"
                   [squad]="squad"
                   (squadDelete)="deleteSquad(squad)"
                   (squadSelected)="selectSquad($event)"
                   [selected]="squad._id == selectedSquadId">
-  </pjm-squad-item>
+  </cc-squad-item>
 </div>
diff --git a/static/src/app/manage/users/user-list/user-item.component.html b/static/src/app/manage/users/user-list/user-item.component.html
index 4f399d1..a74a2d1 100644
--- a/static/src/app/manage/users/user-list/user-item.component.html
+++ b/static/src/app/manage/users/user-list/user-item.component.html
@@ -14,6 +14,7 @@
 
     <div class="col-sm-4">
       <mat-icon (click)="delete(); $event.stopPropagation()" matTooltip="{{'users.list.tooltip.delete' | translate}}"
+                *ngIf="loginService.hasPermission(3)"
                 class="pull-right" style="margin-top: 8px;" svgIcon="delete"></mat-icon>
       <mat-icon (click)="award(); $event.stopPropagation()" matTooltip="{{'users.list.tooltip.awards' | translate}}"
                 class="icon-award pull-right" svgIcon="award"></mat-icon>
diff --git a/static/src/app/manage/users/user-list/user-item.component.ts b/static/src/app/manage/users/user-list/user-item.component.ts
index 9887618..0e474cc 100644
--- a/static/src/app/manage/users/user-list/user-item.component.ts
+++ b/static/src/app/manage/users/user-list/user-item.component.ts
@@ -1,9 +1,10 @@
 import {ChangeDetectionStrategy, Component, EventEmitter, Input, Output} from '@angular/core';
 import {User} from '../../../models/model-interfaces';
 import {Fraction} from '../../../utils/fraction.enum';
+import {LoginService} from '../../../services/app-user-service/login-service';
 
 @Component({
-  selector: 'pjm-user-item',
+  selector: 'cc-user-item',
   templateUrl: './user-item.component.html',
   styleUrls: ['./user-item.component.css', '../../../style/list-entry.css'],
   changeDetection: ChangeDetectionStrategy.OnPush
@@ -20,7 +21,7 @@ export class UserItemComponent {
 
   readonly fraction = Fraction;
 
-  constructor() {
+  constructor(public loginService: LoginService) {
   }
 
   select() {
diff --git a/static/src/app/manage/users/user-list/user-list.component.html b/static/src/app/manage/users/user-list/user-list.component.html
index f728040..2463e0e 100644
--- a/static/src/app/manage/users/user-list/user-list.component.html
+++ b/static/src/app/manage/users/user-list/user-list.component.html
@@ -19,12 +19,12 @@
        [infiniteScrollDistance]="scrollDistance"
        [infiniteScrollThrottle]="throttle"
        (scrolled)="onScrollDown()">
-    <pjm-user-item *ngFor="let user of users$ | async"
+    <cc-user-item *ngFor="let user of users$ | async"
                    [user]="user"
                    (userDelete)="deleteUser(user)"
                    (userSelected)="selectUser($event)"
                    (userAward)="awardUser($event)"
                    [selected]="user._id == selectedUserId">
-    </pjm-user-item>
+    </cc-user-item>
   </div>
 </div>