From 3b104cb052db99454abd67f3ba3878fb4b92dc45 Mon Sep 17 00:00:00 2001
From: Kostis Trantzas <ktrantzas@ece.upatras.gr>
Date: Thu, 21 Nov 2024 18:24:50 +0200
Subject: [PATCH] Fix for #24 - A non-admin user must not be able to change a
 Service Order & Service state

---
 .../preview-service-order.component.html             | 12 ++++++------
 .../preview-service/preview-service.component.html   | 12 ++++++------
 .../preview-service/preview-service.component.ts     |  2 ++
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html
index 92974ea..950134d 100644
--- a/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html
+++ b/src/app/p_services/admin/orderManagement/preview-service-order/preview-service-order.component.html
@@ -155,12 +155,12 @@
                                                         </mat-form-field> -->
                                                     </div>
                                                     <div class="col-lg-6">
-                                                        <ng-container *ngIf="!editMode">
+                                                        <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">
                                                             <h6>State</h6>
                                                             <p [ngClass]="orderStateClassSelector(serviceOrder?.state)"><b>{{serviceOrder?.state}}</b></p>
                                                         </ng-container>
                 
-                                                        <mat-form-field *ngIf="editMode">
+                                                        <mat-form-field *ngIf="editMode && isAdminUser">
                                                             <mat-label>State</mat-label>
                                                             <mat-select formControlName="state">
                                                                 <ng-container *ngIf="serviceOrder?.state === 'INITIAL'">
@@ -181,7 +181,7 @@
                                                     </div>
                 
                                                     <div class="col-lg-6">
-                                                        <ng-container *ngIf="!editMode">
+                                                        <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">
                                                             <h6>Starting Date</h6>
                                                             <div *ngIf="serviceOrder?.startDate">
                                                                 <p class="mb-0">{{serviceOrder?.startDate | date:'d MMM y, h:mm a'}} - Local Time</p>
@@ -189,7 +189,7 @@
                                                             </div>
                                                         </ng-container>
                 
-                                                        <mat-form-field *ngIf="editMode" [owlDateTimeTrigger]="pickerFrom" class="mb-2">
+                                                        <mat-form-field *ngIf="editMode && isAdminUser" [owlDateTimeTrigger]="pickerFrom" class="mb-2">
                                                             <mat-label>Starting Date</mat-label>
                                                             <input matInput [owlDateTime]="pickerFrom" placeholder="Date Time"
                                                                 formControlName="startDate">
@@ -200,7 +200,7 @@
                                                     </div>
                 
                                                     <div class="col-lg-6">
-                                                        <ng-container *ngIf="!editMode">
+                                                        <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">
                                                             <h6>Expected Completion Date</h6>
                                                             <div *ngIf="serviceOrder?.expectedCompletionDate">
                                                                 <p class="mb-0">{{serviceOrder?.expectedCompletionDate | date:'d MMM y, h:mm a'}} - Local Time</p>
@@ -209,7 +209,7 @@
 
                                                         </ng-container>
                 
-                                                        <mat-form-field *ngIf="editMode" [owlDateTimeTrigger]="pickerUntil" class="mb-2">
+                                                        <mat-form-field *ngIf="editMode && isAdminUser" [owlDateTimeTrigger]="pickerUntil" class="mb-2">
                                                             <mat-label>Expected Completion Date </mat-label>
                                                             <input matInput [owlDateTime]="pickerUntil" placeholder="Date Time"
                                                                 formControlName="expectedCompletionDate">
diff --git a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html
index 7296ad1..fc1630d 100644
--- a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html
+++ b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.html
@@ -61,13 +61,13 @@
                                                   </div>
 
                                                   <div class="col-lg-4">
-                                                      <ng-container *ngIf="!editMode">
+                                                      <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">
                                                           <h6>State</h6>
                                                           <p [ngClass]="serviceStateClassSelector(service?.state)">
                                                               <b>{{service?.state}}</b></p>
                                                       </ng-container>
 
-                                                      <mat-form-field *ngIf="editMode">
+                                                      <mat-form-field *ngIf="editMode && isAdminUser">
                                                           <mat-label>State</mat-label>
                                                           <mat-select formControlName="state">
                                                               <mat-option *ngFor="let state of availableStates"
@@ -116,7 +116,7 @@
                                               <div class="row">
 
                                                   <div class="col-lg-4">
-                                                      <ng-container *ngIf="!editMode">
+                                                      <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">
                                                           <h6>Starting Date</h6>
                                                           <p [class.mb-0]="service?.startDate"
                                                               *ngIf="service?.startDate">
@@ -127,7 +127,7 @@
                                                               UTC</p>
                                                       </ng-container>
 
-                                                      <mat-form-field *ngIf="editMode"
+                                                      <mat-form-field *ngIf="editMode && isAdminUser"
                                                           [owlDateTimeTrigger]="pickerFrom" class="mb-2">
                                                           <mat-label>Starting Date</mat-label>
                                                           <input matInput [owlDateTime]="pickerFrom"
@@ -142,7 +142,7 @@
                                                   </div>
 
                                                   <div class="col-lg-4">
-                                                      <ng-container *ngIf="!editMode">
+                                                      <ng-container *ngIf="!editMode || (editMode && !isAdminUser)">
                                                           <h6>Ending Date</h6>
                                                           <p [class.mb-0]="service?.endDate" *ngIf="service?.endDate">
                                                               {{service?.endDate | date:'d MMM y, h:mm a'}} - Local
@@ -152,7 +152,7 @@
                                                               UTC</p>
                                                       </ng-container>
 
-                                                      <mat-form-field *ngIf="editMode"
+                                                      <mat-form-field *ngIf="editMode && isAdminUser"
                                                           [owlDateTimeTrigger]="pickerFrom" class="mb-2">
                                                           <mat-label>Ending Date</mat-label>
                                                           <input matInput [owlDateTime]="pickerFrom"
diff --git a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.ts b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.ts
index 715e063..4b56a2c 100644
--- a/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.ts
+++ b/src/app/p_services/admin/serviceActivationAndConfiguration/preview-service/preview-service.component.ts
@@ -52,6 +52,7 @@ export class PreviewServiceComponent implements OnInit {
     endDate: new FormControl()
   })
   editMode: boolean = false
+  isAdminUser: boolean = false
 
   newNote: boolean = false
   availableStates = ['feasibilityChecked', 'designed', 'reserved', 'inactive', 'active', 'terminated']
@@ -64,6 +65,7 @@ export class PreviewServiceComponent implements OnInit {
   jsonEditorOptions = new JsonEditorOptions()
 
   ngOnInit() {
+    this.isAdminUser = this.authService.portalUserJWT.realm_access.roles.includes('ADMIN')
 
     this.initSubscriptions()
 
-- 
GitLab