Merge branch 'release/v2.1.0-RC2' into fix/891/semantic-hub-error-han…

…dling
eclipse-tractusx · Jul 16, 2024 · d27a6e0 · d27a6e0
2 parents 600c032 + 087b451
commit d27a6e0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@
 - **Semantic Hub**:
   - show appropriate error information to the user along with refetch button [#917](https://github.com/eclipse-tractusx/portal-frontend/pull/917)
 
+### Bugfixes
+
+- **User Management**:
+  - Fix disable button state when deselect all checkboxes [#923](https://github.com/eclipse-tractusx/portal-frontend/pull/923)
+
 ## 2.1.0-RC1
 
 ### Change

diff --git a/src/components/overlays/EditPortalRoles/index.tsx b/src/components/overlays/EditPortalRoles/index.tsx
@@ -106,10 +106,11 @@ export default function EditPortalRoles({ id }: { id: string }) {
   }
 
   const checkConfirmButton = () =>
-    assignedRoles &&
-    selectedRoles &&
-    assignedRoles.length === selectedRoles.length &&
-    assignedRoles.every((value) => selectedRoles.includes(value))
+    selectedRoles.length === 0 ||
+    (assignedRoles &&
+      selectedRoles &&
+      assignedRoles.length === selectedRoles.length &&
+      assignedRoles.every((value) => selectedRoles.includes(value)))
 
   return (
     <>