From b1a4eec7be70759208e292d014a8f86a8b0e4c98 Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Mon, 5 Dec 2022 15:51:53 -0800
Subject: [PATCH] Change toggle all, fix multiple group inheritance, fix select
 dark mode display

---
 .../user-edit-dialog/user-edit-dialog.component.ts  | 11 +++++++----
 .../permissions-select.component.ts                 |  3 +++
 src-ui/src/theme.scss                               | 13 +++++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts
index 52a4ef55c..c3add99cd 100644
--- a/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts
+++ b/src-ui/src/app/components/common/edit-dialog/user-edit-dialog/user-edit-dialog.component.ts
@@ -66,9 +66,12 @@ export class UserEditDialogComponent
   }
 
   get inheritedPermissions(): string[] {
-    const groupsVal = this.objectForm.get('groups').value
-    return groupsVal !== null
-      ? this.groups.find((g) => g.id == groupsVal)?.permissions
-      : []
+    const groupsVal: Array<number> = this.objectForm.get('groups').value
+
+    if (!groupsVal) return []
+    else
+      return groupsVal.flatMap(
+        (id) => this.groups.find((g) => g.id == id)?.permissions
+      )
   }
 }
diff --git a/src-ui/src/app/components/common/permissions-select/permissions-select.component.ts b/src-ui/src/app/components/common/permissions-select/permissions-select.component.ts
index d69e7fb31..56ba619bb 100644
--- a/src-ui/src/app/components/common/permissions-select/permissions-select.component.ts
+++ b/src-ui/src/app/components/common/permissions-select/permissions-select.component.ts
@@ -145,6 +145,9 @@ export class PermissionsSelectComponent
       })
       this.typesWithAllActions.add(type)
     } else {
+      Object.keys(PermissionAction).forEach((action) => {
+        typeGroup.get(action).patchValue(false)
+      })
       this.typesWithAllActions.delete(type)
     }
   }
diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss
index 77260a882..3c166434d 100644
--- a/src-ui/src/theme.scss
+++ b/src-ui/src/theme.scss
@@ -157,6 +157,19 @@ $form-check-radio-checked-bg-image-dark: url("data:image/svg+xml,<svg xmlns='htt
     background-color: var(--bs-light);
   }
 
+  .ng-select-multiple .ng-select-container .ng-value-container .ng-value {
+    background-color: var(--pngx-bg-alt);
+    color: var(--bs-body-color);
+
+    .ng-value-icon.left {
+      border-color: var(--pngx-bg-alt);
+
+      &:hover {
+        background-color: var(--pngx-primary-lighten-30);
+      }
+    }
+  }
+
   table {
     .des,
     .asc {