Fixed SHIBUI-2435 - enable button for admins

TIER · Oct 28, 2022 · b47c71e · b47c71e
1 parent 4ae88e1
commit b47c71e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ui/src/app/core/user/UserContext.js b/ui/src/app/core/user/UserContext.js
@@ -72,7 +72,7 @@ function useIsAdminOrInGroup() {
 function useCanEnable() {
     const isAdmin = useIsAdmin();
     const isEnabler = useIsEnabler();
-    return isAdmin || isEnabler;
+    return (approved) => isAdmin ? true : (isEnabler && approved);
 }
 
 function useIsApprover() {

diff --git a/ui/src/app/metadata/domain/source/component/SourceList.js b/ui/src/app/metadata/domain/source/component/SourceList.js
@@ -86,7 +86,7 @@ export default function SourceList({ entities, onDelete, onEnable, onApprove, on
                                             </td>
                                             <td className="text-center align-middle">
                                                 <span className="d-flex justify-content-center align-items-center">
-                                                {onEnable && (canEnable && source.approved) ?
+                                                {onEnable && canEnable(source.approved) ?
                                                     <Form.Check
                                                         type="switch"
                                                         id={`enable-switch-${idx}`}

diff --git a/ui/src/app/metadata/view/MetadataOptions.js b/ui/src/app/metadata/view/MetadataOptions.js
@@ -53,7 +53,7 @@ export function MetadataOptions ({reload}) {
 
     const enabled = type === 'source' ? metadata.serviceEnabled : metadata.enabled;
 
-    const canEnable = useCanEnable();
+    const canEnable = useCanEnable()(metadata.approved);
     const isAdmin = useIsAdmin();
     const canApprove = useIsApprover();