Show overview of gateway status

src/app/admin/api-key/api-key-list/api-key-list.component.html

@@ -2,6 +2,7 @@
   [title]="'NAV.API-KEY' | translate"
   [ctaLabel]="'API-KEY.CREATE-NEW-API-KEY' | translate"
   [ctaRouterLink]="'new-api-key'"
+  [canEdit]="canEdit"
 >
 </app-top-bar>
 <div class="container-fluid">

src/app/admin/api-key/api-key-list/api-key-list.component.ts

@@ -2,6 +2,8 @@ import { Component, Input, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { TranslateService } from '@ngx-translate/core';
 import { SharedVariableService } from '@shared/shared-variable/shared-variable.service';
+import { MeService } from '@shared/services/me.service';
+import { OrganizationAccessScope } from '@shared/enums/access-scopes';
 
 @Component({
   selector: 'app-api-key-list',
@@ -10,11 +12,13 @@ import { SharedVariableService } from '@shared/shared-variable/shared-variable.s
 })
 export class ApiKeyListComponent implements OnInit {
   @Input() organisationId: number;
+  canEdit: boolean;
 
   constructor(
     public translate: TranslateService,
     private titleService: Title,
-    private globalService: SharedVariableService
+    private globalService: SharedVariableService,
+    private meService: MeService
   ) {
     translate.use('da');
   }
@@ -24,5 +28,6 @@ export class ApiKeyListComponent implements OnInit {
       this.titleService.setTitle(translations['TITLE.API-KEY']);
     });
     this.organisationId = this.globalService.getSelectedOrganisationId();
+    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.UserAdministrationWrite, this.organisationId);
   }
 }

src/app/admin/api-key/api-key-list/api-key-table/api-key-table.component.ts

@@ -9,6 +9,7 @@ import { merge, Observable, of } from 'rxjs';
 import { catchError, map, startWith, switchMap } from 'rxjs/operators';
 import { ApiKeyGetManyResponse, ApiKeyResponse } from '../../api-key.model';
 import { ApiKeyService } from '../../api-key.service';
+import { OrganizationAccessScope } from '@shared/enums/access-scopes';
 
 @Component({
   selector: 'app-api-key-table',
@@ -81,7 +82,8 @@ export class ApiKeyTableComponent implements AfterViewInit {
   }
 
   canAccess(_element: ApiKeyResponse) {
-    return this.meService.hasAdminAccessInTargetOrganization(
+    return this.meService.hasAccessToTargetOrganization(
+      OrganizationAccessScope.UserAdministrationWrite,
       this.organisationId
     );
   }

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

@@ -1,6 +1,13 @@
 <div [hidden]="!organisation" *ngIf="organisation">
-    <app-top-bar [data]="organisation" [backButton]="backButton" [subPage]="true" [addDetailDowndown]="true"
-        [dropDownButton]="dropdownButton" (deleteSelectedInDropdown)="clickDelete()">
+    <app-top-bar
+      [data]="organisation"
+      [backButton]="backButton"
+      [subPage]="true"
+      [addDetailDowndown]="true"
+      [dropDownButton]="dropdownButton"
+      (deleteSelectedInDropdown)="clickDelete()"
+      [canEdit]="canEdit"
+    >
     </app-top-bar>
     <div class="container-fluid">
         <div class="row">
@@ -34,4 +41,4 @@ <h3>
             </div>
         </div>
     </div>
-</div>
+</div>

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

@@ -15,6 +15,8 @@ import { DropdownButton } from '@shared/models/dropdown-button.model';
 import { ApplicationService } from '@applications/application.service';
 import { environment } from '@environments/environment';
 import { Title } from '@angular/platform-browser';
+import { MeService } from '@shared/services/me.service';
+import { OrganizationAccessScope } from '@shared/enums/access-scopes';
 
 @Component({
   selector: 'app-organisation-detail',
@@ -41,6 +43,7 @@ export class OrganisationDetailComponent implements OnInit, OnChanges, OnDestroy
   id: number;
   subscription: Subscription;
   permissions: PermissionResponse[];
+  canEdit: boolean;
 
   constructor(
     public translate: TranslateService,
@@ -49,7 +52,8 @@ export class OrganisationDetailComponent implements OnInit, OnChanges, OnDestroy
     private permissionsService: PermissionService,
     private deleteDialogService: DeleteDialogService,
     private location: Location,
-    private titleService: Title
+    private titleService: Title,
+    private meService: MeService
   ) { }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -71,8 +75,10 @@ export class OrganisationDetailComponent implements OnInit, OnChanges, OnDestroy
       .subscribe(translations => {
         this.backButton.label = translations['NAV.ORGANISATIONS'];
         this.dropdownButton.label = translations['ORGANISATION.DROPDOWN'];
-        this.titleService.setTitle(translations['TITLE.ORGANIZATION'])
+        this.titleService.setTitle(translations['TITLE.ORGANIZATION']);
       });
+
+    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.UserAdministrationWrite);
   }
 
   ngOnDestroy() {
@@ -119,6 +125,6 @@ export class OrganisationDetailComponent implements OnInit, OnChanges, OnDestroy
           }
         });
       }
