@eeacms/volto-eea-website-theme 4.1.0 → 4.2.0

package/CHANGELOG.md

@@ -4,6 +4,21 @@ 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).
 
+### [4.2.0](https://github.com/eea/volto-eea-website-theme/compare/4.1.1...4.2.0) - 21 April 2026
+
+#### :nail_care: Enhancements
+
+- refactor: replace eea-settings controlpanel with header-settings via asyncPropsExtenders [Miu Razvan - [`f7d169b`](https://github.com/eea/volto-eea-website-theme/commit/f7d169b1bd12446cef74b78969cca1ddb19a7531)]
+
+#### :hammer_and_wrench: Others
+
+- Release 4.2.0 [Alin Voinea - [`8f7d6d0`](https://github.com/eea/volto-eea-website-theme/commit/8f7d6d0d0547dbe384c835375b56ccdb87c5dd44)]
+### [4.1.1](https://github.com/eea/volto-eea-website-theme/compare/4.1.0...4.1.1) - 17 April 2026
+
+#### :bug: Bug Fixes
+
+- fix(order-sidebar): respect required and fixed block restrictions - refs #302095 [Alin Voinea - [`51557f2`](https://github.com/eea/volto-eea-website-theme/commit/51557f220fbe3992110e96862f4ab0ba987d42ed)]
+
 ### [4.1.0](https://github.com/eea/volto-eea-website-theme/compare/4.0.5...4.1.0) - 17 April 2026
 
 #### :house: Internal changes

package/package.json

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

package/src/actions/header-settings.js

@@ -0,0 +1,9 @@
+import { GET_HEADER_SETTINGS } from '../constants/ActionTypes';
+
+export const getHeaderSettings = () => ({
+  type: GET_HEADER_SETTINGS,
+  request: {
+    op: 'get',
+    path: '/@header-settings',
+  },
+});

package/src/actions/index.js

@@ -1,3 +1,3 @@
 export * from './print';
 export * from './navigation';
-export * from './eea-settings';
+export * from './header-settings';

package/src/constants/ActionTypes.js

@@ -6,4 +6,4 @@
 export const SET_ISPRINT = 'SET_ISPRINT';
 export const SET_PRINT_LOADING = 'SET_PRINT_LOADING';
 export const GET_NAVIGATION_SETTINGS = 'GET_NAVIGATION_SETTINGS';
-export const GET_EEA_SETTINGS = 'GET_EEA_SETTINGS';
+export const GET_HEADER_SETTINGS = 'GET_HEADER_SETTINGS';

package/src/customizations/volto/components/manage/Blocks/Block/Order/Item.jsx

@@ -0,0 +1,146 @@
+import React, { forwardRef } from 'react';
+import classNames from 'classnames';
+import { useDispatch, useSelector } from 'react-redux';
+import includes from 'lodash/includes';
+import isBoolean from 'lodash/isBoolean';
+import cx from 'classnames';
+import Icon from '@plone/volto/components/theme/Icon/Icon';
+import { setUIState } from '@plone/volto/actions/form/form';
+import config from '@plone/volto/registry';
+
+import deleteSVG from '@plone/volto/icons/delete.svg';
+import dragSVG from '@plone/volto/icons/drag.svg';
+
+// TEMPORARY PATCH (Volto issue #6481):
+// Remove this customization once the upstream fixes are released and adopted.
+// Upstream PRs: https://github.com/plone/volto/pull/8124 and
+// https://github.com/plone/volto/pull/8125
+export const Item = forwardRef(
+  (
+    {
+      clone,
+      data,
+      depth,
+      disableSelection,
+      disableInteraction,
+      ghost,
+      id,
+      handleProps,
+      indentationWidth,
+      onRemove,
+      onSelectBlock,
+      parentId,
+      parentType,
+      style,
+      value,
+      wrapperRef,
+      errors,
+      ...props
+    },
+    ref,
+  ) => {
+    const selected = useSelector((state) => state.form.ui.selected);
+    const hovered = useSelector((state) => state.form.ui.hovered);
+    const multiSelected = useSelector((state) => state.form.ui.multiSelected);
+    const gridSelected = useSelector((state) => state.form.ui.gridSelected);
+    const dispatch = useDispatch();
+
+    const icon =
+      config.blocks.blocksConfig[data?.['@type']]?.icon ||
+      config.blocks.blocksConfig.title?.icon;
+
+    const required = isBoolean(data?.required)
+      ? data.required
+      : includes(config.blocks.requiredBlocks, data?.['@type']);
+    const fixed = !!data?.fixed;
+
+    return (
+      <li
+        className={classNames(
+          'tree-item-wrapper',
+          clone && 'clone',
+          ghost && 'ghost',
+          disableSelection && 'disable-selection',
+          disableInteraction && 'disable-interaction',
+        )}
+        role="presentation"
+        onMouseOver={() => dispatch(setUIState({ hovered: id }))}
+        onFocus={() => dispatch(setUIState({ hovered: id }))}
+        onMouseLeave={() => dispatch(setUIState({ hovered: null }))}
+        onClick={(e) => {
+          if (depth === 0) {
+            const isMultipleSelection = e.shiftKey || e.ctrlKey || e.metaKey;
+            selected !== id &&
+              onSelectBlock(
+                id,
+                selected === id ? false : isMultipleSelection,
+                e,
+              );
+          } else {
+            dispatch(
+              setUIState({
+                selected: parentId,
+                multiSelected: [],
+                gridSelected: id,
+              }),
+            );
+          }
+        }}
+        ref={wrapperRef}
+        style={{
+          '--spacing': `${indentationWidth * depth}px`,
+        }}
+        {...props}
+      >
+        <div
+          className={classNames(
+            'tree-item',
+            (selected === id || gridSelected === id) && 'selected',
+            hovered === id && 'hovered',
+            includes(multiSelected, id) && 'multiSelected',
+            `depth-${depth}`,
+          )}
+          ref={ref}
+          style={style}
+        >
+          {!fixed && (
+            <button
+              ref={ref}
+              {...handleProps}
+              className={classNames('action', 'drag')}
+              tabIndex={0}
+              data-cypress="draggable-handle"
+            >
+              <Icon name={dragSVG} size="16px" />
+            </button>
+          )}
+          <span
+            className={cx('text', {
+              errored: errors && Object.keys(errors).length > 0,
+            })}
+          >
+            {icon && (
+              <Icon
+                name={icon}
+                size="20px"
+                style={{ verticalAlign: 'middle' }}
+              />
+            )}{' '}
+            {data?.plaintext ||
+              config.blocks.blocksConfig[data?.['@type']]?.title ||
+              data?.title}
+          </span>
+          {!clone && onRemove && !required && (
+            <button
+              onClick={onRemove}
+              className={classNames('action', 'delete')}
+              tabIndex={0}
+            >
+              <Icon name={deleteSVG} size="18" />
+            </button>
+          )}
+        </div>
+      </li>
+    );
+  },
+);

package/src/customizations/volto/components/theme/Header/Header.jsx

@@ -61,9 +61,12 @@ const EEAHeader = ({ pathname, token, items, history, subsite }) => {
   const width = useSelector((state) => state.screen?.width);
   const dispatch = useDispatch();
 
-  const eeaSettings = useSelector((state) => state.eeaSettings?.data);
+  const headerSettings = useSelector(
+    (state) => state.reduxAsyncConnect?.headerSettings,
+  );
+
   const headerSearchBox =
-    eeaSettings?.header?.searchBox || eea.headerSearchBox || [];
+    headerSettings?.searchBox || eea.headerSearchBox || [];
   const previousToken = usePrevious(token);
   const navigationSettings =
     useSelector((state) => state.navigationSettings?.settings) ||

package/src/customizations/volto/server.jsx

@@ -33,7 +33,6 @@ import {
 import { changeLanguage } from '@plone/volto/actions/language/language';
 
 import userSession from '@plone/volto/reducers/userSession/userSession';
-import { getEEASettings } from '@eeacms/volto-eea-website-theme/actions';
 
 import configureStore from '@plone/volto/store';
 import ErrorPage from '@plone/volto/error';
@@ -264,7 +263,6 @@ server.get('/*', (req, res) => {
   const location = parseUrl(url);
 
   loadOnServer({ store, location, routes, api })
-    .then(() => Promise.all([store.dispatch(getEEASettings())]).catch(() => {}))
     .then(() => {
       const initialLang =
         req.universalCookies.get('I18N_LANGUAGE') ||

package/src/helpers/headerSettingsExtender.js

@@ -0,0 +1,20 @@
+import { getHeaderSettings } from '@eeacms/volto-eea-website-theme/actions';
+
+// asyncPropsExtenders entry. Loads header settings during SSR so they're
+// available to the Header component on the first render. Result lands in
+// state.reduxAsyncConnect.headerSettings.
+export const headerSettingsExtender = {
+  path: '/',
+  extend: (dispatchActions) => {
+    if (
+      dispatchActions.filter((a) => a.key === 'headerSettings').length === 0
+    ) {
+      dispatchActions.push({
+        key: 'headerSettings',
+        promise: ({ store: { dispatch } }) =>
+          __SERVER__ && dispatch(getHeaderSettings()),
+      });
+    }
+    return dispatchActions;
+  },
+};

package/src/index.js

@@ -49,7 +49,8 @@ import okMiddleware from './middleware/ok';
 import voltoCustomCSSMiddleware from './middleware/voltoCustom';
 import { voltoCustomJsMiddleware } from './middleware/voltoCustom';
 import installSlate from './slate';
-import { print, navigationSettings, eeaSettings } from './reducers';
+import { print, navigationSettings } from './reducers';
+import { headerSettingsExtender } from './helpers/headerSettingsExtender';
 
 import * as eea from './config';
 
@@ -676,9 +677,13 @@ const applyConfig = (config) => {
     ...(config.addonReducers || {}),
     print,
     navigationSettings,
-    eeaSettings,
   };
 
+  config.settings.asyncPropsExtenders = [
+    ...(config.settings.asyncPropsExtenders || []),
+    headerSettingsExtender,
+  ];
+
   // Mega menu object
   if (!config.settings.menuItemsLayouts) {
     config.settings.menuItemsLayouts = {};

package/src/reducers/index.js

@@ -1,5 +1,4 @@
 import print from './print';
 import navigationSettings from './navigation';
-import eeaSettings from './eea-settings';
 
-export { print, navigationSettings, eeaSettings };
+export { print, navigationSettings };

package/src/actions/eea-settings.js

@@ -1,9 +0,0 @@
-import { GET_EEA_SETTINGS } from '../constants/ActionTypes';
-
-export const getEEASettings = () => ({
-  type: GET_EEA_SETTINGS,
-  request: {
-    op: 'get',
-    path: '/@eea.settings',
-  },
-});

package/src/reducers/eea-settings.js

@@ -1,33 +0,0 @@
-import { GET_EEA_SETTINGS } from '../constants/ActionTypes';
-
-const initialState = {
-  error: null,
-  loaded: false,
-  loading: false,
-  data: {},
-};
-
-export default function eeaSettings(state = initialState, action = {}) {
-  switch (action.type) {
-    case `${GET_EEA_SETTINGS}_PENDING`:
-      return { ...state, error: null, loaded: false, loading: true };
-    case `${GET_EEA_SETTINGS}_SUCCESS`:
-      return {
-        ...state,
-        error: null,
-        loaded: true,
-        loading: false,
-        data: action.result || {},
-      };
-    case `${GET_EEA_SETTINGS}_FAIL`:
-      return {
-        ...state,
-        error: action.error,
-        loaded: false,
-        loading: false,
-        data: {},
-      };
-    default:
-      return state;
-  }
-}