IOT-1144 removed create,edit and delete from user with read permissions, from application, iot-device, datatarget, device model and top bar

Author: jeppeej

src/app/applications/application-detail/application-detail.component.html

@@ -1,6 +1,6 @@
 <div *ngIf="application">
   <app-top-bar [data]="application" [backButton]="backButton" [subPage]="true"
-    [ctaRouterLink]="['datatarget-list', application.name]" [ctaLabel]="'APPLICATION.DATATARGET-SHOW' | translate"
+    [dtRouterLink]="['datatarget-list', application.name]" [dtLabel]="'APPLICATION.DATATARGET-SHOW' | translate"
     [addDetailDowndown]="true" [dropDownButton]="dropdownButton" (deleteSelectedInDropdown)="onDeleteApplication()">
   </app-top-bar>
   <div class="container-fluid">

src/app/applications/applications-list/applications-table/applications-table.component.html

@@ -35,7 +35,7 @@
       <ng-container matColumnDef="menu">
         <th mat-header-cell *matHeaderCellDef class="col-1"></th>
         <td mat-cell *matCellDef="let element">
-          <div class="dropdown">
+          <div class="dropdown" *ngIf="canEdit">
             <a href="#" role="button" id="tableRowDropdown-{{element.id}}" class="applicationRow__edit dropdown-toggle"
               data-toggle="dropdown" aria-expanded="false"
               [attr.aria-label]="'APPLICATION-TABLE-ROW.SHOW-OPTIONS' | translate"></a>

src/app/applications/applications-list/applications-table/applications-table.component.ts

@@ -1,11 +1,12 @@
-import { Component, ViewChild, AfterViewInit, Input } from '@angular/core';
+import { Component, ViewChild, AfterViewInit, Input, OnInit } from '@angular/core';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
 import { Router } from '@angular/router';
 import { Application, ApplicationData } from '@applications/application.model';
 import { ApplicationService } from '@applications/application.service';
 import { environment } from '@environments/environment';
 import { DeleteDialogService } from '@shared/components/delete-dialog/delete-dialog.service';
+import { MeService } from '@shared/services/me.service';
 import { merge, Observable, of as observableOf } from 'rxjs';
 import { catchError, map, startWith, switchMap } from 'rxjs/operators';
 
@@ -17,7 +18,7 @@ import { catchError, map, startWith, switchMap } from 'rxjs/operators';
   styleUrls: ['./applications-table.component.scss'],
   templateUrl: './applications-table.component.html',
 })