-    })
+    });
   }
 }

src/app/admin/organisation/organisation-list/organisation-list.component.html

@@ -1,5 +1,5 @@
 <app-top-bar [title]="'NAV.ORGANISATIONS' | translate"
-    [ctaLabel]="'ORGANISATION.FORM.CREATE-NEW-ORGANISATION' | translate" [ctaRouterLink]="'new-organisation'">
+    [ctaLabel]="'ORGANISATION.FORM.CREATE-NEW-ORGANISATION' | translate" [ctaRouterLink]="'new-organisation'" [canEdit]="canEdit">
 </app-top-bar>
 <div class="container-fluid">
     <div class="row">
@@ -9,4 +9,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

src/app/admin/organisation/organisation-list/organisation-list.component.ts

@@ -1,23 +1,29 @@
 import { Component, OnInit } from '@angular/core';
 import { Title } from '@angular/platform-browser';
 import { TranslateService } from '@ngx-translate/core';
-import { Sort } from '@shared/models/sort.model';
+import { MeService } from '@shared/services/me.service';
+import { OrganizationAccessScope } from '@shared/enums/access-scopes';
 
 @Component({
   selector: 'app-organisation-list',
   templateUrl: './organisation-list.component.html',
   styleUrls: ['./organisation-list.component.scss'],
 })
 export class OrganisationListComponent implements OnInit {
-
-  constructor(public translate: TranslateService, private titleService: Title) {
+  canEdit: boolean;
+
+  constructor(
+    public translate: TranslateService,
+    private titleService: Title,
+    private meService: MeService
+  ) {
     translate.use('da');
   }
 
   ngOnInit(): void {
-    this.translate.get(['TITLE.ORGANIZATION'])
-      .subscribe(translations => {
-        this.titleService.setTitle(translations['TITLE.ORGANIZATION']);
-      });
-   }
+    this.translate.get(['TITLE.ORGANIZATION']).subscribe((translations) => {
+      this.titleService.setTitle(translations['TITLE.ORGANIZATION']);
+    });
+    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.UserAdministrationWrite);
+  }
 }

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

@@ -1,6 +1,6 @@
 <div *ngIf="permission">
     <app-top-bar [data]="permission" [backButton]="backButton" [subPage]="true" [addDetailDowndown]="true"
-        [dropDownButton]="dropdownButton" (deleteSelectedInDropdown)="onDeletePermission()">
+        [dropDownButton]="dropdownButton" (deleteSelectedInDropdown)="onDeletePermission()" [canEdit]="canEdit">
     </app-top-bar>
     <div class="container-fluid">
         <div class="row">
@@ -33,13 +33,13 @@ <h3>
                         {{ 'PERMISSION.DETAIL.APPLICATIONS' | translate }}
                     </h3>
 
-                    <app-applications-table *ngIf="permission.type == 'Write' || permission.type == 'Read'" [permissionId]="id">
+                    <app-applications-table *ngIf="permission.type == 'Read'" [permissionId]="id">
                     </app-applications-table>
