Fixed issue with role_enable for users

TIER · Aug 23, 2021 · c9dc17c · c9dc17c
1 parent 000bf13
commit c9dc17c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/ui/src/app/core/user/UserContext.js b/ui/src/app/core/user/UserContext.js
@@ -39,6 +39,11 @@ function useIsAdmin() {
     return user.role === 'ROLE_ADMIN';
 }
 
+function useIsEnabler() {
+    const user = useCurrentUser();
+    return user.role === 'ROLE_ENABLE';
+}
+
 function useIsInGroup(id) {
     const user = useCurrentUser();
     return user.group === id;
@@ -50,5 +55,11 @@ function useIsAdminOrInGroup() {
     return isAdmin || isInGroup;
 }
 
+function useCanEnable() {
+    const isAdmin = useIsAdmin();
+    const isEnabler = useIsEnabler();
+    return isAdmin || isEnabler;
+}
+
 
-export { UserContext, UserProvider, Consumer as UserConsumer, useCurrentUser, useIsAdmin, useIsAdminOrInGroup };
+export { UserContext, UserProvider, Consumer as UserConsumer, useCurrentUser, useIsAdmin, useIsAdminOrInGroup, useCanEnable};
diff --git a/ui/src/app/metadata/domain/source/component/SourceList.js b/ui/src/app/metadata/domain/source/component/SourceList.js
@@ -13,13 +13,14 @@ import FormattedDate from '../../../../core/components/FormattedDate';
 import Translate from '../../../../i18n/components/translate';
 import { Scroller } from '../../../../dashboard/component/Scroller';
 import { useTranslator } from '../../../../i18n/hooks';
-import { useIsAdmin } from '../../../../core/user/UserContext';
+import { useCanEnable, useIsAdmin } from '../../../../core/user/UserContext';
 import { GroupsProvider } from '../../../../admin/hoc/GroupsProvider';
 
 export default function SourceList({ entities, onDelete, onEnable, onChangeGroup }) {
 
     const translator = useTranslator();
     const isAdmin = useIsAdmin();
+    const canEnable = useCanEnable();
 
     return (
         <Scroller entities={entities}>
@@ -52,7 +53,7 @@ export default function SourceList({ entities, onDelete, onEnable, onChangeGroup
                                     <td className="align-middle"><FormattedDate date={source.createdDate} /></td>
                                     <td className="text-center align-middle">
                                         <span className="d-flex justify-content-center align-items-center">
-                                        {onEnable && isAdmin ?
+                                        {onEnable && canEnable ?
                                             <Form.Check
                                                 type="switch"
                                                 id={`enable-switch-${source.id}`}

diff --git a/ui/src/app/metadata/view/MetadataOptions.js b/ui/src/app/metadata/view/MetadataOptions.js
@@ -20,6 +20,7 @@ import { MetadataFilterConfigurationList } from '../domain/filter/component/Meta
 import { MetadataFilterTypes } from '../domain/filter';
 import { useMetadataSchema } from '../hooks/schema';
 import { FilterableProviders } from '../domain/provider';
+import { useCanEnable } from '../../core/user/UserContext';
 
 export function MetadataOptions ({reload}) {
 
@@ -51,6 +52,8 @@ export function MetadataOptions ({reload}) {
 
     const enabled = type === 'source' ? metadata.serviceEnabled : metadata.enabled;
 
+    const canEnable = useCanEnable();
+
     return (
         <MetadataActions type={type}>
             {(enable, remove) =>
@@ -65,7 +68,7 @@ export function MetadataOptions ({reload}) {
                     model={metadata}
                     showGroup={type === 'source'}>
                     <div className="d-flex align-items-start btn-group">
-                        {enable &&
+                        {enable && canEnable &&
                         <Button variant={enabled ? 'outline-secondary' : 'outline-secondary' } size="sm" className=""
                                 onClick={() => enable(metadata, !enabled, reload)}>
                                      <span className=" mr-1">