@eeacms/volto-cca-policy 0.3.73 → 0.3.74

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

@@ -120,52 +120,70 @@ function sendOnSocket(request) {
  * @param {Object} api Api object.
  * @returns {Promise} Action promise.
  */
-const apiMiddlewareFactory = (api) => ({ dispatch, getState }) => (next) => (
-  action,
-) => {
-  const { settings } = config;
+const apiMiddlewareFactory =
+  (api) =>
+  ({ dispatch, getState }) =>
+  (next) =>
+  (action) => {
+    const { settings } = config;
 
-  const isAnonymous = !getState().userSession.token;
+    const isAnonymous = !getState().userSession.token;
 
-  if (typeof action === 'function') {
-    return action(dispatch, getState);
-  }
+    if (typeof action === 'function') {
+      return action(dispatch, getState);
+    }
 
-  const { request, type, mode = 'parallel', ...rest } = action;
-  const { subrequest } = action; // We want subrequest remains in `...rest` above
+    const { request, type, mode = 'parallel', ...rest } = action;
+    const { subrequest } = action; // We want subrequest remains in `...rest` above
 
-  let actionPromise;
+    let actionPromise;
 
-  if (!request) {
-    return next(action);
-  }
+    if (!request) {
+      return next(action);
+    }
 
-  next({ ...rest, type: `${type}_PENDING` });
+    next({ ...rest, type: `${type}_PENDING` });
 
-  if (socket) {
-    actionPromise = Array.isArray(request)
-      ? Promise.all(
-          request.map((item) =>
-            sendOnSocket({
-              ...item,
-              path: addExpandersToPath(item.path, type, isAnonymous),
-              id: type,
-            }),
-          ),
-        )
-      : sendOnSocket({
-          ...request,
-          path: addExpandersToPath(request.path, type, isAnonymous),
-          id: type,
-        });
-  } else {
-    actionPromise = Array.isArray(request)
-      ? mode === 'serial'
-        ? request.reduce((prevPromise, item) => {
-            return prevPromise.then((acc) => {
-              return api[item.op](
-                addExpandersToPath(item.path, type, isAnonymous),
-                {
+    if (socket) {
+      actionPromise = Array.isArray(request)
+        ? Promise.all(
+            request.map((item) =>
+              sendOnSocket({
+                ...item,
+                path: addExpandersToPath(item.path, type, isAnonymous),
+                id: type,
+              }),
+            ),
+          )
+        : sendOnSocket({
+            ...request,
+            path: addExpandersToPath(request.path, type, isAnonymous),
+            id: type,
+          });
+    } else {
+      actionPromise = Array.isArray(request)
+        ? mode === 'serial'
+          ? request.reduce((prevPromise, item) => {
+              return prevPromise.then((acc) => {
+                return api[item.op](
+                  addExpandersToPath(item.path, type, isAnonymous),
+                  {
+                    data: item.data,
+                    type: item.type,
+                    headers: item.headers,
+                    params: request.params,
+                    checkUrl: settings.actions_raising_api_errors.includes(
+                      action.type,
+                    ),
+                  },
+                ).then((reqres) => {
+                  return [...acc, reqres];
+                });
+              });
+            }, Promise.resolve([]))
+          : Promise.all(
+              request.map((item) =>
+                api[item.op](addExpandersToPath(item.path, type, isAnonymous), {
                   data: item.data,
                   type: item.type,
                   headers: item.headers,
@@ -173,178 +191,164 @@ const apiMiddlewareFactory = (api) => ({ dispatch, getState }) => (next) => (
                   checkUrl: settings.actions_raising_api_errors.includes(
                     action.type,
                   ),
-                },
-              ).then((reqres) => {
-                return [...acc, reqres];
-              });
-            });
-          }, Promise.resolve([]))
-        : Promise.all(
-            request.map((item) =>
-              api[item.op](addExpandersToPath(item.path, type, isAnonymous), {
-                data: item.data,
-                type: item.type,
-                headers: item.headers,
-                params: request.params,
-                checkUrl: settings.actions_raising_api_errors.includes(
-                  action.type,
-                ),
-              }),
-            ),
-          )
-      : api[request.op](addExpandersToPath(request.path, type, isAnonymous), {
-          data: request.data,
-          type: request.type,
-          headers: request.headers,
-          params: request.params,
-          checkUrl: settings.actions_raising_api_errors.includes(action.type),
-        });
-    actionPromise.then(
-      (result) => {
-        const { settings } = config;
-        if (getState().apierror.connectionRefused) {
-          next({
-            ...rest,
-            type: RESET_APIERROR,
+                }),
+              ),
+            )
+        : api[request.op](addExpandersToPath(request.path, type, isAnonymous), {
+            data: request.data,
+            type: request.type,
+            headers: request.headers,
+            params: request.params,
+            checkUrl: settings.actions_raising_api_errors.includes(action.type),
           });
-        }
-        if (type === GET_CONTENT) {
-          // customization original: result?.language?.token
-          const lang = result?.language?.token || result.language || '';
-          // end customization
-          if (
-            lang &&
-            getState().intl.locale !== toReactIntlLang(lang) &&
-            !subrequest &&
-            config.settings.supportedLanguages.includes(lang)
-          ) {
-            const langFileName = toGettextLang(lang);
-            import('~/../locales/' + langFileName + '.json').then((locale) => {
-              dispatch(changeLanguage(lang, locale.default));
+      actionPromise.then(
+        (result) => {
+          const { settings } = config;
+          if (getState().apierror.connectionRefused) {
+            next({
+              ...rest,
+              type: RESET_APIERROR,
             });
           }
-        }
-        if (type === LOGIN && settings.websockets) {
-          const cookies = new Cookies();
-          cookies.set(
-            'auth_token',
-            result.token,
-            getCookieOptions({
-              expires: new Date(jwtDecode(result.token).exp * 1000),
-            }),
-          );
-          api.get('/@wstoken').then((res) => {
-            socket = new WebSocket(
-              `${settings.apiPath.replace('http', 'ws')}/@ws?ws_token=${
-                res.token
-              }`,
+          if (type === GET_CONTENT) {
+            // customization original: result?.language?.token
+            const lang = result?.language?.token || result.language || '';
+            // end customization
+            if (
+              lang &&
+              getState().intl.locale !== toReactIntlLang(lang) &&
+              !subrequest &&
+              config.settings.supportedLanguages.includes(lang)
+            ) {
+              const langFileName = toGettextLang(lang);
+              import('~/../locales/' + langFileName + '.json').then(
+                (locale) => {
+                  dispatch(changeLanguage(lang, locale.default));
+                },
+              );
+            }
+          }
+          if (type === LOGIN && settings.websockets) {
+            const cookies = new Cookies();
+            cookies.set(
+              'auth_token',
+              result.token,
+              getCookieOptions({
+                expires: new Date(jwtDecode(result.token).exp * 1000),
+              }),
             );
-            socket.onmessage = (message) => {
-              const packet = JSON.parse(message.data);
-              if (packet.error) {
-                dispatch({
-                  type: `${packet.id}_FAIL`,
-                  error: packet.error,
-                });
-              } else {
-                dispatch({
-                  type: `${packet.id}_SUCCESS`,
-                  result: JSON.parse(packet.data),
-                });
-              }
-            };
-          });
-        }
-        try {
-          return next({ ...rest, result, type: `${type}_SUCCESS` });
-        } catch (error) {
-          // There was an exception while processing reducers or downstream middleware.
-          next({
-            ...rest,
-            error: { status: 500, error },
-            type: `${type}_FAIL`,
-          });
-          // Rethrow the original exception on the client side only,
-          // so it doesn't fall through to express on the server.
-          if (__CLIENT__) throw error;
-        }
-      },
-      (error) => {
-        // Only SSR can set ECONNREFUSED
-        if (error.code === 'ECONNREFUSED') {
-          next({
-            ...rest,
-            error,
-            statusCode: error.code,
-            connectionRefused: true,
-            type: SET_APIERROR,
-          });
-        }
-
-        // Response error is marked crossDomain if CORS error happen
-        else if (error.crossDomain) {
-          next({
-            ...rest,
-            error,
-            statusCode: 'CORSERROR',
-            connectionRefused: false,
-            type: SET_APIERROR,
-          });
-        }
-
-        // Check for actions who can raise api errors
-        if (settings.actions_raising_api_errors.includes(action.type)) {
-          // Gateway timeout
-          if (error?.response?.statusCode === 504) {
-            next({
-              ...rest,
-              error,
-              statusCode: error.code,
-              connectionRefused: true,
-              type: SET_APIERROR,
+            api.get('/@wstoken').then((res) => {
+              socket = new WebSocket(
+                `${settings.apiPath.replace('http', 'ws')}/@ws?ws_token=${
+                  res.token
+                }`,
+              );
+              socket.onmessage = (message) => {
+                const packet = JSON.parse(message.data);
+                if (packet.error) {
+                  dispatch({
+                    type: `${packet.id}_FAIL`,
+                    error: packet.error,
+                  });
+                } else {
+                  dispatch({
+                    type: `${packet.id}_SUCCESS`,
+                    result: JSON.parse(packet.data),
+                  });
+                }
+              };
             });
           }
-
-          // Redirect
-          else if (error?.code === 301) {
+          try {
+            return next({ ...rest, result, type: `${type}_SUCCESS` });
+          } catch (error) {
+            // There was an exception while processing reducers or downstream middleware.
             next({
               ...rest,
-              error,
-              statusCode: error.code,
-              connectionRefused: false,
-              type: SET_APIERROR,
+              error: { status: 500, error },
+              type: `${type}_FAIL`,
             });
+            // Rethrow the original exception on the client side only,
+            // so it doesn't fall through to express on the server.
+            if (__CLIENT__) throw error;
           }
-
-          // Redirect
-          else if (error?.code === 408) {
+        },
+        (error) => {
+          // Only SSR can set ECONNREFUSED
+          if (error.code === 'ECONNREFUSED') {
             next({
               ...rest,
               error,
               statusCode: error.code,
-              connectionRefused: false,
+              connectionRefused: true,
               type: SET_APIERROR,
             });
           }
 
-          // Unauthorized
-          else if (error?.response?.statusCode === 401) {
+          // Response error is marked crossDomain if CORS error happen
+          else if (error.crossDomain) {
             next({
               ...rest,
               error,
-              statusCode: error.response,
-              message: error.response.body.message,
+              statusCode: 'CORSERROR',
               connectionRefused: false,
               type: SET_APIERROR,
             });
           }
-        }
-        return next({ ...rest, error, type: `${type}_FAIL` });
-      },
-    );
-  }
 
-  return actionPromise;
-};
+          // Check for actions who can raise api errors
+          if (settings.actions_raising_api_errors.includes(action.type)) {
+            // Gateway timeout
+            if (error?.response?.statusCode === 504) {
+              next({
+                ...rest,
+                error,
+                statusCode: error.code,
+                connectionRefused: true,
+                type: SET_APIERROR,
+              });
+            }
+
+            // Redirect
+            else if (error?.code === 301) {
+              next({
+                ...rest,
+                error,
+                statusCode: error.code,
+                connectionRefused: false,
+                type: SET_APIERROR,
+              });
+            }
+
+            // Redirect
+            else if (error?.code === 408) {
+              next({
+                ...rest,
+                error,
+                statusCode: error.code,
+                connectionRefused: false,
+                type: SET_APIERROR,
+              });
+            }
+
+            // Unauthorized
+            else if (error?.response?.statusCode === 401) {
+              next({
+                ...rest,
+                error,
+                statusCode: error.response,
+                message: error.response.body.message,
+                connectionRefused: false,
+                type: SET_APIERROR,
+              });
+            }
+          }
+          return next({ ...rest, error, type: `${type}_FAIL` });
+        },
+      );
+    }
+
+    return actionPromise;
+  };
 
 export default apiMiddlewareFactory;

package/src/customizations/volto/server.jsx

@@ -22,7 +22,7 @@ import cookiesMiddleware from 'universal-cookie-express';
 import debug from 'debug';
 // import crypto from 'crypto';
 
-import routes from '@root/routes';
+import routes from '@plone/volto/routes';
 import config from '@plone/volto/registry';
 
 import {

package/src/express-middleware.js

@@ -24,7 +24,7 @@ function viewMiddleware(req, res, next) {
     .catch(next);
 }
 
-export default function (config) {
+const viewsMiddlewareConfigurator = (config) => {
   const middleware = express.Router();
 
   // TODO: do we want catch all?
@@ -43,4 +43,6 @@ export default function (config) {
   middleware.id = 'viewsMiddleware';
   config.settings.expressMiddleware.push(middleware);
   return config;
-}
+};
+
+export default viewsMiddlewareConfigurator;

package/src/helpers/Utils.jsx

@@ -111,7 +111,20 @@ export const BannerTitle = (props) => {
   } = config;
   const TitleBlockView = blocksConfig?.title?.view;
 
-  return <TitleBlockView {...props} data={data} metadata={content} />;
+  const blockData = {
+    '@type': 'title',
+    ...data,
+  };
+
+  return (
+    <TitleBlockView
+      {...props}
+      data={blockData}
+      metadata={content}
+      properties={content}
+      blocksConfig={blocksConfig}
+    />
+  );
 };
 
 export const ReferenceInfo = (props) => {
@@ -424,7 +437,7 @@ export const WebDetails = (props) => {
         <FormattedMessage id="Web" defaultMessage="Web" />
       </h4>
       <p>
-        <a href={eventUrl} target="_blank">
+        <a href={eventUrl} target="_blank" rel="noopener">
           <FormattedMessage
             id="Visit external website"
             defaultMessage="Visit external website"

package/src/helpers/country_map/euro-countries-simplified.js

@@ -1,4 +1,4 @@
-export default {
+const euroCountries = {
   type: 'FeatureCollection',
   name: 'new-map-1-1',
   crs: {
@@ -46232,3 +46232,5 @@ export default {
     },
   ],
 };
+
+export default euroCountries;

package/src/index.js

@@ -350,11 +350,6 @@ const applyConfig = (config) => {
     }
   }
 
-  config.blocks.blocksConfig.__grid = {
-    ...config.blocks.blocksConfig.__grid,
-    maxNumberOfColumns: 7,
-  };
-
   config.blocks.blocksConfig.nextCloudVideo = {
     ...config.blocks.blocksConfig.nextCloudVideo,
     whiteList: [
@@ -563,9 +558,8 @@ const applyConfig = (config) => {
     // 'content',
   ];
 
-  config.widgets.vocabulary[
-    'plone.app.vocabularies.Users'
-  ] = SelectAutoCompleteWidget;
+  config.widgets.vocabulary['plone.app.vocabularies.Users'] =
+    SelectAutoCompleteWidget;
 
   config.settings.matomoTrackerIdFn = (pathname) => {
     return pathname.split('/')[2] === 'mission'

package/src/search/cca/views.js

@@ -1,4 +1,4 @@
-export default {
+const viewsCCA = {
   resultViews: [
     {
       id: 'ClusterHorizontalCardItem',
@@ -13,3 +13,5 @@ export default {
     },
   ],
 };
+
+export default viewsCCA;

package/src/search/health_observatory/views-health.js

@@ -1,4 +1,4 @@
-export default {
+const viewsHealth = {
   resultViews: [
     {
       id: 'healthHorizontalCardItem',
@@ -13,3 +13,5 @@ export default {
     },
   ],
 };
+
+export default viewsHealth;

package/src/store/middleware.js

@@ -1,40 +1,41 @@
-export const langRedirection = ({ dispatch, getState }) => (next) => (
-  action,
-) => {
-  if (typeof action === 'function') {
-    return next(action);
-  }
+export const langRedirection =
+  ({ dispatch, getState }) =>
+  (next) =>
+  (action) => {
+    if (typeof action === 'function') {
+      return next(action);
+    }
 
-  switch (action.type) {
-    case '@@router/LOCATION_CHANGE':
-      const { pathname } = action.payload.location;
-      const state = getState();
-      const locale = state.intl.locale || 'en';
-      const search = ['/data-and-downloads', '/advanced-search'];
-      const isSearchPage = search.some((el) => pathname.includes(el));
-      const queryString = action.payload.location.search;
-      const urlParams = new URLSearchParams(queryString);
-      const hasLanguageQueryParam = urlParams.has('set_language');
+    switch (action.type) {
+      case '@@router/LOCATION_CHANGE':
+        const { pathname } = action.payload.location;
+        const state = getState();
+        const locale = state.intl.locale || 'en';
+        const search = ['/data-and-downloads', '/advanced-search'];
+        const isSearchPage = search.some((el) => pathname.includes(el));
+        const queryString = action.payload.location.search;
+        const urlParams = new URLSearchParams(queryString);
+        const hasLanguageQueryParam = urlParams.has('set_language');
 
-      // sometimes there's Links where the target has moved
-      const nonApiPathname = pathname.replaceAll('++api++', '');
-      if (nonApiPathname !== pathname) {
-        action.payload.location.pathname = nonApiPathname;
-        window.history.replaceState(window.history.state, '', nonApiPathname);
-      }
+        // sometimes there's Links where the target has moved
+        const nonApiPathname = pathname.replaceAll('++api++', '');
+        if (nonApiPathname !== pathname) {
+          action.payload.location.pathname = nonApiPathname;
+          window.history.replaceState(window.history.state, '', nonApiPathname);
+        }
 
-      if (
-        locale !== 'en' &&
-        !isSearchPage &&
-        !hasLanguageQueryParam &&
-        pathname.indexOf('/en/') > -1
-      ) {
-        const newPathname = pathname.replaceAll('/en/', `/${locale}/`);
-        action.payload.location.pathname = newPathname;
-        window.history.replaceState(window.history.state, '', newPathname);
-      }
-      return next(action);
-    default:
-      return next(action);
-  }
-};
+        if (
+          locale !== 'en' &&
+          !isSearchPage &&
+          !hasLanguageQueryParam &&
+          pathname.indexOf('/en/') > -1
+        ) {
+          const newPathname = pathname.replaceAll('/en/', `/${locale}/`);
+          action.payload.location.pathname = newPathname;
+          window.history.replaceState(window.history.state, '', newPathname);
+        }
+        return next(action);
+      default:
+        return next(action);
+    }
+  };

package/theme/globals/blocks.less

@@ -89,3 +89,7 @@
     }
   }
 }
+
+.ui.items > .item > img + .content {
+  padding-left: 1rem;
+}

package/theme/globals/mission.less

@@ -15,20 +15,13 @@
 }
 
 body.view-viewview.contenttype-subsite.section-mission
-  .block.__grid.teaserGrid.centered
-  h2 {
-  color: #3d5265;
-  font-size: 23px;
-}
-
-body.view-viewview.contenttype-subsite.section-mission
-  .block.__grid.teaserGrid.centered
+  .block.gridBlock
   .image {
   height: 260px;
 }
 
 body.view-viewview.contenttype-subsite.section-mission
-  .block.__grid.teaserGrid.centered
+  .block.gridBlock
   img {
   height: 260px;
   object-fit: contain;

package/theme/globals/observatory.less

@@ -35,7 +35,7 @@
 .no-padding-tab .column-blocks-wrapper {
   margin-bottom: 1rem;
 
-  .block.teaserGrid {
+  .block.gridBlock {
     margin-bottom: 0rem;
   }
 }
@@ -72,7 +72,7 @@
 }
 
 .block.call-to-action,
-.block.teaserGrid {
+.block.gridBlock {
   margin-bottom: 0rem;
 }