SHIBUI-1943/1945 user role fixes

TIER · Jun 10, 2021 · 624da20 · 624da20
1 parent 9ee68ba
commit 624da20
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/ui/src/app/core/components/Header.js b/ui/src/app/core/components/Header.js
@@ -9,12 +9,16 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faTh, faSignOutAlt, faPlusCircle, faCube, faCubes } from '@fortawesome/free-solid-svg-icons';
 
 import Translate from '../../i18n/components/translate';
-import { useTranslation } from '../../i18n/hooks';
+import { useTranslator } from '../../i18n/hooks';
 
 import { brand } from '../../app.brand';
+import { useIsAdmin } from '../user/UserContext';
 
 export function Header () {
-    const logoutLabel = useTranslation('action.logout');
+
+    const translator = useTranslator();
+
+    const isAdmin = useIsAdmin();
 
     return (
         <Navbar expand="md" fixed="top" bg="">
@@ -26,6 +30,7 @@ export function Header () {
             <Navbar.Toggle aria-controls="basic-navbar-nav" />
             <Navbar.Collapse id="basic-navbar-nav">
                 <Nav className="ml-auto align-items-center" navbar>
+                    {isAdmin &&
                     <Dropdown className="mr-2" id="basic-nav-dropdown">
                         <Dropdown.Toggle variant="outline-primary" id="dropdown-basic" size="sm">
                             <FontAwesomeIcon icon={faPlusCircle} className="mr-2" />
@@ -38,6 +43,7 @@ export function Header () {
                             </Dropdown.Item>
                         </Dropdown.Menu>
                     </Dropdown>
+                    }
                     <Dropdown className="" id="basic-nav-dropdown">
                         <Dropdown.Toggle variant="outline-primary" id="dropdown-basic" size="sm">
                             <FontAwesomeIcon icon={faPlusCircle} className="mr-2" />
@@ -48,18 +54,18 @@ export function Header () {
                                 <FontAwesomeIcon icon={faCube} className="mr-2" />
                                 <Translate value="action.add-new-source" />
                             </Dropdown.Item>
-                            <Dropdown.Item as={Link} to="/metadata/provider/new" className="text-primary py-2">
+                            {isAdmin && <Dropdown.Item as={Link} to="/metadata/provider/new" className="text-primary py-2">
                                 <FontAwesomeIcon icon={faCubes} className="mr-2" />
                                 <Translate value="action.add-new-provider" />
-                            </Dropdown.Item>
+                            </Dropdown.Item> }
                         </Dropdown.Menu>
                     </Dropdown>
                     <Link to="/dashboard" className="nav-link" aria-label="Metadata Dashboard">
                         <i className="fa fa-th fa-fw" aria-hidden="true"></i>
                         <FontAwesomeIcon icon={faTh} className="mr-2" />
                         <Translate value="action.dashboard">Dashboard</Translate>
                     </Link>
-                    <Nav.Link href="/logout" target="_self" aria-label={logoutLabel}>
+                    <Nav.Link href="/logout" target="_self" aria-label={translator('action.logout')}>
                         <FontAwesomeIcon icon={faSignOutAlt} className="mr-2" />
                         <Translate value="action.logout">Logout</Translate>
                     </Nav.Link>

diff --git a/ui/src/app/metadata/wizard/MetadataProviderWizard.js b/ui/src/app/metadata/wizard/MetadataProviderWizard.js
@@ -57,6 +57,7 @@ export function MetadataProviderWizard({onRestart}) {
         const body = removeNull(definition.parser(metadata), true);
         await post('', body);
         if (response.ok) {
+            setBlocking(false);
             history.push('/dashboard/metadata/manager/providers');
         } else {
             const { errorCode, errorMessage, cause } = response.data;

diff --git a/ui/src/app/metadata/wizard/MetadataSourceWizard.js b/ui/src/app/metadata/wizard/MetadataSourceWizard.js
@@ -61,6 +61,7 @@ export function MetadataSourceWizard ({ onShowNav }) {
         const body = removeNull(metadata, true);
         await post('', body);
         if (response.ok) {
+            setBlocking(false);
             history.push('/');
         } else {
             console.log(response.body);