disabled delete and fixed enabled for non admins

TIER · Jun 10, 2021 · 07ea9af · 07ea9af
1 parent 508a02a
commit 07ea9af
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/ui/src/app/metadata/domain/source/component/DeleteSourceConfirmation.js b/ui/src/app/metadata/domain/source/component/DeleteSourceConfirmation.js
@@ -9,6 +9,8 @@ import { useMetadataEntity } from '../../../hooks/api';
 import Translate from '../../../../i18n/components/translate';
 import { noop } from 'lodash';
 
+import { useIsAdmin } from '../../../../core/user/UserContext';
+
 export function DeleteSourceConfirmation ({children}) {
 
     const { del, response } = useMetadataEntity('source');
@@ -34,9 +36,11 @@ export function DeleteSourceConfirmation ({children}) {
         }
     }
 
+    const isAdmin = useIsAdmin();
+
     return (
         <>
-            {children(onDeleteSource)}
+            {children(isAdmin ? onDeleteSource : false)}
             <Modal show={!!deleting} onHide={() => setDeleting(null)}>
                 <Modal.Header><Translate value="message.delete-source-title">Delete Metadata Source?</Translate></Modal.Header>
                 <Modal.Body className="d-flex align-content-center">

diff --git a/ui/src/app/metadata/domain/source/component/SourceList.js b/ui/src/app/metadata/domain/source/component/SourceList.js
@@ -33,7 +33,7 @@ export default function SourceList({ entities, onDelete, onEnable }) {
                                 <th className="w-15"><Translate value="label.author">Author</Translate></th>
                                 <th className="w-15"><Translate value="label.creation-date">Created Date</Translate></th>
                                 <th className="text-center w-15"><Translate value="label.enabled">Enabled</Translate></th>
-                                <th className="w-auto"></th>
+                                {onDeleteSource && <th className="w-auto"></th>}
                             </tr>
                         </thead>
                         <tbody>
@@ -66,7 +66,7 @@ export default function SourceList({ entities, onDelete, onEnable }) {
                                     </td>
 
 
-                                    <td className="text-right">
+                                    {onDeleteSource && <td className="text-right">
                                         <OverlayTrigger trigger={source.serviceEnabled ? ['hover', 'focus'] : []} placement="left"
                                             overlay={
                                                 <Popover id={`delete-source-btn-${idx}`}>
@@ -83,8 +83,7 @@ export default function SourceList({ entities, onDelete, onEnable }) {
                                                     </Button>
                                                 </span>
                                         </OverlayTrigger>
-                                    </td>
-
+                                    </td>}
                                 </tr>
                             )}
                         </tbody>

diff --git a/ui/src/app/metadata/hooks/schema.js b/ui/src/app/metadata/hooks/schema.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { useIsAdmin } from '../../core/user/UserContext';
 
 const fillInRootProperties = (keys, ui) => {
     return keys.reduce((sch, key, idx) => {
@@ -34,7 +35,21 @@ export function useUiSchema(definition, schema, current, locked = true) {
         };
     }, [mapped, step.locked, locked]);
 
-    return {uiSchema: isLocked, step};
+    const isAdmin = useIsAdmin();
+
+    const hideEnableFromNonAdmins = React.useMemo(() => {
+        if (!isAdmin) {
+            return {
+                ...isLocked,
+                serviceEnabled: {
+                    'ui:widget': 'hidden'
+                }
+            };
+        }
+        return isLocked;
+    }, [isAdmin, isLocked]);
+
+    return { uiSchema: hideEnableFromNonAdmins, step};
 }
 
 

diff --git a/ui/src/app/metadata/view/MetadataOptions.js b/ui/src/app/metadata/view/MetadataOptions.js
@@ -58,7 +58,7 @@ export function MetadataOptions () {
                     current={true}
                     enabled={type === 'source' ? metadata.serviceEnabled : metadata.enabled}
                     model={metadata}>
-                    {type === 'source' &&
+                    {type === 'source' && onDeleteSource &&
                         <button className="btn btn-outline btn-sm btn-danger align-self-start"
                             disabled={metadata.serviceEnabled}
                             onClick={() => onDeleteSource(metadata.id, redirectOnDelete)}>