Added snackbar. Removed global admin checks, as these are already done.

Author: MadsApollo

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

@@ -88,8 +88,6 @@ 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

@@ -21,7 +21,6 @@ <h1 mat-dialog-title>{{ "APPLICATION.CHANGE-ORGANIZATION.TITLE" | translate }}</
   <mat-select
     id="userGroup"
     class="form-control"
-    [formControl]="permissionMultiCtrl"
     [multiple]="true"
     panelClass="overflow-x-hidden"
     [(value)]="application.permissionIds"

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

@@ -1,6 +1,7 @@
 import { Component, Inject, OnInit } from "@angular/core";
 import { UntypedFormControl } from "@angular/forms";
 import { MAT_DIALOG_DATA, MatDialogRef } from "@angular/material/dialog";
+import { MatSnackBar } from "@angular/material/snack-bar";
 import { Organisation } from "@app/admin/organisation/organisation.model";
 import { OrganisationService } from "@app/admin/organisation/organisation.service";
 import { PermissionResponse } from "@app/admin/permission/permission.model";
@@ -21,7 +22,6 @@ export class ChangeOrganizationDialogComponent implements OnInit {
   public applicationsSubscription: Subscription;
   public permissionsSubscription: Subscription;
   public organizationsSubscription: Subscription;
-  public permissionMultiCtrl: UntypedFormControl = new UntypedFormControl();
   public application: UpdateApplicationOrganization;
   public permissions: PermissionResponse[];
   public organizations: Organisation[];
@@ -34,14 +34,14 @@ export class ChangeOrganizationDialogComponent implements OnInit {
     private permissionService: PermissionService,
     private organizationService: OrganisationService,
     private sharedVariableService: SharedVariableService,
+    private snackBar: MatSnackBar,
     private dialog: MatDialogRef<ChangeOrganizationDialogComponent>,
     @Inject(MAT_DIALOG_DATA) public dialogModel: ApplicationDialogModel
   ) {
     this.application = {
       organizationId: this.dialogModel.organizationId ?? this.sharedVariableService.getSelectedOrganisationId(),
       permissionIds: [],
     };
-    this.permissionMultiCtrl.setValue(this.application.permissionIds);
   }
 
   ngOnInit(): void {
@@ -56,7 +56,6 @@ export class ChangeOrganizationDialogComponent implements OnInit {
   getApplication(id: number): void {
     this.applicationsSubscription = this.applicationService.getApplication(id).subscribe((application: Application) => {
       this.application.permissionIds = application.permissionIds;
-      this.permissionMultiCtrl.setValue(this.application.permissionIds);
     });
   }
 
@@ -85,17 +84,27 @@ export class ChangeOrganizationDialogComponent implements OnInit {
       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)
-      );
+      this.application.permissionIds = res
+        .filter(permission => permission.automaticallyAddNewApplications)
+        .map(permission => permission.id);
     });
   }
 
   onSubmit() {
     this.applicationsSubscription = this.applicationService
       .updateApplicationOrganization(this.application, this.dialogModel.id)
-      .subscribe(() => {
-        this.dialog.close();
+      .subscribe(savedApplication => {
+        this.snackBar.open(
+          this.translate.instant("APPLICATION.CHANGE-ORGANIZATION.SNACKBAR-SAVED", {
+            applicationName: savedApplication.name,
+            organizationName: savedApplication.belongsTo.name,
+          }),
+          "",
+          {
+            duration: 10000,
+          }
+        );
+        this.dialog.close(true);
       });
   }
 }

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

@@ -273,11 +273,17 @@ export class ApplicationsTableComponent implements AfterViewInit, OnInit {
   }
 
   onOpenChangeOrganizationDialog(id: number) {
-    this.changeOrganizationDialog.open(ChangeOrganizationDialogComponent, {
+    const dialog = this.changeOrganizationDialog.open(ChangeOrganizationDialogComponent, {
       data: {
         id: id,
       } as ApplicationDialogModel,
     });
+
+    dialog.afterClosed().subscribe(res => {
+      if (!res) return;
+
+      location.reload();
+    });
   }
 
   protected readonly columnDefinitions = columnDefinitions;

src/assets/i18n/da.json

@@ -156,7 +156,7 @@
       "CHOOSE-ORGANIZATION": "Vælg hvilken organisation denne applikation skal tilhøre",
       "CHOOSE-USER-GROUPS": "Vælg hvilke brugergrupper, der skal have adgang",
       "USER-GROUP-AUTO-SELECT": "Brugergruppe med automatisk tilføjelse af nye applikationer er allerede valgt",
-      "SNACKBAR-SAVED": " [Applikationsnavn] tilhører nu [Organisationsnavn]"
+      "SNACKBAR-SAVED": "{{applicationName}} tilhører nu {{organizationName}}"
     }
   },
   "GATEWAY": {