Fixed issues

TIER · Nov 22, 2022 · 2128188 · 2128188
1 parent 01fc5d8
commit 2128188
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 20 deletions.
diff --git a/ui/src/app/dashboard/view/ProvidersTab.js b/ui/src/app/dashboard/view/ProvidersTab.js
@@ -11,7 +11,7 @@ import { MetadataActions } from '../../admin/container/MetadataActions';
 import Spinner from '../../core/components/Spinner';
 import { Link } from 'react-router-dom';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faCube } from '@fortawesome/free-solid-svg-icons';
+import { faCubes } from '@fortawesome/free-solid-svg-icons';
 const searchProps = ['name', '@type', 'createdBy'];
 
 export function ProvidersTab () {
@@ -65,7 +65,7 @@ export function ProvidersTab () {
                                                     <div className="w-25 alert alert-info m-3 d-flex flex-column align-items-center">
                                                         <p className="text-center">No Metadata Providers found.</p>
                                                         <Link to="/metadata/provider/new" className="btn btn-primary" id="metadata-provider-create-btn">
-                                                            <FontAwesomeIcon icon={faCube} className="me-2" fixedWidth />
+                                                            <FontAwesomeIcon icon={faCubes} className="me-2" fixedWidth />
                                                             <Translate value="action.add-new-provider" />
                                                         </Link>
                                                     </div>

diff --git a/ui/src/app/dynamic-registration/component/DynamicRegistrationForm.js b/ui/src/app/dynamic-registration/component/DynamicRegistrationForm.js
@@ -58,8 +58,6 @@ export function DynamicRegistrationForm ({registration = {}, errors = [], loadin
                     </Form>
                 </Col>
             </Row>
-
-            <pre>{JSON.stringify(errors, null, 4)}</pre>
         </div>
     </>)
 }

diff --git a/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js b/ui/src/app/dynamic-registration/view/DynamicRegistrationDetail.js
@@ -15,7 +15,7 @@ import { Schema } from '../../form/Schema';
 import definition from '../hoc/DynamicConfigurationDefinition';
 import { useSelectDynamicRegistrationQuery } from '../../store/dynamic-registration/DynamicRegistrationSlice';
 import { DynamicRegistrationActions } from '../hoc/DynamicRegistrationActions';
-import { useIsAdmin } from '../../core/user/UserContext';
+import { useCanEnable, useIsAdmin } from '../../core/user/UserContext';
 import { GroupsProvider } from '../../admin/hoc/GroupsProvider';
 
 export function DynamicRegistrationDetail () {
@@ -30,6 +30,7 @@ export function DynamicRegistrationDetail () {
     };
 
     const isAdmin = useIsAdmin();
+    const canEnable = useCanEnable()(detail?.approved);
 
     return (
         <div className="container-fluid p-3">
@@ -98,21 +99,25 @@ export function DynamicRegistrationDetail () {
                                                 }
                                             </h5>
                                             <div className="d-flex align-items-start btn-group">
-                                                <Button variant={detail.enabled ? 'outline-secondary' : 'outline-secondary' } size="sm" className=""
-                                                        onClick={() => enable(detail, !detail.enabled)}>
-                                                            <span className=" me-1">
-                                                                <Translate value={detail.enabled ? 'label.disable' : 'label.enable'} />
-                                                            </span>
-                                                    <FontAwesomeIcon size="lg" icon={detail.enabled ? faToggleOn : faToggleOff} />
-                                                </Button>
-                                                <Button
-                                                    size="sm"
-                                                    variant={ 'danger' }
-                                                    disabled={detail.enabled}
-                                                    onClick={() => remove({id: detail.resourceId})}>
-                                                    <Translate value="action.delete" />
-                                                    <FontAwesomeIcon icon={faTrash} className="ms-2" />
-                                                </Button>
+                                                {enable && (canEnable && detail?.approved) &&
+                                                    <Button variant={detail.enabled ? 'outline-secondary' : 'outline-secondary' } size="sm" className=""
+                                                            onClick={() => enable(detail, !detail.enabled)}>
+                                                                <span className=" me-1">
+                                                                    <Translate value={detail.enabled ? 'label.disable' : 'label.enable'} />
+                                                                </span>
+                                                        <FontAwesomeIcon size="lg" icon={detail.enabled ? faToggleOn : faToggleOff} />
+                                                    </Button>
+                                                }
+                                                {isAdmin &&
+                                                    <Button
+                                                        size="sm"
+                                                        variant={ 'danger' }
+                                                        disabled={detail.enabled}
+                                                        onClick={() => remove({id: detail.resourceId})}>
+                                                        <Translate value="action.delete" />
+                                                        <FontAwesomeIcon icon={faTrash} className="ms-2" />
+                                                    </Button>
+                                                }
                                             </div>
                                         </div>