PR changes.

Author: AugustHA-Iterator

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

@@ -75,34 +75,13 @@ export class PermissionService {
     }
   }
 
-  getPermissionsWithoutUsers(
-    limit: number = 1000,
-    offset: number = 0,
-    orderByColumn?: string,
-    orderByDirection?: string,
-    userId?: number,
-    organisationId?: number,
-    ignoreGlobalAdmin?: boolean
-  ): Observable<PermissionGetManyResponse> {
-    if (userId || organisationId) {
-      return this.restService.get(this.endpoint + "/getAllPermissionsWithoutUsers", {
-        limit: limit,
-        offset: offset,
-        orderOn: orderByColumn,
-        sort: orderByDirection,
-        userId: userId,
-        organisationId: organisationId,
-        ignoreGlobalAdmin: ignoreGlobalAdmin,
-      });
-    } else {
-      return this.restService.get(this.endpoint + "/getAllPermissionsWithoutUsers", {
-        limit: limit,
-        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) {

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

@@ -80,7 +80,7 @@
 
   <div class="row mb-5">
     <div class="form-group mt-3 col-12">
-      <label class="form-label" for="permissions">{{ "QUESTION.PERMISSION.SELECT-PERMISSION" | translate }}</label
+      <label class="form-label" id="permissions" for="permissions">{{ "QUESTION.PERMISSION.SELECT-PERMISSION" | translate }}</label
       >*
       <mat-select
         class="form-control"

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

@@ -145,15 +145,7 @@ export class UserEditComponent implements OnInit, OnDestroy {
 
   private getPermissions(userId: number) {
     this.permissionsSubscription = this.permissionService
-      .getPermissionsWithoutUsers(
-        1000,
-        0,
-        undefined,
-        undefined,
-        this.meService.hasGlobalAdmin() ? undefined : userId,
-        undefined,
-        true
-      )
+      .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) {