georchestra · f-necas · Aug 2, 2024 · Oct 4, 2024 · Dec 2, 2024 · Dec 6, 2024
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -12,6 +12,7 @@ module.exports = {
   rules: {
     'vue/multi-word-component-names': 'off',
     'no-undef': 'off',
+    'vue/require-v-for-key': 'warn',
   },
   parserOptions: {
     ecmaVersion: 'latest',

diff --git a/index.html b/index.html
@@ -13,10 +13,7 @@
     <title>geOrchestra header</title>
   </head>
   <body style="margin: 0">
-    <geor-header
-      logo-url="https://www.georchestra.org/public/georchestra-logo.svg"
-      active-app="datahub"
-    ></geor-header>
+    <geor-header config-file="/config.json" stylesheet=""></geor-header>
     <script type="module" src="/src/main.ts"></script>
   </body>
 </html>
diff --git a/public/config.json b/public/config.json
@@ -0,0 +1,58 @@
+{
+  "config": {
+    "legacyHeader": false,
+    "legacyUrl": "/header",
+    "stylesheet": "https://data.lillemetropole.fr/public/georchestra.css",
+    "logoUrl": "https://data.lillemetropole.fr/public/logo-mel.jpg",
+    "hideLogin": false,
+    "lang": "es"
+  },
+  "menu": [
+    {
+      "label": "Catalogue",
+      "i18n": "hello",
+      "url": "/datahub/",
+      "activeAppUrl" : "/datahub"
+    },
+    {
+      "label": "My other service",
+      "url": "/geoserver/web",
+      "activeAppUrl": "/geoserver"
+    },
+    {
+      "label": "Mapstore",
+      "url": "/mapstore/#/",
+      "activeAppUrl": "/mapstore"
+    },
+    {
+      "label": "Mapstore home",
+      "url": "/mapstore/#/home",
+      "activeAppUrl": "/mapstore/#/home"
+    },
+    {
+      "label": "Cadastrapp",
+      "url": "/mapstore/#/context/cadastre",
+      "activeAppUrl": "includes:/#/context/cadastre"
+    },
+    {
+      "type": "dropdown",
+      "label": "A dropdown",
+      "items": [
+        {
+          "label": "Console",
+          "i18n": "users",
+          "url": "/console/manager/home",
+          "activeAppUrl": "/console"
+        }
+      ]
+    }
+  ],
+  "i18n": {
+    "en": {
+      "hello": "Hello"
+    },
+    "fr": {
+      "hello": "Bonjour"
+    }
+  }
+}
diff --git a/src/auth.ts b/src/auth.ts
@@ -1,23 +1,10 @@
 const AUTH_API_URL = '/whoami'
 const CONSOLE_PLATFORM_API_URL = '/console/private/platform/infos'
 
-type KNOWN_ROLES =
-  | 'ROLE_SUPERUSER'
-  | 'ROLE_ORGADMIN'
-  | 'ROLE_MAPSTORE_ADMIN'
-  | 'ROLE_USER'
-  | 'ROLE_ADMINISTRATOR'
-  | 'ROLE_EXTRACTORAPP'
-  | 'ROLE_GN_REVIEWER'
-  | 'ROLE_GN_EDITOR'
-  | 'ROLE_GN_ADMIN'
-  | 'ROLE_EMAILPROXY'
-  | 'ROLE_ANONYMOUS'
-  | 'ROLE_IMPORT'
 
 interface WhoAmIResponse {
   GeorchestraUser: {
-    roles: KNOWN_ROLES[]
+    roles: string[]
     username: string
     firstName: string
     lastName: string
@@ -33,17 +20,7 @@ export interface User {
   anonymous: boolean
   warned: boolean
   remainingDays: string
-  adminRoles: AdminRoles | null
-}
-
-export interface AdminRoles {
-  superUser: boolean
-  admin: boolean
-  console: boolean
-  catalog: boolean
-  catalogAdmin: boolean
-  viewer: boolean
-  import: boolean
+  roles: string[]
 }
 
 export async function getUserDetails(): Promise<User> {
@@ -57,42 +34,21 @@ export async function getUserDetails(): Promise<User> {
           warned: false,
           remainingDays: '0',
           anonymous: true,
-          adminRoles: null,
+          roles: ['ROLE_ANONYMOUS'],
         }
       }
-      const roles = user.roles
       return {
         username: user.username,
         firstname: user.firstName,
         lastname: user.lastName,
         warned: user.ldapWarn,
         remainingDays: user.ldapRemainingDays,
-        anonymous: roles.indexOf('ROLE_ANONYMOUS') > -1,
-        adminRoles: getAdminRoles(roles),
+        anonymous: user.roles.indexOf('ROLE_ANONYMOUS') > -1,
+        roles: user.roles,
       }
     })
 }
 
-export function getAdminRoles(roles: KNOWN_ROLES[]): AdminRoles | null {
-  const superUser = roles.indexOf('ROLE_SUPERUSER') > -1
-  const console = superUser || roles.indexOf('ROLE_ORGADMIN') > -1
-  const catalogAdmin = superUser || roles.indexOf('ROLE_GN_ADMIN') > -1
-  const catalog = !catalogAdmin && (roles.indexOf('ROLE_GN_EDITOR') > -1 || roles.indexOf('ROLE_GN_REVIEWER') > -1)
-  const viewer = superUser || roles.indexOf('ROLE_MAPSTORE_ADMIN') > -1
-  const admin =
-    superUser || console || catalog || viewer || catalogAdmin
-  if (!admin && roles.indexOf('ROLE_IMPORT') === -1) return null
-  return {
-    superUser,
-    admin,
-    console,
-    catalog,
-    catalogAdmin,
-    viewer,
-    import: superUser || roles.indexOf('ROLE_IMPORT') > -1,
-  }
-}
-
 export interface PlatformInfos {
   analyticsEnabled: boolean
   extractorappEnabled: boolean

diff --git a/src/config-interfaces.ts b/src/config-interfaces.ts
@@ -0,0 +1,32 @@
+interface MenuItem {
+  type?: string
+  hasRole?: string
+  blockedRole?: string
+}
+
+export interface Link extends MenuItem {
+  label: string
+  url: string
+  i18n?: string
+  activeAppUrl?: string
+}
+
+export interface Dropdown extends MenuItem {
+  label: string
+  i18n?: string
+  items?: Array<Link>
+}
+
+export interface Separator extends MenuItem {}
+
+export interface Config {
+  legacyHeader?: boolean
+  legacyUrl?: string
+  logoUrl?: string
+  logoTitle?: string
+  hideLogin?: boolean
+  style?: string
+  stylesheet?: string
+  lang?: string
+  adminRoles: string[]
+}
diff --git a/src/default-config.json b/src/default-config.json
@@ -0,0 +1,90 @@
+{
+  "defaultConfig": {
+    "legacyHeader": false,
+    "legacyUrl": "/header/",
+    "hideLogin": false,
+    "style": "",
+    "adminRoles": [
+        "ROLE_SUPERUSER",
+        "ROLE_ORGADMIN",
+        "ROLE_GN_ADMIN",
+        "ROLE_GN_REVIEWER",
+        "ROLE_GN_EDITOR",
+        "ROLE_MAPSTORE_ADMIN"
+    ]
+  },
+  "defaultMenu": [
+      {
+        "label": "Catalogue",
+        "i18n": "catalogue",
+        "url": "/datahub/",
+        "activeAppUrl": "/datahub"
+      },
+      {
+        "label": "Mapstore viewer",
+        "i18n": "viewer",
+        "url": "/mapstore",
+        "activeAppUrl": "/mapstore"
+      },
+      {
+        "label": "Maps",
+        "i18n": "maps",
+        "url": "/mapstore/#/home",
+        "activeAppUrl": "/mapstore/#/home"
+      },
+      {
+        "label": "Services",
+        "i18n": "services",
+        "url": "/geoserver/web",
+        "activeAppUrl": "/geoserver"
+      },
+      {
+        "label": "Datafeeder",
+        "i18n": "datafeeder",
+        "url": "/import",
+        "activeAppUrl": "/import",
+        "hasRole": "ROLE_SUPERUSER,ROLE_IMPORT"
+      },
+      {
+        "hasRole": "ROLE_SUPERUSER,ROLE_GN_EDITOR,ROLE_GN_ADMIN,ROLE_MAPSTORE_ADMIN",
+        "type": "separator"
+      },
+      {
+        "type": "dropdown",
+        "label": "Administration",
+        "i18n": "admin",
+        "hasRole": "ROLE_SUPERUSER,ROLE_GN_EDITOR,ROLE_GN_ADMIN,ROLE_MAPSTORE_ADMIN",
+        "items": [
+          {
+            "label": "Geonetwork",
+            "i18n": "catalogue",
+            "url": "/geonetwork/srv/:lang3/catalog.edit#/board",
+            "activeAppUrl": "/geonetwork",
+            "hasRole": "ROLE_GN_EDITOR",
+            "blockedRole": "ROLE_SUPERUSER,ROLE_GN_REVIEWER,ROLE_GN_ADMIN"
+          },
+          {
+            "label": "Geonetwork",
+            "i18n": "catalogue",
+            "url": "/geonetwork/srv/:lang3/admin.console",
+            "activeAppUrl": "/geonetwork",
+            "hasRole": "ROLE_SUPERUSER,ROLE_GN_REVIEWER,ROLE_GN_ADMIN"
+          },
+          {
+            "label": "Viewer",
+            "i18n": "viewer",
+            "url": "/mapstore/#/admin",
+            "activeAppUrl": "/mapstore/#/admin",
+            "hasRole": "ROLE_SUPERUSER,ROLE_MAPSTORE_ADMIN"
+          },
+          {
+            "label": "Console",
+            "i18n": "users",
+            "url": "/console/manager/home",
+            "activeAppUrl": "/console/manager",
+            "hasRole": "ROLE_SUPERUSER"
+          }
+        ]
+      }
+    ]
+}