@eeacms/volto-n2k 1.1.9 → 1.1.10

package/CHANGELOG.md

@@ -4,11 +4,23 @@ 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.1.9](https://github.com/eea/volto-n2k/compare/1.1.8...1.1.9) - 23 October 2025
+### [1.1.10](https://github.com/eea/volto-n2k/compare/1.1.9...1.1.10) - 1 December 2025
 
-#### :rocket: New Features
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`1990f52`](https://github.com/eea/volto-n2k/commit/1990f520b0223fbaecd5ce4a38f55e8a28beb3eb)]
+- style: Automated code fix [eea-jenkins - [`6bb329d`](https://github.com/eea/volto-n2k/commit/6bb329d70a488f9f4e2673dcc1bceab99a8ff4b7)]
+- style: Automated code fix [eea-jenkins - [`f49ce89`](https://github.com/eea/volto-n2k/commit/f49ce89ad1c659f469d7667f1693b65dce29c55c)]
 
-- feat(dependencies): remove volto-spotlight [Miu Razvan - [`2f3e6a1`](https://github.com/eea/volto-n2k/commit/2f3e6a111a2e38073d96398611f745c15e4a0ff7)]
+#### :hammer_and_wrench: Others
+
+- fix habitat priority [Miu Razvan - [`e69d33e`](https://github.com/eea/volto-n2k/commit/e69d33e9f086e6a7b0005868a0ebda958fdf727d)]
+- fix pipeline [vladcalin-edw - [`9f318d5`](https://github.com/eea/volto-n2k/commit/9f318d5f66073d59e03b14d7d72c2d2cf1e58045)]
+- added sort by code_2000 [vladcalin-edw - [`c641c97`](https://github.com/eea/volto-n2k/commit/c641c9729c10c9bc268568f4a2e2c4d3615cc0c4)]
+- added priority to habitats banner [vladcalin-edw - [`c53b0a4`](https://github.com/eea/volto-n2k/commit/c53b0a49232968045473df72a111afe47bcb916f)]
+- added conditional priority [vladcalin-edw - [`83c0c0a`](https://github.com/eea/volto-n2k/commit/83c0c0aff46b53fc7dd44d0aa802e2bb26599999)]
+- fix no priority count [vladcalin-edw - [`af22479`](https://github.com/eea/volto-n2k/commit/af224793069a6d3acf84905478ee8af6fb799563)]
+### [1.1.9](https://github.com/eea/volto-n2k/compare/1.1.8...1.1.9) - 23 October 2025
 
 ### [1.1.8](https://github.com/eea/volto-n2k/compare/1.1.7...1.1.8) - 1 October 2025
 

package/package.json

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

package/src/components/manage/Blocks/HabitatsBanner/View.jsx

@@ -53,6 +53,20 @@ const ViewComponent = (props) => {
   } = habitat;
   const { attribution_copyright = [] } = habitat_pictures;
 
+  const priorityLabel = useMemo(() => {
+    const priority = habitat_prioriy[0];
+
+    if (priority === 0) {
+      return 'Conditional priority';
+    }
+    if (priority === null) {
+      return 'Without priority';
+    }
+    if (priority === 1) {
+      return 'With priority';
+    }
+  }, [habitat_prioriy]);
+
   const pictures = useMemo(
     () => habitat_pictures?.['WebURL'] || [],
     [habitat_pictures],
@@ -99,11 +113,9 @@ const ViewComponent = (props) => {
           <p className="info">
             Habitats Directive Annex I code&nbsp;&nbsp;&nbsp;{code_2000[0]}
           </p>
-          {habitat_prioriy[0] && (
-            <p className="info" style={{ marginTop: '1rem' }}>
-              Priority habitat type
-            </p>
-          )}
+          <p className="info" style={{ marginTop: '1rem' }}>
+            {priorityLabel}
+          </p>
         </div>
         {pictures_length > 0 && (
           <div className={cx('carousel one-slide')}>

package/src/components/manage/Blocks/SiteHabitatsList/Filters/SortBy.jsx

@@ -16,6 +16,7 @@ const View = (props) => {
     { text: 'Name', value: 'scientific_name', key: 'scientific_name' },
     { text: 'Coverage', value: 'coverage_ha', key: 'coverage_ha' },
     { text: 'Sites', value: 'number_sites', key: 'number_sites' },
+    { text: 'Code', value: 'code_2000', key: 'code_2000' },
   ];
 
   return (

package/src/components/manage/Blocks/SiteHabitatsList/Filters/View.jsx

@@ -99,22 +99,8 @@ const View = (props) => {
         if (key !== 'getTitle') {
           newFilters[filter][key] =
             filteredHabitats.filter((habitats) => {
-              return !!habitats.filter((habitat) => {
-                if (
-                  filtersLabels[filter][key] ===
-                  filtersLabels.habitat_prioriy.wp
-                ) {
-                  return habitat[filter] === 1;
-                }
-                if (
-                  filtersLabels[filter][key] ===
-                  filtersLabels.habitat_prioriy.np
-                ) {
-                  return habitat[filter] === null;
-                }
-
-                return habitat[filter] === filtersLabels[filter][key];
-              }).length;
+              return !!habitats.filter((habitat) => habitat[filter] === key)
+                .length;
             }).length || 'none';
         }
       }

package/src/components/manage/Blocks/SiteHabitatsList/View.jsx

@@ -16,6 +16,10 @@ const getCurrentPageLength = (pagination, arr) => {
   return pagination.itemsPerPage;
 };
 
+function getPriorityString(priority) {
+  return filtersLabels.habitat_prioriy[priority] || '';
+}
+
 const View = (props) => {
   const {
     provider_data = {},
@@ -24,7 +28,7 @@ const View = (props) => {
   const dataReady = React.useRef(false);
   const [activeHabitatsGroup, setActiveHabitatsGroup] = React.useState('All');
   const [filters, setFilters] = React.useState({});
-  const [habitats, spetHabitats] = React.useState([]);
+  const [habitats, setHabitats] = React.useState([]);
   const [filteredHabitats, setFilteredHabitats] = React.useState([]);
   const [pagination, setPagination] = React.useState({
     activePage: 1,
@@ -56,36 +60,13 @@ const View = (props) => {
 
     const filteredHabitats = habitats.filter((items, index) => {
       let itemsHaveFilter = true;
-
       Object.keys(activeFilters).forEach((filter) => {
         let habitatHasFilter = false;
-
-        activeFilters[filter].forEach((key) => {
-          if (filter in filtersLabels) {
-            if (
-              filtersLabels[filter][key] === filtersLabels.habitat_prioriy.wp
-            ) {
-              habitatHasFilter = items[0][filter] === 1;
-              return;
-            }
-            if (
-              filtersLabels[filter][key] === filtersLabels.habitat_prioriy.np
-            ) {
-              habitatHasFilter = items[0][filter] === null;
-              return;
-            }
-
-            if (filtersLabels[filter][key] === items[0][filter]) {
-              habitatHasFilter = true;
-              return;
-            }
+        items.forEach((item) => {
+          if (activeFilters[filter].includes(item[filter])) {
+            habitatHasFilter = true;
           }
         });
-
-        if (activeFilters[filter].includes(items[0][filter])) {
-          habitatHasFilter = true;
-        }
-
         if (!habitatHasFilter) {
           itemsHaveFilter = false;
         }
@@ -115,10 +96,16 @@ const View = (props) => {
         if (!newHabitats[habitatsIndex[habitat.code_2000]]) {
           newHabitats[habitatsIndex[habitat.code_2000]] = [];
         }
-        newHabitats[habitatsIndex[habitat.code_2000]].push(habitat);
+        newHabitats[habitatsIndex[habitat.code_2000]].push({
+          ...habitat,
+          habitat_prioriy:
+            habitat.habitat_prioriy !== null
+              ? habitat.habitat_prioriy.toString()
+              : '-1',
+        });
       });
     }
-    spetHabitats(getSortedHabitats(newHabitats.filter((habitats) => habitats)));
+    setHabitats(getSortedHabitats(newHabitats.filter((habitats) => habitats)));
     /* eslint-disable-next-line */
   }, [JSON.stringify(provider_data)]);
 
@@ -161,6 +148,7 @@ const View = (props) => {
                 k + (pagination.activePage - 1) * pagination.itemsPerPage,
             ).map((index) => {
               const habitatsData = filteredHabitats[index][0];
+              const priority = getPriorityString(habitatsData.habitat_prioriy);
 
               return (
                 <Grid
@@ -211,9 +199,7 @@ const View = (props) => {
                             style={{ fontSize: '1.2rem' }}
                             key={`habitat-${index}-${habitat.code_2000}`}
                           >
-                            {habitat.habitat_prioriy
-                              ? `Priority habitat type; `
-                              : ''}
+                            {priority ? `${priority}; ` : ''}
                             Cover: {habitat.coverage_ha.toFixed(2)} ha (
                             {(habitat.coverage_ha / 100).toFixed(2)} km²)
                             {habitat.caves > 0

package/src/components/manage/Blocks/SiteHabitatsList/style.less

@@ -14,7 +14,9 @@ div#view .site-habitats-list .habitats-list .ui.container > * {
       justify-content: space-between;
 
       .active-filters {
+        display: flex;
         margin-top: 0;
+        gap: 0.5rem;
 
         .ui.label.active-filter {
           display: inline-flex;
@@ -22,6 +24,7 @@ div#view .site-habitats-list .habitats-list .ui.container > * {
           align-items: center;
           border: 1px solid #c5c5c5;
           border-radius: 18px;
+          background-color: #fff;
           color: #000;
           font-weight: 400;
 

package/src/components/manage/Blocks/SiteHabitatsList/utils.js

@@ -1,7 +1,8 @@
 export const filtersLabels = {
   habitat_prioriy: {
-    wp: 'With priority',
-    np: 'Without priority',
+    1: 'With priority',
+    0: 'Conditional priority',
+    '-1': 'Without priority',
     getTitle: () => 'Habitat priority',
   },
 };

package/src/components/manage/Blocks/SiteSpeciesList/style.less

@@ -14,7 +14,9 @@ div#view .site-species-list .species-list .ui.container > * {
       justify-content: space-between;
 
       .active-filters {
+        display: flex;
         margin-top: 0;
+        gap: 0.5rem;
 
         .ui.label.active-filter {
           display: inline-flex;
@@ -22,6 +24,7 @@ div#view .site-species-list .species-list .ui.container > * {
           align-items: center;
           border: 1px solid #c5c5c5;
           border-radius: 18px;
+          background-color: #fff;
           color: #000;
           font-weight: 400;