-                    <app-applications-table *ngIf="permission.type == 'OrganizationAdmin'" [organizationId]="permission.organization?.id">
+                    <app-applications-table *ngIf="permission.type == 'OrganizationApplicationAdmin'" [organizationId]="permission.organization?.id">
                     </app-applications-table>
                     <app-applications-table *ngIf="permission.type == 'GlobalAdmin'"></app-applications-table>
                 </div>
             </div>
         </div>
     </div>
-</div>
+</div>

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

@@ -11,6 +11,8 @@ import { DropdownButton } from '@shared/models/dropdown-button.model';
 import { DeleteDialogService } from '@shared/components/delete-dialog/delete-dialog.service';
 import { environment } from '@environments/environment';
 import { Title } from '@angular/platform-browser';
+import { MeService } from '@shared/services/me.service';
+import { OrganizationAccessScope } from '@shared/enums/access-scopes';
 
 
 @Component({
@@ -43,14 +45,16 @@ export class PermissionDetailComponent implements OnInit, OnChanges {
   subscription: Subscription;
   users: UserResponse[];
   dropdownButton: DropdownButton;
+  canEdit: boolean;
 
   constructor(
     public translate: TranslateService,
     private route: ActivatedRoute,
     private permissionService: PermissionService,
     private router: Router,
     private titleService: Title,
-    private deleteDialogService: DeleteDialogService
+    private deleteDialogService: DeleteDialogService,
+    private meService: MeService
   ) { }
 
   ngOnInit(): void {
@@ -62,14 +66,15 @@ export class PermissionDetailComponent implements OnInit, OnChanges {
         label: '',
         editRouterLink: 'edit-permission',
         isErasable: true,
-      }
+      };
     }
     this.translate.get(['NAV.PERMISSIONS', 'PERMISSION.DETAIL.DROPDOWN', 'TITLE.PERMISSION'])
       .subscribe(translations => {
         this.backButton.label = translations['NAV.PERMISSIONS'];
         this.dropdownButton.label = translations['PERMISSION.DETAIL.DROPDOWN'];
         this.titleService.setTitle(translations['TITLE.PERMISSION']);
       });
+    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.UserAdministrationWrite);
   }
 
   ngOnChanges(changes: SimpleChanges): void {
@@ -95,7 +100,7 @@ export class PermissionDetailComponent implements OnInit, OnChanges {
           }
         });
       }
