feat: update header with link to catalog-admin

config.template.js

@@ -10,6 +10,7 @@ window.env = {
   CATALOG_COMMENTS_SERVICE_HOST: '$CATALOG_COMMENTS_SERVICE_HOST',
   CONCEPT_CATALOG_FRONTEND_BASE_URI: '$CONCEPT_CATALOG_FRONTEND_BASE_URI',
   CATALOG_ADMIN_SERVICE_BASE_URI: '$CATALOG_ADMIN_SERVICE_BASE_URI',
+  CATALOG_ADMIN_BASE_URI: '$CATALOG_ADMIN_BASE_URI',
   FDK_PORTAL_BASE_URI: '$FDK_PORTAL_BASE_URI',
-  USE_DEMO_LOGO: '$USE_DEMO_LOGO'
+  USE_DEMO_LOGO: '$USE_DEMO_LOGO',
 };

package.json

@@ -48,7 +48,7 @@
     "@fellesdatakatalog/button": "^0.2.10",
     "@fellesdatakatalog/external-footer": "^0.3.0",
     "@fellesdatakatalog/icons": "^0.8.4",
-    "@fellesdatakatalog/internal-header": "^0.5.11",
+    "@fellesdatakatalog/internal-header": "^0.8.0",
     "@fellesdatakatalog/link": "^0.2.15",
     "@fellesdatakatalog/theme": "^0.5.4",
     "@reduxjs/toolkit": "^1.9.7",

src/app/App.tsx

@@ -1,40 +1,32 @@
 import React from 'react';
 import { Provider } from 'react-redux';
-import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
+import {
+  BrowserRouter as Router,
+  Route,
+  Switch
+} from 'react-router-dom';
 import _ from 'lodash';
 import Footer from '@fellesdatakatalog/external-footer';
-import Header from '@fellesdatakatalog/internal-header';
-import Link from '@fellesdatakatalog/link';
 
 import { routeConfig } from './routeConfig';
 import { Breadcrumbs } from '../components/breadcrumbs/breadcrumbs.component';
-import { authService } from '../services/auth-service';
-
-import { getConfig } from '../config';
 import { store } from './redux/store';
+import { Header } from '../components/header';
+
+export const App: React.FC = () => {
 
-export const App: React.FC = () => (
-  <Provider store={store}>
-    <Router>
-      <Header
-        homeUrl={getConfig().registrationHost}
-        username={authService.getUser()?.name}
-        onLogout={authService.logout}
-        useDemoLogo={getConfig().useDemoLogo}
-      >
-        <Link href={`${getConfig().searchHost}/guidance`}>Registrere data</Link>
-        <Link href={getConfig().adminGui.host}>Høste data</Link>
-        <Link href={getConfig().searchHost} external>
-          Søk i Felles datakatalog
-        </Link>
-      </Header>
-      <Breadcrumbs />
-      <Switch>
-        {routeConfig.map((route, i) => (
-          <Route key={`${i}-${_.get(route, 'path', '')}`} {...route} />
-        ))}
-      </Switch>
-      <Footer />
-    </Router>
-  </Provider>
-);
+  return (
+    <Provider store={store}>
+      <Router>
+        <Header/>
+        <Breadcrumbs />
+        <Switch>
+          {routeConfig.map((route, i) => (
+            <Route key={`${i}-${_.get(route, 'path', '')}`} {...route} />
+          ))}
+        </Switch>
+        <Footer />
+      </Router>
+    </Provider>
+  );
+};

src/components/header/index.tsx

@@ -0,0 +1,41 @@
+import React, { FC, HTMLAttributes } from 'react';
+
+import HeaderBase from '@fellesdatakatalog/internal-header';
+
+interface Props extends HTMLAttributes<HTMLInputElement> {}
+
+import Link from '@fellesdatakatalog/link';
+import authService from '../../services/auth-service';
+import { getConfig } from '../../config';
+import { useLocation } from 'react-router-dom';
+
+const showManageConceptCatalogsUrl = () => {
+  const resourceRoles = authService.getResourceRoles();
+  const location = useLocation();
+  const pathParts = location.pathname.split('/');
+  const currentCatalogId = pathParts ? pathParts[1] : undefined;
+
+  return resourceRoles.some((role) => {
+    const roleOrgNumber = role?.resourceId;
+    return authService.hasOrganizationAdminPermission(
+      currentCatalogId ? currentCatalogId : roleOrgNumber
+    );
+  });
+};
+
+export const Header: FC<Props> = () => (
+  <HeaderBase
+    homeUrl={getConfig().registrationHost}
+    username={authService.getUser()?.name}
+    onLogout={authService.logout}
+    useDemoLogo={getConfig().useDemoLogo}
+    showManageConceptCatalogsUrl={showManageConceptCatalogsUrl()}
+    manageConceptCatalogsUrl={getConfig().catalogAdminBaseUri}
+  >
+    <Link href={`${getConfig().searchHost}/guidance`}>Registrere data</Link>
+    <Link href={getConfig().adminGui.host}>Høste data</Link>
+    <Link href={getConfig().searchHost} external>
+      Søk i Felles datakatalog
+    </Link>
+  </HeaderBase>
+);

src/config.ts

@@ -23,6 +23,7 @@ const env = (window as any).env || {
 //   'https://begrepskatalog.staging.fellesdatakatalog.digdir.no';
 // env.CATALOG_ADMIN_SERVICE_BASE_URI =
 //   'https://catalog-admin-service.staging.fellesdatakatalog.digdir.no';
+// env.CATALOG_ADMIN_BASE_URI = 'https://catalog-admin.staging.fellesdatakatalog.digdir.no';
 // env.USE_DEMO_LOGO = false;
 
 const config = {
@@ -60,6 +61,7 @@ const config = {
   },
   conceptCatalogFrontendBaseUri: env.CONCEPT_CATALOG_FRONTEND_BASE_URI,
   catalogAdminServiceBaseUri: env.CATALOG_ADMIN_SERVICE_BASE_URI,
+  catalogAdminBaseUri: env.CATALOG_ADMIN_BASE_URI,
   useDemoLogo: env.USE_DEMO_LOGO
 };