@eeacms/volto-cca-policy 0.3.91 → 0.3.92

package/CHANGELOG.md

@@ -4,7 +4,7 @@ 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).
 
-### [0.3.91](https://github.com/eea/volto-cca-policy/compare/1.0.0-alpha.1...0.3.91) - 2 December 2025
+### [0.3.92](https://github.com/eea/volto-cca-policy/compare/1.0.0-alpha.1...0.3.92) - 8 December 2025
 
 #### :rocket: Dependency updates
 
@@ -26,6 +26,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :nail_care: Enhancements
 
+- change: code cleanup, add customization comments [kreafox - [`4418a01`](https://github.com/eea/volto-cca-policy/commit/4418a0157df75b4588956b15e1a0950bbd1f504c)]
+- change: add 301/302 redirect handling [kreafox - [`1125c61`](https://github.com/eea/volto-cca-policy/commit/1125c61f8b963a1f49bb6f7672b68bed03e559f9)]
+- change: update volto customizations [kreafox - [`a712c5d`](https://github.com/eea/volto-cca-policy/commit/a712c5da2f949262dc82b0526d3623c31a1ee105)]
 - change: update menu layout - refs #294274 [kreafox - [`984cbdf`](https://github.com/eea/volto-cca-policy/commit/984cbdfd8694f52416199a1bfef064fc22ad7ea9)]
 - change: cleanup, css fix [kreafox - [`cd1f97f`](https://github.com/eea/volto-cca-policy/commit/cd1f97f65b0549188ec336820c517e45ea728f47)]
 - change: remove website and contribution links from organisation cards, use semantic cards - refs #294273 [kreafox - [`7cffbca`](https://github.com/eea/volto-cca-policy/commit/7cffbca5cc2d422120b08fd683d5235f368256ce)]
@@ -55,6 +58,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- code cleanup [kreafox - [`5eb537f`](https://github.com/eea/volto-cca-policy/commit/5eb537f30bfc867e460fd46a145e0f7069b2c6f7)]
 - Refs #290863 - update message key [iugin - [`871b61c`](https://github.com/eea/volto-cca-policy/commit/871b61cea7070ff5ca6d303dcf5ecaf2fdd4e965)]
 - Refs #290863 - add translations [iugin - [`63dfc08`](https://github.com/eea/volto-cca-policy/commit/63dfc08243aa19dec5c92d800b22ed739f2f0f75)]
 - test: try to use specific version for plone-backend [kreafox - [`79c542e`](https://github.com/eea/volto-cca-policy/commit/79c542e8d55d2f1663b768c555880599634ae527)]
@@ -147,8 +151,14 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Add some loadable for components [Tiberiu Ichim - [`1793962`](https://github.com/eea/volto-cca-policy/commit/179396211c66a6a2465b2d1b6c0f2afc40fc7189)]
 - Refs #284961 - test [Tripon Eugen - [`c989f1f`](https://github.com/eea/volto-cca-policy/commit/c989f1f8638c0c5233c5c49f8673c9a2cdc7937e)]
 - Refs #284961 - add translations [Tripon Eugen - [`04ee988`](https://github.com/eea/volto-cca-policy/commit/04ee988c086d393b9b37ce1ea8d24f5e84f266aa)]
-### [1.0.0-alpha.0](https://github.com/eea/volto-cca-policy/compare/0.3.90...1.0.0-alpha.0) - 15 July 2025
+### [1.0.0-alpha.0](https://github.com/eea/volto-cca-policy/compare/0.3.91...1.0.0-alpha.0) - 15 July 2025
 
+### [0.3.91](https://github.com/eea/volto-cca-policy/compare/0.3.90...0.3.91) - 4 December 2025
+
+#### :hammer_and_wrench: Others
+
+- Refs #290863 - update message key [iugin - [`871b61c`](https://github.com/eea/volto-cca-policy/commit/871b61cea7070ff5ca6d303dcf5ecaf2fdd4e965)]
+- Refs #290863 - add translations [iugin - [`63dfc08`](https://github.com/eea/volto-cca-policy/commit/63dfc08243aa19dec5c92d800b22ed739f2f0f75)]
 ### [0.3.90](https://github.com/eea/volto-cca-policy/compare/0.3.89...0.3.90) - 20 November 2025
 
 #### :nail_care: Enhancements

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.3.91",
+  "version": "0.3.92",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/customizations/volto/components/theme/View/README.md

@@ -1 +1,9 @@
-Customized View.jsx to add the stripping of ++api++
+# View Customizations
+
+## Changes
+
+1. **API URL stripping**: Removes `++api++` from URLs
+2. **Link redirect handling**: Supports 301/302 redirects for Link content types
+   - Checks `@components.redirect` from backend serializer
+   - Sets correct HTTP status code for SSR (301 vs 302)
+   - Backwards compatible with error-based redirects

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

@@ -18,6 +18,7 @@ import {
   Tags,
   Toolbar,
 } from '@plone/volto/components';
+import { AlternateHrefLangs } from '@plone/volto/components/theme/AlternateHrefLangs/AlternateHrefLangs';
 import { listActions, getContent } from '@plone/volto/actions';
 import {
   BodyClass,
@@ -98,6 +99,8 @@ class View extends Component {
        * Error type
        */
       status: PropTypes.number,
+      code: PropTypes.number,
+      url: PropTypes.string,
     }),
   };
 
@@ -203,23 +206,33 @@ class View extends Component {
    */
   render() {
     const { views } = config;
-    if (this.props.error && this.props.error.code === 301) {
-      // const base = typeof window !== 'undefined' ? window.location.origin : '';
 
-      const redirect = flattenToAppURL(this.props.error.url)
-        .replaceAll('/++api++', '/')
+    // customization
+    const redirectData =
+      this.props.content?.['@components']?.redirect ||
+      ([301, 302].includes(this.props.error?.code) && {
+        url: this.props.error.url,
+        status: this.props.error.code,
+      });
+
+    if (redirectData) {
+      const redirect = flattenToAppURL(redirectData.url)
+        .replace('/++api++', '')
         .replaceAll('//', '/')
         .split('?')[0];
-      const redirParams = {
-        pathname: redirect,
-        search: this.props.location.search,
-      };
+      const targetUrl = `${redirect}${this.props.location.search}`;
+
+      if (this.props.staticContext) {
+        this.props.staticContext.error_code = redirectData.status || 302;
+      }
+
+      const shouldPush = redirectData.status === 302;
 
-      // eslint-disable-next-line no-console
-      console.log('Redirecting', redirParams);
+      return <Redirect to={targetUrl} push={shouldPush} />;
+    }
+    // end of customization
 
-      return <Redirect to={redirParams} push={true} />;
-    } else if (this.props.error && !this.props.connectionRefused) {
+    if (this.props.error && !this.props.connectionRefused) {
       let FoundView;
       if (this.props.error.status === undefined) {
         // For some reason, while development and if CORS is in place and the
@@ -247,6 +260,7 @@ class View extends Component {
     return (
       <div id="view">
         <ContentMetadataTags content={this.props.content} />
+        <AlternateHrefLangs content={this.props.content} />
         {/* Body class if displayName in component is set */}
         <BodyClass
           className={

package/src/customizations/volto/middleware/api.js

@@ -50,10 +50,7 @@ export function addExpandersToPath(path, type, isAnonymous) {
   } = qs.parseUrl(path, { decode: false });
 
   const expandersFromConfig = apiExpanders
-    .filter((expand) => {
-      const res = matchPath(url, expand.match) && expand[type];
-      return res;
-    })
+    .filter((expand) => matchPath(url, expand.match) && expand[type])
     .map((expand) => expand[type]);
 
   const expandMerge = compact(
@@ -70,7 +67,15 @@ export function addExpandersToPath(path, type, isAnonymous) {
 
   const querystringFromConfig = apiExpanders
     .filter((expand) => matchPath(url, expand.match) && expand[type])
-    .reduce((acc, expand) => ({ ...acc, ...expand?.['querystring'] }), {});
+    .reduce((acc, expand) => {
+      let querystring = expand?.['querystring'];
+      // The querystring accepts being a function to be able to take other
+      // config parameters
+      if (typeof querystring === 'function') {
+        querystring = querystring(config);
+      }
+      return { ...acc, ...querystring };
+    }, {});
 
   const queryMerge = { ...query, ...querystringFromConfig };
 
@@ -128,6 +133,13 @@ const apiMiddlewareFactory =
     const { settings } = config;
 
     const isAnonymous = !getState().userSession.token;
+    // const token = getState().userSession.token;
+    // let isAnonymous = true;
+    // if (token) {
+    //   const tokenExpiration = jwtDecode(token).exp;
+    //   const currentTime = new Date().getTime() / 1000;
+    //   isAnonymous = !token || currentTime > tokenExpiration;
+    // }
 
     if (typeof action === 'function') {
       return action(dispatch, getState);
@@ -310,15 +322,23 @@ const apiMiddlewareFactory =
             }
 
             // Redirect
-            else if (error?.code === 301) {
+            // customization
+            else if (error?.code === 301 || error?.code === 302) {
+              const redirectUrl =
+                error.response?.body?.url || error.response?.body?.location;
+
               next({
                 ...rest,
-                error,
+                error: {
+                  ...error,
+                  url: redirectUrl,
+                },
                 statusCode: error.code,
                 connectionRefused: false,
                 type: SET_APIERROR,
               });
             }
+            // end of customization
 
             // Redirect
             else if (error?.code === 408) {
@@ -337,7 +357,7 @@ const apiMiddlewareFactory =
                 ...rest,
                 error,
                 statusCode: error.response,
-                message: error.response.body.message,
+                message: error.response?.body?.message,
                 connectionRefused: false,
                 type: SET_APIERROR,
               });

package/src/customizations/volto/server.jsx

@@ -321,7 +321,11 @@ server.get('/*', (req, res) => {
       }
 
       if (context.url) {
-        res.redirect(flattenToAppURL(context.url));
+        // customization
+        // Use error_code if set (for Link redirects with specific status)
+        const redirectStatus = context.error_code || 302;
+        res.redirect(redirectStatus, flattenToAppURL(context.url));
+        // end of customization
       } else if (context.error_code) {
         res.set({
           'Cache-Control': 'no-cache',