Check for null id when the host is ungroupped

RedHatInsights · Aug 13, 2023 · 57cceeb · 57cceeb
1 parent fab5588
commit 57cceeb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/components/GeneralInfo/EditButton/EditButton.js b/src/components/GeneralInfo/EditButton/EditButton.js
@@ -34,10 +34,9 @@ const EditButtonUnknownPermissions = (props) => {
   const entity = useSelector(({ entityDetails }) => entityDetails?.entity);
 
   const { hasAccess: canEditHost } = usePermissionsWithContext([
-    'inventory:hosts:write',
-    ...(entity?.groups?.[0]?.id !== undefined // if the host is in a group, then we can check group level access
-      ? [REQUIRED_PERMISSION_TO_MODIFY_HOST_IN_GROUP(entity?.groups?.[0]?.id)]
-      : []),
+    REQUIRED_PERMISSION_TO_MODIFY_HOST_IN_GROUP(
+      entity?.groups?.[0]?.id ?? null // null stands for ungroupped hosts
+    ),
   ]);
 
   if (!canEditHost) {

diff --git a/src/routes/InventoryDetail.js b/src/routes/InventoryDetail.js
@@ -113,10 +113,9 @@ const Inventory = () => {
   const clearNotifications = () => dispatch(actions.clearNotifications());
 
   const { hasAccess: canDeleteHost } = usePermissionsWithContext([
-    'inventory:hosts:write',
-    ...(entity?.groups?.[0]?.id !== undefined // if the host is in a group, then we can check group level access
-      ? [REQUIRED_PERMISSION_TO_MODIFY_HOST_IN_GROUP(entity?.groups?.[0]?.id)]
-      : []),
+    REQUIRED_PERMISSION_TO_MODIFY_HOST_IN_GROUP(
+      entity?.groups?.[0]?.id ?? null // null stands for ungroupped hosts
+    ),
   ]);
 
   useEffect(() => {