Fixed delete for enablers

TIER · Aug 23, 2021 · 72368f4 · 72368f4
1 parent c9dc17c
commit 72368f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/ui/src/app/metadata/domain/source/component/SourceList.js b/ui/src/app/metadata/domain/source/component/SourceList.js
@@ -35,7 +35,7 @@ export default function SourceList({ entities, onDelete, onEnable, onChangeGroup
                                 <th className=""><Translate value="label.creation-date">Created Date</Translate></th>
                                 <th className="text-center"><Translate value="label.enabled">Enabled</Translate></th>
                                 {isAdmin && onChangeGroup && <th className=""><Translate value="label.group">Group</Translate></th> }
-                                {onDelete && <th className="w-auto"></th>}
+                                {onDelete && isAdmin && <th className="w-auto"></th>}
                             </tr>
                         </thead>
                         <tbody>
@@ -94,7 +94,7 @@ export default function SourceList({ entities, onDelete, onEnable, onChangeGroup
                                         </GroupsProvider>
                                     </td>
                                     }
-                                    {onDelete &&
+                                    {onDelete && isAdmin &&
                                     <td className="text-right align-middle">
                                         <OverlayTrigger trigger={source.serviceEnabled ? ['hover', 'focus'] : []} placement="left"
                                             overlay={

diff --git a/ui/src/app/metadata/view/MetadataOptions.js b/ui/src/app/metadata/view/MetadataOptions.js
@@ -20,7 +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';
+import { useCanEnable, useIsAdmin } from '../../core/user/UserContext';
 
 export function MetadataOptions ({reload}) {
 
@@ -53,6 +53,7 @@ export function MetadataOptions ({reload}) {
     const enabled = type === 'source' ? metadata.serviceEnabled : metadata.enabled;
 
     const canEnable = useCanEnable();
+    const isAdmin = useIsAdmin();
 
     return (
         <MetadataActions type={type}>
@@ -77,7 +78,7 @@ export function MetadataOptions ({reload}) {
                             <FontAwesomeIcon size="lg" icon={enabled ? faToggleOn : faToggleOff} />
                         </Button>
                         }
-                        {type === 'source' && remove &&
+                        {type === 'source' && remove && isAdmin &&
                         <Button
                             size="sm"
                             variant={ 'danger' }