@eeacms/volto-arcgis-block 0.1.434 → 0.1.436

package/CHANGELOG.md

@@ -4,6 +4,19 @@ 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.436](https://github.com/eea/volto-arcgis-block/compare/0.1.435...0.1.436) - 12 March 2026
+
+#### :hammer_and_wrench: Others
+
+- (bug): measurement and area widget in 3D fixes [Unai Bolivar - [`b42a3ee`](https://github.com/eea/volto-arcgis-block/commit/b42a3ee5670678058edbb8cb4ebfe205916f944f)]
+- (bug): enforce space gap between geocoder bar and toc menu in 2D and 3D to same distance [Unai Bolivar - [`0ffc993`](https://github.com/eea/volto-arcgis-block/commit/0ffc993adedda8300d53d90704e96a057da2632f)]
+- (bug): 3D button placement [Unai Bolivar - [`9d94157`](https://github.com/eea/volto-arcgis-block/commit/9d9415730ab8196b9012a6d415a614ff8a8c34c7)]
+### [0.1.435](https://github.com/eea/volto-arcgis-block/compare/0.1.434...0.1.435) - 10 March 2026
+
+#### :hammer_and_wrench: Others
+
+- (bug): Fix Upload widget TOC menu stored services correct loading in 2D and 3D [Unai Bolivar - [`8b9e5fa`](https://github.com/eea/volto-arcgis-block/commit/8b9e5fad5a7d361e8fa4c8f48ae771422ae1c262)]
+- (bug): fix upload widget error report, loading spinner, and TOC menu cleanup in 3D [Unai Bolivar - [`dc2ab0d`](https://github.com/eea/volto-arcgis-block/commit/dc2ab0d5ecafdb1cdc9c417bd8533c7ff0f28446)]
 ### [0.1.434](https://github.com/eea/volto-arcgis-block/compare/0.1.433...0.1.434) - 10 March 2026
 
 #### :hammer_and_wrench: Others
@@ -22,7 +35,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINSFILE] use sonarqube [valentinab25 - [`ec5e822`](https://github.com/eea/volto-arcgis-block/commit/ec5e8229c968e8cb5239e493537e0559435fe67e)]
 
 #### :hammer_and_wrench: Others
 
@@ -38,9 +50,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINSFILE] add package version in sonarqube [valentinab25 - [`78addd9`](https://github.com/eea/volto-arcgis-block/commit/78addd9908a5a16eb8b8c984b6d98fe992af4449)]
-- chore: [JENKINSFILE] add package version in sonarqube [EEA Jenkins - [`3001a9d`](https://github.com/eea/volto-arcgis-block/commit/3001a9d84c1ceb2072d2c8fdf42b75b0fa2a36c7)]
-- chore: [JENKINSFILE] add sonarqube branches Refs #293878 [EEA Jenkins - [`3430596`](https://github.com/eea/volto-arcgis-block/commit/34305966fc548b9213d2a914cdd61fdb4ef3a973)]
 
 ### [0.1.430](https://github.com/eea/volto-arcgis-block/compare/0.1.429...0.1.430) - 19 February 2026
 
@@ -350,7 +359,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :hammer_and_wrench: Others
 
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`fa8e13d`](https://github.com/eea/volto-arcgis-block/commit/fa8e13da184b9a9146cb65aca7a89c05fb0261ba)]
 ### [0.1.372](https://github.com/eea/volto-arcgis-block/compare/0.1.371...0.1.372) - 26 June 2025
 
 #### :hammer_and_wrench: Others
@@ -377,11 +385,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] fix variable, uncomment tests [valentinab25 - [`00d88b5`](https://github.com/eea/volto-arcgis-block/commit/00d88b52265cba983d1d5e21a49c051004b705b5)]
-- chore: [JENKINS] use clms-theme pipeline [valentinab25 - [`52b392c`](https://github.com/eea/volto-arcgis-block/commit/52b392cc993f3767099525ed39249e574ce2b421)]
-- chore: [JENKINS] use volto 16 pipeline [valentinab25 - [`a676671`](https://github.com/eea/volto-arcgis-block/commit/a676671186aa227f4c77a766b9ca852028168b5c)]
-- chore: [JENKINS] fix Dockerfile to use eea frontend-builder [valentinab25 - [`980608c`](https://github.com/eea/volto-arcgis-block/commit/980608cc867ace42896831791a55c535838250ee)]
-- chore: [JENKINS] update Makefile for Jenkins [valentinab25 - [`021267e`](https://github.com/eea/volto-arcgis-block/commit/021267e620d6529327a730f122a39f7fec53b293)]
 
 #### :hammer_and_wrench: Others
 
@@ -426,7 +429,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Merge pull request #945 from eea/CLMS-285178-ISOLATED-SWIPE-WIDGET-FIX [Unai Bolivar - [`617b4c4`](https://github.com/eea/volto-arcgis-block/commit/617b4c43ad4363267c4df34c72e64314ee42afb4)]
 - CLMS-285178 (bug): Separated swipe from other tickets and can push now going [Unai Bolivar - [`84efe24`](https://github.com/eea/volto-arcgis-block/commit/84efe24d964b79f54ddf17f69e389a3f57e3f867)]
 - CLMS-285178 (bug): Separated swipe from other tickets and can push [Unai Bolivar - [`3e94fd6`](https://github.com/eea/volto-arcgis-block/commit/3e94fd6d2f92817d6b0220155a7e8a0ed5d8dfdb)]
-- Add Sonarqube tag using clms-frontend addons list [EEA Jenkins - [`fdd39ce`](https://github.com/eea/volto-arcgis-block/commit/fdd39ce6c0d848b33f3b6d033e4b35e9bd4f2002)]
 ### [0.1.356](https://github.com/eea/volto-arcgis-block/compare/0.1.355...0.1.356) - 6 May 2025
 
 #### :hammer_and_wrench: Others
@@ -625,7 +627,6 @@ 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
 
@@ -944,13 +945,10 @@ 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
@@ -990,7 +988,6 @@ 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
@@ -2064,13 +2061,10 @@ 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)]
@@ -2130,7 +2124,6 @@ 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
@@ -2150,7 +2143,6 @@ 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
 
@@ -2245,7 +2237,6 @@ 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
@@ -2490,7 +2481,6 @@ 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.434",
+  "version": "0.1.436",
   "description": "volto-arcgis-block: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: CodeSyntax",

package/src/components/MapViewer/AreaWidget.jsx

@@ -65,6 +65,9 @@ class AreaWidget extends React.Component {
     this.addFeatureCollectionToMap = this.addFeatureCollectionToMap.bind(this);
     this.checkFeatureCount = this.checkFeatureCount.bind(this);
     this.prepackage = false;
+    this.isComponentMounted = false;
+    this.clickEventHandle = null;
+    this.dragEventContext = null;
   }
 
   loader() {
@@ -1348,6 +1351,7 @@ class AreaWidget extends React.Component {
    * This method is executed after the rener method is executed
    */
   async componentDidMount() {
+    this.isComponentMounted = true;
     await this.loader();
     await this.initFMI();
     this.nutsGroupLayer = new GroupLayer({
@@ -1355,7 +1359,10 @@ class AreaWidget extends React.Component {
       //opacity: 0.5,
     });
     this.props.map.add(this.nutsGroupLayer);
-    this.props.view.on('click', (event) => {
+    this.clickEventHandle = this.props.view.on('click', (event) => {
+      if (!this.isComponentMounted) {
+        return;
+      }
       if (
         (this.props.mapViewer.activeWidget === this || this.props.download) &&
         (this.props.mapViewer.activeWidget
@@ -1397,9 +1404,12 @@ class AreaWidget extends React.Component {
                 });
                 this.props.uploadFileHandler(true);
                 if (this.props.download) {
-                  document.querySelector(
+                  let popupNode = document.querySelector(
                     '.drawRectanglePopup-block',
-                  ).style.display = 'none';
+                  );
+                  if (popupNode) {
+                    popupNode.style.display = 'none';
+                  }
                 }
               }
             }
@@ -1408,23 +1418,47 @@ class AreaWidget extends React.Component {
       }
     });
     this.props.view.when(() => {
+      if (!this.isComponentMounted || !this.props.view || !this.props.view.ui) {
+        return;
+      }
       this.props.download
         ? this.container !== null && this.props.view.ui.add(this.container)
         : this.container.current !== null &&
           this.props.view.ui.add(this.container.current, 'top-right');
 
-      var popup = document.createElement('div');
-      popup.className = 'drawRectanglePopup-block';
-      popup.innerHTML =
-        '<div className="drawRectanglePopup-content">' +
-        '<span className="drawRectanglePopup-icon"><span className="esri-icon-cursor-marquee"></span></span>' +
-        '<div className="drawRectanglePopup-text">Select or draw an area of interest in the map to continue</div>' +
-        '</div>';
+      let popup = document.querySelector('.drawRectanglePopup-block');
+      if (!popup) {
+        popup = document.createElement('div');
+        popup.className = 'drawRectanglePopup-block';
+        popup.innerHTML =
+          '<div className="drawRectanglePopup-content">' +
+          '<span className="drawRectanglePopup-icon"><span className="esri-icon-cursor-marquee"></span></span>' +
+          '<div className="drawRectanglePopup-text">Select or draw an area of interest in the map to continue</div>' +
+          '</div>';
+      }
       this.props.download && this.props.view.ui.add(popup, 'top-right');
     });
     this.dragElement(document.querySelector('.coordinateWindow'));
   }
 
+  componentWillUnmount() {
+    this.isComponentMounted = false;
+    if (this.clickEventHandle && this.clickEventHandle.remove) {
+      this.clickEventHandle.remove();
+      this.clickEventHandle = null;
+    }
+    if (this.dragEventContext && this.dragEventContext.handleTarget) {
+      this.dragEventContext.handleTarget.removeEventListener(
+        'mousedown',
+        this.dragEventContext.handleEvent,
+      );
+      this.dragEventContext = null;
+    }
+    if (this.state.ShowGraphics && this.state.ShowGraphics.remove) {
+      this.state.ShowGraphics.remove();
+    }
+  }
+
   async initFMI() {
     let fetchUrl =
       window.location.href
@@ -1445,6 +1479,9 @@ class AreaWidget extends React.Component {
     }
   }
   dragElement(elmnt) {
+    if (!elmnt) {
+      return;
+    }
     var pos1 = 0,
       pos2 = 0,
       pos3 = 0,
@@ -1470,10 +1507,25 @@ class AreaWidget extends React.Component {
       document.onmouseup = null;
       document.onmousemove = null;
     };
+    if (this.dragEventContext && this.dragEventContext.handleTarget) {
+      this.dragEventContext.handleTarget.removeEventListener(
+        'mousedown',
+        this.dragEventContext.handleEvent,
+      );
+      this.dragEventContext = null;
+    }
     if (header) {
       header.addEventListener('mousedown', dragMouseDown);
+      this.dragEventContext = {
+        handleTarget: header,
+        handleEvent: dragMouseDown,
+      };
     } else {
       elmnt.addEventListener('mousedown', dragMouseDown);
+      this.dragEventContext = {
+        handleTarget: elmnt,
+        handleEvent: dragMouseDown,
+      };
     }
   }
   /**

package/src/components/MapViewer/BookmarkWidget.jsx

@@ -1354,7 +1354,7 @@ class BookmarkWidget extends React.Component {
                 }}
                 type="submit"
               >
-                <span class="esri-bookmarks__add-bookmark-icon esri-icon-plus"></span>
+                <span className="esri-bookmarks__add-bookmark-icon esri-icon-plus"></span>
                 Upload a bookmark
               </button>
             </div>

package/src/components/MapViewer/LoadingSpinner.jsx

@@ -37,11 +37,17 @@ class LoadingSpinner extends React.Component {
     });
     const handle3 = this.props.view.on('layerview-create-error', (event) => {
       if (!this._isMounted) return;
-      if (event.layer.loadError !== null && this.state.loading === true) {
+      if (this.state.loading === true) {
         this.setState({ loading: false }, this.showLoading);
       }
     });
-    this.arcgisEventHandles.push(handle1, handle2, handle3);
+    const handle4 = this.props.view.watch('updating', (isUpdating) => {
+      if (!this._isMounted) return;
+      if (!isUpdating && this.state.loading === true) {
+        this.setState({ loading: false }, this.showLoading);
+      }
+    });
+    this.arcgisEventHandles.push(handle1, handle2, handle3, handle4);
   }
 
   showLoading() {

package/src/components/MapViewer/MapViewer.jsx

@@ -386,6 +386,7 @@ class MapViewer extends React.Component {
     this.isViewModeButtonLoaded = false;
     this.viewUiOperationState = null;
     this.shouldClearSessionOnUnmount = true;
+    this.uploadErrorTimeoutTask = null;
     this.scheduleViewModeButtonLoad = this.scheduleViewModeButtonLoad.bind(
       this,
     );
@@ -645,7 +646,24 @@ class MapViewer extends React.Component {
       const containerNodeList = document.querySelectorAll(selector);
       if (!containerNodeList || containerNodeList.length === 0) return;
       containerNodeList.forEach((containerNode) => {
-        if (!containerNode) return;
+        if (!containerNode || !containerNode.isConnected) return;
+        if (!containerNode.__mapViewerContainerParentNode) {
+          const containerParentNode = containerNode.parentNode;
+          const isUiContainerParent =
+            containerParentNode &&
+            containerParentNode.classList &&
+            (containerParentNode.classList.contains(
+              'esri-ui-inner-container',
+            ) ||
+              containerParentNode.classList.contains('esri-ui-corner') ||
+              containerParentNode.classList.contains('esri-ui-top-left') ||
+              containerParentNode.classList.contains('esri-ui-top-right') ||
+              containerParentNode.classList.contains('esri-ui-bottom-left') ||
+              containerParentNode.classList.contains('esri-ui-bottom-right'));
+          containerNode.__mapViewerContainerParentNode = isUiContainerParent
+            ? this.mapContainer.current
+            : containerParentNode;
+        }
         try {
           this.view.ui.add(containerNode, position);
         } catch (error) {}
@@ -673,6 +691,7 @@ class MapViewer extends React.Component {
         this.isViewSwitchInProgress ||
         !this.state.isWidgetRenderEnabled
       ) {
+        this.syncViewTask = null;
         return;
       }
       this.syncViewWidgetContainers();
@@ -713,7 +732,8 @@ class MapViewer extends React.Component {
     const resolveWidgetParentNode = (widgetNode) => {
       if (
         widgetNode &&
-        widgetNode.__mapViewerContainerParentNode instanceof Node
+        widgetNode.__mapViewerContainerParentNode instanceof Node &&
+        widgetNode.__mapViewerContainerParentNode.isConnected
       ) {
         return widgetNode.__mapViewerContainerParentNode;
       }
@@ -1305,8 +1325,16 @@ class MapViewer extends React.Component {
 
   uploadFileErrorHandler = (errorType = 'uploadError') => {
     this.setState({ uploadError: true, uploadErrorType: errorType });
-    setTimeout(() => {
+    if (this.uploadErrorTimeoutTask) {
+      clearTimeout(this.uploadErrorTimeoutTask);
+      this.uploadErrorTimeoutTask = null;
+    }
+    this.uploadErrorTimeoutTask = setTimeout(() => {
+      if (!this.isComponentMounted) {
+        return;
+      }
       this.setState({ uploadError: false, uploadErrorType: 'uploadError' });
+      this.uploadErrorTimeoutTask = null;
     }, 3000);
   };
 
@@ -1459,6 +1487,7 @@ class MapViewer extends React.Component {
 
   componentDidUpdate(prevProps, prevState) {
     // Handle Download/dataset URL changes (existing logic)
+    this.scheduleViewModeButtonLoad();
     if (
       this.props.Download ||
       (this.location &&
@@ -1518,6 +1547,11 @@ class MapViewer extends React.Component {
       this.viewModeButtonTimeout = null;
     }
 
+    if (this.uploadErrorTimeoutTask) {
+      clearTimeout(this.uploadErrorTimeoutTask);
+      this.uploadErrorTimeoutTask = null;
+    }
+
     window.removeEventListener('beforeunload', this.handlePageUnload);
     window.removeEventListener('pagehide', this.handlePageUnload);
     document.removeEventListener(
@@ -1848,13 +1882,25 @@ class MapViewer extends React.Component {
     // DOM element to be mounted (but not yet mounted)
     if ('loading' in this.props.mapviewer_config) {
       return (
-        <div ref={this.mapContainer} className={this.mapClass}>
+        <div
+          ref={this.mapContainer}
+          className={classNames(
+            this.mapClass,
+            `view-mode-${this.state.viewMode}`,
+          )}
+        >
           <div ref={this.mapdiv} className="map" />
         </div>
       );
     } else {
       return (
-        <div ref={this.mapContainer} className={this.mapClass}>
+        <div
+          ref={this.mapContainer}
+          className={classNames(
+            this.mapClass,
+            `view-mode-${this.state.viewMode}`,
+          )}
+        >
           <div ref={this.mapdiv} className="map" />
           {this.appLanguage()}
           {this.state.isWidgetRenderEnabled && (

package/src/components/MapViewer/MeasurementWidget.jsx

@@ -63,7 +63,7 @@ class MeasurementWidget extends React.Component {
       // and ensure that the component is rendered again
       this.setState({ showMapMenu: false });
       this.toggleDropdownContent();
-      this.clearMeasurements();
+      this.clearMeasurements(false);
       this.clearCoordinates();
     } else {
       this.props.mapViewer.setActiveWidget(this);
@@ -133,7 +133,7 @@ class MeasurementWidget extends React.Component {
       );
     }
     this.toggleDropdownContent(e);
-    this.clearMeasurements();
+    this.clearMeasurements(false);
     this.clearCoordinates();
     if (e.currentTarget.getAttribute('aria-expanded') === 'true') {
       this.areaMeasurement();
@@ -147,7 +147,7 @@ class MeasurementWidget extends React.Component {
       );
     }
     this.toggleDropdownContent(e);
-    this.clearMeasurements();
+    this.clearMeasurements(false);
     this.clearCoordinates();
     if (e.currentTarget.getAttribute('aria-expanded') === 'true') {
       this.distanceMeasurement();
@@ -156,7 +156,7 @@ class MeasurementWidget extends React.Component {
 
   coordsMeasurementHandler(e) {
     this.toggleDropdownContent(e);
-    this.clearMeasurements();
+    this.clearMeasurements(false);
     //*** Add event to show mouse coordinates on click and move ***//
     var getCoordinates = this.props.view.on(
       ['pointer-down', 'pointer-move'],
@@ -171,6 +171,9 @@ class MeasurementWidget extends React.Component {
 
   areaMeasurement() {
     if (this.isThreeDimensionalView()) {
+      if (!this.areaMeasurementWidget || !this.distanceMeasurementWidget) {
+        this.initializeThreeDimensionalMeasurements();
+      }
       if (this.areaMeasurementWidget) {
         this.areaMeasurementWidget.visible = true;
       }
@@ -187,6 +190,9 @@ class MeasurementWidget extends React.Component {
 
   distanceMeasurement() {
     if (this.isThreeDimensionalView()) {
+      if (!this.areaMeasurementWidget || !this.distanceMeasurementWidget) {
+        this.initializeThreeDimensionalMeasurements();
+      }
       if (this.distanceMeasurementWidget) {
         this.distanceMeasurementWidget.visible = true;
       }
@@ -201,7 +207,7 @@ class MeasurementWidget extends React.Component {
     }
   }
 
-  clearMeasurements() {
+  clearMeasurements(shouldDestroyThreeDimensionalMeasurements = false) {
     if (this.measurement && this.measurement.clear) {
       this.measurement.clear();
     }
@@ -216,9 +222,91 @@ class MeasurementWidget extends React.Component {
       this.distanceMeasurementWidget.clear();
       this.distanceMeasurementWidget.visible = false;
     }
+    if (this.isThreeDimensionalView()) {
+      this.resetThreeDimensionalMeasurementState();
+    }
+    if (
+      this.isThreeDimensionalView() &&
+      shouldDestroyThreeDimensionalMeasurements
+    ) {
+      this.destroyThreeDimensionalMeasurements();
+    }
+  }
+
+  resetThreeDimensionalMeasurementState() {
+    const widgetList = [
+      this.areaMeasurementWidget,
+      this.distanceMeasurementWidget,
+    ];
+
+    widgetList.forEach((widget) => {
+      if (!widget) return;
+
+      if (widget.viewModel && widget.viewModel.newMeasurement) {
+        widget.viewModel.newMeasurement();
+      }
+      if (widget.viewModel && widget.viewModel.clear) {
+        widget.viewModel.clear();
+      }
+      if (widget.clear) {
+        widget.clear();
+      }
+      widget.visible = false;
+    });
+  }
+
+  initializeThreeDimensionalMeasurements() {
+    if (
+      !this.container.current ||
+      !this.props.view ||
+      !this.isThreeDimensionalView()
+    ) {
+      return;
+    }
+
+    if (!this.areaMeasurementWidget) {
+      this.areaMeasurementWidget = new AreaMeasurement3D({
+        view: this.props.view,
+        container: this.container.current.querySelector('.measurement-area'),
+      });
+      this.areaMeasurementWidget.visible = false;
+    }
+
+    if (!this.distanceMeasurementWidget) {
+      this.distanceMeasurementWidget = new DirectLineMeasurement3D({
+        view: this.props.view,
+        container: this.container.current.querySelector(
+          '.measurement-distance',
+        ),
+      });
+      this.distanceMeasurementWidget.visible = false;
+    }
+  }
+
+  destroyThreeDimensionalMeasurements() {
+    if (this.areaMeasurementWidget && this.areaMeasurementWidget.destroy) {
+      this.areaMeasurementWidget.destroy();
+      this.areaMeasurementWidget = null;
+    }
+    if (
+      this.distanceMeasurementWidget &&
+      this.distanceMeasurementWidget.destroy
+    ) {
+      this.distanceMeasurementWidget.destroy();
+      this.distanceMeasurementWidget = null;
+    }
   }
 
   showCoordinates(pt) {
+    if (
+      !pt ||
+      typeof pt.latitude !== 'number' ||
+      typeof pt.longitude !== 'number'
+    ) {
+      this.setState({ latlong: false });
+      return;
+    }
+
     this.setState({
       latlong: { x: pt.latitude.toFixed(4), y: pt.longitude.toFixed(4) },
     });
@@ -243,19 +331,7 @@ class MeasurementWidget extends React.Component {
       this.props.view.ui.add(this.container.current, 'top-right');
 
       if (this.isThreeDimensionalView()) {
-        this.areaMeasurementWidget = new AreaMeasurement3D({
-          view: this.props.view,
-          container: this.container.current.querySelector('.measurement-area'),
-        });
-        this.areaMeasurementWidget.visible = false;
-
-        this.distanceMeasurementWidget = new DirectLineMeasurement3D({
-          view: this.props.view,
-          container: this.container.current.querySelector(
-            '.measurement-distance',
-          ),
-        });
-        this.distanceMeasurementWidget.visible = false;
+        this.initializeThreeDimensionalMeasurements();
       } else {
         this.measurement = new Measurement({
           view: this.props.view,
@@ -272,15 +348,7 @@ class MeasurementWidget extends React.Component {
     if (this.measurement && this.measurement.destroy) {
       this.measurement.destroy();
     }
-    if (this.areaMeasurementWidget && this.areaMeasurementWidget.destroy) {
-      this.areaMeasurementWidget.destroy();
-    }
-    if (
-      this.distanceMeasurementWidget &&
-      this.distanceMeasurementWidget.destroy
-    ) {
-      this.distanceMeasurementWidget.destroy();
-    }
+    this.destroyThreeDimensionalMeasurements();
   }
   /**
    * This method renders the component

package/src/components/MapViewer/MenuWidget.jsx

@@ -3583,6 +3583,35 @@ class MenuWidget extends React.Component {
           resourceLayer.ViewService = (viewService || '').trim();
         }
 
+        const isSceneUploadValidation =
+          this.view &&
+          this.view.type === '3d' &&
+          (serviceType === 'WMS' || serviceType === 'WMTS');
+
+        if (isSceneUploadValidation) {
+          try {
+            this.map.add(resourceLayer);
+            await this.view.whenLayerView(resourceLayer);
+          } catch (error) {
+            try {
+              if (this.map.findLayerById(resourceLayer.id)) {
+                this.map.remove(resourceLayer);
+              }
+            } catch (e) {}
+            if (this.isSceneTilingError(error)) {
+              this.props.uploadFileErrorHandler('sceneViewTilingError');
+              continue;
+            }
+            throw error;
+          }
+
+          try {
+            if (this.map.findLayerById(resourceLayer.id)) {
+              this.map.remove(resourceLayer);
+            }
+          } catch (e) {}
+        }
+
         const layerSignatureData = `${(
           resourceLayer.ViewService || ''
         ).trim()}::${resourceLayer.LayerId}`;
@@ -3897,6 +3926,14 @@ class MenuWidget extends React.Component {
         const checkedLayers =
           JSON.parse(sessionStorage.getItem('checkedLayers')) || [];
         const isChecked = checkedLayers.includes(layer.LayerId);
+        const serviceType =
+          layer.type === 'wmts'
+            ? 'WMTS'
+            : layer.type === 'wms'
+            ? 'WMS'
+            : layer.type === 'geojson'
+            ? 'WFS'
+            : 'WMS';
 
         // Create a simplified object for storage
         return {
@@ -3918,9 +3955,18 @@ class MenuWidget extends React.Component {
           })),
           ViewService: layer.ViewService,
           LayerId: layer.LayerId,
+          serviceType: serviceType,
+          activeLayer:
+            serviceType === 'WMTS' && layer.activeLayer
+              ? {
+                  id: layer.activeLayer.id,
+                  title: layer.activeLayer.title,
+                  tileMatrixSetId: layer.activeLayer.tileMatrixSetId,
+                }
+              : null,
           visibility: layer.visible !== false,
           opacity: layer.opacity || 1,
-          checked: isChecked || layer.checked || false,
+          checked: isChecked,
         };
       });
 
@@ -3941,26 +3987,65 @@ class MenuWidget extends React.Component {
         if (savedServices && Array.isArray(savedServices)) {
           // Process saved services to recreate actual layer objects
           const recreatedLayers = await Promise.all(
-            savedServices.map(async (serviceData) => {
+            savedServices.map(async (serviceData, serviceIndex) => {
               try {
-                // Create a new WMSLayer with the saved properties
-                const newLayer = new WMSLayer(serviceData);
+                const resolveServiceType =
+                  serviceData.serviceType ||
+                  (typeof serviceData.ViewService === 'string' &&
+                  serviceData.ViewService.toLowerCase().includes('wmts')
+                    ? 'WMTS'
+                    : 'WMS');
+                const resolvedLayerId =
+                  serviceData.LayerId ||
+                  serviceData.id ||
+                  `user_service_${serviceIndex}`;
+                const newLayer =
+                  resolveServiceType === 'WMTS'
+                    ? new WMTSLayer({
+                        id: resolvedLayerId,
+                        url: serviceData.url || serviceData.ViewService,
+                        title: serviceData.title || '',
+                        spatialReference: this.view?.spatialReference,
+                        serviceMode: 'KVP',
+                        activeLayer: serviceData.activeLayer || undefined,
+                        ViewService:
+                          serviceData.ViewService || serviceData.url || '',
+                      })
+                    : new WMSLayer({
+                        id: resolvedLayerId,
+                        url: serviceData.url || serviceData.ViewService,
+                        featureInfoFormat:
+                          serviceData.featureInfoFormat || 'text/html',
+                        featureInfoUrl:
+                          serviceData.featureInfoUrl ||
+                          serviceData.url ||
+                          serviceData.ViewService,
+                        title: serviceData.title || '',
+                        legendEnabled: serviceData.legendEnabled,
+                        sublayers: serviceData.sublayers,
+                        ViewService:
+                          serviceData.ViewService || serviceData.url || '',
+                      });
 
                 // Set visibility property based on saved value
                 newLayer.visible = serviceData.visibility !== false;
+                newLayer.LayerId = resolvedLayerId;
+                if (serviceData.description) {
+                  newLayer.description = serviceData.description;
+                }
 
                 // Remember the original checked state and visibility
                 newLayer.checked = serviceData.checked;
 
                 // Initialize visibleLayers for this layer
                 if (!this.visibleLayers) this.visibleLayers = {};
-                this.visibleLayers[serviceData.LayerId] =
+                this.visibleLayers[resolvedLayerId] =
                   serviceData.visibility !== false
                     ? ['fas', 'eye']
                     : ['fas', 'eye-slash'];
 
                 // Add to this.layers
-                this.layers[serviceData.LayerId] = newLayer;
+                this.layers[resolvedLayerId] = newLayer;
                 return newLayer;
               } catch (error) {
                 return null;
@@ -3995,9 +4080,11 @@ class MenuWidget extends React.Component {
 
                     // Then check the checkbox and call toggleLayer with a flag to preserve visibility
                     node.checked = true;
+                    node.dataset.preserveCheckedLayerState = 'true';
 
                     // Custom addition to toggleLayer to bypass visibility override
                     this.toggleLayerWithoutVisibilityReset(node);
+                    delete node.dataset.preserveCheckedLayerState;
                   }
                 }
               });
@@ -4264,6 +4351,8 @@ class MenuWidget extends React.Component {
       this.state.wmsUserServiceLayers.find(
         (layer) => layer.LayerId === elem.id,
       ) || null;
+    const preserveCheckedLayerState =
+      elem.dataset && elem.dataset.preserveCheckedLayerState === 'true';
     if (elem.checked && !userService) {
       this.findCheckedDatasetNoServiceToVisualize(elem);
     }
@@ -4284,7 +4373,9 @@ class MenuWidget extends React.Component {
       if (!canApplyWmtsSettings) {
         elem.checked = false;
         this.layers[elem.id].visible = false;
-        this.deleteCheckedLayer(elem.id);
+        if (!preserveCheckedLayerState) {
+          this.deleteCheckedLayer(elem.id);
+        }
         delete this.activeLayersJSON[elem.id];
         if (this.visibleLayers) {
           delete this.visibleLayers[elem.id];
@@ -4303,7 +4394,9 @@ class MenuWidget extends React.Component {
         try {
           await this.layers[elem.id].load();
         } catch (error) {
-          this.processUnsupportedWmtsLayer(elem);
+          this.processUnsupportedWmtsLayer(elem, {
+            preserveCheckedLayerState,
+          });
           return;
         }
       }
@@ -4400,7 +4493,9 @@ class MenuWidget extends React.Component {
         try {
           await this.view.whenLayerView(this.layers[elem.id]);
         } catch (error) {
-          this.processUnsupportedWmtsLayer(elem);
+          this.processUnsupportedWmtsLayer(elem, {
+            preserveCheckedLayerState,
+          });
           return;
         }
       }
@@ -4539,13 +4634,16 @@ class MenuWidget extends React.Component {
     this.url = null;
   }
 
-  processUnsupportedWmtsLayer(elem) {
+  processUnsupportedWmtsLayer(elem, options = {}) {
+    const { preserveCheckedLayerState = false } = options;
     if (!elem || !this.layers || !this.layers[elem.id]) {
       return;
     }
     elem.checked = false;
     this.layers[elem.id].visible = false;
-    this.deleteCheckedLayer(elem.id);
+    if (!preserveCheckedLayerState) {
+      this.deleteCheckedLayer(elem.id);
+    }
     const mapLayer = this.map ? this.map.findLayerById(elem.id) : null;
     if (mapLayer) {
       try {
@@ -6906,7 +7004,9 @@ class MenuWidget extends React.Component {
             const node = document.getElementById(layer.LayerId);
             if (node) {
               node.checked = true;
+              node.dataset.preserveCheckedLayerState = 'true';
               this.toggleLayer(node);
+              delete node.dataset.preserveCheckedLayerState;
             }
           }
         });
@@ -7333,6 +7433,9 @@ class MenuWidget extends React.Component {
       for (var i = layers.length - 1; i >= 0; i--) {
         let layer = layers[i];
         let node = document.getElementById(layer);
+        const restoreLayerState = this.state.wmsUserServiceLayers.some(
+          (serviceLayer) => serviceLayer.LayerId === layer,
+        );
 
         if (node) {
           if (!node.checked) {
@@ -7340,7 +7443,13 @@ class MenuWidget extends React.Component {
             // click event fires toggleLayer()
             //node.dispatchEvent(event);
             node.checked = true;
+            if (restoreLayerState) {
+              node.dataset.preserveCheckedLayerState = 'true';
+            }
             this.toggleLayer(node);
+            if (restoreLayerState) {
+              delete node.dataset.preserveCheckedLayerState;
+            }
           }
 
           // set scroll position

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

@@ -49,6 +49,14 @@
   z-index: 1;
 }
 
+.esri-ui-top-left.esri-ui-corner {
+  margin-top: 0.5rem !important;
+}
+
+.map-container.view-mode-3d .esri-ui-top-left.esri-ui-corner {
+  margin-top: 0 !important;
+}
+
 .esri-component.esri-zoom.esri-widget {
   background: none;
   box-shadow: none;