-export class ApplicationsTableComponent implements AfterViewInit {
+export class ApplicationsTableComponent implements AfterViewInit, OnInit {
   @Input() organizationId: number;
   @Input() permissionId: number;
   displayedColumns: string[] = ['name', 'devices', 'menu'];
@@ -27,16 +28,22 @@ export class ApplicationsTableComponent implements AfterViewInit {
   resultsLength = 0;
   isLoadingResults = true;
   public errorMessage: string;
+  public canEdit = false;
 
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
   constructor(
     private applicationService: ApplicationService,
     private router: Router,
+    private meService: MeService,
     private deleteDialogService: DeleteDialogService
   ) { }
 
+  ngOnInit() {
+    this.canEdit = this.meService.canWriteInTargetOrganization()
+  }
+
   ngAfterViewInit() {
     // If the user changes the sort order, reset back to the first page.
     this.sort.sortChange.subscribe(() => (this.paginator.pageIndex = 0));

src/app/applications/datatarget/datatarget-table/datatarget-table.component.html

@@ -28,7 +28,7 @@
       <ng-container matColumnDef="menu">
         <th mat-header-cell *matHeaderCellDef class="col-1"></th>
         <td mat-cell *matCellDef="let element">
-          <div class="dropdown">
+          <div class="dropdown" *ngIf="canEdit">
             <a href="#" role="button" id="tableRowDropdown-{{element.id}}" class="applicationRow__edit dropdown-toggle"
               data-toggle="dropdown" aria-expanded="false"
               [attr.aria-label]="'DATATARGET-TABLE-ROW.SHOW-OPTIONS' | translate"></a>

src/app/applications/datatarget/datatarget-table/datatarget-table.component.ts

@@ -10,6 +10,7 @@ import { MatSort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { environment } from '@environments/environment';
 import { tableSorter } from '@shared/helpers/table-sorting.helper';
+import { MeService } from '@shared/services/me.service';
 
 @Component({
     selector: 'app-datatarget-table',
@@ -23,6 +24,7 @@ export class DatatargetTableComponent implements OnInit, AfterViewInit, OnDestro
     dataSource = new MatTableDataSource<Datatarget>();
     datatargets: Datatarget[];
     resultsLength = 0;
+    public canEdit = false;
     @Input() isLoadingResults: boolean;
     public pageSize = environment.tablePageSize;
 
@@ -38,6 +40,7 @@ export class DatatargetTableComponent implements OnInit, AfterViewInit, OnDestro
         private route: ActivatedRoute,
         private deleteDialogService: DeleteDialogService,
         private datatargetService: DatatargetService,
+        private meService: MeService,
         public translate: TranslateService) {
         translate.use('da');
     }
@@ -46,6 +49,7 @@ export class DatatargetTableComponent implements OnInit, AfterViewInit, OnDestro
         this.applicationId = +Number(this.route.parent.parent.snapshot.paramMap.get('id'));
         console.log(this.applicationId);
         this.getDatatarget();
+        this.canEdit = this.meService.canWriteInTargetOrganization()
     }
 
     ngAfterViewInit() {

src/app/applications/iot-devices/iot-devices-table/iot-devices-table.component.html

@@ -56,7 +56,7 @@
     <ng-container matColumnDef="menu">
       <th mat-header-cell *matHeaderCellDef></th>
       <td mat-cell *matCellDef="let element">
-        <div class="dropdown ">
+        <div class="dropdown" *ngIf="canEdit">
           <a href="#" role="button" id="tableRowDropdown-{{element.id}}" class="applicationRow__edit dropdown-toggle"
             data-toggle="dropdown" aria-expanded="false"
             [attr.aria-label]="'APPLICATION-TABLE-ROW.SHOW-OPTIONS' | translate"></a>

src/app/applications/iot-devices/iot-devices-table/iot-devices-table.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, Input, ViewChild, AfterViewInit, OnInit } from '@angular/core';
 import { merge, Observable, of as observableOf } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
 import { RestService } from 'src/app/shared/services/rest.service';
@@ -17,16 +17,16 @@ import { DeleteDialogService } from '@shared/components/delete-dialog/delete-dia
 import { ReceivedMessageMetadata } from '@shared/models/received-message-metadata.model';
 import { environment } from '@environments/environment';
 import { startWith, switchMap, map, catchError } from 'rxjs/operators';
+import { MeService } from '@shared/services/me.service';
 
 @Component({
   selector: 'app-iot-devices-table',
   templateUrl: './iot-devices-table.component.html',
   styleUrls: ['./iot-devices-table.component.scss'],
 })
-export class IotDevicesTableComponent implements AfterViewInit {
+export class IotDevicesTableComponent implements AfterViewInit, OnInit {
   @Input() applicationId: number;
   data: IotDevice[] = [];
-
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
   public pageSize = environment.tablePageSize;
@@ -37,6 +37,7 @@ export class IotDevicesTableComponent implements AfterViewInit {
     'active',
     'menu',
   ];
+  public canEdit = false;
 
   private readonly CHIRPSTACK_BATTERY_NOT_AVAILIBLE = 255;
 
@@ -50,12 +51,17 @@ export class IotDevicesTableComponent implements AfterViewInit {
     private deleteDialogService: DeleteDialogService,
     public translate: TranslateService,
     public iotDeviceService: IoTDeviceService,
+    private meService: MeService,
     private dialog: MatDialog
   ) {
     translate.use('da');
     moment.locale('da');
   }
 
+  ngOnInit() {
+    this.canEdit = this.meService.canWriteInTargetOrganization()
+  }
+
   ngAfterViewInit() {
     // If the user changes the sort order, reset back to the first page.
     this.sort.sortChange.subscribe(() => (this.paginator.pageIndex = 0));

src/app/device-model/device-model-table/device-model-table.component.html

@@ -28,7 +28,7 @@
         <ng-container matColumnDef="menu">
             <th mat-header-cell *matHeaderCellDef></th>
             <td mat-cell *matCellDef="let element">
-                <div class="dropdown">
+                <div class="dropdown" *ngIf="canEdit">
                     <a href="#" role="button" id="tableRowDropdown-{{ element.id }}"
                         class="applicationRow__edit dropdown-toggle" data-toggle="dropdown" aria-expanded="false"
                         [attr.aria-label]="'DEVICE-MODEL.SHOW-OPTIONS' | translate"></a>

src/app/device-model/device-model-table/device-model-table.component.ts

@@ -12,6 +12,7 @@ import { MatTableDataSource } from '@angular/material/table';
 import { environment } from '@environments/environment';
 import { TranslateService } from '@ngx-translate/core';
 import { DeleteDialogService } from '@shared/components/delete-dialog/delete-dialog.service';
+import { MeService } from '@shared/services/me.service';
 import { SharedVariableService } from '@shared/shared-variable/shared-variable.service';
 import { merge, Observable, of as observableOf, Subscription } from 'rxjs';
 import { startWith, switchMap, map, catchError } from 'rxjs/operators';
@@ -26,26 +27,25 @@ import { DeviceModel, DeviceModelResponse } from '../device.model';
 export class DeviceModelTableComponent implements OnInit, AfterViewInit {
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
-
   public data: DeviceModel[];
-
   public displayedColumns: string[] = ['name', 'id', 'menu'];
   public pageSize = environment.tablePageSize;
   public isLoadingResults = false;
   public resultsLength = 0;
-  public hasWritePermission = false;
   deleteDialogSubscription: Subscription;
   errorTitle: string;
+  public canEdit = false;
 
   constructor(
     private sharedVariableService: SharedVariableService,
     private deviceModelService: DeviceModelService,
     private deleteDialogservice: DeleteDialogService,
-    private translateService: TranslateService
+    private translateService: TranslateService,
+    private meService: MeService
   ) {}
 
   ngOnInit(): void {
-    this.hasWritePermission = this.sharedVariableService.getHasWritePermission();
+    this.canEdit = this.meService.canWriteInTargetOrganization()
     this.translateService
       .get(['DEVICE-MODEL.DELETE-FAILED'])
       .subscribe((translations) => {

src/app/shared/components/top-bar/top-bar.component.html

@@ -25,9 +25,14 @@ <h3 class="pl-md-3">{{title || staticTitle}}</h3>
 
           <!-- action buttons -->
           <div class="action-group d-flex justify-content-end">
-            <button *ngIf="ctaRouterLink && ctaRouterLink != ''" [routerLink]="ctaRouterLink" routerLinkActive="active"
+
+            <button *ngIf="ctaRouterLink && ctaRouterLink != '' && canEdit" [routerLink]="ctaRouterLink" routerLinkActive="active"
               class="btn btn-primary mr-1" type="button" [attr.aria-label]="ctaLabel">{{ctaLabel}}</button>
-            <div class="btn-group float-md-right dropdown" *ngIf="dropDownButton && addDetailDowndown === true">
+
+            <button *ngIf="dtRouterLink && dtRouterLink != ''" [routerLink]="dtRouterLink" routerLinkActive="active"
+            class="btn btn-primary mr-1" type="button" [attr.aria-label]="dtLabel">{{dtLabel}}</button>
+            
+            <div class="btn-group float-md-right dropdown" *ngIf="dropDownButton && addDetailDowndown === true && canEdit">
               <button type="button" id="dropdown-{{ data.name }}" class="btn btn-primary dropdown-toggle"
                 data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 {{dropDownButton.label}} <span class="caret"></span>