From 494918a30808124cd7ea77697dfd503a3c713d05 Mon Sep 17 00:00:00 2001 From: Celia Amador Date: Wed, 4 Feb 2026 14:11:20 +0100 Subject: [PATCH] EDM-3215: Decommissioned devices cannot be modified --- .../Device/DeviceDetails/DeviceDetailsPage.tsx | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libs/ui-components/src/components/Device/DeviceDetails/DeviceDetailsPage.tsx b/libs/ui-components/src/components/Device/DeviceDetails/DeviceDetailsPage.tsx index ba46f2562..4c65c5c84 100644 --- a/libs/ui-components/src/components/Device/DeviceDetails/DeviceDetailsPage.tsx +++ b/libs/ui-components/src/components/Device/DeviceDetails/DeviceDetailsPage.tsx @@ -59,9 +59,10 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) = const isEnrolled = !device || isDeviceEnrolled(device); const { checkPermissions } = usePermissionsContext(); - const [hasTerminalAccess, canDelete, canEdit, canDecommission, canResume] = + const [hasTerminalAccess, canDelete, hasEditPermissions, canDecommission, canResume] = checkPermissions(deviceDetailsPermissions); + const canEdit = hasEditPermissions && isEnrolled; const canOpenTerminal = hasTerminalAccess && isEnrolled; const { deleteAction, deleteModal } = useDeleteAction({ @@ -159,7 +160,7 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) = isEnrolled ? ( - {canEdit && ( + {hasEditPermissions && ( navigate({ route: ROUTE.DEVICE_EDIT, postfix: deviceId })} {...editActionProps} @@ -186,7 +187,7 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) = + {children} } @@ -194,7 +195,12 @@ const DeviceDetailsPage = ({ children, hideTerminal }: DeviceDetailsPageProps) = + } /> {!hideTerminal && canOpenTerminal && } />}