Added update method for applications, and some small cleanup

Author: MadsApollo

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

@@ -88,6 +88,8 @@ export class ApplicationDetailComponent implements OnInit, OnDestroy, AfterViewI
       };
 
       this.translate.get("APPLICATION.CHANGE-ORGANIZATION.TITLE").subscribe(translation => {
+        if (!this.meService.hasGlobalAdmin()) return;
+
         const changeOrganizationButton = {
           id: this.id,
           label: translation,

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

@@ -11,7 +11,7 @@ <h1 mat-dialog-title>{{ "APPLICATION.CHANGE-ORGANIZATION.TITLE" | translate }}</
     [compareWith]="compare"
     (selectionChange)="onOrganizationChange()"
   >
-    <mat-option *ngFor="let organization of filteredOrganizationsMulti | async" [value]="organization.id">
+    <mat-option *ngFor="let organization of filteredOrganizations | async" [value]="organization.id">
       {{ organization.name }}
     </mat-option>
   </mat-select>
@@ -27,15 +27,14 @@ <h1 mat-dialog-title>{{ "APPLICATION.CHANGE-ORGANIZATION.TITLE" | translate }}</
     [(value)]="application.permissionIds"
     [compareWith]="compare"
   >
-    <app-mat-select-search [formControl]="permissionMultiFilterCtrl"></app-mat-select-search>
     <mat-option *ngFor="let permission of filteredPermissionsMulti | async" [value]="permission.id">
       {{ permission.name }}
     </mat-option>
   </mat-select>
   <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">
+  <button (click)="onSubmit()" class="btn btn-primary">
     {{ "GEN.SAVE" | translate }}
   </button>
   <button mat-dialog-close [mat-dialog-close]="false" class="btn btn-secondary ml-2">

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

@@ -1,15 +1,14 @@
 import { Component, Inject, OnInit } from "@angular/core";
 import { UntypedFormControl } from "@angular/forms";
-import { MAT_DIALOG_DATA } from "@angular/material/dialog";
+import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog";
 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, UpdateApplicationOrganization } from "@applications/application.model";
+import { ApplicationService } from "@applications/application.service";
 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";
 
@@ -23,24 +22,22 @@ export class ChangeOrganizationDialogComponent implements OnInit {
   public permissionsSubscription: Subscription;
   public organizationsSubscription: Subscription;
   public permissionMultiCtrl: UntypedFormControl = new UntypedFormControl();
-  public permissionMultiFilterCtrl: UntypedFormControl = new UntypedFormControl();
   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);
+  public filteredOrganizations: ReplaySubject<Organisation[]> = new ReplaySubject<Organisation[]>(1);
 
   constructor(
-    private restService: RestService,
+    private applicationService: ApplicationService,
     public translate: TranslateService,
     private permissionService: PermissionService,
     private organizationService: OrganisationService,
     private sharedVariableService: SharedVariableService,
-    private meService: MeService,
+    private dialog: MatDialogRef<ChangeOrganizationDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public dialogModel: ApplicationDialogModel
   ) {
     this.application = {
-      applicationId: this.dialogModel.id,
       organizationId: this.dialogModel.organizationId ?? this.sharedVariableService.getSelectedOrganisationId(),
       permissionIds: [],
     };
@@ -56,45 +53,31 @@ export class ChangeOrganizationDialogComponent implements OnInit {
     this.getPermissions();
   }
 
-  public compare(o1: any, o2: any): boolean {
-    return o1 === o2;
-  }
-
   getApplication(id: number): void {
-    this.applicationsSubscription = this.restService
-      .get("application", {}, id)
-      .subscribe((application: Application) => {
-        this.application.permissionIds = application.permissionIds;
-        this.permissionMultiCtrl.setValue(this.application.permissionIds);
-      });
+    this.applicationsSubscription = this.applicationService.getApplication(id).subscribe((application: Application) => {
+      this.application.permissionIds = application.permissionIds;
+      this.permissionMultiCtrl.setValue(this.application.permissionIds);
+    });
   }
 
   getOrganizations() {
     this.organizationsSubscription = this.organizationService.getMinimal().subscribe(res => {
       this.organizations = res.data;
-      this.filteredOrganizationsMulti.next(this.organizations.slice());
+      this.filteredOrganizations.next(this.organizations.slice());
     });
   }
 
   getPermissions() {
-    this.permissionsSubscription = this.permissionService
-      .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.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);
-        }
-      });
+    this.permissionsSubscription = this.permissionService.getPermissions(1000, 0).subscribe(res => {
+      this.permissions = res.data.sort((a, b) => a.name.localeCompare(b.name, "da-DK", { numeric: true }));
+      this.filteredPermissionsMulti.next(
+        this.permissions.filter(p => p?.organization?.id === this?.application?.organizationId)
+      );
+    });
+  }
+
+  public compare(o1: any, o2: any): boolean {
+    return o1 === o2;
   }
 
   onOrganizationChange() {
@@ -107,4 +90,12 @@ export class ChangeOrganizationDialogComponent implements OnInit {
       );
     });
   }
+
+  onSubmit() {
+    this.applicationsSubscription = this.applicationService
+      .updateApplicationOrganization(this.application, this.dialogModel.id)
+      .subscribe(() => {
+        this.dialog.close();
+      });
+  }
 }

src/app/applications/application.model.ts

@@ -63,7 +63,6 @@ export interface ApplicationData {
 }
 
 export class UpdateApplicationOrganization {
-  public applicationId: number;
   public organizationId: number;
   public permissionIds: number[];
 }

src/app/applications/application.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from "@angular/core";
-import { Application, ApplicationData } from "@applications/application.model";
+import { Application, ApplicationData, UpdateApplicationOrganization } from "@applications/application.model";
 import { RestService } from "../shared/services/rest.service";
 import { Observable } from "rxjs";
 import { map } from "rxjs/operators";
@@ -76,4 +76,10 @@ export class ApplicationService {
   deleteApplication(id: number) {
     return this.restService.delete("application", id);
   }
+
+  updateApplicationOrganization(body: UpdateApplicationOrganization, id: number): Observable<Application> {
+    return this.restService.put("application/updateApplicationOrganization", body, id, {
+      observe: "response",
+    });
+  }
 }