[0.11.x] Display datastore config to managers in Admin tab: Fixes #1275

horreum-web/src/App.tsx

@@ -22,7 +22,7 @@ import {
 import {Provider, useSelector} from "react-redux"
 
 import store from "./store"
-import {isAdminSelector, LoginLogout} from "./auth"
+import {isAdminSelector, isManagerSelector, LoginLogout} from "./auth"
 import {initKeycloak} from "./keycloak"
 import {UserProfileLink, UserSettings} from "./domain/user/UserSettings"
 
@@ -92,6 +92,7 @@ export default function App() {
 
 function Main() {
     const isAdmin = useSelector(isAdminSelector)
+    const isManager = useSelector(isManagerSelector)
 
 
     return (
@@ -120,7 +121,7 @@ function Main() {
                                     <NavItem itemId={3}>
                                         <NavLink to="/reports">Reports</NavLink>
                                     </NavItem>
-                                    {isAdmin && (
+                                    { (isAdmin || isManager) && (
                                         <NavItem itemId={4}>
                                             <NavLink to="/admin">Administration</NavLink>
                                         </NavItem>

horreum-web/src/auth.tsx

@@ -111,6 +111,10 @@ export const isAdminSelector = (state: State) => {
     return state.auth.roles.includes("admin")
 }
 
+export const isManagerSelector = (state: State) => {
+    return managedTeamsSelector(state).length > 0
+}
+
 export const teamsSelector = (state: State): string[] => {
     return state.auth.teams
 }

horreum-web/src/domain/admin/Admin.tsx

@@ -1,22 +1,28 @@
-import { useRef } from "react"
-import { Card, CardBody, PageSection } from "@patternfly/react-core"
+import {useRef} from "react"
+import {Card, CardBody, NavItem, PageSection} from "@patternfly/react-core"
 
-import SavedTabs, { SavedTab, TabFunctions, saveFunc, resetFunc, modifiedFunc } from "../../components/SavedTabs"
-import { FragmentTab } from "../../components/FragmentTabs"
+import SavedTabs, {SavedTab, TabFunctions, saveFunc, resetFunc, modifiedFunc} from "../../components/SavedTabs"
+import FragmentTabs, {FragmentTab} from "../../components/FragmentTabs"
 import AllowedSiteList from "../actions/AllowedSiteList"
 import ActionList from "../actions/ActionList"
 import BannerConfig from "./BannerConfig"
 import Notifications from "./Notifications"
 import Teams from "./Teams"
 import Administrators from "./Administrators"
 import {useSelector} from "react-redux";
-import {isAdminSelector} from "../../auth";
+import {isAdminSelector, isManagerSelector} from "../../auth";
 import Datastores from "./Datastores";
+import {NavLink} from "react-router-dom";
+import DatasetData from "../runs/DatasetData";
+import RunData from "../runs/RunData";
+import MetaData from "../runs/MetaData";
 
 export default function Admin() {
     const adminFuncsRef = useRef<TabFunctions>()
     const teamsFuncsRef = useRef<TabFunctions>()
     const isAdmin = useSelector(isAdminSelector)
+    const isManager = useSelector(isManagerSelector)
+
     if (isAdmin) {
         return (
             <PageSection>
@@ -60,6 +66,21 @@ export default function Admin() {
                 </Card>
             </PageSection>
         )
+    } else if (isManager) {
+        return (
+            <PageSection>
+                <Card>
+                    <CardBody>
+                        <FragmentTabs>
+                            <FragmentTab title="Datastores" fragment="datastores">
+                                <Datastores/>
+                            </FragmentTab>
+                        </FragmentTabs>
+                    </CardBody>
+                </Card>
+            </PageSection>
+        )
+
     } else {
         return (
             <PageSection>