Merge pull request #539 from Esri/develop

Sync master with develop after 10.3 release
Esri · Nov 21, 2022 · 5033426 · 5033426
2 parents 5c3b979 + d0488db
commit 5033426
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/index.html b/index.html
@@ -41,8 +41,8 @@
     <!-- Bootstrap TouchSpinner CSS -->
     <link rel="stylesheet" type="text/css" href="js/vendor/touch-spinner/jquery.bootstrap-touchspin.min.css" />
     <!--Dojo and Esri CSS-->
-    <link rel="stylesheet" href="https://js.arcgis.com/3.41/dijit/themes/claro/claro.css" />
-    <link rel="stylesheet" href="https://js.arcgis.com/3.41/esri/css/esri.css" />
+    <link rel="stylesheet" href="https://js.arcgis.com/3.42/dijit/themes/claro/claro.css" />
+    <link rel="stylesheet" href="https://js.arcgis.com/3.42/esri/css/esri.css" />
     <!-- Load any application specific styles -->
     <link rel="stylesheet" href="css/main.css" type="text/css" />
     <link rel="stylesheet" href="css/common.css" type="text/css" />
@@ -113,7 +113,7 @@
     <script type="text/javascript" src="js/vendor/bootstrap-datetimepicker/bootstrap-datetimepicker.min.js"></script>
     <script type="text/javascript" src="js/vendor/touch-spinner/jquery.bootstrap-touchspin.min.js"></script>
     <script type="text/javascript" src="js/vendor/exif/exif.js"></script>
-    <script type="text/javascript" src="https://js.arcgis.com/3.41"></script>
+    <script type="text/javascript" src="https://js.arcgis.com/3.42"></script>
     <script type="text/javascript">
         require([
                 "application/bootstrapper"

diff --git a/js/widgets/geo-form/geo-form.js b/js/widgets/geo-form/geo-form.js
@@ -529,6 +529,11 @@ define([
         _filterOperationalLayers: function (opLayers) {
             var i;
             for (i = 0; i < opLayers.length; i++) {
+                //With new MapViewer 'visibility' is an optional property with an implicit default of true
+                var layerVisibility = true;
+                if (opLayers[i].hasOwnProperty('visibility') && !opLayers[i].visibility) {
+                    layerVisibility = false;
+                }
                 // if layerId matches store it in this.layer
                 // else remove that layer form map, so that only selected layer is visible on map.
                 if (opLayers[i].id === this.layerId) {
@@ -549,7 +554,7 @@ define([
                                 if ((opLayers[i].resourceInfo.capabilities.indexOf("Create") === -1) &&
                                         ((opLayers[i].resourceInfo.capabilities.indexOf("Update") === -1) ||
                                         (opLayers[i].resourceInfo.capabilities.indexOf("Editing") === -1)) &&
-                                        opLayers[i].visibility) {
+                                        layerVisibility) {
                                     opLayers[i].layerObject.show(); // display non-editable layer
                                     // condition to check feature layer with create, edit, delete permissions and popup enabled, but all fields marked display only
                                 } else if ((opLayers[i].resourceInfo.capabilities.indexOf("Create") !== -1) &&
@@ -573,7 +578,7 @@ define([
                             array.forEach(opLayers[i].featureCollection.layers, lang.hitch(this, function (featureCollectionLayer) {
                                 if (featureCollectionLayer.layerObject && (featureCollectionLayer.layerObject.capabilities.indexOf("Create") === -1) &&
                                         ((featureCollectionLayer.layerObject.capabilities.indexOf("Editing") === -1) ||
-                                        (featureCollectionLayer.layerObject.capabilities.indexOf("Update") === -1)) && opLayers[i].visibility) {
+                                        (featureCollectionLayer.layerObject.capabilities.indexOf("Update") === -1)) && layerVisibility) {
                                     featureCollectionLayer.layerObject.hide();
                                 }
                             }));

diff --git a/js/widgets/webmap-list/webmap-list.js b/js/widgets/webmap-list/webmap-list.js
@@ -265,11 +265,11 @@ define([
                             }
 
                             if (this.appConfig.showNonEditableLayers) {
-                                if (!(response[i][1].itemInfo.itemData.operationalLayers[j].visibility)) {
+                                if (!(layerVisibility)) {
                                     this._layersToRemove[response[i][1].itemInfo.item.id].push(response[i][1].itemInfo.itemData.operationalLayers[j].id);
                                 }
                             } else {
-                                if (!(response[i][1].itemInfo.itemData.operationalLayers[j].layerType === "ArcGISFeatureLayer" && response[i][1].itemInfo.itemData.operationalLayers[j].visibility)) {
+                                if (!(response[i][1].itemInfo.itemData.operationalLayers[j].layerType === "ArcGISFeatureLayer" && layerVisibility)) {
                                     this._layersToRemove[response[i][1].itemInfo.item.id].push(response[i][1].itemInfo.itemData.operationalLayers[j].id);
                                 }
                             }
@@ -873,15 +873,20 @@ define([
         */
         _displayNonEditableLayers: function () {
             array.forEach(this.selectedMapResponse.itemInfo.itemData.operationalLayers, lang.hitch(this, function (currentLayer, index) {
+                //With new MapViewer 'visibility' is an optional property with an implicit default of true
+                var layerVisibility = true;
+                if (currentLayer.hasOwnProperty('visibility') && !currentLayer.visibility) {
+                    layerVisibility = false;
+                }
                 if (currentLayer.resourceInfo && currentLayer.resourceInfo.capabilities && currentLayer.layerType === "ArcGISFeatureLayer") {
                     // condition to check if feature layer is non-editable & it is visible in the TOC
                     if ((currentLayer.resourceInfo.capabilities.indexOf("Create") === -1) &&
                             ((currentLayer.resourceInfo.capabilities.indexOf("Update") === -1) ||
-                            (currentLayer.resourceInfo.capabilities.indexOf("Editing") === -1)) && currentLayer.visibility) {
+                            (currentLayer.resourceInfo.capabilities.indexOf("Editing") === -1)) && layerVisibility) {
                         currentLayer.layerObject.show();
                         if (currentLayer.layerObject.showLabels && currentLayer.layerObject.labelingInfo) {
                             currentLayer.layerObject.visible = true;
-                            //Workarund to show labels on layer load
+                            //Workaround to show labels on layer load
                             currentLayer.layerObject.refresh();
                         }
                         // condition to check feature layer with create, edit, delete permissions and popup enabled, but all fields marked display only
@@ -899,7 +904,7 @@ define([
                     array.forEach(currentLayer.featureCollection.layers, lang.hitch(this, function (featureCollectionLayer) {
                         if (featureCollectionLayer.layerObject && (featureCollectionLayer.layerObject.capabilities.indexOf("Create") === -1) &&
                                 ((featureCollectionLayer.layerObject.capabilities.indexOf("Editing") === -1) ||
-                                (featureCollectionLayer.layerObject.capabilities.indexOf("Update") === -1)) && currentLayer.visibility) {
+                                (featureCollectionLayer.layerObject.capabilities.indexOf("Update") === -1)) && layerVisibility) {
                             featureCollectionLayer.layerObject.show();
                         }
                     }));