feat: set header to config file

georchestra · Jan 8, 2025 · 5dc35d3 · 5dc35d3
1 parent 50e44c2
commit 5dc35d3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/configs/localConfig.json b/configs/localConfig.json
@@ -21,6 +21,9 @@
     "stylesheetUri": "",
     "header": {
       "height": 80,
+      "url": "/header/",
+      "legacy": false,
+      "logoUrl": "https://www.georchestra.org/public/georchestra-logo.svg",
       "configFile": "",
       "script": "https://cdn.jsdelivr.net/gh/georchestra/header@dist/header.js",
       "stylesheet": ""

diff --git a/js/plugins/Header.jsx b/js/plugins/Header.jsx
@@ -8,30 +8,47 @@
 import {useEffect} from "react";
 import { createPlugin, connect } from "@mapstore/utils/PluginsUtils";
 
-export const Header = ({ page = "mapstore", height = 80,
+export const Header = ({url = "/header/", page = "mapstore", height = 90, ignoreIFrame = false,
     script = "https://cdn.jsdelivr.net/gh/georchestra/header@dist/header.js",
+    legacy = false,
+    logoUrl = "https://www.georchestra.org/public/georchestra-logo.svg",
     stylesheet = "", configFile = ""}) => {
     useEffect(() => {
         const header = document.getElementById("georchestra-header");
         const headerScript = document.getElementById("georchestra-header-script");
         const container = document.getElementById("container");
         if (header) {
-            header.setAttribute("active-app", page);
-            header.setAttribute("stylesheet", stylesheet);
-            header.setAttribute("config-file", configFile);
-            headerScript.src = script;
-            if (container) {
-                container.style.top = height + "px";
+            if (!ignoreIFrame && window.location !== window.parent.location) {
+                header.style.display = 'none';
+                if (container) {
+                    container.style.top = '0';
+                }
+            } else {
+                header.setAttribute("active-app", page);
+                header.setAttribute("legacy-url", url);
+                header.setAttribute("legacy-header", legacy);
+                header.setAttribute("logo-url", logoUrl);
+                header.setAttribute("stylesheet", stylesheet);
+                header.setAttribute("config-file", configFile);
+                headerScript.src = script;
+
+                if (container) {
+                    container.style.top = height + "px";
+                }
             }
+
         }
-    }, [page, window.location, window.parent.location]);
+    }, [page, url, height, window.location, window.parent.location]);
     return null;
 };
 
 export default createPlugin('Header', {
     component: connect((state) => ({
-        script: state.localConfig && state.localConfig.header && state.localConfig.header.script,
+        url: state.localConfig && state.localConfig.header && state.localConfig.header.url,
         height: state.localConfig && state.localConfig.header && state.localConfig.header.height,
+        script: state.localConfig && state.localConfig.header && state.localConfig.header.script,
+        legacy: state.localConfig && state.localConfig.header && state.localConfig.header.legacy,
+        logoUrl: state.localConfig && state.localConfig.header && state.localConfig.header.logoUrl,
         stylesheet: state.localConfig && state.localConfig.header && state.localConfig.header.stylesheet,
         configFile: state.localConfig && state.localConfig.header && state.localConfig.header.configFile
     }))(Header)

diff --git a/web/src/main/resources/mapstore.properties b/web/src/main/resources/mapstore.properties
@@ -18,4 +18,4 @@
 
 datadir.location=${georchestra.extensions:},${georchestra.datadir}/mapstore
 overrides.config=../default.properties
-overrides.mappings=header.script=headerScript,header.height=headerHeight,header.stylesheet=georchestraStylesheet,header.configFile=headerConfigFile
+overrides.mappings=header.url=headerUrl,header.height=headerHeight,header.script=headerScript,header.legacy=useLegacyHeader,header.logoUrl=logoUrl,header.stylesheet=georchestraStylesheet,header.configFile=headerConfigFile