@eeacms/volto-marine-policy 2.0.26 → 2.0.28

package/CHANGELOG.md

@@ -4,6 +4,25 @@ 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).
 
+### [2.0.28](https://github.com/eea/volto-marine-policy/compare/2.0.27...2.0.28) - 11 September 2025
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`cbf9e77`](https://github.com/eea/volto-marine-policy/commit/cbf9e77a6fe1d745288792ad83f463ef3c9bec41)]
+
+#### :hammer_and_wrench: Others
+
+- fix eslint [Laszlo Cseh - [`04b17b2`](https://github.com/eea/volto-marine-policy/commit/04b17b25c5dbbd9d8afd1caf74132e7fca642f39)]
+- NISlistingView fix assign to total count [Laszlo Cseh - [`ef82759`](https://github.com/eea/volto-marine-policy/commit/ef827593308f779e420c4cc3b3b8cae025c1616f)]
+- NISlistingView download button location [Laszlo Cseh - [`22153f4`](https://github.com/eea/volto-marine-policy/commit/22153f422e06f7fbaa7adfa45817cd8ce7199c5a)]
+- NISlistingView fix paths [Laszlo Cseh - [`ffa946e`](https://github.com/eea/volto-marine-policy/commit/ffa946eb83d144ca461af43787faa48f71d545ee)]
+- WiP Nis improvements [Laszlo Cseh - [`c66a5f6`](https://github.com/eea/volto-marine-policy/commit/c66a5f68d3c3d1bc8aa968c98aa12f409e931adc)]
+### [2.0.27](https://github.com/eea/volto-marine-policy/compare/2.0.26...2.0.27) - 5 September 2025
+
+#### :hammer_and_wrench: Others
+
+- fix eslint [laszlocseh - [`3f90c17`](https://github.com/eea/volto-marine-policy/commit/3f90c17f976fdf48a2e967d2997487ba87a3535d)]
+- Demo Sites Explorer filter Targets facet options by selected objective [laszlocseh - [`3b975ad`](https://github.com/eea/volto-marine-policy/commit/3b975ad4380196cfd71c8fd2919fc717f98528a5)]
 ### [2.0.26](https://github.com/eea/volto-marine-policy/compare/2.0.25...2.0.26) - 29 August 2025
 
 #### :rocket: Dependency updates

package/package.json

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

package/src/components/Blocks/DemoSitesExplorer/DemoSitesExplorerView.js

@@ -77,7 +77,7 @@ export default function DemoSitesExplorerView(props) {
           activeFilters={activeFilters}
           hideFilters={hideFilters}
           setActiveFilters={setActiveFilters}
-          map={map}
+          highlightedIndex={highlightedIndex}
         />
       </Grid.Row>
       <Grid.Row>

package/src/components/Blocks/DemoSitesExplorer/DemoSitesFilters.jsx

@@ -1,6 +1,30 @@
 import React from 'react';
 
 import { clearFilters } from './utils';
+import { objectivesCustomOrder } from './utils';
+
+const objectivesTargets = {
+  'Objective 1: Protect and restore marine and freshwater ecosystems and biodiversity':
+    [
+      'Contribute to relevant marine nature restoration targets including degraded seabed habitats and coastal ecosystems',
+      "Protect at least 30% of the EU's seas and integrate ecological corridors, as part of a true Trans-European Nature Network",
+      "Strictly protect at least 10% of the EU's seas",
+      'Restore at least 25,000 km of free/flowing rivers',
+    ],
+  'Objective 2: Prevent and eliminate pollution of our oceans, seas and waters':
+    [
+      'Reduce nutrient losses by 50%',
+      'Reduce the use and risk of chemical pesticides by 50%',
+      'Reduce plastic litter at sea by 50%',
+      'Reduce by 30% microplastics released into the environment',
+    ],
+  'Objective 3: Make the sustainable blue economy carbon-neutral and circular':
+    [
+      'Achieve net zero maritime emissions',
+      'Promote circular, low-carbon multi-purpose use of marine and water space',
+      'Develop zero-carbon and low-impact aquaculture',
+    ],
+};
 
 const normalizeSearchInput = (searchInput) => {
   let normInput = searchInput
@@ -13,6 +37,25 @@ const normalizeSearchInput = (searchInput) => {
   return '\\b' + normInput + '\\b';
 };
 
+const filterTargetsByObjective = (filters, filterName, highlightedIndex) => {
+  if (filterName !== 'target_filter') return filters;
+  if (highlightedIndex < 0 || highlightedIndex > 2) return filters;
+
+  let selectedObjective = objectivesCustomOrder[highlightedIndex];
+  let allowedTargets = objectivesTargets[selectedObjective] || [];
+
+  // Filter the targets based on the allowed ones
+  if (filters['target_filter']) {
+    filters['target_filter'] = Object.fromEntries(
+      Object.entries(filters['target_filter']).filter(([key]) =>
+        allowedTargets.includes(key),
+      ),
+    );
+  }
+
+  return filters;
+};
+
 export function DemoSitesFilter(props) {
   const {
     filterTitle,
@@ -20,11 +63,15 @@ export function DemoSitesFilter(props) {
     activeFilters,
     setActiveFilters,
     filterName,
-    // map,
+    highlightedIndex,
   } = props;
 
   const customOrder = props?.customOrder || [];
-  const entries = Object.entries(filters?.[filterName] || {});
+  const entries = Object.entries(
+    filterTargetsByObjective(filters, filterName, highlightedIndex)?.[
+      filterName
+    ] || {},
+  );
   let sortedEntries = [];
 
   if (customOrder.length > 0) {
@@ -112,7 +159,13 @@ export function DemoSitesFilter(props) {
 }
 
 export function DemoSitesFilters(props) {
-  const { filters, activeFilters, hideFilters, setActiveFilters, map } = props;
+  const {
+    filters,
+    activeFilters,
+    hideFilters,
+    setActiveFilters,
+    highlightedIndex,
+  } = props;
 
   React.useEffect(() => {
     window.addEventListener('click', (event) => {
@@ -148,7 +201,7 @@ export function DemoSitesFilters(props) {
           filters={filters}
           activeFilters={activeFilters}
           setActiveFilters={setActiveFilters}
-          map={map}
+          highlightedIndex={highlightedIndex}
         />
       ) : (
         ''
@@ -160,7 +213,7 @@ export function DemoSitesFilters(props) {
           filters={filters}
           activeFilters={activeFilters}
           setActiveFilters={setActiveFilters}
-          map={map}
+          highlightedIndex={highlightedIndex}
         />
       ) : (
         ''
@@ -171,7 +224,7 @@ export function DemoSitesFilters(props) {
         filters={filters}
         activeFilters={activeFilters}
         setActiveFilters={setActiveFilters}
-        map={map}
+        highlightedIndex={highlightedIndex}
       />
       <DemoSitesFilter
         filterTitle="Country"
@@ -179,7 +232,7 @@ export function DemoSitesFilters(props) {
         filters={filters}
         activeFilters={activeFilters}
         setActiveFilters={setActiveFilters}
-        map={map}
+        highlightedIndex={highlightedIndex}
       />
     </>
   );

package/src/components/Blocks/DemoSitesExplorer/styles.less

@@ -231,7 +231,7 @@
 
         .filter-input {
           display: flex;
-          align-items: center;
+          align-items: baseline;
           justify-content: flex-start;
           cursor: pointer;
           font-size: 14px;

package/src/components/theme/NISListingView/NISListingView.jsx

@@ -1,49 +1,115 @@
-// import ProgressWorkflow from '@eeacms/volto-workflow-progress/ProgressWorkflow';
 import ProgressWorkflow from '@eeacms/volto-marine-policy/components/theme/ProgressWorkflow/ProgressWorkflow';
 
-// import { Link } from 'react-router-dom';
+import qs from 'query-string';
 import PropTypes from 'prop-types';
 import './style.less';
 import { useState, useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import { Checkbox } from 'semantic-ui-react';
-import { Button, Select } from 'semantic-ui-react';
+import { Button, Select, Dimmer, Loader } from 'semantic-ui-react';
+
+function normalizeQueryOperators(query) {
+  return query.map((q) => {
+    // if the operator starts with "paqo", replace with full
+    if (q.o && q.o.startsWith('paqo.')) {
+      const op = q.o.replace('paqo.', 'plone.app.querystring.operation.');
+      return { ...q, o: op };
+    }
+    return q;
+  });
+}
+
+async function getCurrentSearchItems() {
+  // parse querystring into an object
+  const parsed = qs.parse(window.location.search);
+
+  // decode the `query` param, which is itself a JSON string
+  let query = [];
+  if (parsed.query) {
+    try {
+      query = normalizeQueryOperators(JSON.parse(parsed.query));
+    } catch (e) {
+      // console.error('Invalid query param JSON', e);
+    }
+  }
+
+  // build payload
+  const payload = {
+    metadata_fields: '_all',
+    b_size: parsed.b_size ? parseInt(parsed.b_size, 10) : 25,
+    limit: parsed.limit ? parseInt(parsed.limit, 10) : 3000,
+    query,
+    sort_on: parsed.sort_on || 'effective',
+    sort_order: parsed.sort_order || 'ascending',
+    b_start: parsed.b_start ? parseInt(parsed.b_start, 10) : 0,
+  };
+
+  // call Plone
+  try {
+    const response = await fetch('/marine/++api++/@querystring-search', {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(payload),
+    });
+    return response;
+  } catch (err) {
+    // console.error('Querystring search failed:', err);
+  }
+}
 
 const NISListingView = ({ items, isEditMode }) => {
+  const [isLoading, setIsLoading] = useState(false);
   const [selectedItems, setSelectedItems] = useState([]);
+  const [itemsTotal, setItemsTotal] = useState(0);
   const [users, setUsers] = useState([]);
   const [assignee, setAssignee] = useState(null);
   const actions = useSelector((state) => state.actions.actions);
   const canEditPage = actions?.object?.some((action) => action.id === 'edit');
-  // console.log('actions', actions);
 
   const toggleSelection = (id) => {
+    setItemsTotal(0);
     setSelectedItems((prev) =>
-      prev.includes(id) ? prev.filter((x) => x !== id) : [...prev, id],
+      prev.includes(id)
+        ? prev.filter((x) => x !== id && x !== 'All')
+        : [...prev.filter((x) => x !== 'All'), id],
     );
   };
 
   const handleBulkAssign = () => {
+    setItemsTotal(0);
     onBulkAssign(selectedItems, assignee);
     setSelectedItems([]);
     setAssignee(null);
   };
 
+  const handleBulkAssignAll = async () => {
+    const items = await getCurrentSearchItems();
+    const itemsTotal = await items.json();
+    setItemsTotal(itemsTotal.items_total);
+    setSelectedItems(['All']);
+  };
+
   const onBulkAssign = async (ids, assignee) => {
-    await fetch(`${window.location.origin}/marine/++api++/@bulk-assign`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        Accept: 'application/json',
+    setIsLoading(true);
+    await fetch(
+      `${window.location.origin}/marine/++api++/@bulk-assign${window.location.search}`,
+      {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+        },
+        credentials: 'include',
+        body: JSON.stringify({
+          items: ids,
+          assigned_to: assignee,
+          search: window.location.search,
+        }),
       },
-      credentials: 'include',
-      body: JSON.stringify({
-        items: ids,
-        assigned_to: assignee,
-      }),
-    });
+    );
 
-    // const result = await res.json();
     window.location.reload();
   };
 
@@ -74,6 +140,37 @@ const NISListingView = ({ items, isEditMode }) => {
 
   return (
     <>
+      {isLoading && (
+        <Dimmer active inverted>
+          <Loader>Assigning...</Loader>
+        </Dimmer>
+      )}
+      {canEditPage && (
+        <div className="download-button-wrapper">
+          <Button
+            className="primary"
+            size="small"
+            onClick={handleBulkAssignAll}
+          >
+            <i className="ri-user-add-line"></i>Assign search results
+          </Button>
+          <div>
+            <a
+              href={`/marine/++api++${window.location.pathname.replace(
+                '/marine',
+                '',
+              )}/nis-export${window.location.search}`}
+              title="Download"
+              target="_blank"
+              rel="noopener"
+              className="ui button primary download-as-xls"
+            >
+              <i className="ri-file-download-line"></i>
+              Download search results
+            </a>
+          </div>
+        </div>
+      )}
       <table className="ui table">
         <thead>
           <tr>
@@ -82,28 +179,11 @@ const NISListingView = ({ items, isEditMode }) => {
             <th>Scientific name accepted</th>
             <th>Region</th>
             <th>Subregion</th>
+            <th>Country</th>
             <th>Status</th>
             <th>Group</th>
             <th>Assigned to</th>
-            <th>
-              {canEditPage && (
-                <div>
-                  <a
-                    href={`/marine/++api++${window.location.pathname.replace(
-                      '/marine',
-                      '',
-                    )}/nis-export${window.location.search}`}
-                    title="Download"
-                    target="_blank"
-                    rel="noopener"
-                    className="ui button primary download-as-xls"
-                  >
-                    <i className="ri-file-download-line"></i>
-                    Download
-                  </a>
-                </div>
-              )}
-            </th>
+            <th></th>
           </tr>
         </thead>
         <tbody>
@@ -114,6 +194,7 @@ const NISListingView = ({ items, isEditMode }) => {
               <td>{item.nis_scientificname_accepted}</td>
               <td>{item.nis_region}</td>
               <td>{item.nis_subregion}</td>
+              <td>{item.nis_country && item.nis_country.join(', ')}</td>
               <td>{item.nis_status}</td>
               <td>{item.nis_group}</td>
               <td>
@@ -163,8 +244,13 @@ const NISListingView = ({ items, isEditMode }) => {
       {selectedItems.length > 0 && (
         <div className="users-assign-container">
           <h4>
-            Assign {selectedItems.length} item
-            {selectedItems.length > 1 ? 's' : ''}
+            {itemsTotal > 0 &&
+              selectedItems[0] === 'All' &&
+              `Assign ${itemsTotal} search result items`}
+            {itemsTotal === 0 &&
+              `Assign ${selectedItems.length} selected item${
+                selectedItems.length > 1 ? 's' : ''
+              }`}
           </h4>
           <Select
             placeholder="Select expert"

package/src/components/theme/NISListingView/style.less

@@ -11,6 +11,10 @@
   font-size: 0.9em;
 }
 
+.ui.text.loader {
+  position: fixed;
+}
+
 .ui.table tr {
   td,
   th {
@@ -145,3 +149,16 @@
 .download-as-xls {
   padding: 0.6em 0.5em !important;
 }
+
+.download-button-wrapper {
+  display: flex;
+
+  button {
+    padding: 0.6em 0.5em !important;
+    font-size: 1em !important;
+
+    i {
+      margin-right: 5px;
+    }
+  }
+}