Simplify revised permission migration

src/app/admin/permission/permission-detail/permission-detail.component.html

@@ -33,8 +33,7 @@ <h3>
                         {{ 'PERMISSION.DETAIL.APPLICATIONS' | translate }}
                     </h3>
 
-                    <app-applications-table *ngIf="!isApplicationAdmin()" [permissionId]="id" [organizationId]="permission.organization?.id"></app-applications-table>
-                    <app-applications-table *ngIf="isApplicationAdmin()"></app-applications-table>
+                    <app-applications-table [permissionId]="id" [organizationId]="permission.organization?.id"></app-applications-table>
                 </div>
             </div>
         </div>

src/app/admin/permission/permission-detail/permission-detail.component.ts

@@ -113,14 +113,4 @@ export class PermissionDetailComponent implements OnInit, OnChanges {
   onEditPermission() {
     this.router.navigate(['edit-permission'], { relativeTo: this.route });
   }
-
-  isApplicationAdmin () {
-    if (this.permission) {
-      if (this.permission.type.some(perm => perm.type === PermissionType.OrganizationApplicationAdmin)) {
-        return true;
-      }
-    }
-
-	return false;
-  }
 }

src/app/admin/permission/permission.model.ts

@@ -23,6 +23,7 @@ export interface PermissionResponse {
   users?: UserResponse[];
   organization?: OrganisationResponse;
   applications?: Application[];
+  applicationIds?: number[];
   id: number;
   createdAt: Date;
   updatedAt: Date;

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

@@ -53,7 +53,7 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy {
         label: '',
         editRouterLink: '../../edit-application/' + this.id,
         isErasable: true,
-      };      
+      };
     }
 
     this.translate
@@ -68,7 +68,7 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy {
           translations['APPLICATION-TABLE-ROW.SHOW-OPTIONS'];
         this.titleService.setTitle(translations['TITLE.APPLICATION']);
       });
