@eeacms/volto-marine-policy 3.0.0 → 3.0.2

package/CHANGELOG.md

@@ -4,7 +4,33 @@ 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).
 
-### [3.0.0](https://github.com/eea/volto-marine-policy/compare/2.0.41...3.0.0) - 24 April 2026
+### [3.0.2](https://github.com/eea/volto-marine-policy/compare/3.0.1...3.0.2) - 10 June 2026
+
+#### :rocket: Dependency updates
+
+- Release @eeacms/volto-openlayers-map@2.0.1 [EEA Jenkins - [`8c4dbb3`](https://github.com/eea/volto-marine-policy/commit/8c4dbb3f7e95dfa5f1247ad5912ad141a7c3a077)]
+
+#### :bug: Bug Fixes
+
+- fix: custom NIS status widget to not show 'No value' [laszlocseh - [`7823b63`](https://github.com/eea/volto-marine-policy/commit/7823b63f2f8a042368a7dc2156f92e3ebc5722f1)]
+- fix: format assigned to in NisListingView [laszlocseh - [`702d3fd`](https://github.com/eea/volto-marine-policy/commit/702d3fdbeabad42f270499f29c0c2e8f4212e5dd)]
+
+#### :hammer_and_wrench: Others
+
+- test: remove TextAlign.test.jsx [laszlocseh - [`3f8a47f`](https://github.com/eea/volto-marine-policy/commit/3f8a47f035e55313e83b9a686dd635eb30e1c012)]
+- test: fix TextAlign.test.jsx snapshot [laszlocseh - [`94b1431`](https://github.com/eea/volto-marine-policy/commit/94b1431295dda5a4a457398521c862a78fa4f5f0)]
+- fix jest-config [nileshgulia1 - [`866cbb9`](https://github.com/eea/volto-marine-policy/commit/866cbb980d2238f74a164047e4660598b31f793f)]
+### [3.0.1](https://github.com/eea/volto-marine-policy/compare/3.0.0...3.0.1) - 28 April 2026
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`114ccd4`](https://github.com/eea/volto-marine-policy/commit/114ccd4ceefcd2c76e595762c84611120d0a4048)]
+
+#### :hammer_and_wrench: Others
+
+- add @eeacms/volto-block-style to deps [nileshgulia1 - [`8ac077b`](https://github.com/eea/volto-marine-policy/commit/8ac077bd64842e99557ff7c1a3da4089bb594eef)]
+- fix hydration warnings and remove unnecesary deps [nileshgulia1 - [`4cab29e`](https://github.com/eea/volto-marine-policy/commit/4cab29e0d0b27a571459e5098ede4460d6e01caf)]
+## [3.0.0](https://github.com/eea/volto-marine-policy/compare/2.0.41...3.0.0) - 27 April 2026
 
 #### :rocket: Dependency updates
 
@@ -38,6 +64,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :house: Internal changes
 
 - style: Automated code fix [eea-jenkins - [`0421290`](https://github.com/eea/volto-marine-policy/commit/0421290d7fdd9fdd0b6d483b53c424a0747137b3)]
+- chore: [JENKINSFILE] add package version in sonarqube [valentinab25 - [`fb1d0f0`](https://github.com/eea/volto-marine-policy/commit/fb1d0f083474b3a14b0ec36a329c7efc7499dd3d)]
+- chore: [JENKINSFILE] use sonarqube branches [EEA Jenkins - [`40d0b36`](https://github.com/eea/volto-marine-policy/commit/40d0b368836d32544b46ae7c7b070ffb71989b55)]
 
 #### :hammer_and_wrench: Others
 

package/jest-addon.config.js

@@ -66,7 +66,7 @@ module.exports = {
   },
   ...(process.env.JEST_USE_SETUP === 'ON' && {
     setupFilesAfterEnv: [
-      '<rootDir>/node_modules/@eeacms/volto-eea-website-policy/jest.setup.js',
+      '<rootDir>/node_modules/@eeacms/volto-marine-policy/jest.setup.js',
     ],
   }),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-marine-policy",
-  "version": "3.0.0",
+  "version": "3.0.2",
   "description": "@eeacms/volto-marine-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -18,35 +18,29 @@
   },
   "addons": [
     "@eeacms/volto-openlayers-map",
-    "@eeacms/volto-tabs-block",
     "@eeacms/volto-embed",
     "@eeacms/volto-eea-design-system",
     "@eeacms/volto-eea-website-theme",
     "@eeacms/volto-globalsearch",
     "@eeacms/volto-metadata-block",
     "@eeacms/volto-workflow-progress",
-    "@plone-collective/volto-authomatic",
-    "@eeacms/volto-group-block"
+    "@eeacms/volto-block-style"
   ],
   "resolutions": {
     "react-countup/countup.js": "2.5.0",
     "d3-array": "^2.12.1",
     "@eeacms/countup": "^2.0.6",
-    "@elastic/search-ui": "1.21.2",
-    "@eeacms/volto-group-block": "^9.0.0"
+    "@elastic/search-ui": "1.21.2"
   },
   "dependencies": {
+    "@eeacms/volto-block-style": "9.0.1",
     "@eeacms/volto-eea-design-system": "*",
     "@eeacms/volto-eea-website-theme": "*",
     "@eeacms/volto-embed": "*",
     "@eeacms/volto-globalsearch": "^2.0.0",
-    "@eeacms/volto-group-block": "^9.0.0",
     "@eeacms/volto-metadata-block": "*",
-    "@eeacms/volto-openlayers-map": "2.0.0",
-    "@eeacms/volto-searchlib": "^2.0.2",
-    "@eeacms/volto-tabs-block": "*",
+    "@eeacms/volto-openlayers-map": "2.0.1",
     "@eeacms/volto-workflow-progress": "*",
-    "@plone-collective/volto-authomatic": "2.0.1",
     "axios": "0.30.0",
     "d3-array": "^2.12.1",
     "jquery": "3.6.0",

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

@@ -82,7 +82,7 @@ function DemoSitesMap(props) {
   );
 
   React.useEffect(() => {
-    if (!map) return null;
+    if (!map) return;
 
     if (activeItems) {
       pointsSource.clear();
@@ -93,7 +93,7 @@ function DemoSitesMap(props) {
   }, [map, activeItems, pointsSource, hideFilters, ol]);
 
   React.useEffect(() => {
-    if (!map) return null;
+    if (!map) return;
 
     const moveendListener = (e) => {
       // console.log('map.getView()', map.getView());

package/src/components/Widgets/NISStatusWidget.jsx

@@ -0,0 +1,13 @@
+import React from 'react';
+import SelectWidget from '@plone/volto/components/manage/Widgets/SelectWidget';
+
+/**
+ * NISStatusWidget — wraps the default SelectWidget and disables the
+ * client-side "No value" option that Volto injects for hardcoded-choice
+ * fields when noValueOption=true (the default) and default is nullish.
+ */
+const NISStatusWidget = (props) => (
+  <SelectWidget {...props} noValueOption={false} />
+);
+
+export default NISStatusWidget;

package/src/components/theme/AppExtras/PrintPage/PrintPage.jsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { Portal } from 'react-portal';
 import { compose } from 'redux';
 import { connect } from 'react-redux';
@@ -22,6 +22,11 @@ const PrintPage = (props) => {
   const { pathname } = props;
   const intl = useIntl();
   const cmsView = isCmsUi(pathname);
+  const [isMounted, setIsMounted] = useState(false);
+
+  useEffect(() => {
+    setIsMounted(true);
+  }, []);
 
   const printPage = () => {
     document.getElementById('main').classList.add('print');
@@ -34,8 +39,8 @@ const PrintPage = (props) => {
 
   return (
     <>
-      {!cmsView && (
-        <Portal node={__CLIENT__ && document.querySelector('.content-area')}>
+      {!cmsView && isMounted && (
+        <Portal node={document.querySelector('.content-area')}>
           <BodyClass className="has-print-button" />
           <div className="ui container">
             <div className="print-button">

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

@@ -7,6 +7,7 @@ import { useState, useEffect } from 'react';
 import { useSelector } from 'react-redux';
 import { Checkbox } from 'semantic-ui-react';
 import { Button, Select, Dimmer, Loader } from 'semantic-ui-react';
+import UniversalLink from '@plone/volto/components/manage/UniversalLink/UniversalLink';
 
 function normalizeQueryOperators(query) {
   return query.map((q) => {
@@ -46,19 +47,33 @@ async function getCurrentSearchItems() {
 
   // call Plone
   try {
-    const response = await fetch('/marine/++api++/@querystring-search', {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
+    const response = await fetch(
+      `${window.env.apiPath}/++api++/@querystring-search`,
+      {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify(payload),
       },
-      body: JSON.stringify(payload),
-    });
+    );
     return response;
   } catch (err) {
     // console.error('Querystring search failed:', err);
   }
 }
 
+function formatAssignedTo(assignedTo) {
+  if (!assignedTo) return '';
+  // Fix Python-style unicode escape sequences (\UXXXXXXXX -> actual char)
+  let result = assignedTo.replace(/\\U([0-9A-Fa-f]{8})/g, (_, hex) =>
+    String.fromCodePoint(parseInt(hex, 16)),
+  );
+  // Strip the "(userid)" suffix to show only the display name
+  result = result.replace(/\s*\([^)]+\)\s*$/, '').trim();
+  return result;
+}
+
 const NISListingView = ({ items, isEditMode }) => {
   const [isLoading, setIsLoading] = useState(false);
   const [selectedItems, setSelectedItems] = useState([]);
@@ -94,7 +109,7 @@ const NISListingView = ({ items, isEditMode }) => {
   const onBulkAssign = async (ids, assignee) => {
     setIsLoading(true);
     await fetch(
-      `${window.location.origin}/marine/++api++/@bulk-assign${window.location.search}`,
+      `${window.env.apiPath}/++api++/@bulk-assign${window.location.search}`,
       {
         method: 'POST',
         headers: {
@@ -116,7 +131,7 @@ const NISListingView = ({ items, isEditMode }) => {
   useEffect(() => {
     const fetchUsers = async () => {
       const res = await fetch(
-        `${window.location.origin}/marine/++api++/@vocabularies/nis_experts_vocabulary`,
+        `${window.env.apiPath}/++api++/@vocabularies/nis_experts_vocabulary`,
         {
           headers: {
             Accept: 'application/json',
@@ -129,7 +144,7 @@ const NISListingView = ({ items, isEditMode }) => {
         setUsers(
           data.items.map((u) => ({
             key: u.token,
-            text: u.title,
+            text: formatAssignedTo(u.title),
             value: u.token,
           })),
         );
@@ -194,12 +209,12 @@ 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_country}</td>
               <td>{item.nis_status}</td>
               <td>{item.nis_group}</td>
               <td>
                 <div className="assigned-to-container">
-                  <div>{item.nis_assigned_to}</div>
+                  <div>{formatAssignedTo(item.nis_assigned_to)}</div>
                   {canEditPage && (
                     <Checkbox
                       checked={selectedItems.includes(item['@id'])}
@@ -211,22 +226,18 @@ const NISListingView = ({ items, isEditMode }) => {
               <td>
                 <div className="workflow-actions">
                   <div className="action-buttons">
-                    <a
+                    <UniversalLink
                       className="ui button secondary mini"
                       href={`${item['@id']}`}
-                      target="_blank"
-                      rel="noopener"
                     >
                       View
-                    </a>
-                    <a
+                    </UniversalLink>
+                    <UniversalLink
                       className="ui button primary mini"
                       href={`${item['@id']}/edit`}
-                      target="_blank"
-                      rel="noopener"
                     >
                       Edit
-                    </a>
+                    </UniversalLink>
                   </div>
                   <div className="workflow-progress">
                     <ProgressWorkflow

package/src/index.js

@@ -16,6 +16,7 @@ import installMsfdDataExplorerBlock from './components/Blocks/MsfdDataExplorerBl
 import { breadcrumb, localnavigation, workflowProgressPath } from './reducers';
 import customBlockTemplates from '@eeacms/volto-marine-policy/components/Blocks/CustomBlockTemplates/customBlockTemplates';
 import TextAlignWidget from './components/Widgets/TextAlign';
+import NISStatusWidget from './components/Widgets/NISStatusWidget';
 import './slate-styles.less';
 import './less/toc-title-sizes.less';
 
@@ -113,6 +114,7 @@ const applyConfig = (config) => {
   }
 
   config.widgets.widget.text_align = TextAlignWidget;
+  config.widgets.id.nis_status = NISStatusWidget;
   // check if it breaks the 'theme' field in volto-tabs-block in the 'horizontal carousel' layout
   // We have a 'theme' field in the wise catalogue metadata (CatalogueMetadata)
   config.widgets.id.indicator_theme = TokenWidget;

package/src/components/Widgets/TextAlign.test.jsx

@@ -1,33 +0,0 @@
-import React from 'react';
-import renderer from 'react-test-renderer';
-import configureStore from 'redux-mock-store';
-import { Provider } from 'react-intl-redux';
-
-import TextAlign from './TextAlign';
-
-const mockStore = configureStore();
-
-test('renders a text align component', () => {
-  const store = mockStore({
-    intl: {
-      locale: 'en',
-      messages: {},
-    },
-  });
-
-  const component = renderer.create(
-    <Provider store={store}>
-      <TextAlign
-        id="my-field"
-        title="My field"
-        value="left"
-        fieldSet="default"
-        onChange={() => {}}
-        onBlur={() => {}}
-        onClick={() => {}}
-      />
-    </Provider>,
-  );
-  const json = component.toJSON();
-  expect(json).toMatchSnapshot();
-});