@eeacms/volto-cca-policy 1.0.19 → 1.0.21

package/src/components/theme/Content/Sections/ExtendedToolGeographicMetadata.test.jsx

@@ -7,8 +7,14 @@ import ExtendedToolGeographicMetadata from './ExtendedToolGeographicMetadata';
 
 jest.mock('./MetadataItemList', () => ({
   __esModule: true,
-  default: ({ value = [] }) => (
-    <p>{value.map((item) => item.title || item.token || item).join(', ')}</p>
+  default: ({ value = [], asTags, maxItems }) => (
+    <div
+      data-testid="metadata-item-list"
+      data-astags={asTags ? 'true' : 'false'}
+      data-maxitems={maxItems}
+    >
+      {value.map((item) => item.title || item.token || item).join(', ')}
+    </div>
   ),
 }));
 
@@ -20,7 +26,7 @@ const renderComponent = (content) =>
   );
 
 describe('ExtendedToolGeographicMetadata', () => {
-  it('renders geochars in the Extended Tool design order', () => {
+  it('renders categories and tags in order without Europe prefix', () => {
     const { container } = renderComponent({
       geochars: JSON.stringify({
         geoElements: {
@@ -34,22 +40,115 @@ describe('ExtendedToolGeographicMetadata', () => {
       }),
     });
 
+    const metadataEl = container.querySelector(
+      '.extended-tool-geographic-metadata',
+    );
+    expect(metadataEl).toHaveTextContent(
+      'Countries:Germany, France' +
+        'Macro-Transnational region:Alpine Space, Danube Area' +
+        'Biogeographical regions:Alpine' +
+        'Sub Nationals:Prov. Antwerpen (BE)' +
+        'Municipalities & other:Brussels',
+    );
+    expect(metadataEl).not.toHaveTextContent('Europe');
+
+    const titles = container.querySelectorAll('.geographic-category-title');
+    expect(titles).toHaveLength(5);
+    expect(titles[0]).toHaveTextContent('Countries:');
+    expect(titles[1]).toHaveTextContent('Macro-Transnational region:');
+    expect(titles[2]).toHaveTextContent('Biogeographical regions:');
+    expect(titles[3]).toHaveTextContent('Sub Nationals:');
+    expect(titles[4]).toHaveTextContent('Municipalities & other:');
+
+    const tagContainers = screen.getAllByTestId('metadata-item-list');
+    expect(tagContainers).toHaveLength(5);
+    tagContainers.forEach((tc) => {
+      expect(tc).toHaveAttribute('data-astags', 'true');
+      expect(tc).toHaveAttribute('data-maxitems', '3');
+    });
+  });
+
+  it('renders country category without Europe prefix (e.g. Portugal)', () => {
+    const { container } = renderComponent({
+      geochars: JSON.stringify({
+        geoElements: {
+          element: 'EUROPE',
+          countries: ['PT'],
+        },
+      }),
+    });
+
+    const metadataEl = container.querySelector(
+      '.extended-tool-geographic-metadata',
+    );
+    expect(metadataEl).toHaveTextContent('Countries:Portugal');
+    expect(metadataEl).not.toHaveTextContent('Europe');
+  });
+
+  it('renders city category as Municipalities & other without Europe prefix (e.g. Selected cities)', () => {
+    const { container } = renderComponent({
+      geochars: JSON.stringify({
+        geoElements: {
+          element: 'EUROPE',
+          city: 'Selected cities',
+        },
+      }),
+    });
+
+    const metadataEl = container.querySelector(
+      '.extended-tool-geographic-metadata',
+    );
+    expect(metadataEl).toHaveTextContent(
+      'Municipalities & other:Selected cities',
+    );
+    expect(metadataEl).not.toHaveTextContent('Europe');
+  });
+
+  it('renders element when no specific regions exist', () => {
+    const { container } = renderComponent({
+      geochars: JSON.stringify({
+        geoElements: {
+          element: 'EUROPE',
+        },
+      }),
+    });
+
+    const metadataEl = container.querySelector(
+      '.extended-tool-geographic-metadata',
+    );
+    expect(metadataEl).toHaveTextContent('Europe');
     expect(
-      container.querySelector('.extended-tool-geographic-metadata'),
-    ).toHaveTextContent(
-      'Europe · Germany, France · Alpine Space, Danube Area · Alpine · Prov. Antwerpen (BE) · Brussels',
+      container.querySelector('.geographic-category-title'),
+    ).not.toBeInTheDocument();
+  });
+
+  it('renders Global when element is GLOBAL and no specific regions exist', () => {
+    const { container } = renderComponent({
+      geochars: JSON.stringify({
+        geoElements: {
+          element: 'GLOBAL',
+        },
+      }),
+    });
+
+    const metadataEl = container.querySelector(
+      '.extended-tool-geographic-metadata',
     );
-    expect(screen.queryByRole('heading')).not.toBeInTheDocument();
+    expect(metadataEl).toHaveTextContent('Global');
+    expect(
+      container.querySelector('.geographic-category-title'),
+    ).not.toBeInTheDocument();
   });
 
   it('supports legacy spatial fields', () => {
     const { container } = renderComponent({
-      spatial_layer: 'Global',
+      spatial_layer: 'Countries',
       spatial_values: [{ token: 'France' }],
     });
 
-    expect(
-      container.querySelector('.extended-tool-geographic-metadata'),
-    ).toHaveTextContent('Global · France');
+    const metadataEl = container.querySelector(
+      '.extended-tool-geographic-metadata',
+    );
+    expect(metadataEl).toHaveTextContent('Countries:France');
   });
 });

package/src/components/theme/Content/Sections/GeographicMetadata.jsx

@@ -14,6 +14,11 @@ const messages = defineMessages({
   'Countries:': { id: 'Countries:', defaultMessage: 'Countries:' },
   'Sub Nationals:': { id: 'Sub Nationals:', defaultMessage: 'Sub Nationals:' },
   'City:': { id: 'City:', defaultMessage: 'City:' },
+  'Cities:': { id: 'Cities:', defaultMessage: 'Cities:' },
+  'Municipalities & other:': {
+    id: 'Municipalities & other:',
+    defaultMessage: 'Municipalities & other:',
+  },
 });
 
 const GeographicMetadata = (props) => {
@@ -61,7 +66,11 @@ const GeographicMetadata = (props) => {
           section.value && (
             <Fragment key={index}>
               {section.title && (
-                <h5>{intl.formatMessage(messages[section.title])}</h5>
+                <h5>
+                  {messages[section.title]
+                    ? intl.formatMessage(messages[section.title])
+                    : section.title}
+                </h5>
               )}
               <p>
                 {section.value

package/src/components/theme/Content/Sections/geographicMetadataUtils.js

@@ -91,6 +91,9 @@ function renderSubnational(value) {
 }
 
 function renderCity(value) {
+  if (!value) {
+    return null;
+  }
   if (Array.isArray(value)) {
     if (value.length === 0) {
       return null;
@@ -154,7 +157,7 @@ export function renderGeochar(geoElements, isObservatoryPage = false) {
     biotrans: 'Biogeographical regions:',
     countries: 'Countries:',
     subnational: 'Sub Nationals:',
-    city: 'City:',
+    city: 'Municipalities & other:',
   };
 
   if (isObservatoryPage) {
@@ -167,6 +170,7 @@ export function renderGeochar(geoElements, isObservatoryPage = false) {
     if (section !== undefined) {
       let rendered = renderSection(section, key);
       out[key] = out.push({
+        key,
         title: sectionTitles[key],
         value: rendered,
       });

package/src/components/theme/Views/ExtendedToolView.jsx

@@ -34,7 +34,6 @@ const ExtendedToolView = (props) => {
     adaptation_support_cycle_step,
     type_of_outputs,
     temporality_of_data,
-    tool_available_english,
     tool_available_language,
     accessibility_and_usability,
     tool_input,
@@ -44,17 +43,14 @@ const ExtendedToolView = (props) => {
     used_in,
   } = content;
 
-  const availableLanguages = tool_available_english ? ['English'] : [];
-  if (Array.isArray(tool_available_language)) {
-    availableLanguages.push(...tool_available_language);
-  } else if (tool_available_language) {
-    availableLanguages.push(
-      ...tool_available_language
-        .split(',')
-        .map((language) => language.trim())
-        .filter(Boolean),
-    );
-  }
+  const availableLanguages = Array.isArray(tool_available_language)
+    ? tool_available_language
+    : tool_available_language
+      ? tool_available_language
+          .split(',')
+          .map((language) => language.trim())
+          .filter(Boolean)
+      : [];
 
   const hasGeoChars = Boolean(geochars || spatial_layer?.length);
   const hasHyperlink = Boolean(hyperlink && hyperlink.length > 0);
@@ -293,6 +289,7 @@ const ExtendedToolView = (props) => {
                     />
                   </div>
                 )}
+
                 {adaptation_support_cycle_step?.length > 0 && (
                   <div className="metadata-group adaptation-step">
                     <h5>
@@ -415,6 +412,7 @@ const ExtendedToolView = (props) => {
           </Grid.Row>
         </Grid>
       </Container>
+
       <RelatedTools content={content} />
     </div>
   );

package/src/components/theme/Views/ExtendedToolView.test.jsx

@@ -574,7 +574,6 @@ describe('ExtendedToolView', () => {
       sectors: [{ title: 'Agriculture' }, { title: 'Health' }],
       type_of_outputs: [{ title: 'Maps' }, { title: 'Charts' }],
       temporality_of_data: [{ title: 'Historical' }, { title: 'Projections' }],
-      tool_available_english: true,
       tool_available_language: [{ title: 'French' }, 'Romanian'],
       intended_user_groups: [{ title: 'Policy makers' }, 'Researchers'],
       accessibility_and_usability: 'Easy to use',
@@ -623,7 +622,7 @@ describe('ExtendedToolView', () => {
     expect(
       screen.getByRole('heading', { name: 'Language' }),
     ).toBeInTheDocument();
-    expect(screen.getByText('English, French, Romanian')).toBeInTheDocument();
+    expect(screen.getByText('French, Romanian')).toBeInTheDocument();
     expect(
       screen.getByRole('heading', { name: 'User Group' }),
     ).toBeInTheDocument();

package/src/search/navigator_catalogue/facets.js

@@ -12,28 +12,24 @@ const messages = defineMessages({
     defaultMessage: 'Climate hazards',
   },
   adaptationSupportCycleStep: {
-    id: 'Adaptation Support Cycle Step',
-    defaultMessage: 'Adaptation Support Cycle Step',
-  },
-  userGroups: {
-    id: 'User Groups',
-    defaultMessage: 'User Groups',
+    id: 'Adaptation policy cycle',
+    defaultMessage: 'Adaptation policy cycle',
   },
   typeOfOutputs: {
-    id: 'Type of Outputs',
-    defaultMessage: 'Type of Outputs',
+    id: 'Type of outputs',
+    defaultMessage: 'Type of outputs',
   },
-  typeOfData: {
-    id: 'Type of Data',
-    defaultMessage: 'Type of Data',
+  focusAreas: {
+    id: 'Focus areas',
+    defaultMessage: 'Focus areas',
   },
-  licenseStatus: {
-    id: 'License status',
-    defaultMessage: 'License status',
+  implementationLevel: {
+    id: 'Implementation level',
+    defaultMessage: 'Implementation level',
   },
-  natureBasedSolution: {
-    id: 'Nature-based solution',
-    defaultMessage: 'Nature-based solution',
+  adaptationApproaches: {
+    id: 'Adaptation approaches',
+    defaultMessage: 'Adaptation approaches',
   },
 });
 
@@ -58,13 +54,6 @@ const facets = [
     label: messages.adaptationSupportCycleStep,
     alwaysVisible: false,
   }),
-  multiTermFacet({
-    field: 'cca_intended_user_groups.keyword',
-    isFilterable: false,
-    isMulti: true,
-    label: messages.userGroups,
-    alwaysVisible: false,
-  }),
   multiTermFacet({
     field: 'cca_type_of_outputs.keyword',
     isFilterable: false,
@@ -73,24 +62,24 @@ const facets = [
     alwaysVisible: false,
   }),
   multiTermFacet({
-    field: 'cca_type_of_data.keyword',
+    field: 'cca_focus_areas.keyword',
     isFilterable: false,
     isMulti: true,
-    label: messages.typeOfData,
+    label: messages.focusAreas,
     alwaysVisible: false,
   }),
   multiTermFacet({
-    field: 'cca_license_status.keyword',
+    field: 'cca_place_of_implementation.keyword',
     isFilterable: false,
     isMulti: true,
-    label: messages.licenseStatus,
+    label: messages.implementationLevel,
     alwaysVisible: false,
   }),
   multiTermFacet({
-    field: 'cca_nature_based_solution.keyword',
+    field: 'cca_elements.keyword',
     isFilterable: false,
     isMulti: true,
-    label: messages.natureBasedSolution,
+    label: messages.adaptationApproaches,
     alwaysVisible: false,
   }),
 ];

package/theme/globals/navigator.less

@@ -699,14 +699,6 @@
     gap: 1rem;
   }
 
-  .catalogue-licence {
-    display: inline-block;
-    overflow: hidden;
-    max-width: 300px;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
   .license-type {
     gap: 0.7em;
   }

package/theme/globals/views.less

@@ -518,6 +518,20 @@ hr {
     }
   }
 
+  .extended-tool-geographic-metadata {
+    .geographic-category {
+      & + .geographic-category {
+        margin-top: 0.85rem;
+      }
+    }
+
+    .geographic-category-title {
+      margin-bottom: 0.35rem;
+      color: #4c5a6b;
+      font-size: 0.8125rem;
+      font-weight: 600;
+    }
+  }
   .extended-tool-related {
     padding: 2.5rem;
     margin-top: 3rem;