@eeacms/volto-eea-website-theme 3.9.2 → 3.10.1

package/CHANGELOG.md

@@ -4,11 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-### [3.9.2](https://github.com/eea/volto-eea-website-theme/compare/3.9.1...3.9.2) - 22 September 2025
+### [3.10.1](https://github.com/eea/volto-eea-website-theme/compare/3.10.0...3.10.1) - 26 September 2025
+
+#### :nail_care: Enhancements
+
+- change(app): Update CustomCSS to use relative paths for resources [David Ichim - [`0b377f1`](https://github.com/eea/volto-eea-website-theme/commit/0b377f19c1e9ca474cd5ae89283235a143609f6b)]
+
+#### :hammer_and_wrench: Others
+
+- Remove unused import of config from registry [David Ichim - [`5f16220`](https://github.com/eea/volto-eea-website-theme/commit/5f16220ca34cf51721fd6b1099996a3c8ebb8bb6)]
+### [3.10.0](https://github.com/eea/volto-eea-website-theme/compare/3.9.2...3.10.0) - 25 September 2025
+
+#### :nail_care: Enhancements
+
+- change(custom-js): removed App.jsx override in favor of adding to CustomCSS.jsx [David Ichim - [`3d180ec`](https://github.com/eea/volto-eea-website-theme/commit/3d180ec365ee7d4b7a96f8ad3cdae532b4834ec3)]
 
 #### :hammer_and_wrench: Others
 
-- feature(context-navigation): allow disabling of side nav per content type [David Ichim - [`5430166`](https://github.com/eea/volto-eea-website-theme/commit/54301668a9fdcffb9f17f509147e3e91d028964e)]
+- Bump package version to 3.10.0 [David Ichim - [`1c88a94`](https://github.com/eea/volto-eea-website-theme/commit/1c88a94de85ebd2aec72f2d2c1cfdd31a36ca3f5)]
+### [3.9.2](https://github.com/eea/volto-eea-website-theme/compare/3.9.1...3.9.2) - 22 September 2025
+
 ### [3.9.1](https://github.com/eea/volto-eea-website-theme/compare/3.9.0...3.9.1) - 26 August 2025
 
 ### [3.9.0](https://github.com/eea/volto-eea-website-theme/compare/3.8.0...3.9.0) - 20 August 2025

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-theme",
-  "version": "3.9.2",
+  "version": "3.10.1",
   "description": "@eeacms/volto-eea-website-theme: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/components/manage/Blocks/ContextNavigation/variations/Accordion.jsx

@@ -226,6 +226,7 @@ export default compose(
         fixedVisibilitySwitchTarget=".main.bar"
         // insertBeforeOnMobile=".banner"
         shouldRender={Boolean(props.navigation?.items?.length)}
+        sideMenuTransitionTarget=".breadcrumbs"
       />
     );
   },

package/src/components/theme/CustomCSS/CustomCSS.jsx

@@ -1,11 +1,12 @@
 import React from 'react';
-import config from '@plone/volto/registry';
 
 const CustomCSS = (props) => {
-  const href = `${config.settings.apiPath}/voltoCustom.css`;
+  const href = `/voltoCustom.css`;
+  const src = `/voltoCustom.js`;
   return (
     <>
       <link rel="stylesheet" href={href} />
+      <script type="text/javascript" src={src}></script>
     </>
   );
 };

package/src/index.js

@@ -44,7 +44,8 @@ import SubsiteClass from './components/theme/SubsiteClass';
 import contentBoxSVG from './icons/content-box.svg';
 
 import okMiddleware from './middleware/ok';
-import voltoCustomMiddleware from './middleware/voltoCustom';
+import voltoCustomCSSMiddleware from './middleware/voltoCustom';
+import { voltoCustomJsMiddleware } from './middleware/voltoCustom';
 import installSlate from './slate';
 import { print, navigationSettings } from './reducers';
 
@@ -397,7 +398,8 @@ const applyConfig = (config) => {
     const express = require('express');
     config.settings.expressMiddleware = [
       ...(config.settings.expressMiddleware || []),
-      voltoCustomMiddleware(express),
+      voltoCustomCSSMiddleware(express),
+      voltoCustomJsMiddleware(express),
       okMiddleware(express),
     ];
   }

package/src/index.test.js

@@ -146,7 +146,7 @@ describe('applyConfig', () => {
     );
 
     expect(config.widgets.views.id.subjects).toBe('MockedTokenWidget');
-    expect(config.settings.expressMiddleware.length).toEqual(2);
+    expect(config.settings.expressMiddleware.length).toEqual(3);
     expect(config.settings.appExtras).toEqual([
       { match: '/**', component: 'MockedInpageNavigation' },
       { match: '', component: 'MockedCustomCSS' },
@@ -313,7 +313,7 @@ describe('applyConfig', () => {
     expect(config.blocks.blocksConfig['hero'].copyrightPrefix).toBe('Image');
 
     expect(config.widgets.views.id.subjects).toBe('MockedTokenWidget');
-    expect(config.settings.expressMiddleware.length).toEqual(2);
+    expect(config.settings.expressMiddleware.length).toEqual(3);
     expect(config.settings.appExtras).toEqual([
       { match: '/**', component: 'MockedInpageNavigation' },
       { match: '', component: 'MockedCustomCSS' },

package/src/middleware/voltoCustom.js

@@ -29,11 +29,39 @@ function voltoCustomMiddleware(req, res, next) {
     });
 }
 
-const registervoltoCustomMiddleware = function (express) {
+function getVoltoCustomJsMiddleware(req, res, next) {
+  getBackendResourceWithAuth(req)
+    .then((resource) => {
+      // Just forward the headers that we need
+      HEADERS.forEach((header) => {
+        if (resource?.get?.(header)) {
+          res.set(header, resource.get(header));
+        }
+      });
+      res.status(resource.statusCode);
+      res.send(resource.body);
+    })
+    .catch(() => {
+      res.set('Content-Type', 'text/javascript; charset=utf-8');
+      res.status(200);
+      res.send(
+        '/* Override this by adding a File called voltoCustom.js to backend at portal_skins/custom/manage_main */',
+      );
+    });
+}
+
+const registerVoltoCustomMiddleware = function (express) {
   const middleware = express.Router();
   middleware.all(['**/voltoCustom.css$'], voltoCustomMiddleware);
   middleware.id = 'voltoCustom.css';
   return middleware;
 };
 
-export default registervoltoCustomMiddleware;
+export const voltoCustomJsMiddleware = function (express) {
+  const middleware = express.Router();
+  middleware.all(['**/voltoCustom.js$'], getVoltoCustomJsMiddleware);
+  middleware.id = 'voltoCustom.js';
+  return middleware;
+};
+
+export default registerVoltoCustomMiddleware;