Merge branch 'stage' into feature/IOT-1583-MoveApplication

Author: fcv-iteratorIt

.github/workflows/on-push-pr.action.yml

@@ -17,12 +17,9 @@ jobs:
   vulnerabilities-scan:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-        name: Checkout repository
-      - uses: debricked/actions/scan@v1
-        name: Run a vulnerability scan
+      - uses: actions/checkout@v4
+      - uses: debricked/actions@v4
         env:
-          # Token must have API access scope to run scans
           DEBRICKED_TOKEN: ${{ secrets.DEBRICKED_TOKEN }}
   code-build:
     runs-on: ubuntu-latest

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

@@ -10,6 +10,13 @@
   >
   </app-top-bar>
   <div class="container-fluid">
+    <div *ngIf="errorMessages" class="error-messages p-3">
+      <ul class="mb-0">
+        <li *ngFor="let error of errorMessages">
+          {{ error | translate }}
+        </li>
+      </ul>
+    </div>
     <div class="row">
       <div class="col-12">
         <div class="jumbotron">

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

@@ -17,6 +17,8 @@ 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";
+import { ErrorMessageService } from "@shared/error-message.service";
+import { HttpErrorResponse } from "@angular/common/http";
 
 @Component({
   selector: "app-organisation-detail",
@@ -34,6 +36,7 @@ export class OrganisationDetailComponent implements OnInit, OnChanges, OnDestroy
   private applicationsSubscription: Subscription;
   private deleteDialogSubscription: Subscription;
   public dropdownButton: DropdownButton;
+  public errorMessages: string[];
 
   organisation: OrganisationResponse;
   public backButton: BackButton = {
@@ -53,7 +56,8 @@ export class OrganisationDetailComponent implements OnInit, OnChanges, OnDestroy
     private deleteDialogService: DeleteDialogService,
     private location: Location,
     private titleService: Title,
-    private meService: MeService
+    private meService: MeService,
+    private errorMessageService: ErrorMessageService
   ) {}
 
   ngOnChanges(changes: SimpleChanges): void {}
@@ -100,6 +104,10 @@ export class OrganisationDetailComponent implements OnInit, OnChanges, OnDestroy
     this.deleteDialogSubscription = this.deleteDialogService.showSimpleDialog().subscribe(response => {
       if (response) {
         this.organisationService.delete(this.organisation.id).subscribe(response => {
+          if (response instanceof HttpErrorResponse) {
+            this.errorMessages = this.errorMessageService.handleErrorMessageWithFields(response).errorMessages;
+            return;
+          }
           this.location.back();
         });
       } else {

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

@@ -1,4 +1,11 @@
-<div class="mat-elevation-z8">
+<div *ngIf="errorMessages" class="error-messages p-3">
+  <ul class="mb-0">
+    <li *ngFor="let error of errorMessages">
+      {{ error | translate }}
+    </li>
+  </ul>
+</div>
+<div class="mat-elevation-z8 mt-3">
   <div class="loading-shade" *ngIf="isLoadingResults">
     <mat-spinner *ngIf="isLoadingResults"></mat-spinner>
   </div>

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

@@ -8,6 +8,8 @@ import { MatPaginator, PageEvent } from "@angular/material/paginator";
 import { environment } from "@environments/environment";
 import { startWith, switchMap, map, catchError } from "rxjs/operators";
 import { DefaultPageSizeOptions } from "@shared/constants/page.constants";
+import { ErrorMessageService } from "@shared/error-message.service";
+import { HttpErrorResponse } from "@angular/common/http";
 
 @Component({
   selector: "app-organisation-tabel",
@@ -30,8 +32,13 @@ export class OrganisationTabelComponent implements AfterViewInit {
   pageSizeOptions = DefaultPageSizeOptions;
 
   isLoadingResults = true;
+  public errorMessages: string[];
 
-  constructor(private organisationService: OrganisationService, private deleteDialogService: DeleteDialogService) {}
+  constructor(
+    private organisationService: OrganisationService,
+    private deleteDialogService: DeleteDialogService,
+    private errorMessageService: ErrorMessageService
+  ) {}
 
   ngAfterViewInit() {
     // If the user changes the sort order, reset back to the first page.
@@ -72,6 +79,10 @@ export class OrganisationTabelComponent implements AfterViewInit {
     this.deleteDialogService.showSimpleDialog().subscribe(response => {
       if (response) {
         this.organisationService.delete(element.id).subscribe(response => {
+          if (response instanceof HttpErrorResponse) {
+            this.errorMessages = this.errorMessageService.handleErrorMessageWithFields(response).errorMessages;
+            return;
+          }
           if (response.ok) {
             this.refresh();
           }

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

@@ -69,7 +69,10 @@
       [compareWith]="compare"
       #multiSelect
     >
-      <app-mat-select-search [formControl]="userMultiFilterCtrl"></app-mat-select-search>
+      <app-mat-select-search
+        [initialValues]="this.permission.userIds"
+        [formControl]="userMultiFilterCtrl"
+      ></app-mat-select-search>
       <mat-option *ngFor="let user of filteredUsersMulti | async" [value]="user.id">
         {{ getTextForUser(user) }}
       </mat-option>
@@ -102,25 +105,28 @@
   </div>
 
   <div class="form-group mt-3 col-12" *ngIf="isOrganizationApplicationPermission()">
-      <label class="form-label" for="name">{{ "PERMISSION.EDIT.APPS" | translate }}</label>
-      <div class="col-12">
-        <mat-select
-          id="applicationIds"
-          [formControl]="applicationMultiCtrl"
-          [multiple]="true"
-          class="form-control"
-          panelClass="overflow-x-hidden"
-          [(value)]="permission.applicationIds"
-          name="applicationIds"
-          #multiSelect
-          [compareWith]="compare"
-        >
-          <app-mat-select-search [formControl]="applicationMultiFilterCtrl"></app-mat-select-search>
-          <mat-option *ngFor="let app of filteredApplicationsMulti | async" [value]="app.id">
-            {{ app.name }}
-          </mat-option>
-        </mat-select>
-      </div>
+    <label class="form-label" for="name">{{ "PERMISSION.EDIT.APPS" | translate }}</label>
+    <div class="col-12">
+      <mat-select
+        id="applicationIds"
+        [formControl]="applicationMultiCtrl"
+        [multiple]="true"
+        class="form-control"
+        panelClass="overflow-x-hidden"
+        [(value)]="permission.applicationIds"
+        name="applicationIds"
+        #multiSelect
+        [compareWith]="compare"
+      >
+        <app-mat-select-search
+          [initialValues]="this.permission.applicationIds"
+          [formControl]="applicationMultiFilterCtrl"
+        ></app-mat-select-search>
+        <mat-option *ngFor="let app of filteredApplicationsMulti | async" [value]="app.id">
+          {{ app.name }}
+        </mat-option>
+      </mat-select>
+    </div>
   </div>
 
   <div *ngIf="isReadOrWrite()">

src/app/admin/permission/permission.service.ts

@@ -53,7 +53,8 @@ export class PermissionService {
     orderByColumn?: string,
     orderByDirection?: string,
     userId?: number,
-    organisationId?: number
+    organisationId?: number,
+    ignoreGlobalAdmin?: boolean
   ): Observable<PermissionGetManyResponse> {
     if (userId || organisationId) {
       return this.restService.get(this.endpoint, {
@@ -63,6 +64,7 @@ export class PermissionService {
         sort: orderByDirection,
         userId: userId,
         organisationId: organisationId,
+        ignoreGlobalAdmin: ignoreGlobalAdmin,
       });
     } else {
       return this.restService.get(this.endpoint, {
@@ -97,10 +99,20 @@ export class PermissionService {
         offset: offset,
         orderOn: orderByColumn,
         sort: orderByDirection,
+        ignoreGlobalAdmin: ignoreGlobalAdmin,
       });
     }
   }
 
+  getPermissionsWithoutUsers(userId?: number): Observable<PermissionGetManyResponse> {
+    return this.restService.get(this.endpoint + "/getAllPermissionsWithoutUsers", {
+      limit: 1000,
+      offset: 0,
+      userId: userId ?? undefined,
+      ignoreGlobalAdmin: true,
+    });
+  }
+
   deletePermission(id: number) {
     return this.restService.delete(this.endpoint, id);
   }

src/app/admin/users/new-kombit-user-page/new-user.component.html

@@ -50,7 +50,9 @@ <h1>
               panelClass="overflow-x-hidden"
               aria-required="true"
             >
-              <app-mat-select-search [formControl]="organisationsFilterCtrl"></app-mat-select-search>
+              <app-mat-select-search
+                [formControl]="organisationsFilterCtrl"
+              ></app-mat-select-search>
 
               <mat-option *ngFor="let org of filteredOrganisations | async" [value]="org">{{ org.name }}</mat-option>
             </mat-select>

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

@@ -77,6 +77,25 @@
       />
     </div>
   </div>
+
+  <div class="row mb-5">
+    <div class="form-group mt-3 col-12">
+      <label class="form-label" id="permissions" for="permissions">{{ "QUESTION.PERMISSION.SELECT-PERMISSION" | translate }}</label
+      >*
+      <mat-select
+        class="form-control"
+        name="permissions"
+        [compareWith]="compare"
+        [(ngModel)]="user.permissionIds"
+        [multiple]="true"
+      >
+        <mat-option *ngFor="let permission of permissions" [value]="permission.id">
+          {{ permission.name }}
+        </mat-option>
+      </mat-select>
+    </div>
+  </div>
+
   <div class="row mb-5">
     <mat-slide-toggle [(ngModel)]="user.active" id="active" name="active">
       {{ "USERS.FORM.ACTIVE" | translate }}</mat-slide-toggle

src/app/admin/users/user-edit/user-edit.component.ts

@@ -1,25 +1,27 @@
 import { HttpErrorResponse } from "@angular/common/http";
-import { Component, OnInit } from "@angular/core";
-import { UntypedFormGroup } from "@angular/forms";
+import { Component, OnDestroy, OnInit } from "@angular/core";
+import { UntypedFormControl, UntypedFormGroup } from "@angular/forms";
 import { ActivatedRoute } from "@angular/router";
 import { UserRequest } from "../user.model";
 import { TranslateService } from "@ngx-translate/core";
 import { UserService } from "../user.service";
-import { Subscription } from "rxjs";
+import { Subject, Subscription } from "rxjs";
 import { Location } from "@angular/common";
-import { PermissionType } from "@app/admin/permission/permission.model";
-import { AuthService, CurrentUserInfoResponse } from "@auth/auth.service";
-import { SharedVariableService } from "@shared/shared-variable/shared-variable.service";
+import { PermissionResponse, PermissionType } from "@app/admin/permission/permission.model";
 import { MeService } from "@shared/services/me.service";
 import { OrganizationAccessScope } from "@shared/enums/access-scopes";
+import { PermissionService } from "@app/admin/permission/permission.service";
+import { SharedVariableService } from "@shared/shared-variable/shared-variable.service";
 
 @Component({
   selector: "app-user-edit",
   templateUrl: "./user-edit.component.html",
   styleUrls: ["./user-edit.component.scss"],
 })
-export class UserEditComponent implements OnInit {
-  user = new UserRequest();
+export class UserEditComponent implements OnInit, OnDestroy {
+  public user = new UserRequest();
+  public permissions: PermissionResponse[];
+  public permissionsSubscription: Subscription;
   public errorMessage: string;
   public errorMessages: any;
   public errorFields: string[];
@@ -28,20 +30,22 @@ export class UserEditComponent implements OnInit {
   public backButtonTitle = "";
   public title = "";
   public submitButton = "";
-  id: number;
-  subscription: Subscription;
-  isGlobalAdmin = false;
-  isKombit: boolean;
-  canEdit: boolean;
+  public id: number;
+  public subscription: Subscription;
+  public isGlobalAdmin = false;
+  public isKombit: boolean;
+  public canEdit: boolean;
+  public permissionMultiCtrl: UntypedFormControl = new UntypedFormControl();
+  private _onDestroy = new Subject<void>();
 
   constructor(
     private translate: TranslateService,
     private route: ActivatedRoute,
     private userService: UserService,
     private location: Location,
-    private authService: AuthService,
-    private sharedVariableService: SharedVariableService,
-    private meService: MeService
+    private meService: MeService,
+    private permissionService: PermissionService,
+    private sharedVariableService: SharedVariableService
   ) {}
 
   ngOnInit(): void {
@@ -60,6 +64,7 @@ export class UserEditComponent implements OnInit {
     }
     this.amIGlobalAdmin();
     this.canEdit = this.meService.hasAccessToTargetOrganization(OrganizationAccessScope.UserAdministrationWrite);
+    this.getPermissions(this.sharedVariableService.getUserInfo().user.id);
   }
 
   private getUser(id: number) {
@@ -70,6 +75,8 @@ export class UserEditComponent implements OnInit {
       this.user.active = response.active;
       this.user.globalAdmin = response.permissions.some(perm => perm.name === PermissionType.GlobalAdmin);
       this.isKombit = response.nameId != null;
+      this.user.permissionIds = response.permissions.map(pm => pm.id);
+
       // We cannot set the password.
     });
   }
@@ -80,8 +87,7 @@ export class UserEditComponent implements OnInit {
 
   private create(): void {
     this.userService.post(this.user).subscribe(
-      response => {
-        console.log(response);
+      () => {
         this.routeBack();
       },
       (error: HttpErrorResponse) => {
@@ -132,4 +138,28 @@ export class UserEditComponent implements OnInit {
   routeBack(): void {
     this.location.back();
   }
+
+  public compare(matOptionValue: number, ngModelObject: number): boolean {
+    return matOptionValue === ngModelObject;
+  }
+
+  private getPermissions(userId: number) {
+    this.permissionsSubscription = this.permissionService
+      .getPermissionsWithoutUsers(this.meService.hasGlobalAdmin() ? undefined : userId)
+      .subscribe(res => {
+        this.permissions = res.data.sort((a, b) => a.name.localeCompare(b.name, "da-DK", { numeric: true }));
+        if (!this.id) {
+          this.permissionMultiCtrl.setValue(this.user.permissionIds);
+        }
+      });
+  }
+
+  ngOnDestroy() {
+    // prevent memory leak by unsubscribing
+    if (this.permissionsSubscription) {
+      this.permissionsSubscription.unsubscribe();
+    }
+    this._onDestroy.next();
+    this._onDestroy.complete();
+  }
 }