From 028601005394be7487706575b6c3c015aa55c61e Mon Sep 17 00:00:00 2001 From: Lenin Alevski Date: Thu, 27 Jan 2022 15:10:05 -0600 Subject: [PATCH] Fix regression on disabled elements for SecureComponent (#1478) Signed-off-by: Lenin Alevski --- portal-ui/src/common/SecureComponent/SecureComponent.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/portal-ui/src/common/SecureComponent/SecureComponent.tsx b/portal-ui/src/common/SecureComponent/SecureComponent.tsx index 4fa0f61be..f2544c446 100644 --- a/portal-ui/src/common/SecureComponent/SecureComponent.tsx +++ b/portal-ui/src/common/SecureComponent/SecureComponent.tsx @@ -58,12 +58,15 @@ const SecureComponent = ({ resource, }: ISecureComponentProps) => { const permissionGranted = hasPermission(resource, scopes, matchAll); - const childComponent = <>{children}; if (!permissionGranted && !errorProps) return ; if (!permissionGranted && errorProps) { - return cloneElement(childComponent, { ...errorProps }); + return Array.isArray(children) ? ( + <>{children.map((child) => cloneElement(child, { ...errorProps }))} + ) : ( + cloneElement(children, { ...errorProps }) + ); } - return childComponent; + return <>{children}; }; export default SecureComponent;