Merge pull request #39 from eea/develop

Release

CHANGELOG.md

@@ -4,7 +4,21 @@ 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).
 
-### [0.1.30](https://github.com/eea/volto-forest-policy/compare/0.1.29...0.1.30) - 15 February 2024
+### [0.1.31](https://github.com/eea/volto-forest-policy/compare/0.1.30...0.1.31) - 24 October 2024
+
+#### :bug: Bug Fixes
+
+- fix: pin @eeacms/volto-searchlib [kreafox - [`097500b`](https://github.com/eea/volto-forest-policy/commit/097500b4ebe1a73d3b005da15e05b098a6ab5471)]
+- fix: add @elastic/react-search-ui [kreafox - [`9ebab34`](https://github.com/eea/volto-forest-policy/commit/9ebab34e90aaacbe75406f6e928bb4f6969d54c4)]
+- fix: add @elastic/react-search-ui-views [kreafox - [`4d01df2`](https://github.com/eea/volto-forest-policy/commit/4d01df2ba5a4ac195f0ddd61fe56a57a72ec7934)]
+- fix: add @elastic/search-ui to resolutions [kreafox - [`f60695c`](https://github.com/eea/volto-forest-policy/commit/f60695c4d5e464ff2f12c6b10a49bfd5e18bae78)]
+- fix: add @elastic/search-ui to dependencies [kreafox - [`1a6fda5`](https://github.com/eea/volto-forest-policy/commit/1a6fda5f49e62f7a824acf6e680193d92780dc32)]
+- fix: handle undefined tableColumns - refs #278548 [kreafox - [`f40f75c`](https://github.com/eea/volto-forest-policy/commit/f40f75c759ce6bcae4fc8f320430551ca3bec4d2)]
+
+#### :hammer_and_wrench: Others
+
+- Pin dependencies for volto 16 [kreafox - [`4c41dcf`](https://github.com/eea/volto-forest-policy/commit/4c41dcf2227fc3e2538a9516e3e97d65bc7540d4)]
+### [0.1.30](https://github.com/eea/volto-forest-policy/compare/0.1.29...0.1.30) - 19 February 2024
 
 #### :house: Internal changes
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-forest-policy",
-  "version": "0.1.30",
+  "version": "0.1.31",
   "description": "@eeacms/volto-forest-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -16,9 +16,6 @@
     "type": "git",
     "url": "git@github.com:eea/volto-forest-policy.git"
   },
-  "resolutions": {
-    "d3-array": "^2.12.1"
-  },
   "addons": [
     "@eeacms/volto-eea-map",
     "@eeacms/volto-plotlycharts",
@@ -32,16 +29,19 @@
     "@eeacms/volto-searchlib"
   ],
   "dependencies": {
-    "@eeacms/volto-datablocks": "*",
-    "@eeacms/volto-eea-design-system": "*",
-    "@eeacms/volto-eea-map": "*",
-    "@eeacms/volto-eea-website-theme": "*",
-    "@eeacms/volto-embed": "*",
-    "@eeacms/volto-globalsearch": "*",
+    "@eeacms/volto-datablocks": "^6.3.0",
+    "@eeacms/volto-eea-design-system": "^1.22.4",
+    "@eeacms/volto-eea-map": "^3.2.1",
+    "@eeacms/volto-eea-website-theme": "<=1.26.1",
+    "@eeacms/volto-embed": "^9.0.5",
+    "@eeacms/volto-globalsearch": "^1.0.22",
     "@eeacms/volto-matomo": "*",
     "@eeacms/volto-openlayers-map": "0.1.4",
-    "@eeacms/volto-plotlycharts": "*",
-    "@eeacms/volto-searchlib": "*",
+    "@eeacms/volto-plotlycharts": "^8.2.0",
+    "@eeacms/volto-searchlib": "2.0.2",
+    "@elastic/react-search-ui": "1.20.2",
+    "@elastic/react-search-ui-views": "1.20.2",
+    "@elastic/search-ui": "1.21.2",
     "@sentry/browser": "7.17.3",
     "d3-array": "^2.12.1",
     "dompurify": "^2.0.12",

src/components/manage/Blocks/SimpleDataTable/templates/expandable/PopupMap.jsx

@@ -92,8 +92,9 @@ const PopupMap = ({ rowData, provider_data, mapData }) => {
   };
 
   if (!provider_data) {
-    return 'Loading..';
+    return 'Loading...';
   }
+
   return (
     <div className="map-container">
       {selectedData.length > 0 ? (

src/components/manage/Blocks/SimpleDataTable/templates/expandable/PopupTable.jsx

@@ -41,7 +41,7 @@ const PopupTable = ({ rowData, providerUrl, provider_data, tableColumns }) => {
   }, [provider_data]);
 
   if (!provider_data) {
-    return 'Loading..';
+    return 'Loading...';
   }
 
   return (
@@ -66,7 +66,7 @@ const PopupTable = ({ rowData, providerUrl, provider_data, tableColumns }) => {
               .map((_, i) => {
                 return (
                   <Table.Row key={i}>
-                    {tableColumns.map((col, j) => (
+                    {tableColumns?.map((col, j) => (
                       <Table.Cell
                         textAlign={getAlignmentOfColumn(col, j)}
                         key={j}