@eeacms/volto-cca-policy 1.0.37 → 1.0.38

package/CHANGELOG.md

@@ -4,6 +4,19 @@ 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).
 
+### [1.0.38](https://github.com/eea/volto-cca-policy/compare/1.0.37...1.0.38) - 11 October 2026
+
+#### :bug: Bug Fixes
+
+- fix(navigator): update map notice role and optimize geographic field checks [kreafox - [`f40bcdf`](https://github.com/eea/volto-cca-policy/commit/f40bcdfa6573143dc0ccff7017e8d4ec6feda055)]
+
+#### :nail_care: Enhancements
+
+- refactor(navigator): refactor map component, add tests [kreafox - [`91f5795`](https://github.com/eea/volto-cca-policy/commit/91f57957a00b9e8b014074edf58f5166ce1dc1f9)]
+
+#### :hammer_and_wrench: Others
+
+- test(navigator): add tests for tool removal and export functionality [kreafox - [`0eeda9d`](https://github.com/eea/volto-cca-policy/commit/0eeda9db7929e7665376813f664b54406162f3f2)]
 ### [1.0.37](https://github.com/eea/volto-cca-policy/compare/1.0.36...1.0.37) - 8 October 2026
 
 #### :hammer_and_wrench: Others
@@ -628,12 +641,15 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINSFILE] sanitize sonarqube command Refs #305084 [valentinab25 - [`8106a44`](https://github.com/eea/volto-cca-policy/commit/8106a44e8f40dd360a274cede4b3f9c215d026cf)]
 
 #### :hammer_and_wrench: Others
 
 - test: pin Chromium version 149 to work with Cypress [valentinab25 - [`659ec82`](https://github.com/eea/volto-cca-policy/commit/659ec823dd71fe592a3a7accda22effbe1fb07bc)]
-## [1.0.0](https://github.com/eea/volto-cca-policy/compare/1.0.0-alpha.34...1.0.0) - 12 June 2026
+## [1.0.0](https://github.com/eea/volto-cca-policy/compare/1.0.0-alpha.36...1.0.0) - 12 June 2026
+
+### [1.0.0-alpha.36](https://github.com/eea/volto-cca-policy/compare/1.0.0-alpha.35...1.0.0-alpha.36) - 9 October 2026
+
+### [1.0.0-alpha.35](https://github.com/eea/volto-cca-policy/compare/1.0.0-alpha.34...1.0.0-alpha.35) - 9 October 2026
 
 ### [1.0.0-alpha.34](https://github.com/eea/volto-cca-policy/compare/1.0.0-alpha.33...1.0.0-alpha.34) - 8 October 2026
 
@@ -1170,7 +1186,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINSFILE] sanitize sonarqube command Refs #305084 [valentinab25 - [`8106a44`](https://github.com/eea/volto-cca-policy/commit/8106a44e8f40dd360a274cede4b3f9c215d026cf)]
 
 #### :hammer_and_wrench: Others
 
@@ -1707,7 +1722,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINSFILE] add package version in sonarqube [valentinab25 - [`e901251`](https://github.com/eea/volto-cca-policy/commit/e901251592eb54609fbc7eb8fcf7bd452c2da9cd)]
 
 ### [0.3.102](https://github.com/eea/volto-cca-policy/compare/0.3.101...0.3.102) - 24 February 2026
 
@@ -1717,7 +1731,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINSFILE] use sonarqube branches [EEA Jenkins - [`8b3699a`](https://github.com/eea/volto-cca-policy/commit/8b3699a6cbaef662b5e80884ac2c1f7dc9c6591e)]
 
 ### [0.3.101](https://github.com/eea/volto-cca-policy/compare/0.3.100...0.3.101) - 28 January 2026
 
@@ -2005,7 +2018,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - style: fix item spacing [kreafox - [`7d4535d`](https://github.com/eea/volto-cca-policy/commit/7d4535dbc486e6cb80fc55d6ac8c7c01d9cf48af)]
 - chore: code cleanup [kreafox - [`842419b`](https://github.com/eea/volto-cca-policy/commit/842419b1bce3dc624755c81c9dea672198cab9e2)]
 - style: update teaser block styling [kreafox - [`1e0cad8`](https://github.com/eea/volto-cca-policy/commit/1e0cad8e1ed3ae827ee868dce8ad50b292a937ba)]
-- chore: update Makefile, run yarn i18n [kreafox - [`61e6962`](https://github.com/eea/volto-cca-policy/commit/61e6962901068ae6512265417a730bd9befd65fe)]
 - chore: move styling to theme folder [kreafox - [`8cf6a1b`](https://github.com/eea/volto-cca-policy/commit/8cf6a1b8b14abf472a9c61b28db574f6d9e0bd3b)]
 - chore: remove ArrayWidget customization [kreafox - [`249bf93`](https://github.com/eea/volto-cca-policy/commit/249bf93054f7726c3d57a8b8ca01b75cd0d30522)]
 - chore: remove Footer customization [kreafox - [`7038af3`](https://github.com/eea/volto-cca-policy/commit/7038af37d48a328dfc31746f3fa84973e2f840ab)]
@@ -4768,13 +4780,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #260715 rast-block wip [Tripon Eugen - [`f19d54e`](https://github.com/eea/volto-cca-policy/commit/f19d54e0b9a6a86bf344eb85b6a1cda7f3de91bf)]
 - Refs #260715 rast-block wip [Tripon Eugen - [`2828537`](https://github.com/eea/volto-cca-policy/commit/2828537b6c084cd1a82162d552fb4ef025b71f9f)]
 - Refs #260715 rast-block updates [Tripon Eugen - [`1e803e5`](https://github.com/eea/volto-cca-policy/commit/1e803e5bd3d3fb7558f261c76c68866be7beb8b5)]
-- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`0a15e1b`](https://github.com/eea/volto-cca-policy/commit/0a15e1b2ad081233685e80d5b3c60a8663f6b896)]
-- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`9554e44`](https://github.com/eea/volto-cca-policy/commit/9554e44c92a621a52b2adb5a4830fb084ee5734b)]
 ### [0.1.49](https://github.com/eea/volto-cca-policy/compare/0.1.48...0.1.49) - 15 November 2023
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Refactor automated testing [valentinab25 - [`7b820a6`](https://github.com/eea/volto-cca-policy/commit/7b820a6369c2ddd5203b1a4abe352cb4bb43db7a)]
 - chore: husky, lint-staged use fixed versions [valentinab25 - [`f0a8061`](https://github.com/eea/volto-cca-policy/commit/f0a8061c275c236deb00087c23fac9860a073106)]
 
 #### :hammer_and_wrench: Others
@@ -4791,9 +4800,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #259267 - jenkins test [Tripon Eugen - [`cacd31e`](https://github.com/eea/volto-cca-policy/commit/cacd31e7b1afe0983674ed5c7632d2e1d7fa752e)]
 - Refs #259267 - jenkins [Tripon Eugen - [`5b3affe`](https://github.com/eea/volto-cca-policy/commit/5b3affee8401239de10097884c1b7f2349d15ec0)]
 - Refs #259267 - add When, lead image and title to files [Tripon Eugen - [`2cedb23`](https://github.com/eea/volto-cca-policy/commit/2cedb237f898af9057e13fba94b615ef71077204)]
-- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`4d607a5`](https://github.com/eea/volto-cca-policy/commit/4d607a576e9d0a5c34e48c41b409e7df616ee3d6)]
-- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`b7f74d5`](https://github.com/eea/volto-cca-policy/commit/b7f74d53513a6edbfbca5cb6d19687929bb1e5db)]
-- test: [JENKINS] Improve cypress time [valentinab25 - [`db65617`](https://github.com/eea/volto-cca-policy/commit/db656173391f65157098d95d388c25f6429753d8)]
 - Refs #259267 - cca event blocks attachments and check not mandatoty fields [Tripon Eugen - [`3138e5a`](https://github.com/eea/volto-cca-policy/commit/3138e5afb5bfbdbed14e27ed457b16867b7fa414)]
 - Refs #256681 - Fix error in CCA Event view menu. ([React Intl] An id must be provided to format a message.) [GhitaB - [`517eeb8`](https://github.com/eea/volto-cca-policy/commit/517eeb817264a47bbfd6b9b7d22aaf22d44ed224)]
 - Refs #161485 - Fix ECDE name conflict. [GhitaB - [`8bfd99f`](https://github.com/eea/volto-cca-policy/commit/8bfd99ff68bb82a04d1c0ed625fa514fcf46289e)]
@@ -5010,7 +5016,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`ad1ced0`](https://github.com/eea/volto-cca-policy/commit/ad1ced0971ba116c13a3b5fcc039172cc915c919)]
 
 #### :hammer_and_wrench: Others
 
@@ -5491,7 +5496,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Refs #158294 - Update supported languages list. [GhitaB - [`0a4f91f`](https://github.com/eea/volto-cca-policy/commit/0a4f91f39b7edc367bd4c127d6a8f273c7788361)]
-- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`8f1f9ce`](https://github.com/eea/volto-cca-policy/commit/8f1f9ce6c22805670cc0800d3c779b6d619d0f31)]
 ### [0.1.1](https://github.com/eea/volto-cca-policy/compare/0.1.0...0.1.1) - 13 December 2022
 
 #### :hammer_and_wrench: Others

package/package.json

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

package/src/components/Search/NavigatorCatalogue/NavigatorCatalogueMapState.jsx

@@ -0,0 +1,72 @@
+import React from 'react';
+import { Button } from 'semantic-ui-react';
+import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
+
+const messages = defineMessages({
+  countrySelectionRequired: {
+    id: 'Map view is only applicable when countries are selected in the <strong>Geographic coverage</strong>.',
+    defaultMessage:
+      'Map view is only applicable when countries are selected in the <strong>Geographic coverage</strong>.',
+  },
+  clearGeographicCoverageFilters: {
+    id: 'Clear other geographic coverage filters to enable the map.',
+    defaultMessage:
+      'Clear other geographic coverage filters to enable the map.',
+  },
+  clearGeographicCoverageFiltersButton: {
+    id: 'Clear filters',
+    defaultMessage: 'Clear filters',
+  },
+  selectCountryForMap: {
+    id: 'Select a country to explore the map',
+    defaultMessage: 'Select a country to explore the map',
+  },
+});
+
+const NavigatorCatalogueMapState = ({ children, isMapDisabled, onClear }) => {
+  const intl = useIntl();
+
+  return (
+    <div
+      className={`navigator-catalogue-map-state${
+        isMapDisabled ? ' is-disabled' : ''
+      }`}
+      aria-disabled={isMapDisabled || undefined}
+    >
+      <div
+        className="navigator-catalogue-map-content"
+        aria-hidden={isMapDisabled || undefined}
+        inert={isMapDisabled ? '' : undefined}
+      >
+        {children}
+      </div>
+
+      {isMapDisabled && (
+        <div className="navigator-catalogue-map-overlay">
+          <div className="navigator-catalogue-map-notice">
+            <h4>{intl.formatMessage(messages.selectCountryForMap)}</h4>
+            <p>
+              <FormattedMessage
+                {...messages.countrySelectionRequired}
+                values={{ strong: (text) => <strong>{text}</strong> }}
+              />
+            </p>
+            <p>
+              <FormattedMessage {...messages.clearGeographicCoverageFilters} />
+            </p>
+            <Button
+              className="primary map-notice-clear-button"
+              onClick={onClear}
+            >
+              {intl.formatMessage(
+                messages.clearGeographicCoverageFiltersButton,
+              )}
+            </Button>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+export default NavigatorCatalogueMapState;

package/src/components/Search/NavigatorCatalogue/NavigatorCatalogueMapState.test.jsx

@@ -0,0 +1,46 @@
+import React from 'react';
+import '@testing-library/jest-dom';
+import { fireEvent, render, screen } from '@testing-library/react';
+import { IntlProvider } from 'react-intl';
+import NavigatorCatalogueMapState from './NavigatorCatalogueMapState';
+
+const renderMapState = (props) =>
+  render(
+    <IntlProvider locale="en">
+      <NavigatorCatalogueMapState {...props}>
+        <div data-testid="country-map">Map</div>
+      </NavigatorCatalogueMapState>
+    </IntlProvider>,
+  );
+
+describe('NavigatorCatalogueMapState', () => {
+  it('leaves the map interactive when it is enabled', () => {
+    renderMapState({ isMapDisabled: false, onClear: jest.fn() });
+
+    expect(screen.getByTestId('country-map').parentElement).not.toHaveAttribute(
+      'inert',
+    );
+    expect(
+      screen.queryByText('Select a country to explore the map'),
+    ).not.toBeInTheDocument();
+  });
+
+  it('disables the map and handles the clear action', () => {
+    const onClear = jest.fn();
+    renderMapState({ isMapDisabled: true, onClear });
+
+    expect(screen.getByTestId('country-map').parentElement).toHaveAttribute(
+      'inert',
+    );
+    expect(
+      screen.getByText('Select a country to explore the map'),
+    ).toBeInTheDocument();
+
+    fireEvent.click(
+      screen.getByRole('button', {
+        name: 'Clear filters',
+      }),
+    );
+    expect(onClear).toHaveBeenCalledTimes(1);
+  });
+});

package/src/components/Search/NavigatorCatalogue/NavigatorCatalogueMapView.jsx

@@ -22,10 +22,13 @@ import {
   getColorForCount,
   normalizeCountryName,
   buildCountryCounts,
+  clearMapIncompatibleGeographicFilters,
   filterCountryCounts,
+  hasMapIncompatibleGeographicSelection,
   mapLegendItems,
   setCountryFilter,
 } from './utils';
+import NavigatorCatalogueMapState from './NavigatorCatalogueMapState';
 
 const messages = defineMessages({
   toolAvailability: {
@@ -140,7 +143,7 @@ const CountryClickInteractions = ({ ol, countryCounts, onExploreTools }) => {
 };
 
 /* istanbul ignore next */
-const NavigatorCatalogueMapViewInner = (props) => {
+const NavigatorCatalogueCountryMap = (props) => {
   const { geofeatures, projection, ol } = props;
   const intl = useIntl();
   const searchContext = useSearchContext();
@@ -270,6 +273,22 @@ const NavigatorCatalogueMapViewInner = (props) => {
   );
 };
 
+const NavigatorCatalogueMapViewInner = (props) => {
+  const searchContext = useSearchContext();
+  const isMapDisabled = hasMapIncompatibleGeographicSelection(
+    searchContext.filters,
+  );
+
+  return (
+    <NavigatorCatalogueMapState
+      isMapDisabled={isMapDisabled}
+      onClear={() => clearMapIncompatibleGeographicFilters(searchContext)}
+    >
+      <NavigatorCatalogueCountryMap {...props} />
+    </NavigatorCatalogueMapState>
+  );
+};
+
 /* istanbul ignore next */
 export default compose(
   withClientOnly,

package/src/components/Search/NavigatorCatalogue/NavigatorCatalogueMapView.test.jsx

@@ -3,7 +3,9 @@ import {
   getColorForCount,
   normalizeCountryName,
   buildCountryCounts,
+  clearMapIncompatibleGeographicFilters,
   filterCountryCounts,
+  hasMapIncompatibleGeographicSelection,
   mapLegendItems,
   setCountryFilter,
 } from './utils';
@@ -185,6 +187,92 @@ describe('filterCountryCounts', () => {
   });
 });
 
+describe('hasMapIncompatibleGeographicSelection', () => {
+  it('allows no geographic selection and country selections', () => {
+    expect(hasMapIncompatibleGeographicSelection()).toBe(false);
+    expect(hasMapIncompatibleGeographicSelection([])).toBe(false);
+    expect(
+      hasMapIncompatibleGeographicSelection([
+        {
+          field: 'cca_geographic_countries.keyword',
+          values: [],
+          type: 'any',
+        },
+      ]),
+    ).toBe(false);
+    expect(
+      hasMapIncompatibleGeographicSelection([
+        {
+          field: 'cca_geographic_countries.keyword',
+          values: ['Germany'],
+          type: 'any',
+        },
+      ]),
+    ).toBe(false);
+  });
+
+  it('rejects Global, Europe, and transnational selections', () => {
+    expect(
+      hasMapIncompatibleGeographicSelection([
+        {
+          field: 'cca_navigator_geographic_scope',
+          values: ['Global', 'Europe'],
+          type: 'any',
+        },
+        {
+          field: 'cca_geographic_transnational_region.keyword',
+          values: ['Alpine Space'],
+          type: 'any',
+        },
+      ]),
+    ).toBe(true);
+  });
+});
+
+describe('clearMapIncompatibleGeographicFilters', () => {
+  it('clears only map-incompatible geographic filters', () => {
+    const searchContext = {
+      filters: [
+        {
+          field: 'cca_navigator_geographic_scope',
+          values: ['Europe'],
+          type: 'any',
+        },
+        {
+          field: 'cca_geographic_transnational_region.keyword',
+          values: ['Alpine Space'],
+          type: 'any',
+        },
+        {
+          field: 'cca_geographic_countries.keyword',
+          values: ['Germany'],
+          type: 'any',
+        },
+        {
+          field: 'cca_climate_impacts.keyword',
+          values: ['Flooding'],
+          type: 'any',
+        },
+      ],
+      removeFilter: jest.fn(),
+    };
+
+    clearMapIncompatibleGeographicFilters(searchContext);
+
+    expect(searchContext.removeFilter).toHaveBeenCalledTimes(2);
+    expect(searchContext.removeFilter).toHaveBeenCalledWith(
+      'cca_navigator_geographic_scope',
+      null,
+      'any',
+    );
+    expect(searchContext.removeFilter).toHaveBeenCalledWith(
+      'cca_geographic_transnational_region.keyword',
+      null,
+      'any',
+    );
+  });
+});
+
 describe('mapLegendItems', () => {
   it('has 5 legend items', () => {
     expect(mapLegendItems).toHaveLength(5);

package/src/components/Search/NavigatorCatalogue/NavigatorGeographicCoverageFacet.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Button, Card, Icon } from 'semantic-ui-react';
 import { defineMessages, useIntl } from 'react-intl';
 import { Term } from '@eeacms/search/components';
-import { useSearchContext } from '@eeacms/search/lib/hocs';
+import { useSearchContext, useViews } from '@eeacms/search/lib/hocs';
 import { markSelectedFacetValuesFromFilters } from '@eeacms/search/lib/search/helpers';
 import {
   CHARACTERISATION_FIELD,
@@ -70,6 +70,7 @@ const FacetOption = ({ field, option, onChange }) => {
 };
 
 const ExpandableFacetGroup = ({
+  defaultOpen = false,
   field,
   id,
   label,
@@ -78,11 +79,11 @@ const ExpandableFacetGroup = ({
   onChange,
 }) => {
   const hasSelection = options.some(({ selected }) => selected);
-  const [isOpen, setIsOpen] = React.useState(hasSelection);
+  const [isOpen, setIsOpen] = React.useState(hasSelection || defaultOpen);
 
   React.useEffect(() => {
-    if (hasSelection) setIsOpen(true);
-  }, [hasSelection]);
+    if (hasSelection || defaultOpen) setIsOpen(true);
+  }, [defaultOpen, hasSelection]);
 
   return (
     <div className="navigator-geographic-facet-group">
@@ -119,16 +120,10 @@ const ExpandableFacetGroup = ({
   );
 };
 
-const NavigatorActiveFilters = ({ filters, onRemove }) => {
+const NavigatorActiveFilters = ({ fields, filters, onRemove }) => {
   const intl = useIntl();
-  const geographicFields = [
-    CHARACTERISATION_FIELD,
-    TRANSNATIONAL_REGION_FIELD,
-    COUNTRIES_FIELD,
-  ];
   const activeFilters = filters.filter(
-    ({ field, values }) =>
-      geographicFields.includes(field) && values?.length > 0,
+    ({ field, values }) => fields.includes(field) && values?.length > 0,
   );
 
   if (!activeFilters.length) return null;
@@ -190,6 +185,8 @@ const NavigatorGeographicCoverageFacet = ({
 }) => {
   const intl = useIntl();
   const { addFilter, facets, filters = [], removeFilter } = useSearchContext();
+  const { activeViewId } = useViews();
+  const isMapView = activeViewId === 'map';
   const transnationalOptions = getFacetOptions(
     facets,
     filters,
@@ -219,6 +216,7 @@ const NavigatorGeographicCoverageFacet = ({
     }
 
     clearFilter(CHARACTERISATION_FIELD);
+    if (isMapView) clearFilter(TRANSNATIONAL_REGION_FIELD);
     addFilter(field, option.value, 'any');
   };
 
@@ -226,25 +224,28 @@ const NavigatorGeographicCoverageFacet = ({
     <fieldset
       className={`sui-facet searchlib-multiterm-facet navigator-geographic-facet ${className}`}
     >
-      <div className="sui-multi-checkbox-facet navigator-geographic-facet-direct-options">
-        {options.map((option) => {
-          const directOption = {
-            ...option,
-            selected:
-              option.selected || selectedDirectValues.includes(option.value),
-          };
+      {!isMapView && (
+        <div className="sui-multi-checkbox-facet navigator-geographic-facet-direct-options">
+          {options.map((option) => {
+            const directOption = {
+              ...option,
+              selected:
+                option.selected || selectedDirectValues.includes(option.value),
+            };
 
-          return (
-            <FacetOption
-              key={valueAsText(option.value)}
-              field={CHARACTERISATION_FIELD}
-              option={directOption}
-              onChange={updateDirectFilter}
-            />
-          );
-        })}
-      </div>
+            return (
+              <FacetOption
+                key={valueAsText(option.value)}
+                field={CHARACTERISATION_FIELD}
+                option={directOption}
+                onChange={updateDirectFilter}
+              />
+            );
+          })}
+        </div>
+      )}
       <ExpandableFacetGroup
+        defaultOpen={isMapView}
         field={COUNTRIES_FIELD}
         id="navigator-geographic-countries"
         label={intl.formatMessage(countriesLabel)}
@@ -252,17 +253,24 @@ const NavigatorGeographicCoverageFacet = ({
         options={countryOptions}
         onChange={(option) => updateChildFilter(COUNTRIES_FIELD, option)}
       />
-      <ExpandableFacetGroup
-        field={TRANSNATIONAL_REGION_FIELD}
-        id="navigator-geographic-transnational-regions"
-        label={intl.formatMessage(transnationalRegionsLabel)}
-        emptyMessage={intl.formatMessage(messages.noOptionsAvailable)}
-        options={transnationalOptions}
-        onChange={(option) =>
-          updateChildFilter(TRANSNATIONAL_REGION_FIELD, option)
-        }
-      />
+      {!isMapView && (
+        <ExpandableFacetGroup
+          field={TRANSNATIONAL_REGION_FIELD}
+          id="navigator-geographic-transnational-regions"
+          label={intl.formatMessage(transnationalRegionsLabel)}
+          emptyMessage={intl.formatMessage(messages.noOptionsAvailable)}
+          options={transnationalOptions}
+          onChange={(option) =>
+            updateChildFilter(TRANSNATIONAL_REGION_FIELD, option)
+          }
+        />
+      )}
       <NavigatorActiveFilters
+        fields={[
+          CHARACTERISATION_FIELD,
+          TRANSNATIONAL_REGION_FIELD,
+          COUNTRIES_FIELD,
+        ]}
         filters={filters}
         onRemove={(field, value, type) => removeFilter(field, value, type)}
       />

package/src/components/Search/NavigatorCatalogue/NavigatorGeographicCoverageFacet.test.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import '@testing-library/jest-dom';
 import { fireEvent, render, screen } from '@testing-library/react';
 import { IntlProvider } from 'react-intl';
-import { useSearchContext } from '@eeacms/search/lib/hocs';
+import { useSearchContext, useViews } from '@eeacms/search/lib/hocs';
 import NavigatorGeographicCoverageFacet from './NavigatorGeographicCoverageFacet';
 import {
   CHARACTERISATION_FIELD,
@@ -15,9 +15,11 @@ jest.mock('@eeacms/search/components', () => ({
 }));
 jest.mock('@eeacms/search/lib/hocs', () => ({
   useSearchContext: jest.fn(),
+  useViews: jest.fn(),
 }));
 
 const renderFacet = ({
+  activeViewId = 'listing',
   detailedOptions = true,
   filters = [],
   onRemove = jest.fn(),
@@ -26,6 +28,8 @@ const renderFacet = ({
   const addFilter = jest.fn();
   const removeFilter = jest.fn();
 
+  useViews.mockReturnValue({ activeViewId });
+
   useSearchContext.mockReturnValue({
     addFilter,
     removeFilter,
@@ -190,4 +194,64 @@ describe('NavigatorGeographicCoverageFacet', () => {
       screen.getByRole('button', { name: 'Transnational regions' }),
     ).toBeEnabled();
   });
+
+  it('shows only countries in the map view', () => {
+    renderFacet({ activeViewId: 'map' });
+
+    expect(screen.queryByLabelText('Europe')).not.toBeInTheDocument();
+    expect(screen.queryByLabelText('Global')).not.toBeInTheDocument();
+    expect(screen.getByRole('button', { name: 'Countries' })).toHaveAttribute(
+      'aria-expanded',
+      'true',
+    );
+    expect(screen.getByLabelText('Germany')).toBeVisible();
+    expect(
+      screen.queryByRole('button', { name: 'Transnational regions' }),
+    ).not.toBeInTheDocument();
+  });
+
+  it('clears hidden geographic filters when selecting a country on the map', () => {
+    const { addFilter, removeFilter } = renderFacet({
+      activeViewId: 'map',
+      filters: [
+        {
+          field: TRANSNATIONAL_REGION_FIELD,
+          values: ['Alpine Space'],
+          type: 'any',
+        },
+      ],
+    });
+
+    fireEvent.click(screen.getByLabelText('Germany'));
+
+    expect(removeFilter).toHaveBeenCalledWith(
+      CHARACTERISATION_FIELD,
+      null,
+      'any',
+    );
+    expect(removeFilter).toHaveBeenCalledWith(
+      TRANSNATIONAL_REGION_FIELD,
+      null,
+      'any',
+    );
+    expect(addFilter).toHaveBeenCalledWith(COUNTRIES_FIELD, 'Germany', 'any');
+  });
+
+  it('shows hidden active geographic filters in the map view', () => {
+    renderFacet({
+      activeViewId: 'map',
+      detailedOptions: false,
+      filters: [
+        {
+          field: CHARACTERISATION_FIELD,
+          values: ['Europe'],
+          type: 'any',
+        },
+      ],
+    });
+
+    expect(screen.queryByLabelText('Europe')).not.toBeInTheDocument();
+    expect(screen.getByText('Active filters:')).toBeInTheDocument();
+    expect(screen.getByText('Europe')).toBeInTheDocument();
+  });
 });

package/src/components/Search/NavigatorCatalogue/utils.js

@@ -61,6 +61,30 @@ export const filterCountryCounts = (countryCounts, filters) => {
   );
 };
 
+const mapIncompatibleGeographicFields = new Set([
+  'cca_navigator_geographic_scope',
+  'cca_geographic_transnational_region.keyword',
+]);
+
+export const hasMapIncompatibleGeographicSelection = (filters) =>
+  Boolean(
+    filters?.find(
+      ({ field, values }) =>
+        mapIncompatibleGeographicFields.has(field) && values?.length > 0,
+    ),
+  );
+
+export const clearMapIncompatibleGeographicFilters = (searchContext) => {
+  searchContext?.filters
+    ?.filter(
+      ({ field, values }) =>
+        mapIncompatibleGeographicFields.has(field) && values?.length > 0,
+    )
+    .forEach(({ field, type = 'any' }) =>
+      searchContext.removeFilter(field, null, type),
+    );
+};
+
 export const setCountryFilter = (searchContext, countryName) => {
   searchContext?.setFilter(
     'cca_geographic_countries.keyword',

package/src/components/Search/NavigatorGuide/NavigatorGuideContentView.test.jsx

@@ -268,3 +268,70 @@ describe('NavigatorGuideContentView climate hazards', () => {
     ).toHaveTextContent('Flooding');
   });
 });
+
+describe('NavigatorGuideContentView actions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    useSelector.mockReturnValue('en');
+    useSearchDriver.mockReturnValue(undefined);
+    useGuideFacetOptions.mockReturnValue({
+      'cca_adaptation_sectors.keyword': ['Water'],
+    });
+  });
+
+  it('removes a selected option from the current step', () => {
+    const removeFilter = jest.fn();
+    useAtom.mockReturnValue([0, jest.fn()]);
+    useHistory.mockReturnValue({ push: jest.fn() });
+
+    renderGuide(
+      { title: 'Guide tool', href: '/tools/guide-tool' },
+      {
+        removeFilter,
+        facets: {
+          'cca_adaptation_sectors.keyword': [
+            { data: [{ value: 'Water', count: 4 }] },
+          ],
+        },
+      },
+    );
+
+    fireEvent.click(screen.getByText('Water'));
+
+    expect(removeFilter).toHaveBeenCalledWith(
+      'cca_adaptation_sectors.keyword',
+      'Water',
+      'all',
+    );
+  });
+
+  it('opens catalogue results with only supported Guide filters', () => {
+    const history = { push: jest.fn() };
+    useAtom.mockReturnValue([0, jest.fn()]);
+    useHistory.mockReturnValue(history);
+
+    renderGuide(
+      { title: 'Guide tool', href: '/tools/guide-tool' },
+      {
+        filters: [
+          {
+            field: 'cca_adaptation_sectors.keyword',
+            values: ['Water'],
+            type: 'all',
+          },
+          { field: 'unrelated.keyword', values: ['Ignored'], type: 'any' },
+        ],
+      },
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: 'Skip to results' }));
+
+    expect(history.push).toHaveBeenCalledWith(
+      expect.objectContaining({
+        pathname: '/en/navigator/tool-catalogue',
+        search: expect.any(String),
+      }),
+    );
+    expect(history.push.mock.calls[0][0].search).not.toContain('unrelated');
+  });
+});

package/src/components/theme/CompareTools/CompareToolsView.test.jsx

@@ -12,6 +12,7 @@ import { useAtom } from 'jotai';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory, useLocation } from 'react-router-dom';
 import CompareToolsView from './CompareToolsView';
+import { exportComparisonTable } from '../../Search/NavigatorCatalogue/utils';
 import { fetchResultsByUid } from './utils';
 
 jest.mock('jotai', () => ({
@@ -62,6 +63,11 @@ jest.mock('./utils', () => ({
   getPathname: (url) => url?.split('?')[0] || '',
 }));
 
+jest.mock('../../Search/NavigatorCatalogue/utils', () => ({
+  ...jest.requireActual('../../Search/NavigatorCatalogue/utils'),
+  exportComparisonTable: jest.fn(),
+}));
+
 describe('CompareToolsView', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -246,4 +252,57 @@ describe('CompareToolsView', () => {
     expect(thumbnail.querySelector('img')).not.toBeInTheDocument();
     expect(thumbnail.querySelector('.ri-file-line')).toBeInTheDocument();
   });
+
+  it('removes a tool from the selection and URL', async () => {
+    const setSelectedTools = jest.fn();
+    const history = { push: jest.fn() };
+    useAtom.mockReturnValue([[], setSelectedTools]);
+    useHistory.mockReturnValue(history);
+
+    render(
+      <IntlProvider locale="en">
+        <CompareToolsView />
+      </IntlProvider>,
+    );
+    await screen.findByRole('table', { name: 'Compare tools' });
+
+    fireEvent.click(
+      screen.getByRole('button', {
+        name: 'Remove Tool one from comparison',
+      }),
+    );
+
+    const updateSelection = setSelectedTools.mock.calls[0][0];
+    expect(updateSelection([{ uid: 'one' }, { uid: 'two' }])).toEqual([
+      { uid: 'two' },
+    ]);
+    expect(history.push).toHaveBeenCalledWith({
+      pathname: '/en/navigator/compare',
+      search: '?uid=two',
+      hash: '',
+      state: {},
+    });
+  });
+
+  it('exports comparison data with only applicable table options', async () => {
+    render(
+      <IntlProvider locale="en">
+        <CompareToolsView />
+      </IntlProvider>,
+    );
+    await screen.findByRole('table', { name: 'Compare tools' });
+
+    fireEvent.click(screen.getByRole('button', { name: 'Export table' }));
+
+    expect(exportComparisonTable).toHaveBeenCalledTimes(1);
+    const [exportedTools] = exportComparisonTable.mock.calls[0];
+    expect(exportedTools[0].comparisonOptions).toEqual(
+      expect.objectContaining({
+        cca_type_of_outputs: ['Maps and graphs'],
+        cca_adaptation_support_cycle_step: [
+          'Step 2: Assessing Climate Change Risks and Vulnerabilities',
+        ],
+      }),
+    );
+  });
 });

package/theme/globals/navigator.less

@@ -620,11 +620,89 @@
 }
 
 .navigator-catalogue-map-loading {
-  text-align: center;
   display: flex;
   flex-direction: column;
   gap: 1em;
+  text-align: center;
+}
+
+.navigator-catalogue-map-state {
+  position: relative;
+  min-height: 600px;
+
+  .navigator-catalogue-map-content {
+    transition:
+      filter 0.2s ease,
+      opacity 0.2s ease;
+  }
+
+  &.is-disabled .navigator-catalogue-map-content {
+    filter: grayscale(35%);
+    opacity: 0.4;
+  }
+}
+
+.navigator-catalogue-map-overlay {
+  position: absolute;
+  z-index: 1001;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 2rem;
+  background: fade(#fff, 55%);
+  inset: 0;
+}
+
+.navigator-catalogue-map-notice {
+  display: flex;
+  width: 100%;
+  max-width: 700px;
+  box-sizing: border-box;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 3rem 2rem;
+  border: 1px solid fade(#dce7ee, 80%);
+  background-color: #fff;
+  box-shadow: 0 10px 28px fade(#dce7ee, 18%);
+  cursor: default;
+  text-align: center;
+
+  // .map-notice-icon {
+  //   display: inline-flex;
+  //   width: 72px;
+  //   height: 72px;
+  //   align-items: center;
+  //   justify-content: center;
+  //   border-radius: 50%;
+  //   background: @secondaryColor;
+  //   color: #fff;
+
+  //   i.icon {
+  //     width: auto;
+  //     height: auto;
+  //     margin: 0 !important;
+  //     font-size: 2rem;
+  //     line-height: 1;
+  //   }
+  // }
+
+  h4 {
+    margin: 0 0 0.75rem;
+  }
+
+  p {
+    max-width: 620px;
+    margin: 0;
+    font-size: 1rem;
+    line-height: 1.6;
+  }
+
+  .ui.button.map-notice-clear-button {
+    margin: 1.5rem 0 0;
+  }
 }
+
 .navigator-catalogue-map-tooltip {
   position: absolute;
   z-index: 1000;