-    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite);
+    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, this.id);
   }
 
   onDeleteApplication() {

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

@@ -34,7 +34,7 @@
       <ng-container matColumnDef="menu">
         <th mat-header-cell *matHeaderCellDef class="col-1"></th>
         <td mat-cell *matCellDef="let element">
-          <div class="dropdown" *ngIf="canEdit">
+          <div class="dropdown" *ngIf="element?.id | canEditApplication">
             <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

@@ -38,7 +38,6 @@ export class ApplicationsTableComponent implements AfterViewInit, OnInit {
   resultsLength = 0;
   isLoadingResults = true;
   public errorMessage: string;
-  public canEdit = false;
 
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
@@ -47,12 +46,10 @@ export class ApplicationsTableComponent implements AfterViewInit, OnInit {
     public translate: TranslateService,
     private applicationService: ApplicationService,
     private router: Router,
-    private meService: MeService,
     private deleteDialogService: DeleteDialogService
   ) {}
 
   ngOnInit() {
-    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite);
   }
 
   ngAfterViewInit() {

src/app/applications/bulk-import/bulk-import.component.html

@@ -1,4 +1,4 @@
-<app-top-bar [backButtonTitle]="'NAV.APPLICATION' | translate" [title]="'APPLICATION.BULK.TITLE' | translate" [canEdit]="canEdit">
+<app-top-bar [backButtonTitle]="'NAV.APPLICATION' | translate" [title]="'APPLICATION.BULK.TITLE' | translate">
 </app-top-bar>
 <div class="row">
     <div class="col-12">

src/app/applications/bulk-import/bulk-import.component.ts

@@ -59,7 +59,6 @@ export class BulkImportComponent implements OnInit {
   private bulkMapper = new BulkMapping();
   public backButtonTitle: string;
   private applicationId;
-  canEdit: boolean;
 
   constructor(
     private papa: Papa,
@@ -80,9 +79,6 @@ export class BulkImportComponent implements OnInit {
       this.titleService.setTitle(translations['TITLE.BULKIMPORT']);
     });
     this.applicationId = +this.route.snapshot.paramMap.get('id');
-    this.canEdit = this.meService.hasAccessToTargetOrganization(
-      OrganizationAccessScope.ApplicationWrite
-    );
   }
 
   download({ name, url }: { name: string; url: string }) {

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

@@ -51,7 +51,7 @@ export class DatatargetTableComponent implements OnInit, AfterViewInit, OnDestro
     ngOnInit(): void {
         this.applicationId = +Number(this.route.parent.snapshot.paramMap.get('id'));
         this.getDatatarget();
-        this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite);
+        this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, this.applicationId);
     }
 
     ngAfterViewInit() {

src/app/applications/datatarget/fiware/fiware-detail/fiware-detail.component.ts

@@ -43,6 +43,7 @@ export class FiwareDetailComponent  implements DatatargetDetail, OnInit, OnDestr
 
   ngOnInit(): void {
       const id: number = +this.route.snapshot.paramMap.get('datatargetId');
+      const appId: number = +this.route.snapshot.paramMap.get('id');
 
       if (id) {
           this.getDatatarget(id);
@@ -58,7 +59,7 @@ export class FiwareDetailComponent  implements DatatargetDetail, OnInit, OnDestr
               this.backButton.label = translations['NAV.MY-DATATARGET'];
               this.dropdownButton.label = translations['DATATARGET.SHOW-OPTIONS'];
           });
-      this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite);
+      this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, appId);
   }
 
   getDatatarget(id: number) {

src/app/applications/datatarget/httppush/httppush-detail/httppush-detail.component.ts

@@ -43,6 +43,7 @@ export class HttppushDetailComponent  implements DatatargetDetail, OnInit, OnDes
 
   ngOnInit(): void {
       const id: number = +this.route.snapshot.paramMap.get('datatargetId');
+      const appId: number = +this.route.snapshot.paramMap.get('id');
       this.applicationName = this.route.snapshot.paramMap.get('name');
       if (id) {
           this.getDatatarget(id);
@@ -58,7 +59,7 @@ export class HttppushDetailComponent  implements DatatargetDetail, OnInit, OnDes
               this.backButton.label = translations['NAV.MY-DATATARGET'];
               this.dropdownButton.label = translations['DATATARGET.SHOW-OPTIONS'];
           });
-      this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite);
+      this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, appId);
   }
 
   getDatatarget(id: number) {

src/app/applications/datatarget/httppush/httppush-edit/httppush-edit.component.ts

@@ -114,7 +114,7 @@ export class HttppushEditComponent
     }
     this.getPayloadDecoders();
     this.setDataSetExcists();
