Merge pull request #178 from OS2iot/feature/IOT-1583-MoveApplication

Feature/IOT-1583-MoveApplication
OS2iot · Sep 26, 2024 · 40e11d7 · 40e11d7
2 parents 5fb82e0 + b34c8d9
commit 40e11d7
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 19 deletions.
diff --git a/src/app/admin/permission/permission.model.ts b/src/app/admin/permission/permission.model.ts
@@ -39,6 +39,16 @@ export interface PermissionGetManyResponse {
   count: number;
 }
 
+export type PermissionsSlimDto = Pick<
+  PermissionResponse,
+  "id" | "name" | "automaticallyAddNewApplications" | "organization"
+>;
+
+export interface PermissionGetManySlimResponse {
+  data: PermissionsSlimDto[];
+  count: number;
+}
+
 export interface PermissionTypes {
   type: PermissionType;
 }

diff --git a/src/app/admin/permission/permission.service.ts b/src/app/admin/permission/permission.service.ts
@@ -6,6 +6,7 @@ import {
   PermissionResponse,
   PermissionRequest,
   PermissionRequestAcceptUser,
+  PermissionGetManySlimResponse,
 } from "./permission.model";
 import { map } from "rxjs/operators";
 import { UserMinimalService } from "../users/user-minimal.service";
@@ -15,6 +16,7 @@ import { UserMinimalService } from "../users/user-minimal.service";
 })
 export class PermissionService {
   endpoint = "permission";
+  applicationAdmin = "/applicationAdmin";
   constructor(private restService: RestService, private userMinimalService: UserMinimalService) {}
 
   createPermission(body: PermissionRequest): Observable<PermissionResponse> {
@@ -75,6 +77,33 @@ export class PermissionService {
     }
   }
 
+  getPermissionsWhereApplicationAdmin(
+    limit: number = 1000,
+    offset: number = 0,
+    orderByColumn?: string,
+    orderByDirection?: string,
+    userId?: number,
+    organisationId?: number
+  ): Observable<PermissionGetManySlimResponse> {
+    if (userId || organisationId) {
+      return this.restService.get(this.endpoint + this.applicationAdmin, {
+        limit: limit,
+        offset: offset,
+        orderOn: orderByColumn,
+        sort: orderByDirection,
+        userId: userId,
+        organisationId: organisationId,
+      });
+    } else {
+      return this.restService.get(this.endpoint + this.applicationAdmin, {
+        limit: limit,
+        offset: offset,
+        orderOn: orderByColumn,
+        sort: orderByDirection,
+      });
+    }
+  }
+
   getPermissionsWithoutUsers(userId?: number): Observable<PermissionGetManyResponse> {
     return this.restService.get(this.endpoint + "/getAllPermissionsWithoutUsers", {
       limit: 1000,

diff --git a/...lication-change-organization-dialog/application-change-organization-dialog.component.html b/...lication-change-organization-dialog/application-change-organization-dialog.component.html
@@ -35,7 +35,7 @@ <h1 mat-dialog-title>{{ "APPLICATION.CHANGE-ORGANIZATION.TITLE" | translate }}</
       <mat-hint>{{ "APPLICATION.CHANGE-ORGANIZATION.USER-GROUP-AUTO-SELECT" | translate }}</mat-hint>
     </div>
   </div>
-  <div mat-dialog-actions class="d-flex flex-row">
+  <div mat-dialog-actions class="d-flex flex-row mat-dialog-actions">
     <button (click)="onSubmit()" class="btn btn-primary">
       {{ "GEN.SAVE" | translate }}
     </button>

diff --git a/...lication-change-organization-dialog/application-change-organization-dialog.component.scss b/...lication-change-organization-dialog/application-change-organization-dialog.component.scss
@@ -1,3 +1,8 @@
 .application-change-organization-dialog {
   width: 50vw;
 }
+
+.mat-dialog-actions {
+  margin-left: 13px;
+  margin-bottom: 13px;
+}
diff --git a/...pplication-change-organization-dialog/application-change-organization-dialog.component.ts b/...pplication-change-organization-dialog/application-change-organization-dialog.component.ts
@@ -4,7 +4,7 @@ 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";
+import { PermissionResponse, PermissionsSlimDto } 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";
@@ -23,9 +23,9 @@ export class ApplicationChangeOrganizationDialogComponent implements OnInit {
   public permissionsSubscription: Subscription;
   public organizationsSubscription: Subscription;
   public application: UpdateApplicationOrganization;
-  public permissions: PermissionResponse[];
+  public permissions: PermissionsSlimDto[];
   public organizations: Organisation[];
-  public filteredPermissionsMulti: ReplaySubject<PermissionResponse[]> = new ReplaySubject<PermissionResponse[]>(1);
+  public filteredPermissionsMulti: ReplaySubject<PermissionsSlimDto[]> = new ReplaySubject<PermissionsSlimDto[]>(1);
   public filteredOrganizations: ReplaySubject<Organisation[]> = new ReplaySubject<Organisation[]>(1);
 
   constructor(
@@ -61,18 +61,20 @@ export class ApplicationChangeOrganizationDialogComponent implements OnInit {
 
   getOrganizations() {
     this.organizationsSubscription = this.organizationService.getMultipleWithApplicationAdmin().subscribe(res => {
-      this.organizations = res.data;
+      this.organizations = res.data.sort((a, b) => a.name.localeCompare(b.name, "da-DK", { numeric: true }));
       this.filteredOrganizations.next(this.organizations.slice());
     });
   }
 
   getPermissions() {
-    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)
-      );
-    });
+    this.permissionsSubscription = this.permissionService
+      .getPermissionsWhereApplicationAdmin(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 {
@@ -99,12 +101,13 @@ export class ApplicationChangeOrganizationDialogComponent implements OnInit {
             applicationName: savedApplication.name,
             organizationName: savedApplication.belongsTo.name,
           }),
-          "",
+          this.translate.instant("DIALOG.OK"),
           {
             duration: 10000,
           }
         );
         this.dialog.close(true);
+        this.snackBar._openedSnackBarRef.afterDismissed().subscribe(() => location.reload());
       });
   }
 }
diff --git a/src/app/applications/applications-list/applications-table/applications-table.component.ts b/src/app/applications/applications-list/applications-table/applications-table.component.ts
@@ -273,17 +273,11 @@ export class ApplicationsTableComponent implements AfterViewInit, OnInit {
   }
 
   onOpenChangeOrganizationDialog(id: number) {
-    const dialog = this.changeOrganizationDialog.open(ApplicationChangeOrganizationDialogComponent, {
+    this.changeOrganizationDialog.open(ApplicationChangeOrganizationDialogComponent, {
       data: {
         applicationId: id,
       } as ApplicationDialogModel,
     });
-
-    dialog.afterClosed().subscribe(res => {
-      if (!res) return;
-
-      location.reload();
-    });
   }
 
   protected readonly columnDefinitions = columnDefinitions;