-    })
+    });
   }
 
   onEditPermission() {

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

@@ -213,7 +213,7 @@ export class PermissionEditComponent implements OnInit, OnDestroy {
 
         if (
           response.type === PermissionType.Read ||
-          response.type === PermissionType.Write
+          response.type === PermissionType.OrganizationApplicationAdmin
         ) {
           this.getApplications(this.permission.organizationId);
           this.permission.applicationIds = response.applications.map(
@@ -252,12 +252,13 @@ export class PermissionEditComponent implements OnInit, OnDestroy {
   }
 
   allowedLevels() {
-    if (this.permission.level == PermissionType.GlobalAdmin) {
+    if (this.permission.level === PermissionType.GlobalAdmin) {
       return [PermissionType.GlobalAdmin];
     }
     return [
-      PermissionType.OrganizationAdmin,
-      PermissionType.Write,
+      PermissionType.OrganizationUserAdmin,
+      PermissionType.OrganizationApplicationAdmin,
+      PermissionType.OrganizationGatewayAdmin,
       PermissionType.Read,
     ];
   }
@@ -280,7 +281,7 @@ export class PermissionEditComponent implements OnInit, OnDestroy {
 
   isOrganizationApplicationPermission() {
     return (
-      this.permission.level ==
+      this.permission.level ===
         PermissionType.OrganizationApplicationPermissions ||
       this.isReadOrWrite()
     );
@@ -289,7 +290,7 @@ export class PermissionEditComponent implements OnInit, OnDestroy {
   isReadOrWrite(): boolean {
     return (
       this.permission.level === PermissionType.Read ||
-      this.permission.level === PermissionType.Write
+      this.permission.level === PermissionType.OrganizationApplicationAdmin
     );
   }
 

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

@@ -1,5 +1,5 @@
 <app-top-bar [pageLimit]="pageLimit" [title]="'NAV.PERMISSIONS' | translate"
-    [ctaLabel]="'FORM.CREATE-NEW-PERMISSION' | translate" [ctaRouterLink]="'new-permission'"></app-top-bar>
+    [ctaLabel]="'FORM.CREATE-NEW-PERMISSION' | translate" [ctaRouterLink]="'new-permission'" [canEdit]="canEdit"></app-top-bar>
 <div class="container-fluid">
     <div class="row">
         <div class="col-12">
@@ -9,4 +9,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>

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

@@ -6,6 +6,8 @@ import { PermissionService } from '../permission.service';
 import { Sort } from '@shared/models/sort.model';
 import { environment } from '@environments/environment';
 import { Title } from '@angular/platform-browser';
+import { MeService } from '@shared/services/me.service';
+import { OrganizationAccessScope } from '@shared/enums/access-scopes';
 
 @Component({
   selector: 'app-permission-list',
@@ -19,11 +21,13 @@ export class PermissionListComponent implements OnInit, OnChanges {
 
   public permissions: PermissionResponse[];
   permissionSubscription: Subscription;
+  canEdit: boolean;
 
   constructor(
     public translate: TranslateService,
     private titleService: Title,
-    private permissionService: PermissionService
+    private permissionService: PermissionService,
+    private meService: MeService
   ) {
     translate.use('da');
   }
@@ -37,6 +41,7 @@ export class PermissionListComponent implements OnInit, OnChanges {
       .subscribe(translations => {
         this.titleService.setTitle(translations['TITLE.PERMISSION']);
     });
+    this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.UserAdministrationWrite);
   }
 
   getPermissions() {

src/app/admin/permission/permission-list/permission-tabel/permission-tabel.component.ts

@@ -14,6 +14,7 @@ import {
     PermissionType,
 } from '../../permission.model';
 import { PermissionService } from '../../permission.service';
+import { OrganizationAccessScope } from '@shared/enums/access-scopes';
 
 @Component({
     selector: 'app-permission-tabel',
@@ -110,10 +111,10 @@ export class PermissionTabelComponent implements AfterViewInit {
     }
 
     canAccess(element: PermissionResponse) {
-        if (element.type == PermissionType.GlobalAdmin) {
+        if (element.type === PermissionType.GlobalAdmin) {
             return this.meService.hasGlobalAdmin();
         }
-        return this.meService.hasAdminAccessInTargetOrganization(element.organization.id);
+        return this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.UserAdministrationWrite, element.organization.id);
     }
 
     private refresh() {

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

@@ -34,8 +34,9 @@ export interface PermissionGetManyResponse {
 
 export enum PermissionType {
   GlobalAdmin = 'GlobalAdmin',
-  OrganizationAdmin = 'OrganizationAdmin',
-  Write = 'Write',
+  OrganizationUserAdmin = 'OrganizationUserAdmin',
+  OrganizationGatewayAdmin = 'OrganizationGatewayAdmin',
+  OrganizationApplicationAdmin = 'OrganizationApplicationAdmin',
   Read = 'Read',
   OrganizationPermission = 'OrganizationPermission',
   OrganizationApplicationPermissions = 'OrganizationApplicationPermissions',

src/app/admin/users/user-detail/user-detail.component.html

@@ -1,6 +1,6 @@
 <div *ngIf="user">
     <app-top-bar [data]="user" [backButton]="backButton" [subPage]="true" [addDetailDowndown]="true"
-        [dropDownButton]="dropdownButton"></app-top-bar>
+        [dropDownButton]="dropdownButton" [canEdit]="canEdit"></app-top-bar>
     <div class="container-fluid">
         <div class="row">
             <div class="col-12">
@@ -34,4 +34,4 @@ <h3 class="">
             </div>
         </div>
     </div>
-</div>
+</div>