@eeacms/volto-arcgis-block 0.1.346 → 0.1.348

package/CHANGELOG.md

@@ -4,10 +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.348](https://github.com/eea/volto-arcgis-block/compare/0.1.347...0.1.348) - 3 April 2025
+
+### [0.1.347](https://github.com/eea/volto-arcgis-block/compare/0.1.346...0.1.347) - 2 April 2025
+
+#### :hammer_and_wrench: Others
+
+- Merge pull request #923 from eea/develop [Unai Bolivar - [`8073c9e`](https://github.com/eea/volto-arcgis-block/commit/8073c9efeb07111d95eb0abdfc55738339590cbc)]
+- CLMS-282464 (feat): package.json second modify [Urkorue - [`1677d0a`](https://github.com/eea/volto-arcgis-block/commit/1677d0ac1577f04578258c4158acb5d2de9bb071)]
+- CLMS-282464 (feat): package.json modified [Urkorue - [`02fcba4`](https://github.com/eea/volto-arcgis-block/commit/02fcba4787d9cd838cb62acaf37802cf17e92569)]
+- CLMS-282464 (feat): Family filter added [Urkorue - [`61268f3`](https://github.com/eea/volto-arcgis-block/commit/61268f3bb623260a559401f428f2dff913c84515)]
 ### [0.1.346](https://github.com/eea/volto-arcgis-block/compare/0.1.345...0.1.346) - 1 April 2025
 
 #### :hammer_and_wrench: Others
 
+- Merge pull request #919 from eea/develop [Unai Bolivar - [`b16a335`](https://github.com/eea/volto-arcgis-block/commit/b16a335748297d68b1df1e9e9159f62e28b7defd)]
 - CLMS-286065 (bug): Pan cursor no longer pushes other widget buttons down when loading in view [Unai Bolivar - [`98bb42b`](https://github.com/eea/volto-arcgis-block/commit/98bb42bcf2ef04fae4b2821c2b7290e911c84478)]
 - CLMS-286065 (bug): Fixed bug where deleting a user service does not uncheck the rest of the user services [Unai Bolivar - [`300be08`](https://github.com/eea/volto-arcgis-block/commit/300be0808a3c81ee21581ae64080b1533ac9b784)]
 - CLMS-286081 (bug): Fixed persistence for user services of logged user. [Unai Bolivar - [`43dacf7`](https://github.com/eea/volto-arcgis-block/commit/43dacf79aefaf6925f9cdfdaedacb7fcae9fab63)]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.346",
+  "version": "0.1.348",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",
@@ -16,7 +16,8 @@
     "url": "git@github.com:eea/volto-arcgis-block.git"
   },
   "addons": [
-    "@eeacms/volto-clms-utils"
+    "@eeacms/volto-clms-utils",
+    "@eeacms/volto-taxonomy"
   ],
   "lint-staged": {
     "src/**/*.{js,jsx,ts,tsx,json}": [
@@ -65,7 +66,8 @@
     "esri-loader": "3.4.0",
     "highcharts": "^9.3.2",
     "highcharts-react-official": "^3.1.0",
-    "react-datepicker": "4.15.0"
+    "react-datepicker": "4.15.0",
+    "@eeacms/volto-taxonomy": "5.1.0"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.9.5",

package/src/components/MapViewer/MapViewer.jsx

@@ -23,7 +23,7 @@ import BookmarkWidget from './BookmarkWidget';
 import LoadingSpinner from './LoadingSpinner';
 import UploadWidget from './UploadWidget';
 import { injectLazyLibs } from '@plone/volto/helpers/Loadable';
-//import { getTaxonomy } from '@eeacms/volto-taxonomy/actions';
+import { getTaxonomy } from '@eeacms/volto-taxonomy/actions';
 
 //import "isomorphic-fetch";  <-- Necessary to use fetch?
 var Map, MapView, Zoom, intl, Basemap, WebTileLayer, Extent;
@@ -76,7 +76,7 @@ class MapViewer extends React.Component {
     this.uploadFileHandler = this.uploadFileHandler.bind(this);
     this.uploadFileErrorHandler = this.uploadFileErrorHandler.bind(this);
     this.uploadUrlServiceHandler = this.uploadUrlServiceHandler.bind(this);
-    //this.getTaxonomy = this.props.getTaxonomy.bind(this);
+    this.getTaxonomy = this.props.getTaxonomy.bind(this);
   }
 
   mapLayersHandler(newLayers) {
@@ -649,17 +649,18 @@ export const CheckUserID = ({ reference }) => {
             onServiceChange={reference.serviceChangeHandler}
             uploadFileErrorHandler={reference.uploadFileErrorHandler}
             userID={user_id}
+            getTaxonomy={reference.getTaxonomy}
           />
         </>
       )}
     </>
   );
 };
-// const mapDispatchToProps = (dispatch) => {
-//   return {
-//     getTaxonomy: (name) => dispatch(getTaxonomy(name)),
-//   };
-// };
+const mapDispatchToProps = (dispatch) => {
+  return {
+    getTaxonomy: (name) => dispatch(getTaxonomy(name)),
+  };
+};
 
 export default compose(
   connect(
@@ -668,6 +669,6 @@ export default compose(
     }),
     { MapViewerConfig },
   ),
-  //connect(null, mapDispatchToProps),
+  connect(null, mapDispatchToProps),
   injectLazyLibs('highcharts'),
 )(MapViewer, MenuWidget);

package/src/components/MapViewer/MenuWidget.jsx

@@ -501,7 +501,7 @@ class MenuWidget extends React.Component {
     });
 
     this.activeLayersHandler = this.props.activeLayersHandler;
-    //this.getTaxonomy = this.props.getTaxonomy;
+    this.getTaxonomy = this.props.getTaxonomy;
   }
 
   loader() {
@@ -4729,39 +4729,39 @@ class MenuWidget extends React.Component {
     }
   }
   async loadFamilyFilters() {
-    // var selectedFamily = document.getElementById('select-family');
-    // var selectedProduct = document.getElementById('select-product');
-    // this.removeOptions(selectedFamily);
-    //let tax = await this.getTaxonomy('collective.taxonomy.family');
-    //let hasFamily = false;
-    // selectedFamily.options.add(
-    //   new Option('Select a family', 'default', false, false),
-    // );
-    //let text = selectedProduct.selectedOptions[0].text
-    // tax.tree.forEach((element) => {
-    //   if (element.title === selectedProduct.selectedOptions[0].text) {
-    //     //hasFamily = true;
-    //     element.children.forEach((child) => {
-    //       selectedFamily.options.add(
-    //         new Option(child.title, child.key, child.key),
-    //       );
-    //     });
-    //   }
-    // });
-    // let familyFilter = document.querySelector('.menu-family-filter');
-    // if (familyFilter) {
-    //   if (!hasFamily) {
-    //     familyFilter.setAttribute('style','display: none;');
-    //   }else{
-    //     familyFilter.setAttribute('style','display: flex;');
-    //   }
-    // }
+    var selectedFamily = document.getElementById('select-family');
+    var selectedProduct = document.getElementById('select-product');
+    this.removeOptions(selectedFamily);
+    let tax = await this.getTaxonomy('collective.taxonomy.family');
+    let hasFamily = false;
+    selectedFamily.options.add(
+      new Option('Select a sub-group', 'default', false, false),
+    );
+    selectedFamily.options[0].disabled = true;
+    tax.tree.forEach((element) => {
+      if (element.title === selectedProduct.selectedOptions[0].text) {
+        hasFamily = true;
+        element.children.forEach((child) => {
+          selectedFamily.options.add(
+            new Option(child.title, child.key, child.key),
+          );
+        });
+      }
+    });
+    let familyFilter = document.querySelector('.menu-family-filter');
+    if (familyFilter) {
+      if (!hasFamily) {
+        familyFilter.setAttribute('style', 'display: none;');
+      } else {
+        familyFilter.setAttribute('style', 'display: flex;');
+      }
+    }
   }
   async menuSearch() {
     let searchText;
     let componentFilter;
     let productFilter;
-    //let familyFilter;
+    let familyFilter;
     let result = false;
     if (document.querySelector('#menu-searchtext')) {
       searchText = document
@@ -4774,9 +4774,15 @@ class MenuWidget extends React.Component {
     if (document.getElementById('select-product')) {
       productFilter = document.getElementById('select-product').value;
     }
-    // if (document.getElementById('select-family')) {
-    //   familyFilter = document.getElementById('select-family').text;
-    // }
+    if (document.getElementById('select-family')) {
+      familyFilter = document.getElementById('select-family').value;
+    }
+    if (
+      document.querySelector('.menu-family-filter').getAttribute('style') ===
+      'display: none;'
+    ) {
+      familyFilter = 'default';
+    }
     for (let index = 0; index < this.compCfg.length; index++) {
       let componentFound = false;
       let componentChecked = false;
@@ -4809,7 +4815,8 @@ class MenuWidget extends React.Component {
           if (
             searchText === '' &&
             componentFilter === 'default' &&
-            productFilter === 'default'
+            productFilter === 'default' &&
+            familyFilter === 'default'
           ) {
             this.filtersApplied = false;
             componentFound = true;
@@ -4837,7 +4844,9 @@ class MenuWidget extends React.Component {
                 productFilter === 'default') &&
               (this.compCfg[index].ComponentPosition.toString() ===
                 componentFilter ||
-                componentFilter === 'default'))
+                componentFilter === 'default') &&
+              (dataset?.FamilyTitle === familyFilter ||
+                familyFilter === 'default'))
           ) {
             this.filtersApplied = true;
             componentFound = true;
@@ -5166,10 +5175,14 @@ class MenuWidget extends React.Component {
                       ></select>
                     </span>
                     <span className="menu-filter menu-family-filter">
-                      Family
+                      Product sub-group
                       <select
                         id="select-family"
                         class="esri-select filter-select"
+                        onBlur={() => {}}
+                        onChange={() => {
+                          this.menuSearch();
+                        }}
                       ></select>
                     </span>
                   </div>