@eeacms/volto-eea-website-theme 3.15.0 → 3.16.0

package/CHANGELOG.md

@@ -4,15 +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).
 
-### [3.15.0](https://github.com/eea/volto-eea-website-theme/compare/3.14.1...3.15.0) - 3 December 2025
+### [3.16.0](https://github.com/eea/volto-eea-website-theme/compare/3.15.0...3.16.0) - 4 December 2025
 
 #### :rocket: New Features
 
-- feat: Add restricted options for group block - refs #294358 [dobri1408 - [`e23808d`](https://github.com/eea/volto-eea-website-theme/commit/e23808d2fa6ca252032b5a82915fe175b26be913)]
+- feat: Custom Error boundary - refs #291209 [Nilesh - [`6d0cf06`](https://github.com/eea/volto-eea-website-theme/commit/6d0cf06d5c3603359eda6986c69e131e0265b8d9)]
 
 #### :hammer_and_wrench: Others
 
-- Release 3.15.0 [Alin Voinea - [`7ee262b`](https://github.com/eea/volto-eea-website-theme/commit/7ee262b0bcb09b221358bcc1d7c6b43464a86731)]
+- Release 3.16.0 [Alin Voinea - [`d947957`](https://github.com/eea/volto-eea-website-theme/commit/d947957b1597a3b651da1b9581ce661fd441109f)]
+### [3.15.0](https://github.com/eea/volto-eea-website-theme/compare/3.14.1...3.15.0) - 3 December 2025
+
+#### :rocket: New Features
+
+- feat: Add restricted options for group block - refs #294358 [dobri1408 - [`e23808d`](https://github.com/eea/volto-eea-website-theme/commit/e23808d2fa6ca252032b5a82915fe175b26be913)]
+
 ### [3.14.1](https://github.com/eea/volto-eea-website-theme/compare/3.14.0...3.14.1) - 17 November 2025
 
 ### [3.14.0](https://github.com/eea/volto-eea-website-theme/compare/3.13.0...3.14.0) - 6 November 2025

package/locales/de/LC_MESSAGES/volto.po

@@ -11,6 +11,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. Default: "Add"
+#: components/theme/Widgets/SimpleArrayWidget
+msgid "Add"
+msgstr ""
+
 #. Default: "Choices"
 #: components/theme/Widgets/CreatableSelectWidget
 msgid "Choices"
@@ -51,11 +56,31 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. Default: "Hide Children From Navigation"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Hide Children From Navigation"
+msgstr ""
+
 #. Default: "Invalid block - Will be removed on saving"
 #: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
 msgid "Invalid Block"
 msgstr ""
 
+#. Default: "Load Main Navigation Routes"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Load Main Navigation Routes"
+msgstr ""
+
+#. Default: "Menu Item Children List Columns"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Menu Item Children List Columns"
+msgstr ""
+
+#. Default: "Menu Item Columns"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Menu Item Columns"
+msgstr ""
+
 #. Default: "Modified"
 #: components/theme/Banner/View
 msgid "Modified"
@@ -78,11 +103,21 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
+#. Default: "Preparing download"
+#: components/theme/PrintLoader/PrintLoader
+msgid "Preparing download"
+msgstr ""
+
 #. Default: "Published"
 #: components/theme/Banner/View
 msgid "Published"
 msgstr ""
 
+#. Default: "Remove"
+#: components/theme/Widgets/SimpleArrayWidget
+msgid "Remove"
+msgstr ""
+
 #. Default: "Required"
 #: components/theme/Widgets/CreatableSelectWidget
 msgid "Required"
@@ -146,6 +181,16 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. Default: "Restrict access to this block based on user permissions"
+#: index
+msgid "restrictedBlockDescription"
+msgstr ""
+
+#. Default: "Restricted block"
+#: index
+msgid "restrictedBlockTitle"
+msgstr ""
+
 #. Default: "RSS Feed"
 #: components/theme/Banner/View
 msgid "rssFeed"

package/locales/en/LC_MESSAGES/volto.po

@@ -11,6 +11,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. Default: "Add"
+#: components/theme/Widgets/SimpleArrayWidget
+msgid "Add"
+msgstr ""
+
 #. Default: "Choices"
 #: components/theme/Widgets/CreatableSelectWidget
 msgid "Choices"
@@ -51,11 +56,31 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. Default: "Hide Children From Navigation"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Hide Children From Navigation"
+msgstr ""
+
 #. Default: "Invalid block - Will be removed on saving"
 #: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
 msgid "Invalid Block"
 msgstr ""
 
+#. Default: "Load Main Navigation Routes"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Load Main Navigation Routes"
+msgstr ""
+
+#. Default: "Menu Item Children List Columns"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Menu Item Children List Columns"
+msgstr ""
+
+#. Default: "Menu Item Columns"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Menu Item Columns"
+msgstr ""
+
 #. Default: "Modified"
 #: components/theme/Banner/View
 msgid "Modified"
@@ -78,11 +103,21 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
+#. Default: "Preparing download"
+#: components/theme/PrintLoader/PrintLoader
+msgid "Preparing download"
+msgstr ""
+
 #. Default: "Published"
 #: components/theme/Banner/View
 msgid "Published"
 msgstr ""
 
+#. Default: "Remove"
+#: components/theme/Widgets/SimpleArrayWidget
+msgid "Remove"
+msgstr ""
+
 #. Default: "Required"
 #: components/theme/Widgets/CreatableSelectWidget
 msgid "Required"
@@ -146,6 +181,16 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. Default: "Restrict access to this block based on user permissions"
+#: index
+msgid "restrictedBlockDescription"
+msgstr ""
+
+#. Default: "Restricted block"
+#: index
+msgid "restrictedBlockTitle"
+msgstr ""
+
 #. Default: "RSS Feed"
 #: components/theme/Banner/View
 msgid "rssFeed"

package/locales/it/LC_MESSAGES/volto.po

@@ -11,6 +11,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. Default: "Add"
+#: components/theme/Widgets/SimpleArrayWidget
+msgid "Add"
+msgstr ""
+
 #. Default: "Choices"
 #: components/theme/Widgets/CreatableSelectWidget
 msgid "Choices"
@@ -51,11 +56,31 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. Default: "Hide Children From Navigation"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Hide Children From Navigation"
+msgstr ""
+
 #. Default: "Invalid block - Will be removed on saving"
 #: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
 msgid "Invalid Block"
 msgstr ""
 
+#. Default: "Load Main Navigation Routes"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Load Main Navigation Routes"
+msgstr ""
+
+#. Default: "Menu Item Children List Columns"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Menu Item Children List Columns"
+msgstr ""
+
+#. Default: "Menu Item Columns"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Menu Item Columns"
+msgstr ""
+
 #. Default: "Modified"
 #: components/theme/Banner/View
 msgid "Modified"
@@ -78,11 +103,21 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
+#. Default: "Preparing download"
+#: components/theme/PrintLoader/PrintLoader
+msgid "Preparing download"
+msgstr ""
+
 #. Default: "Published"
 #: components/theme/Banner/View
 msgid "Published"
 msgstr ""
 
+#. Default: "Remove"
+#: components/theme/Widgets/SimpleArrayWidget
+msgid "Remove"
+msgstr ""
+
 #. Default: "Required"
 #: components/theme/Widgets/CreatableSelectWidget
 msgid "Required"
@@ -146,6 +181,16 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. Default: "Restrict access to this block based on user permissions"
+#: index
+msgid "restrictedBlockDescription"
+msgstr ""
+
+#. Default: "Restricted block"
+#: index
+msgid "restrictedBlockTitle"
+msgstr ""
+
 #. Default: "RSS Feed"
 #: components/theme/Banner/View
 msgid "rssFeed"

package/locales/ro/LC_MESSAGES/volto.po

@@ -11,6 +11,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
+#. Default: "Add"
+#: components/theme/Widgets/SimpleArrayWidget
+msgid "Add"
+msgstr ""
+
 #. Default: "Choices"
 #: components/theme/Widgets/CreatableSelectWidget
 msgid "Choices"
@@ -51,11 +56,31 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. Default: "Hide Children From Navigation"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Hide Children From Navigation"
+msgstr ""
+
 #. Default: "Invalid block - Will be removed on saving"
 #: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
 msgid "Invalid Block"
 msgstr ""
 
+#. Default: "Load Main Navigation Routes"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Load Main Navigation Routes"
+msgstr ""
+
+#. Default: "Menu Item Children List Columns"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Menu Item Children List Columns"
+msgstr ""
+
+#. Default: "Menu Item Columns"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Menu Item Columns"
+msgstr ""
+
 #. Default: "Modified"
 #: components/theme/Banner/View
 msgid "Modified"
@@ -78,11 +103,21 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
+#. Default: "Preparing download"
+#: components/theme/PrintLoader/PrintLoader
+msgid "Preparing download"
+msgstr ""
+
 #. Default: "Published"
 #: components/theme/Banner/View
 msgid "Published"
 msgstr ""
 
+#. Default: "Remove"
+#: components/theme/Widgets/SimpleArrayWidget
+msgid "Remove"
+msgstr ""
+
 #. Default: "Required"
 #: components/theme/Widgets/CreatableSelectWidget
 msgid "Required"
@@ -146,6 +181,16 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. Default: "Restrict access to this block based on user permissions"
+#: index
+msgid "restrictedBlockDescription"
+msgstr ""
+
+#. Default: "Restricted block"
+#: index
+msgid "restrictedBlockTitle"
+msgstr ""
+
 #. Default: "RSS Feed"
 #: components/theme/Banner/View
 msgid "rssFeed"

package/locales/volto.pot

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2025-06-01T18:42:16.532Z\n"
+"POT-Creation-Date: 2025-12-04T18:19:53.476Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -13,6 +13,11 @@ msgstr ""
 "Preferred-Encodings: utf-8\n"
 "Domain: volto\n"
 
+#. Default: "Add"
+#: components/theme/Widgets/SimpleArrayWidget
+msgid "Add"
+msgstr ""
+
 #. Default: "Choices"
 #: components/theme/Widgets/CreatableSelectWidget
 msgid "Choices"
@@ -53,11 +58,31 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
+#. Default: "Hide Children From Navigation"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Hide Children From Navigation"
+msgstr ""
+
 #. Default: "Invalid block - Will be removed on saving"
 #: components/manage/Blocks/GroupBlockTemplate/FlexGroup/RenderBlocks
 msgid "Invalid Block"
 msgstr ""
 
+#. Default: "Load Main Navigation Routes"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Load Main Navigation Routes"
+msgstr ""
+
+#. Default: "Menu Item Children List Columns"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Menu Item Children List Columns"
+msgstr ""
+
+#. Default: "Menu Item Columns"
+#: components/theme/Widgets/NavigationBehaviorWidget
+msgid "Menu Item Columns"
+msgstr ""
+
 #. Default: "Modified"
 #: components/theme/Banner/View
 msgid "Modified"
@@ -80,11 +105,21 @@ msgstr ""
 msgid "No value"
 msgstr ""
 
+#. Default: "Preparing download"
+#: components/theme/PrintLoader/PrintLoader
+msgid "Preparing download"
+msgstr ""
+
 #. Default: "Published"
 #: components/theme/Banner/View
 msgid "Published"
 msgstr ""
 
+#. Default: "Remove"
+#: components/theme/Widgets/SimpleArrayWidget
+msgid "Remove"
+msgstr ""
+
 #. Default: "Required"
 #: components/theme/Widgets/CreatableSelectWidget
 msgid "Required"
@@ -148,6 +183,16 @@ msgstr ""
 msgid "User"
 msgstr ""
 
+#. Default: "Restrict access to this block based on user permissions"
+#: index
+msgid "restrictedBlockDescription"
+msgstr ""
+
+#. Default: "Restricted block"
+#: index
+msgid "restrictedBlockTitle"
+msgstr ""
+
 #. Default: "RSS Feed"
 #: components/theme/Banner/View
 msgid "rssFeed"

package/package.json

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

package/src/customizations/volto/components/theme/Error/ErrorBoundary.jsx

@@ -0,0 +1,47 @@
+import React from 'react';
+import config from '@plone/volto/registry';
+
+class ErrorBoundary extends React.Component {
+  constructor(props) {
+    super(props);
+    this.state = { hasError: false, error: null };
+  }
+
+  static getDerivedStateFromError(error) {
+    return { hasError: true, error };
+  }
+
+  componentDidCatch(error, errorInfo) {
+    if (this.props.error) {
+      //pass error to error-reporting service
+      config.settings.errorHandlers?.forEach((handler) => {
+        if (typeof handler === 'function') {
+          handler(error);
+        }
+      });
+      if (this.props.onError) {
+        this.props.onError(error, errorInfo);
+      }
+    } else {
+      // eslint-disable-next-line
+      console.error(error, errorInfo);
+    }
+  }
+
+  render() {
+    const ErrorPage =
+      this.props.fallback || config.getComponent('ErrorBoundary')?.component;
+    if (this.state.hasError) {
+      if (ErrorPage) {
+        // You can render any custom fallback UI
+        return <ErrorPage name={this.props.name} error={this.state.error} />;
+      } else {
+        return <pre className="error">{`<error: ${this.props.name}>`}</pre>;
+      }
+    }
+
+    return this.props.children;
+  }
+}
+
+export default ErrorBoundary;

package/src/customizations/volto/server.jsx

@@ -80,10 +80,16 @@ if (middleware.length) server.use('/', middleware);
 server.use(function (err, req, res, next) {
   if (err) {
     const { store } = res.locals;
+    const ErrorComponent =
+      config.getComponent('ErrorBoundary')?.component || null;
     const errorPage = (
       <Provider store={store} onError={reactIntlErrorHandler}>
         <StaticRouter context={{}} location={req.url}>
-          <ErrorPage message={err.message} />
+          {ErrorComponent ? (
+            <ErrorComponent error={err} />
+          ) : (
+            <ErrorPage message={err.message} />
+          )}
         </StaticRouter>
       </Provider>
     );
@@ -157,10 +163,16 @@ function setupServer(req, res, next) {
   const store = configureStore(initialState, history, api);
 
   function errorHandler(error) {
+    const ErrorComponent =
+      config.getComponent('ErrorBoundary').component || null;
     const errorPage = (
       <Provider store={store} onError={reactIntlErrorHandler}>
         <StaticRouter context={{}} location={req.url}>
-          <ErrorPage message={error.message} />
+          {ErrorComponent ? (
+            <ErrorComponent error={error} />
+          ) : (
+            <ErrorPage message={error.message} />
+          )}
         </StaticRouter>
       </Provider>
     );

package/src/hocs/withErrorBoundary.jsx

@@ -0,0 +1,29 @@
+import React from 'react';
+import { ErrorBoundary } from '@plone/volto/components';
+
+export default function withErrorBoundary(WrappedComponent, options = {}) {
+  // Handle backward compatibility - if second param is a component, treat as fallback
+  const config =
+    React.isValidElement(options) || typeof options === 'function'
+      ? { fallback: options }
+      : {
+          fallback: null,
+          onError: null,
+          ...options,
+        };
+
+  const ErrorBoundaryWrapper = React.memo(function ErrorBoundaryWrapper(props) {
+    const { fallback, onError } = config;
+
+    return (
+      <ErrorBoundary fallback={fallback} onError={onError}>
+        <WrappedComponent {...props} />
+      </ErrorBoundary>
+    );
+  });
+
+  const wrappedComponentName = WrappedComponent.displayName || 'Component';
+  ErrorBoundaryWrapper.displayName = `withErrorBoundary(${wrappedComponentName})`;
+
+  return ErrorBoundaryWrapper;
+}

package/src/hocs/withErrorBoundary.test.jsx

@@ -0,0 +1,104 @@
+import { render, screen } from '@testing-library/react';
+import '@testing-library/jest-dom';
+import { ErrorBoundary } from '@plone/volto/components';
+import withErrorBoundary from './withErrorBoundary';
+
+// Mock the ErrorBoundary component from Volto
+jest.mock('@plone/volto/components', () => ({
+  ErrorBoundary: jest.fn(({ children, fallback, onError }) => {
+    try {
+      return children;
+    } catch (error) {
+      if (onError) onError(error, { componentStack: 'test-stack' });
+      return fallback || <div>Error occurred</div>;
+    }
+  }),
+}));
+
+// Test components
+const TestComponent = ({ shouldThrow, message = 'Hello World' }) => {
+  if (shouldThrow) {
+    throw new Error('Test error');
+  }
+  return <div>{message}</div>;
+};
+
+const CustomFallback = () => <div>Custom error fallback</div>;
+
+describe('withErrorBoundary HOC', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('Basic functionality', () => {
+    it('should render the wrapped component normally', () => {
+      const WrappedComponent = withErrorBoundary(TestComponent);
+      render(<WrappedComponent message="Test message" />);
+
+      expect(screen.getByText('Test message')).toBeInTheDocument();
+    });
+
+    it('should pass through all props to the wrapped component', () => {
+      const WrappedComponent = withErrorBoundary(TestComponent);
+      render(<WrappedComponent message="Test props" data-testid="test" />);
+
+      expect(screen.getByText('Test props')).toBeInTheDocument();
+    });
+  });
+
+  describe('Error boundary configuration', () => {
+    it('should use default ErrorBoundary when no fallback is provided', () => {
+      const WrappedComponent = withErrorBoundary(TestComponent);
+      render(<WrappedComponent />);
+
+      expect(ErrorBoundary).toHaveBeenCalledWith(
+        expect.objectContaining({
+          fallback: null,
+          onError: null,
+        }),
+        expect.any(Object),
+      );
+    });
+
+    it('should accept a custom fallback component', () => {
+      const WrappedComponent = withErrorBoundary(TestComponent, {
+        fallback: CustomFallback,
+      });
+      render(<WrappedComponent />);
+
+      expect(ErrorBoundary).toHaveBeenCalledWith(
+        expect.objectContaining({
+          fallback: CustomFallback,
+        }),
+        expect.any(Object),
+      );
+    });
+
+    it('should handle backward compatibility with fallback as second parameter', () => {
+      const WrappedComponent = withErrorBoundary(TestComponent, CustomFallback);
+      render(<WrappedComponent />);
+
+      expect(ErrorBoundary).toHaveBeenCalledWith(
+        expect.objectContaining({
+          fallback: CustomFallback,
+        }),
+        expect.any(Object),
+      );
+    });
+
+    it('should call onError callback when provided', () => {
+      const onErrorMock = jest.fn();
+      const WrappedComponent = withErrorBoundary(TestComponent, {
+        onError: onErrorMock,
+      });
+      render(<WrappedComponent />);
+
+      expect(ErrorBoundary).toHaveBeenCalledWith(
+        expect.objectContaining({
+          onError: onErrorMock,
+        }),
+        expect.any(Object),
+      );
+    });
+  });
+});