-    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite);
+    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, this.applicationId);
   }
 
   addRow() {

src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.html

@@ -1,6 +1,7 @@
 <div *ngIf="datatarget">
   <app-top-bar [data]="datatarget" [backButton]="backButton" [subPage]="true" [addDetailDowndown]="true"
-    [dropDownButton]="dropdownButton" (deleteSelectedInDropdown)="onDeleteDatatarget()"></app-top-bar>
+    [dropDownButton]="dropdownButton" (deleteSelectedInDropdown)="onDeleteDatatarget()" [canEdit]="canEdit">
+  </app-top-bar>
   <div class="container-fluid">
     <div class="row">
       <div class="col-md-6 d-flex align-items-stretch">

src/app/applications/datatarget/mqtt-detail/mqtt-detail.component.ts

@@ -12,6 +12,8 @@ import { DropdownButton } from '@shared/models/dropdown-button.model';
 import { Subscription } from 'rxjs';
 import { Datatarget } from '../datatarget.model';
 import { DatatargetService } from '../datatarget.service';
+import { MeService } from '@shared/services/me.service';
+import { OrganizationAccessScope } from '@shared/enums/access-scopes';
 
 @Component({
   selector: 'app-mqtt-detail',
@@ -28,18 +30,21 @@ export class MqttDetailComponent
   private deleteDialogSubscription: Subscription;
   public dropdownButton: DropdownButton;
   arrowsAltH = faArrowsAltH;
+  canEdit: boolean;
 
   constructor(
     private route: ActivatedRoute,
     private deleteDialogService: DeleteDialogService,
     private location: Location,
     private datatargetRelationService: PayloadDeviceDatatargetService,
     private datatargetService: DatatargetService,
-    public translate: TranslateService
+    public translate: TranslateService,
+    private meService: MeService,
   ) {}
 
   ngOnInit(): void {
     const id: number = +this.route.snapshot.paramMap.get('datatargetId');
+    const appId: number = +this.route.snapshot.paramMap.get('id');
 
     if (id) {
       this.getDatatarget(id);
@@ -56,6 +61,7 @@ export class MqttDetailComponent
         this.backButton.label = translations['NAV.MY-DATATARGET'];
         this.dropdownButton.label = translations['DATATARGET.SHOW-OPTIONS'];
       });
+    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, appId);
   }
 
   getDatatarget(id: number) {

src/app/applications/iot-devices/iot-device-detail/iot-device-detail.component.ts

@@ -97,8 +97,9 @@ export class IoTDeviceDetailComponent implements OnInit, OnDestroy {
     ) { }
 
     ngOnInit(): void {
-        this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite);
         this.deviceId = +this.route.snapshot.paramMap.get('deviceId');
+        const appId: number = +this.route.snapshot.paramMap.get('id');
+        this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, appId);
 
         if (this.deviceId) {
             this.bindIoTDeviceAndApplication(this.deviceId);

src/app/applications/iot-devices/iot-device-edit/iot-device-edit.component.ts

@@ -93,7 +93,7 @@ export class IotDeviceEditComponent implements OnInit, OnDestroy {
         this.getServiceProfiles();
         this.getDeviceProfiles();
         this.getDeviceModels();
-        this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite);
+        this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, this.iotDevice.applicationId);
     }
 
     public compare(o1: any, o2: any): boolean {

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

@@ -25,6 +25,7 @@ import { catchError, map, startWith, switchMap } from 'rxjs/operators';
 import { RestService } from 'src/app/shared/services/rest.service';
 import { IoTDeviceService } from '../iot-device.service';
 import { DefaultPageSizeOptions } from '@shared/constants/page.constants';
+import { ActivatedRoute } from '@angular/router';
 
 @Component({
   selector: 'app-iot-devices-table',
@@ -64,14 +65,16 @@ export class IotDevicesTableComponent implements AfterViewInit, OnInit {
     public translate: TranslateService,
     public iotDeviceService: IoTDeviceService,
     private meService: MeService,
-    private dialog: MatDialog
+    private dialog: MatDialog,
+    private route: ActivatedRoute,
   ) {
     translate.use('da');
     moment.locale('da');
   }
 
   ngOnInit() {
-    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite);
+    const applicationId = +this.route.snapshot.paramMap.get('id');
+    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, applicationId);
   }
 
   ngAfterViewInit() {

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

@@ -57,7 +57,9 @@ export class MulticastTableComponent
   ngOnInit(): void {
     this.applicationId = +Number(this.route.parent.snapshot.paramMap.get('id'));
     this.canEdit = this.meService.hasAccessToTargetOrganization(
-      OrganizationAccessScope.ApplicationWrite
+      OrganizationAccessScope.ApplicationWrite,
+      undefined,
+      this.applicationId
     );
   }
 

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

@@ -37,6 +37,8 @@ export class DeviceModelDetailComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     const deviceModelId = +this.route.snapshot.paramMap.get('deviceId');
+    const appId: number = +this.route.snapshot.paramMap.get('id');
+
     if (deviceModelId) {
       this.getDeviceModel(deviceModelId);
       this.dropdownButton = {
@@ -53,7 +55,7 @@ export class DeviceModelDetailComponent implements OnInit, OnDestroy {
         this.title = translations['DEVICE-MODEL.DETAIL-TITLE'];
         this.errorTitle = translations['DEVICE-MODEL.DELETE-FAILED'];
       });
-    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite);
+    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, undefined, appId);
   }
 
   private getDeviceModel(id: number) {

src/app/payload-decoder/payload-decoder-detail/payload-decoder-detail.component.html

@@ -1,7 +1,7 @@
 <div>
     <app-top-bar *ngIf="payloadDecoder" [data]="payloadDecoder" [backButton]="backButton" [subPage]="true"
         [addDetailDowndown]="true" [dropDownButton]="dropdownButton" (deleteSelectedInDropdown)="onDeletePayload()"
-        [canEdit]="canEdit">
+        [canEdit]="payloadDecoder?.canEdit">
     </app-top-bar>
     <div *ngIf="payloadDecoder">
         <div class=" jumbotron">

src/app/payload-decoder/payload-decoder-detail/payload-decoder-detail.component.ts

@@ -57,7 +57,7 @@ export class PayloadDecoderDetailComponent implements OnInit, OnDestroy {
       });
   }
 
