Merge stage for release 1.2.0

Author: GufCab

package-lock.json

@@ -35,6 +35,7 @@
     "all": "0.0.0",
     "animate.css": "^4.1.1",
     "bootstrap": "5.0.0-alpha2",
+    "chart.js": "^3.7.1",
     "file-saver": "^2.0.2",
     "guid-typescript": "^1.0.9",
     "jwt-decode": "^2.2.0",

package.json

@@ -15,6 +15,7 @@ import { UsersComponent } from './users/users.component';
 import { ApiKeyComponent } from './api-key/api-key.component';
 import { ApiKeyListComponent } from './api-key/api-key-list/api-key-list.component';
 import { ApiKeyEditComponent } from './api-key/api-key-edit/api-key-edit.component';
+import { AcceptUserComponent } from './users/accept-user/accept-user.component';
 
 
 const adminRoutes: Routes = [
@@ -32,6 +33,7 @@ const adminRoutes: Routes = [
             { path: 'new-user', component: UserEditComponent },
             { path: ':user-id', component: UserDetailComponent },
             { path: ':user-id/edit-user', component: UserEditComponent },
+            { path: 'accept-user/:user-id/:org-id', component: AcceptUserComponent }
         ]
     },
     {

src/app/admin/admin-routing.module.ts

@@ -32,6 +32,8 @@ import { ApiKeyComponent } from './api-key/api-key.component';
 import { ApiKeyListComponent } from './api-key/api-key-list/api-key-list.component';
 import { ApiKeyTableComponent } from './api-key/api-key-list/api-key-table/api-key-table.component';
 import { ApiKeyEditComponent } from './api-key/api-key-edit/api-key-edit.component';
+import { AwaitingUsersTableComponent } from './users/user-list/awaiting-users-table/awaiting-users-table.component';
+import { AcceptUserComponent } from './users/accept-user/accept-user.component';
 
 @NgModule({
   declarations: [
@@ -54,6 +56,8 @@ import { ApiKeyEditComponent } from './api-key/api-key-edit/api-key-edit.compone
     ApiKeyListComponent,
     ApiKeyTableComponent,
     ApiKeyEditComponent,
+    AwaitingUsersTableComponent,
+    AcceptUserComponent,
   ],
   imports: [
     AdminRoutingModule,

src/app/admin/admin.module.ts

@@ -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.html

@@ -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-list.component.ts

@@ -85,7 +85,7 @@
     <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
   </table>
   <mat-paginator
-    [pageSizeOptions]="[5, 10, 20]"
+    [pageSizeOptions]="pageSizeOptions"
     [pageSize]="pageSize"
     [length]="resultsLength"
     showFirstLastButtons

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

@@ -9,6 +9,8 @@ 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';
+import { DefaultPageSizeOptions } from '@shared/constants/page.constants';
 
 @Component({
   selector: 'app-api-key-table',
@@ -29,6 +31,7 @@ export class ApiKeyTableComponent implements AfterViewInit {
   @ViewChild(MatSort) sort: MatSort;
   resultsLength = 0;
   public pageSize = environment.tablePageSize;
+  pageSizeOptions = DefaultPageSizeOptions;
 
   constructor(
     private meService: MeService,
@@ -81,7 +84,8 @@ export class ApiKeyTableComponent implements AfterViewInit {
   }
 
   canAccess(_element: ApiKeyResponse) {
-    return this.meService.hasAdminAccessInTargetOrganization(
+    return this.meService.hasAccessToTargetOrganization(
+      OrganizationAccessScope.UserAdministrationWrite,
       this.organisationId
     );
   }

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

@@ -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.html

@@ -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
           }
         });
       }
-    })
+    });
   }
 }