@eeacms/volto-bise-policy 1.3.5 → 1.3.7

package/src/components/manage/Blocks/CaseStudyExplorer/utils.test.js

@@ -1,8 +1,22 @@
 import './mockJsdom';
 import '@testing-library/jest-dom';
-import { getFeatures, filterCases, getFilters } from './utils';
+import {
+  FALLBACK_STATUS_COLOR,
+  getFeatures,
+  getStatusColor,
+  filterCases,
+  getFilters,
+} from './utils';
 
 describe('utils.js', () => {
+  test('maps exact statuses and unknown statuses to colors', () => {
+    expect(getStatusColor('planned')).toBe('#006bb8');
+    expect(getStatusColor('ongoing')).toBe('#ff9933');
+    expect(getStatusColor('completed')).toBe('#00a390');
+    expect(getStatusColor('Planned')).toBe(FALLBACK_STATUS_COLOR);
+    expect(getStatusColor('future')).toBe(FALLBACK_STATUS_COLOR);
+  });
+
   const mockCases = [
     {
       geometry: { coordinates: [0, 0] },
@@ -70,6 +84,83 @@ describe('utils.js', () => {
     expect(mockCasesFiltered).toStrictEqual([]);
   });
 
+  test('filterCases treats search input as literal text (ReDoS-safe)', () => {
+    const cases = [
+      {
+        geometry: { coordinates: [0, 0] },
+        properties: {
+          title: 'the river project (R1)',
+          description: 'a aaa aaaa aaaaa b',
+          url: '/the-river-project-r1',
+        },
+      },
+    ];
+    const noFilters = {
+      measures_implemented: [],
+      typology_of_measures: [],
+      current_status: [],
+      habitat_ecosystem_type: [],
+      nrr_article: [],
+      scale_of_planning: [],
+    };
+
+    // Malformed regex input must not throw (previously: SyntaxError)
+    expect(() => filterCases(cases, noFilters, null, '(')).not.toThrow();
+    // Regex metacharacters are matched literally, not interpreted
+    expect(() => filterCases(cases, noFilters, null, '(a+)+$')).not.toThrow();
+    expect(filterCases(cases, noFilters, null, '(a+)+$')).toHaveLength(0);
+    expect(filterCases(cases, noFilters, null, '(r1')).toHaveLength(1);
+    // Whole-word semantics are preserved
+    expect(filterCases(cases, noFilters, null, 'rive')).toHaveLength(0);
+    expect(filterCases(cases, noFilters, null, 'river')).toHaveLength(1);
+    // Case-insensitive
+    expect(filterCases(cases, noFilters, null, 'R1')).toHaveLength(1);
+  });
+
+  test('filters new scalar and multi-value fields', () => {
+    const cases = [
+      {
+        geometry: { coordinates: [0, 0] },
+        properties: {
+          title: 'planned river case',
+          description: '',
+          url: '/planned-river-case',
+          current_status: 'planned',
+          ecosystem_typology: ['River', 'Wetland'],
+          nrr_article: [{ id: 'article-1', title: 'Article 1' }],
+          scale_of_planning: 'Regional',
+        },
+      },
+      {
+        geometry: { coordinates: [0, 0] },
+        properties: {
+          title: 'future case',
+          description: '',
+          url: '/future-case',
+          current_status: 'Future',
+          ecosystem_typology: ['Forest'],
+          nrr_article: ['article-2'],
+          scale_of_planning: 'National',
+        },
+      },
+    ];
+
+    expect(
+      filterCases(cases, {
+        measures_implemented: [],
+        typology_of_measures: [],
+        current_status: ['planned'],
+        habitat_ecosystem_type: ['River'],
+        nrr_article: ['article-1'],
+        scale_of_planning: ['Regional'],
+      }),
+    ).toHaveLength(1);
+    expect(getFilters(cases).nrr_article).toEqual({
+      'article-1': 'Article 1',
+      'article-2': 'article-2',
+    });
+  });
+
   test('getFilters', () => {
     const mockCasesObject = mockCases.reduce((acc, item, index) => {
       acc[index] = item;
@@ -83,6 +174,10 @@ describe('utils.js', () => {
       typology_of_measures: {
         testsector: 'testsector',
       },
+      current_status: {},
+      habitat_ecosystem_type: {},
+      nrr_article: {},
+      scale_of_planning: {},
     });
   });
 });

package/src/components/manage/Blocks/Title/CountryProfileView.jsx

@@ -0,0 +1,27 @@
+import React from 'react';
+import config from '@plone/volto/registry';
+
+const CountryProfileView = (props) => {
+  const defaultVariation = (
+    config.blocks.blocksConfig.title.variations || []
+  ).find((v) => v.isDefault);
+  const DefaultTemplate = defaultVariation?.view;
+  const CountryFlagView = config.blocks.blocksConfig?.countryFlag?.view;
+
+  if (!DefaultTemplate) return null;
+
+  const banner = CountryFlagView
+    ? {
+        ...(props.banner || {}),
+        title: {
+          view: (
+            <CountryFlagView {...props} path={props.path || props.pathname} />
+          ),
+        },
+      }
+    : props.banner;
+
+  return <DefaultTemplate {...props} banner={banner} />;
+};
+
+export default CountryProfileView;

package/src/components/manage/Blocks/Title/index.js

@@ -0,0 +1,19 @@
+import CountryProfileView from './CountryProfileView';
+import { countryProfileSchemaEnhancer } from './schema';
+
+export default function installTitleVariations(config) {
+  const titleBlock = config.blocks.blocksConfig.title;
+  if (!titleBlock) return config;
+
+  titleBlock.variations = [
+    ...(titleBlock.variations || []),
+    {
+      id: 'countryProfile',
+      title: 'Country Profile',
+      view: CountryProfileView,
+      schemaEnhancer: countryProfileSchemaEnhancer,
+    },
+  ];
+
+  return config;
+}

package/src/components/manage/Blocks/Title/schema.js

@@ -0,0 +1,42 @@
+import CountryFlagSchema from '@eeacms/volto-datablocks/components/manage/Blocks/CountryFlag/schema';
+import countryNames from '@eeacms/volto-datablocks/components/manage/Blocks/CountryFlag/data/countries';
+
+export const countryProfileSchemaEnhancer = ({ schema, intl }) => {
+  const cfSchema = CountryFlagSchema(intl);
+
+  cfSchema.properties.country_name.choices = Object.keys(countryNames).map(
+    (k) => [k, countryNames[k]],
+  );
+
+  schema.fieldsets.push(
+    {
+      id: 'countryFlag',
+      title: 'Country flag',
+      fields: [
+        'country_name',
+        'show_name',
+        'show_flag',
+        'show_dropdown',
+        'render_as',
+      ],
+    },
+    {
+      id: 'dropdownItems',
+      title: 'Dropdown items',
+      fields: ['querystring', 'exclude'],
+    },
+  );
+
+  schema.properties = {
+    ...schema.properties,
+    country_name: cfSchema.properties.country_name,
+    show_name: cfSchema.properties.show_name,
+    show_flag: cfSchema.properties.show_flag,
+    show_dropdown: cfSchema.properties.show_dropdown,
+    render_as: cfSchema.properties.render_as,
+    querystring: cfSchema.properties.querystring,
+    exclude: cfSchema.properties.exclude,
+  };
+
+  return schema;
+};

package/src/components/manage/Blocks/index.js

@@ -7,6 +7,7 @@ import installKeyFacts from './KeyFacts';
 import installMaesViewer from './MaesViewer';
 import installNavigation from './Navigation';
 import installCaseStudyExplorer from './CaseStudyExplorer';
+import installTitleVariations from './Title';
 
 const config = (config) => {
   return [
@@ -19,6 +20,7 @@ const config = (config) => {
     installMaesViewer,
     installNavigation,
     installCaseStudyExplorer,
+    installTitleVariations,
   ].reduce((acc, apply) => apply(acc), config);
 };
 

package/src/customizations/volto/reducers/navigation/navigation.js

@@ -28,9 +28,8 @@ const initialState = {
  */
 function getRecursiveItems(items) {
   return map(items, (item) => ({
-    title: item.title,
-    description: item.description,
     url: flattenToAppURL(item['@id']),
+    ...item,
     ...(item.items && { items: getRecursiveItems(item.items) }),
   }));
 }
@@ -71,11 +70,11 @@ export default function navigation(state = initialState, action = {}) {
       }
       return state;
     case `${GET_NAVIGATION}_SUCCESS`:
-      hasExpander = hasApiExpander(
-        'navigation',
-        getBaseUrl(flattenToAppURL(action.result['@id'])),
-      );
-      if (!hasExpander) {
+      // Even if the expander is set or not, if the GET_NAVIGATION is
+      // called, we want it to store the data if the actions data is
+      // not set in the expander data (['@components']) but in the "normal"
+      // action result (we look for the object property returned by the endpoint)
+      if (!action.result?.['@components'] && action.result?.items) {
         return {
           ...state,
           error: null,

package/src/index.js

@@ -110,6 +110,17 @@ const applyConfig = (config) => {
     'nominatim.openstreetmap.org',
   ];
 
+  // Needed by the CountryFlag block to fall back to sibling items when it
+  // has no listing/query results (e.g. Title block's Country Profile
+  // variation).
+  config.settings.apiExpanders = [
+    ...(config.settings.apiExpanders || []),
+    {
+      match: '',
+      GET_CONTENT: ['siblings'],
+    },
+  ];
+
   // EEA customizations
   config.settings.eea = {
     ...(config.settings.eea || {}),