@eeacms/volto-cca-policy 0.1.38 → 0.1.40

package/CHANGELOG.md

@@ -4,6 +4,17 @@ 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.1.40](https://github.com/eea/volto-cca-policy/compare/0.1.39...0.1.40) - 28 August 2023
+
+#### :hammer_and_wrench: Others
+
+- Bring back some code that was lost [Tiberiu Ichim - [`a8d34d9`](https://github.com/eea/volto-cca-policy/commit/a8d34d95f5a8857968bf1fdac14930ff987b7f11)]
+- Add readme [Tiberiu Ichim - [`487e146`](https://github.com/eea/volto-cca-policy/commit/487e146f71c8495887f8caf1d35e84644b2c07cd)]
+- Rewrite the way we compute the additional volto paths [Tiberiu Ichim - [`bb599ce`](https://github.com/eea/volto-cca-policy/commit/bb599ceb45f340a2b861c9753fe6a7e030ab16fb)]
+- Fix issue with group block [kreafox - [`6ecde58`](https://github.com/eea/volto-cca-policy/commit/6ecde585ddae8529f05bc4acba4b8526d9c86b8f)]
+- test: Update Makefile and docker-compose to align it with Jenkinsfile [valentinab25 - [`e00c532`](https://github.com/eea/volto-cca-policy/commit/e00c532a2fa31612e3bb3d20ca1781e68b6c6fc3)]
+### [0.1.39](https://github.com/eea/volto-cca-policy/compare/0.1.38...0.1.39) - 22 August 2023
+
 ### [0.1.38](https://github.com/eea/volto-cca-policy/compare/0.1.37...0.1.38) - 21 August 2023
 
 #### :hammer_and_wrench: Others

package/docker-compose.yml

@@ -1,11 +1,12 @@
 version: "3"
 services:
   backend:
-    image: plone/plone-backend:${PLONE_VERSION:-6}
+    image: eeacms/plone-backend
     ports:
       - "8080:8080"
     environment:
       SITE: "Plone"
+      PROFILES: "eea.kitkat:testing"
 
   frontend: 
     build:
@@ -23,6 +24,9 @@ services:
     volumes:
       - ./:/app/src/addons/${ADDON_PATH}
     environment:
+      CI: "true"
+      NODE_ENV: "development"
+      RAZZLE_JEST_CONFIG: "src/addons/${ADDON_PATH}/jest-addon.config.js"
       RAZZLE_INTERNAL_API_PATH: "http://backend:8080/Plone"
       RAZZLE_DEV_PROXY_API_PATH: "http://backend:8080/Plone"
       HOST: "0.0.0.0"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "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/Sitemap/Sitemap.jsx

@@ -10,7 +10,7 @@ import { connect } from 'react-redux';
 import { asyncConnect } from '@plone/volto/helpers';
 import { defineMessages, injectIntl } from 'react-intl';
 import { Container } from 'semantic-ui-react';
-import { Helmet, toBackendLang } from '@plone/volto/helpers';
+import { Helmet } from '@plone/volto/helpers';
 import { Link } from 'react-router-dom';
 import config from '@plone/volto/registry';
 
@@ -29,6 +29,27 @@ export function getSitemapPath(pathname = '', lang) {
   return path;
 }
 
+export const toReactIntlLang = (language) => {
+  if (language.includes('_') || language.includes('-')) {
+    let langCode = language.split(/[-_]/);
+    langCode = `${langCode[0]}-${langCode[1].toUpperCase()}`;
+    return langCode;
+  }
+
+  return language;
+};
+// export const toLangUnderscoreRegion = toReactIntlLang; // old name for backwards-compat
+
+/**
+ * Converts a language code like pt_BR or pt-BR to the format `pt-br`.
+ * This format is used on the backend and in volto config settings.
+ * @param {string} language Language to be converted
+ * @returns {string} Language converted
+ */
+export const toBackendLang = (language) => {
+  return toReactIntlLang(language).toLowerCase();
+};
+
 /**
  * Sitemap class.
  * @class Sitemap

package/src/index.js

@@ -26,20 +26,30 @@ import GeolocationWidget from './components/theme/Widgets/GeolocationWidget';
 
 const getEnv = () => (typeof window !== 'undefined' ? window.env : process.env);
 
+const pathToNegRegex = (p) => `(?!(${p}))`;
+
 const restrictedBlocks = ['countryFlag'];
 
 const applyConfig = (config) => {
-  const notInEnMission = /^(?!(\/en\/mission)).*$/;
   const env = getEnv();
-  const isStaging = !!env.RAZZLE_IS_STAGING;
-  const enableMissionIsExternal = !isStaging && !__DEVELOPMENT__;
 
-  if (enableMissionIsExternal) {
+  // VOLTO_LOCATIONS is a list of paths that should be handled by Volto.
+  // All other paths (meaning, everything that's not specifically set in this
+  // variable) will be treated as an external path and the browser will fully
+  // load the link as a separate document, and it will load from Plone 4
+  const voltoLocations = (env.RAZZLE_VOLTO_LOCATIONS || '')
+    .split(';')
+    .map((s) => s.trim().replaceAll('/', '\\/'))
+    .filter((s) => !!s);
+
+  if (voltoLocations.length) {
+    const voltoLocationsRegex =
+      '^' + voltoLocations.map(pathToNegRegex).join('') + '.*$';
     config.settings.externalRoutes = [
       ...(config.settings.externalRoutes || []),
       {
         match: {
-          path: notInEnMission,
+          path: new RegExp(voltoLocationsRegex),
           exact: false,
           strict: false,
         },

package/src/utils.js

@@ -1,6 +1,12 @@
 export const blockAvailableInMission = (properties, block) => {
   const missionBlocks = ['mkh_map', 'rastBlock'];
-  const isMission = properties['@id'].includes('/en/mission');
+  const id = properties?.['@id'];
+
+  if (!id) {
+    return false;
+  }
+
+  const isMission = id.includes('/en/mission');
 
   if (isMission) {
     return missionBlocks.includes(block.id) ? false : true;