@eeacms/volto-arcgis-block 0.1.353 → 0.1.355

package/CHANGELOG.md

@@ -4,6 +4,10 @@ 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.355](https://github.com/eea/volto-arcgis-block/compare/0.1.354...0.1.355) - 5 May 2025
+
+### [0.1.354](https://github.com/eea/volto-arcgis-block/compare/0.1.353...0.1.354) - 24 April 2025
+
 ### [0.1.353](https://github.com/eea/volto-arcgis-block/compare/0.1.352...0.1.353) - 15 April 2025
 
 #### :hammer_and_wrench: Others
@@ -193,6 +197,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
+- chore: [JENKINSFILE] remove unused code [valentinab25 - [`c62af37`](https://github.com/eea/volto-arcgis-block/commit/c62af37e5c81f7b6b1d204de8a724499d00420d9)]
 
 #### :house: Documentation changes
 
@@ -511,10 +516,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - CLMS-2916 (bug): Map Viewer / Products and Datasets tab / Layer - The information icon links to localhost in demo environment [Unai Bolivar - [`eda000a`](https://github.com/eea/volto-arcgis-block/commit/eda000a72278ab073033e520b868ded75dcc2904)]
+- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`8a0855d`](https://github.com/eea/volto-arcgis-block/commit/8a0855dfe47ec58a596ae0ec360ba8f8d075e991)]
+- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`3cfe9be`](https://github.com/eea/volto-arcgis-block/commit/3cfe9be4c6d4ace0ef83b452ebdd5b06025123aa)]
 ### [0.1.245](https://github.com/eea/volto-arcgis-block/compare/0.1.244...0.1.245) - 4 January 2024
 
 #### :hammer_and_wrench: Others
 
+- test: [JENKINS] fix jest config, fail with logs on coverage [valentinab25 - [`a93b081`](https://github.com/eea/volto-arcgis-block/commit/a93b0819eaa765c92bc25cf195f7a43fcd1dddbd)]
 ### [0.1.244](https://github.com/eea/volto-arcgis-block/compare/0.1.243...0.1.244) - 19 December 2023
 
 ### [0.1.243](https://github.com/eea/volto-arcgis-block/compare/0.1.242...0.1.243) - 15 December 2023
@@ -554,6 +562,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
+- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`f45d4bf`](https://github.com/eea/volto-arcgis-block/commit/f45d4bf42061d13d9c18554bef692cb40b3a6fb7)]
 ### [0.1.235](https://github.com/eea/volto-arcgis-block/compare/0.1.234...0.1.235) - 16 November 2023
 
 ### [0.1.234](https://github.com/eea/volto-arcgis-block/compare/0.1.233...0.1.234) - 15 November 2023
@@ -1627,10 +1636,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Merge pull request #148 from eea/develop [KCarpinteroBM - [`24266fb`](https://github.com/eea/volto-arcgis-block/commit/24266fb3a0c1662d22ae0529dc1d5a25c711cf97)]
+- Revert "[JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`f751f69`](https://github.com/eea/volto-arcgis-block/commit/f751f69f652f0340ae55af6a4dab89d6bdc80906)]
 - Revert "Revert "Mapviewer menu and map viewer options persistence"" [Mikel Larreategi - [`ad6e440`](https://github.com/eea/volto-arcgis-block/commit/ad6e440cdc160cffb1e86e1b26e501dbe648476c)]
 - Revert "code coverage removal" [Mikel Larreategi - [`376f2d1`](https://github.com/eea/volto-arcgis-block/commit/376f2d1cd6e4e5110b3b63d5114af1bcfebe094b)]
 - Revert "Update cypress.json" [Mikel Larreategi - [`43d01a0`](https://github.com/eea/volto-arcgis-block/commit/43d01a0a95a58ef5215c6cbf18223ca30a11b9cc)]
 - Revert "Update cypress.json" [Mikel Larreategi - [`054c4ae`](https://github.com/eea/volto-arcgis-block/commit/054c4ae1767e1f26e6ec7e96a0e26a9711f29f04)]
+- Revert "revert [JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967" [Mikel Larreategi - [`64ab56e`](https://github.com/eea/volto-arcgis-block/commit/64ab56e0f1f8dddc26f26039509a028e34653e64)]
+- revert [JENKINS] Use eeacms/plone-backend and Volto alpha version- Refs #151967 [Mikel Larreategi - [`85ee194`](https://github.com/eea/volto-arcgis-block/commit/85ee1941e029df2b7dc910bf75231c75ffeca8c2)]
 - Update cypress.json [KCarpinteroBM - [`be285ff`](https://github.com/eea/volto-arcgis-block/commit/be285fff0c53e06a0180d5318cce81195eabcf80)]
 - Update cypress.json [KCarpinteroBM - [`a7f2118`](https://github.com/eea/volto-arcgis-block/commit/a7f2118acb7b048b4cef85aa9663c2244a1c9ca0)]
 - linting fix [KCarpinteroBM - [`27e969a`](https://github.com/eea/volto-arcgis-block/commit/27e969a7a411fd4646e0e742ce846efc0d79703e)]
@@ -1690,6 +1702,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - UX improvements [rodriama - [`151dc4b`](https://github.com/eea/volto-arcgis-block/commit/151dc4b02d0a73fdd66de9d594620ac0fa5f1dbf)]
 - deleted failing tests [KCarpinteroBM - [`ddaa9e6`](https://github.com/eea/volto-arcgis-block/commit/ddaa9e6f06db6960a4c214d3be2420c48b26715d)]
 - cleaning unnecessary files [KCarpinteroBM - [`2c02199`](https://github.com/eea/volto-arcgis-block/commit/2c021990912beb02b603a1de89aecd62e0063769)]
+- Reverting to Automated release 0.1.39 [KCarpinteroBM - [`fb9f317`](https://github.com/eea/volto-arcgis-block/commit/fb9f3176ccdea18fceb329eaac13ced0566ee648)]
 - commands added [KCarpinteroBM - [`049e60b`](https://github.com/eea/volto-arcgis-block/commit/049e60b7d124d1c05abd0b2775b510795f4ed59f)]
 - Mapviewer testing implementation [KCarpinteroBM - [`0103002`](https://github.com/eea/volto-arcgis-block/commit/0103002869eea108e16e3b5ff2e77a725dcc7c4b)]
 ### [0.1.39](https://github.com/eea/volto-arcgis-block/compare/0.1.38...0.1.39) - 24 March 2022
@@ -1709,6 +1722,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - ESLint fix [rodriama - [`75dae9b`](https://github.com/eea/volto-arcgis-block/commit/75dae9b5bba18ab6d9624f6c99714b4bd2179003)]
 - Remove section title [rodriama - [`ece860e`](https://github.com/eea/volto-arcgis-block/commit/ece860eae3519c7e611abac16e8d53c9a9408b34)]
 - Es-Lint [manuelmartinezbilbomatica - [`39d8d11`](https://github.com/eea/volto-arcgis-block/commit/39d8d11b9096fd603df8510c119d2e12817415d6)]
+- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`bf9f683`](https://github.com/eea/volto-arcgis-block/commit/bf9f683dd35a9edb4cfd9111affcb8f8edbeae89)]
 - FEAT: Parser Time implemented [manuelmartinezbilbomatica - [`689c99e`](https://github.com/eea/volto-arcgis-block/commit/689c99e55221fee6c7c7fafc4ab95ae7a646d3dd)]
 ### [0.1.38](https://github.com/eea/volto-arcgis-block/compare/0.1.37...0.1.38) - 18 March 2022
 
@@ -1803,6 +1817,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - ESLint fix [rodriama - [`5fd3772`](https://github.com/eea/volto-arcgis-block/commit/5fd3772f197a3a380067962a5638dbf901a4624e)]
 - Pixel info [rodriama - [`1ccef39`](https://github.com/eea/volto-arcgis-block/commit/1ccef39a9adcc3ee94655c77a5a166b613600a08)]
 - NUTS bug fix [rodriama - [`37fe7f3`](https://github.com/eea/volto-arcgis-block/commit/37fe7f3fad2c005e3b7c234b3b0564d5df92fa8c)]
+- Add Sonarqube tag using freshwater-frontend addons list [EEA Jenkins - [`ea5af8b`](https://github.com/eea/volto-arcgis-block/commit/ea5af8b02a5f2ee25b9b0be67cf3792bbbe84ed7)]
 ### [0.1.23](https://github.com/eea/volto-arcgis-block/compare/0.1.22...0.1.23) - 17 December 2021
 
 #### :hammer_and_wrench: Others
@@ -2047,6 +2062,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Trying to delay ArcGIS modules load [gonzalezsd - [`ff16985`](https://github.com/eea/volto-arcgis-block/commit/ff169858e42d30bfcacc423ffc27762bb9ef05a4)]
 - Run bootstrap to fix files [valentinab25 - [`236893f`](https://github.com/eea/volto-arcgis-block/commit/236893f03314eb638b7667f81b1f91491a98ee17)]
 - fix git_name [valentinab25 - [`c7806c3`](https://github.com/eea/volto-arcgis-block/commit/c7806c312964425dc23e5d4c6973de8b81ddaeac)]
+- Add Sonarqube tag using frontend addons list [EEA Jenkins - [`e3afb51`](https://github.com/eea/volto-arcgis-block/commit/e3afb515dda459ee03e2b5d4b56465d2d4ad1503)]
 - Trying to change imports [gonzalezsd - [`d83d7e2`](https://github.com/eea/volto-arcgis-block/commit/d83d7e2f68da4b2a284735847f93c0763a7e13b6)]
 - default design [bipoza - [`88fbe0b`](https://github.com/eea/volto-arcgis-block/commit/88fbe0b2bc73e732e2993324a567f53902e85506)]
 - cleanup of unused code [bipoza - [`b167677`](https://github.com/eea/volto-arcgis-block/commit/b1676771f637f056cad50cb0bc186f2ea79e8517)]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-arcgis-block",
-  "version": "0.1.353",
+  "version": "0.1.355",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",

package/src/components/MapViewer/MapViewer.jsx

@@ -77,6 +77,7 @@ class MapViewer extends React.Component {
     this.uploadFileErrorHandler = this.uploadFileErrorHandler.bind(this);
     this.uploadUrlServiceHandler = this.uploadUrlServiceHandler.bind(this);
     this.getTaxonomy = this.props.getTaxonomy.bind(this);
+    this.tax = null;
   }
 
   mapLayersHandler(newLayers) {
@@ -232,6 +233,7 @@ class MapViewer extends React.Component {
   async componentDidMount() {
     loadCss();
     await this.loader();
+    this.tax = await this.getTaxonomy('collective.taxonomy.family');
     this.positronCompositeBasemap = new Basemap({
       title: 'Positron composite',
       thumbnailUrl: this.cfgUrls.positronCompositeThumbnail,
@@ -650,6 +652,7 @@ export const CheckUserID = ({ reference }) => {
             uploadFileErrorHandler={reference.uploadFileErrorHandler}
             userID={user_id}
             getTaxonomy={reference.getTaxonomy}
+            tax={reference.tax}
           />
         </>
       )}

package/src/components/MapViewer/MenuWidget.jsx

@@ -502,6 +502,7 @@ class MenuWidget extends React.Component {
 
     this.activeLayersHandler = this.props.activeLayersHandler;
     this.getTaxonomy = this.props.getTaxonomy;
+    this.tax = this.props.tax;
   }
 
   loader() {
@@ -1251,6 +1252,7 @@ class MenuWidget extends React.Component {
   metodProcessProduct(product, prodIndex, inheritedIndex) {
     var dataset_def = [];
     var datasets = [];
+    var families = [];
     var index = 0;
     var inheritedIndexProduct = inheritedIndex + '_' + prodIndex;
     var checkProduct = 'map_product_' + inheritedIndexProduct;
@@ -1260,33 +1262,62 @@ class MenuWidget extends React.Component {
         : product.ProductDescription;
 
     if (product.Datasets && Array.isArray(product.Datasets)) {
-      for (var i in product.Datasets) {
-        if (this.filtersApplied) {
-          dataset_def = document
-            .querySelector('#' + checkProduct)
-            ?.getAttribute('defcheck');
-        } else if (
-          product.Datasets[i] &&
-          product.Datasets[i].Default_active === true
-        ) {
-          var idDataset = 'map_dataset_' + inheritedIndexProduct + '_' + index;
-          dataset_def.push(idDataset);
+      let familiesMap = new Map();
+      familiesMap['noFamily'] = [];
+      for (let index = 0; index < product.Datasets.length; index++) {
+        if (familiesMap[product.Datasets[index].FamilyTitle]) {
+          familiesMap[product.Datasets[index].FamilyTitle].push(
+            product.Datasets[index],
+          );
+        } else if (product.Datasets[index].FamilyTitle) {
+          familiesMap[product.Datasets[index].FamilyTitle] = [
+            product.Datasets[index],
+          ];
+        } else {
+          familiesMap['noFamily'].push(product.Datasets[index]);
         }
+      }
+      for (var j in familiesMap) {
+        if (j === 'noFamily') {
+          for (var i in familiesMap[j]) {
+            if (this.filtersApplied) {
+              dataset_def = document
+                .querySelector('#' + checkProduct)
+                ?.getAttribute('defcheck');
+            } else if (
+              product.Datasets[i] &&
+              product.Datasets[i].Default_active === true
+            ) {
+              var idDataset =
+                'map_dataset_' + inheritedIndexProduct + '_' + index;
+              dataset_def.push(idDataset);
+            }
 
-        // CLMS-1545
-        // if (!product.Datasets[i].MarkAsDownloadableNoServiceToVisualize) {
-        if (product.Datasets[i]) {
-          datasets.push(
-            this.metodProcessDataset(
-              product.Datasets[i],
-              index,
+            // CLMS-1545
+            // if (!product.Datasets[i].MarkAsDownloadableNoServiceToVisualize) {
+            if (product.Datasets[i]) {
+              datasets.push(
+                this.metodProcessDataset(
+                  product.Datasets[i],
+                  index,
+                  inheritedIndexProduct,
+                  checkProduct,
+                ),
+              );
+              index++;
+            }
+            // }
+          }
+        } else {
+          families.push(
+            this.metodProcessFamily(
+              familiesMap[j],
+              j,
               inheritedIndexProduct,
               checkProduct,
             ),
           );
-          index++;
         }
-        // }
       }
     }
 
@@ -1361,6 +1392,131 @@ class MenuWidget extends React.Component {
           <div
             className="ccl-form map-menu-products-container"
             id={'datasets_container_' + inheritedIndexProduct}
+          >
+            {families}
+            {datasets}
+          </div>
+        </fieldset>
+      </div>
+    );
+  }
+
+  metodProcessFamily(family, familyTitle, inheritedIndex, checkProduct) {
+    var dataset_def = [];
+    var datasets = [];
+    var index = 0;
+    var familyId = familyTitle.replace(/\s+/g, '');
+    var inheritedIndexProduct = inheritedIndex + '_' + familyId;
+    checkProduct = 'map_product_' + inheritedIndexProduct;
+    var familyTitleName = '';
+    this.tax.tree.forEach((element) => {
+      element.children.forEach((element) => {
+        if (element.key === familyTitle) {
+          familyTitleName = element.title;
+        }
+      });
+    });
+    if (family && Array.isArray(family)) {
+      for (var i in family) {
+        // if (this.filtersApplied) {
+        //   dataset_def = document
+        //     .querySelector('#' + checkProduct)
+        //     ?.getAttribute('defcheck');
+        // } else if (
+        //   product.Datasets[i] &&
+        //   product.Datasets[i].Default_active === true
+        // ) {
+        //   var idDataset = 'map_dataset_' + inheritedIndexProduct + '_' + index;
+        //   dataset_def.push(idDataset);
+        // }
+
+        // CLMS-1545
+        // if (!product.Datasets[i].MarkAsDownloadableNoServiceToVisualize) {
+        if (family[i]) {
+          datasets.push(
+            this.metodProcessDataset(
+              family[i],
+              index,
+              inheritedIndexProduct,
+              checkProduct,
+            ),
+          );
+          index++;
+        }
+        // }
+      }
+    }
+
+    // Empty vector, add the first dataset
+    if (!dataset_def.length) {
+      var idDatasetB = 'map_dataset_' + inheritedIndexProduct + '_0';
+      dataset_def.push(idDatasetB);
+    }
+    let style = this.props.download ? { display: 'none' } : {};
+
+    return (
+      <div
+        className="map-menu-family-dropdown"
+        id={'product_' + inheritedIndexProduct}
+        productid={familyId}
+        key={'a' + familyId}
+      >
+        <fieldset className="ccl-fieldset" key={'b' + familyId}>
+          <div
+            id={'dropdown_' + inheritedIndexProduct}
+            className="ccl-expandable__button"
+            aria-expanded="false"
+            key={'c' + familyId}
+            onClick={this.toggleDropdownContent.bind(this)}
+            onKeyDown={this.toggleDropdownContent.bind(this)}
+            tabIndex="0"
+            role="button"
+            style={style}
+          >
+            <div className="dropdown-icon">
+              <FontAwesomeIcon icon={['fas', 'caret-right']} />
+            </div>
+            <div className="ccl-form map-product-checkbox" key={'d' + familyId}>
+              <div className="ccl-form-group" key={'e' + familyId}>
+                <input
+                  type="checkbox"
+                  id={checkProduct}
+                  name=""
+                  value="name"
+                  className="ccl-checkbox ccl-required ccl-form-check-input"
+                  key={'h' + familyId}
+                  defcheck={dataset_def}
+                  onChange={(e) =>
+                    this.toggleProduct(e.target.checked, checkProduct, e)
+                  }
+                ></input>
+                <label
+                  className="ccl-form-check-label"
+                  htmlFor={checkProduct}
+                  key={'f' + familyId}
+                >
+                  <legend className="ccl-form-legend">
+                    {
+                      /* {description ? (
+                      <Popup
+                        trigger={<span>{familyTitle}</span>}
+                        content={description}
+                        basic
+                        className="custom"
+                        style={{ transform: 'translateX(-4rem)' }}
+                      />
+                    ) : (*/
+                      <span>{familyTitleName}</span>
+                      /*)} */
+                    }
+                  </legend>
+                </label>
+              </div>
+            </div>
+          </div>
+          <div
+            className="ccl-form map-menu-family-container"
+            id={'family_container_' + inheritedIndexProduct}
           >
             {datasets}
           </div>
@@ -1532,7 +1688,11 @@ class MenuWidget extends React.Component {
 
     return (
       <div
-        className="map-menu-dataset-dropdown"
+        className={
+          dataset.FamilyTitle
+            ? 'map-menu-family-dataset-dropdown'
+            : 'map-menu-dataset-dropdown'
+        }
         id={'dataset_' + inheritedIndexDataset}
         datasetid={dataset.DatasetId}
         key={'a' + datIndex}
@@ -2119,7 +2279,7 @@ class MenuWidget extends React.Component {
       const checkboxId = LayerId;
 
       return (
-        <div className="map-menu-dataset-dropdown">
+        <div className="map-menu-dataset-dropdown" id={'my-service-' + LayerId}>
           <fieldset className="ccl-fieldset">
             <div className="ccl-expandable__button" aria-expanded="false">
               <div className="dropdown-icon">
@@ -5070,74 +5230,80 @@ class MenuWidget extends React.Component {
           let datasetElem = document.querySelector(
             '[datasetid="' + dataset.DatasetId + '"]',
           );
-          for (let l = 0; l < Object.keys(this.activeLayersJSON).length; l++) {
-            if (
-              dataset.DatasetTitle ===
-              this.layers[Object.keys(this.activeLayersJSON)[l]].DatasetTitle
+          if (datasetElem) {
+            for (
+              let l = 0;
+              l < Object.keys(this.activeLayersJSON).length;
+              l++
             ) {
-              componentChecked = true;
-              productChecked = true;
-              datasetChecked = true;
-            }
-          }
-          if (
-            searchText === '' &&
-            componentFilter === 'default' &&
-            productFilter === 'default' &&
-            (familyFilter === 'default' || familyFilter === '')
-          ) {
-            this.filtersApplied = false;
-            componentFound = true;
-            productFound = true;
-            result = true;
-            componentElem
-              .querySelector('.ccl-expandable__button')
-              .setAttribute('aria-expanded', 'false');
-            productElem
-              .querySelector('.ccl-expandable__button')
-              .setAttribute('aria-expanded', 'false');
-            datasetElem.removeAttribute('style');
-            productElem.removeAttribute('style');
-            componentElem.removeAttribute('style');
-            if (!defaultActive) {
-              defaultActive = 'map_' + datasetElem.id;
-            }
-            if (dataset.Default_active) {
-              defaultActive = 'map_' + datasetElem.id;
-            }
-          } else if (
-            datasetChecked ||
-            (dataset?.DatasetTitle?.toUpperCase().includes(searchText) &&
-              (product.ProductId === productFilter ||
-                productFilter === 'default') &&
-              (this.compCfg[index].ComponentPosition.toString() ===
-                componentFilter ||
-                componentFilter === 'default') &&
-              (dataset?.FamilyTitle === familyFilter ||
-                familyFilter === 'default' ||
-                familyFilter === ''))
-          ) {
-            this.filtersApplied = true;
-            componentFound = true;
-            productFound = true;
-            result = true;
-            componentElem
-              .querySelector('.ccl-expandable__button')
-              .setAttribute('aria-expanded', 'true');
-            productElem
-              .querySelector('.ccl-expandable__button')
-              .setAttribute('aria-expanded', 'true');
-            datasetElem.removeAttribute('style');
-            productElem.removeAttribute('style');
-            componentElem.removeAttribute('style');
-            if (!defaultActive) {
-              defaultActive = 'map_' + datasetElem.id;
+              if (
+                dataset.DatasetTitle ===
+                this.layers[Object.keys(this.activeLayersJSON)[l]].DatasetTitle
+              ) {
+                componentChecked = true;
+                productChecked = true;
+                datasetChecked = true;
+              }
             }
-            if (dataset.Default_active) {
-              defaultActive = 'map_' + datasetElem.id;
+            if (
+              searchText === '' &&
+              componentFilter === 'default' &&
+              productFilter === 'default' &&
+              (familyFilter === 'default' || familyFilter === '')
+            ) {
+              this.filtersApplied = false;
+              componentFound = true;
+              productFound = true;
+              result = true;
+              componentElem
+                .querySelector('.ccl-expandable__button')
+                .setAttribute('aria-expanded', 'false');
+              productElem
+                .querySelector('.ccl-expandable__button')
+                .setAttribute('aria-expanded', 'false');
+              datasetElem.removeAttribute('style');
+              productElem.removeAttribute('style');
+              componentElem.removeAttribute('style');
+              if (!defaultActive) {
+                defaultActive = 'map_' + datasetElem.id;
+              }
+              if (dataset.Default_active) {
+                defaultActive = 'map_' + datasetElem.id;
+              }
+            } else if (
+              datasetChecked ||
+              (dataset?.DatasetTitle?.toUpperCase().includes(searchText) &&
+                (product.ProductId === productFilter ||
+                  productFilter === 'default') &&
+                (this.compCfg[index].ComponentPosition.toString() ===
+                  componentFilter ||
+                  componentFilter === 'default') &&
+                (dataset?.FamilyTitle === familyFilter ||
+                  familyFilter === 'default' ||
+                  familyFilter === ''))
+            ) {
+              this.filtersApplied = true;
+              componentFound = true;
+              productFound = true;
+              result = true;
+              componentElem
+                .querySelector('.ccl-expandable__button')
+                .setAttribute('aria-expanded', 'true');
+              productElem
+                .querySelector('.ccl-expandable__button')
+                .setAttribute('aria-expanded', 'true');
+              datasetElem.removeAttribute('style');
+              productElem.removeAttribute('style');
+              componentElem.removeAttribute('style');
+              if (!defaultActive) {
+                defaultActive = 'map_' + datasetElem.id;
+              }
+              if (dataset.Default_active) {
+                defaultActive = 'map_' + datasetElem.id;
+              }
+            } else {
+              datasetElem.setAttribute('style', 'display: none;');
             }
-          } else {
-            datasetElem.setAttribute('style', 'display: none;');
           }
         }
         productCheckbox.setAttribute('defcheck', defaultActive);
@@ -5159,6 +5325,31 @@ class MenuWidget extends React.Component {
         componentElem.setAttribute('style', 'display: none;');
       }
     }
+    let myServiceResult = false;
+    this.state.wmsUserServiceLayers.forEach((element) => {
+      let node = document.getElementById('my-service-' + element.LayerId);
+      let checkbox = document.getElementById(element.LayerId);
+      if (
+        element?.LayerId?.toUpperCase().includes(searchText) ||
+        checkbox.checked
+      ) {
+        node.removeAttribute('style');
+        result = true;
+        myServiceResult = true;
+      } else {
+        node.setAttribute('style', 'display: none;');
+      }
+    });
+    let dropdowns = document.querySelectorAll('.map-menu-dropdown');
+    let i = dropdowns.length === 0 ? 0 : dropdowns.length - 1;
+    let componentId = `component_${i}`;
+    if (!myServiceResult) {
+      document
+        .getElementById(componentId)
+        .setAttribute('style', 'display: none;');
+    } else {
+      document.getElementById(componentId).removeAttribute('style');
+    }
     if (result) {
       document.querySelector('.no-filter-result-message').style.display =
         'none';

package/src/components/MapViewer/css/ArcgisMap.css

@@ -742,6 +742,14 @@ div.upload-container.esri-component
   margin-bottom: 0.5rem;
 }
 
+.map-menu-family-dataset-dropdown {
+  padding-left: 2rem;
+}
+
+.map-menu-family-dropdown {
+  padding-left: 2rem;
+}
+
 .map-menu-dataset > div:first-of-type {
   display: flex;
   width: 100%;