Added organization select, and user group permissions based on auto active.

Author: MadsApollo

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

@@ -87,7 +87,7 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy, AfterViewI
         extraOptions: [],
       };
 
-      this.translate.get("APPLICATION.CHANGE_ORGANIZATION").subscribe(translation => {
+      this.translate.get("APPLICATION.CHANGE-ORGANIZATION.TITLE").subscribe(translation => {
         const changeOrganizationButton = {
           id: this.id,
           label: translation,
@@ -213,6 +213,7 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy, AfterViewI
     this.changeOrganizationDialog.open(ChangeOrganizationDialogComponent, {
       data: {
         id: this.id,
+        organizationId: this.application.belongsTo.id,
       } as ApplicationDialogModel,
     });
   }

src/app/applications/application-detail/change-organization-dialog/change-organization-dialog.component.html

@@ -1,6 +1,23 @@
-<h2>{{ "APPLICATION.CHANGE_ORGANIZATION" | translate }}</h2>
-<div class="form-group mt-3 col-12">
-  <label class="form-label" for="userGroup">{{ "QUESTION.APPLICATION.ADD-PERMISSION" | translate }}</label>
+<h1 mat-dialog-title>{{ "APPLICATION.CHANGE-ORGANIZATION.TITLE" | translate }}</h1>
+<div mat-dialog-content>
+  <label class="form-label" for="userGroup">{{
+    "APPLICATION.CHANGE-ORGANIZATION.CHOOSE-ORGANIZATION" | translate
+  }}</label>
+  <mat-select
+    id="userGroup"
+    class="form-control"
+    panelClass="overflow-x-hidden"
+    [(value)]="application.organizationId"
+    [compareWith]="compare"
+    (selectionChange)="onOrganizationChange()"
+  >
+    <mat-option *ngFor="let organization of filteredOrganizationsMulti | async" [value]="organization.id">
+      {{ organization.name }}
+    </mat-option>
+  </mat-select>
+  <label class="form-label" for="userGroup">{{
+    "APPLICATION.CHANGE-ORGANIZATION.CHOOSE-USER-GROUPS" | translate
+  }}</label>
   <mat-select
     id="userGroup"
     class="form-control"
@@ -15,5 +32,13 @@ <h2>{{ "APPLICATION.CHANGE_ORGANIZATION" | translate }}</h2>
       {{ permission.name }}
     </mat-option>
   </mat-select>
-  <mat-hint>{{ "QUESTION.APPLICATION.PERMISSION-HINT" | translate }}</mat-hint>
+  <mat-hint>{{ "APPLICATION.CHANGE-ORGANIZATION.USER-GROUP-AUTO-SELECT" | translate }}</mat-hint>
+</div>
+<div mat-dialog-actions class="d-flex flex-row">
+  <button mat-dialog-close [mat-dialog-close]="true" class="btn btn-primary">
+    {{ "GEN.SAVE" | translate }}
+  </button>
+  <button mat-dialog-close [mat-dialog-close]="false" class="btn btn-secondary ml-2">
+    {{ "GEN.CANCEL" | translate }}
+  </button>
 </div>

src/app/applications/application-detail/change-organization-dialog/change-organization-dialog.component.ts

@@ -1,12 +1,14 @@
 import { Component, Inject, OnInit } from "@angular/core";
 import { UntypedFormControl } from "@angular/forms";
 import { MAT_DIALOG_DATA } from "@angular/material/dialog";
-import { ActivatedRoute } from "@angular/router";
+import { Organisation } from "@app/admin/organisation/organisation.model";
+import { OrganisationService } from "@app/admin/organisation/organisation.service";
 import { PermissionResponse } from "@app/admin/permission/permission.model";
 import { PermissionService } from "@app/admin/permission/permission.service";
-import { Application, ApplicationRequest } from "@applications/application.model";
+import { Application, UpdateApplicationOrganization } from "@applications/application.model";
 import { TranslateService } from "@ngx-translate/core";
 import { ApplicationDialogModel } from "@shared/models/dialog.model";
+import { MeService } from "@shared/services/me.service";
 import { RestService } from "@shared/services/rest.service";
 import { SharedVariableService } from "@shared/shared-variable/shared-variable.service";
 import { ReplaySubject, Subscription } from "rxjs";
@@ -19,20 +21,29 @@ import { ReplaySubject, Subscription } from "rxjs";
 export class ChangeOrganizationDialogComponent implements OnInit {
   public applicationsSubscription: Subscription;
   public permissionsSubscription: Subscription;
+  public organizationsSubscription: Subscription;
   public permissionMultiCtrl: UntypedFormControl = new UntypedFormControl();
   public permissionMultiFilterCtrl: UntypedFormControl = new UntypedFormControl();
-  application = new ApplicationRequest();
+  public application: UpdateApplicationOrganization;
   public permissions: PermissionResponse[];
+  public organizations: Organisation[];
   public filteredPermissionsMulti: ReplaySubject<PermissionResponse[]> = new ReplaySubject<PermissionResponse[]>(1);
+  public filteredOrganizationsMulti: ReplaySubject<Organisation[]> = new ReplaySubject<Organisation[]>(1);
 
   constructor(
     private restService: RestService,
-    private route: ActivatedRoute,
     public translate: TranslateService,
     private permissionService: PermissionService,
+    private organizationService: OrganisationService,
     private sharedVariableService: SharedVariableService,
+    private meService: MeService,
     @Inject(MAT_DIALOG_DATA) public dialogModel: ApplicationDialogModel
   ) {
+    this.application = {
+      applicationId: this.dialogModel.id,
+      organizationId: this.dialogModel.organizationId ?? this.sharedVariableService.getSelectedOrganisationId(),
+      permissionIds: [],
+    };
     this.permissionMultiCtrl.setValue(this.application.permissionIds);
   }
 
@@ -41,7 +52,8 @@ export class ChangeOrganizationDialogComponent implements OnInit {
     if (this.dialogModel.id) {
       this.getApplication(this.dialogModel.id);
     }
-    this.getPermissions(this.sharedVariableService.getUserInfo().user.id);
+    this.getOrganizations();
+    this.getPermissions();
   }
 
   public compare(o1: any, o2: any): boolean {
@@ -52,38 +64,47 @@ export class ChangeOrganizationDialogComponent implements OnInit {
     this.applicationsSubscription = this.restService
       .get("application", {}, id)
       .subscribe((application: Application) => {
-        this.application = new ApplicationRequest();
-        this.application.name = application.name;
-        this.application.description = application.description;
-        this.application.organizationId = application.belongsTo.id;
-        this.application.status = application.status;
-        this.application.startDate = application.startDate;
-        this.application.endDate = application.endDate;
-
-        this.application.category = application.category;
-        this.application.owner = application.owner;
-        this.application.contactPerson = application.contactPerson;
-        this.application.contactEmail = application.contactEmail;
-        this.application.contactPhone = application.contactPhone;
-        this.application.personalData = application.personalData;
-        this.application.hardware = application.hardware;
-        this.application.controlledProperties = application.controlledProperties.map(ctrlProperty => ctrlProperty.type);
-        this.application.deviceTypes = application.deviceTypes.map(deviceType => deviceType.type);
         this.application.permissionIds = application.permissionIds;
         this.permissionMultiCtrl.setValue(this.application.permissionIds);
       });
   }
 
-  getPermissions(userId: number) {
+  getOrganizations() {
+    this.organizationsSubscription = this.organizationService.getMinimal().subscribe(res => {
+      this.organizations = res.data;
+      this.filteredOrganizationsMulti.next(this.organizations.slice());
+    });
+  }
+
+  getPermissions() {
     this.permissionsSubscription = this.permissionService
-      .getPermissions(1000, 0, undefined, undefined, userId, this.sharedVariableService.getSelectedOrganisationId())
+      .getPermissions(
+        1000,
+        0,
+        undefined,
+        undefined,
+        this.meService.hasGlobalAdmin() ? undefined : this.sharedVariableService.getUserInfo().user.id
+      )
       .subscribe(res => {
         this.permissions = res.data.sort((a, b) => a.name.localeCompare(b.name, "da-DK", { numeric: true }));
-        this.filteredPermissionsMulti.next(this.permissions.slice());
+        this.filteredPermissionsMulti.next(
+          this.permissions.filter(p => p?.organization?.id === this?.application?.organizationId)
+        );
         if (!this.dialogModel.id) {
           this.application.permissionIds = [this.permissions[0].id];
           this.permissionMultiCtrl.setValue(this.application.permissionIds);
         }
       });
   }
+
+  onOrganizationChange() {
+    this.filteredPermissionsMulti.next(
+      this.permissions.filter(p => p?.organization?.id === this?.application?.organizationId)
+    );
+    this.filteredPermissionsMulti.subscribe(res => {
+      this.permissionMultiCtrl.setValue(
+        res.filter(permission => permission.automaticallyAddNewApplications).map(permission => permission.id)
+      );
+    });
+  }
 }

src/app/applications/application.model.ts

@@ -61,3 +61,9 @@ export interface ApplicationData {
   ok?: boolean;
   count?: number;
 }
+
+export class UpdateApplicationOrganization {
+  public applicationId: number;
+  public organizationId: number;
+  public permissionIds: number[];
+}

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

@@ -163,7 +163,7 @@
               </li>
               <li class="dropdown-item">
                 <a (click)="onOpenChangeOrganizationDialog(element.id)" routerLinkActive="active">{{
-                  "APPLICATION.CHANGE_ORGANIZATION" | translate
+                  "APPLICATION.CHANGE-ORGANIZATION.TITLE" | translate
                 }}</a>
               </li>
               <li class="dropdown-item">

src/app/shared/models/dialog.model.ts

@@ -15,4 +15,5 @@ export class WelcomeDialogModel {
 
 export class ApplicationDialogModel {
   id: number;
+  organizationId?: number;
 }