-  canEdit() {
+  private canEdit() {
     this.payloadDecoder.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.ApplicationWrite, this.payloadDecoder?.organizationId);
   }
 

src/app/shared/pipes/permission/can-edit-application.pipe.ts

@@ -0,0 +1,18 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { OrganizationAccessScope } from '@shared/enums/access-scopes';
+import { MeService } from '@shared/services/me.service';
+
+@Pipe({
+  name: 'canEditApplication',
+})
+export class CanEditApplicationPipe implements PipeTransform {
+  constructor(private meService: MeService) {}
+
+  transform(id: number | undefined): boolean {
+    return this.meService.hasAccessToTargetOrganization(
+      OrganizationAccessScope.ApplicationWrite,
+      undefined,
+      id
+    );
+  }
+}

src/app/shared/pipes/pipes.module.ts

@@ -2,14 +2,15 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { YesNoPipe } from './yesNo.pipe';
 import { ActiveDeactivePipe } from './activeDeactive.pipe';
-import { IsGlobalAdminPipe } from './is-global-admin.pipe';
+import { IsGlobalAdminPipe } from './permission/is-global-admin.pipe';
 import { CreatedUpdatedByPipe } from './created-updated-by.pipe';
 import { CustomDatePipe, CustomTableDatePipe, DateOnlyPipe } from './custom-date.pipe';
 import { FilterDevicesPipe } from './filter-devices.pipe';
-import { TranslatePermissionsPipe } from './translate-permissions.pipe';
+import { TranslatePermissionsPipe } from './permission/translate-permissions.pipe';
 import { SortByPipe } from './sort-by.pipe';
 import { GatewayStatusTooltipPipe } from './gateway/gateway-status-tooltip.pipe';
 import { GatewayStatusClassPipe } from './gateway/gateway-status-class.pipe';
+import { CanEditApplicationPipe } from './permission/can-edit-application.pipe';
 
 @NgModule({
   declarations: [
@@ -24,7 +25,8 @@ import { GatewayStatusClassPipe } from './gateway/gateway-status-class.pipe';
     TranslatePermissionsPipe,
     SortByPipe,
     GatewayStatusTooltipPipe,
-    GatewayStatusClassPipe
+    GatewayStatusClassPipe,
+    CanEditApplicationPipe,
   ],
   imports: [CommonModule],
   exports: [
@@ -39,7 +41,8 @@ import { GatewayStatusClassPipe } from './gateway/gateway-status-class.pipe';
     TranslatePermissionsPipe,
     SortByPipe,
     GatewayStatusTooltipPipe,
-    GatewayStatusClassPipe
+    GatewayStatusClassPipe,
+    CanEditApplicationPipe,
   ],
   providers: [
     DateOnlyPipe