@eeacms/volto-cca-policy 0.3.90 → 0.3.92

package/src/components/manage/Blocks/CaseStudyExplorer/CaseStudyFilters.jsx

@@ -93,7 +93,7 @@ export default function CaseStudyFilters(props) {
           {Object.entries(filters?.sectors || {}).map(
             ([value, label], index) => (
               <Checkbox
-                label={intl.formatMessage({ id: label })}
+                label={intl.formatMessage({ id: label.trim() })}
                 value={value}
                 checked={activeFilters.sectors.includes(value)}
                 name="sectors"
@@ -119,7 +119,7 @@ export default function CaseStudyFilters(props) {
           {Object.entries(filters?.impacts || {}).map(
             ([value, label], index) => (
               <Checkbox
-                label={intl.formatMessage({ id: label })}
+                label={intl.formatMessage({ id: label.trim() })}
                 checked={activeFilters.impacts.includes(value)}
                 value={value}
                 name="impacts"
@@ -145,10 +145,10 @@ export default function CaseStudyFilters(props) {
           {Object.entries(filters?.measures || {}).map(
             ([key, values], index) => (
               <div className="subcategory" key={'ktm' + index}>
-                <h4>{intl.formatMessage({ id: key })}</h4>
+                <h4>{intl.formatMessage({ id: key.trim() })}</h4>
                 {Object.entries(values).map(([_, valData]) => (
                   <Checkbox
-                    label={intl.formatMessage({ id: valData.value })}
+                    label={intl.formatMessage({ id: valData.value.trim() })}
                     value={valData.key}
                     checked={activeFilters.measures.includes(valData.key)}
                     name="measures"
@@ -175,7 +175,7 @@ export default function CaseStudyFilters(props) {
           {Object.entries(filters?.elements || {}).map(
             ([value, label], index) => (
               <Checkbox
-                label={intl.formatMessage({ id: label })}
+                label={intl.formatMessage({ id: label.trim() })}
                 value={value}
                 checked={activeFilters.elements.includes(value)}
                 name="elements"

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',

package/src/messages.js

@@ -0,0 +1,96 @@
+import { defineMessages } from 'react-intl';
+const messages = defineMessages({
+  placeholderClimateSearch: {
+    id: 'Search the Climate-ADAPT database',
+    defaultMessage: 'Search the Climate-ADAPT database',
+  },
+  placeholderObservatorySearch: {
+    id: 'Search the Observatory Resource Catalogue...',
+    defaultMessage: 'Search the Observatory Resource Catalogue...',
+  },
+  placeholderMissionSearch: {
+    id: 'Search the EU Mission on Adaptation',
+    defaultMessage: 'Search the EU Mission on Adaptation',
+  },
+});
+
+export const messagesList = defineMessages({
+  a1def: {
+    id: 'Governance and Institutional',
+    defaultMessage: 'Governance and Institutional',
+  },
+  a1: {
+    id: 'Policy Instruments',
+    defaultMessage: 'Policy Instruments',
+  },
+  a2: {
+    id: 'Management and planning',
+    defaultMessage: 'Management and planning',
+  },
+  a3: {
+    id: 'Coordination cooperation and networks',
+    defaultMessage: 'Coordination cooperation and networks',
+  },
+  b1def: {
+    id: 'Economic and Finance',
+    defaultMessage: 'Economic and Finance',
+  },
+  b1: {
+    id: 'Financing incentive instruments',
+    defaultMessage: 'Financing incentive instruments',
+  },
+  b2: {
+    id: 'Insurance and risk sharing instruments',
+    defaultMessage: 'Insurance and risk sharing instruments',
+  },
+  c1def: {
+    id: 'Physical and technological',
+    defaultMessage: 'Physical and technological',
+  },
+  c1: {
+    id: 'Grey options',
+    defaultMessage: 'Grey options',
+  },
+  c2: {
+    id: 'Technological options',
+    defaultMessage: 'Technological options',
+  },
+  d1def: {
+    id: 'Nature based Solutions and Ecosystem based approaches',
+    defaultMessage: 'Nature based Solutions and Ecosystem based approaches',
+  },
+  d1: {
+    id: 'Green options',
+    defaultMessage: 'Green options',
+  },
+  d2: {
+    id: 'Blue options',
+    defaultMessage: 'Blue options',
+  },
+  e1def: {
+    id: 'Knowledge and behavioural change',
+    defaultMessage: 'Knowledge and behavioural change',
+  },
+  e1: {
+    id: 'Information and awareness raising',
+    defaultMessage: 'Information and awareness raising',
+  },
+  e2: {
+    id: 'Capacity building empowering and lifestyle practices',
+    defaultMessage: 'Capacity building empowering and lifestyle practices',
+  },
+  e3: {
+    id: 'Capacity building empowering and lifestyle practices',
+    defaultMessage: 'Capacity building empowering and lifestyle practices',
+  },
+  healthImpacts: {
+    id: 'Health Impacts',
+    defaultMessage: 'Health Impacts',
+  },
+  types: {
+    id: 'Types',
+    defaultMessage: 'Types',
+  },
+});
+
+export default messages;