Merge pull request #352 from Esri/revert-351-CT-AGOL10.3

Revert "Delivery for Crowdsource Manager - AGOL10.3 Release - Ticket #350"
Esri · Sep 15, 2022 · 25ebf05 · 25ebf05
2 parents f240279 + c51751a
commit 25ebf05
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/js/main.js b/js/main.js
@@ -2280,9 +2280,7 @@ define([
                 lang.hitch(this, function (layer) {
                     isNonEditableLayer = false;
                     showLegend = true;
-                    if (layer && layer.resourceInfo && layer.resourceInfo.capabilities) {
-                        capabilities = layer.resourceInfo.capabilities;
-                    }
+                    capabilities = layer.resourceInfo.capabilities;
                     if (capabilities) {
                         isNonEditableLayer = capabilities.indexOf("Create") === -1 && (capabilities.indexOf("Editing") === -1 ||
                             capabilities.indexOf("Update") === -1);

diff --git a/js/widgets/filter/filter.js b/js/widgets/filter/filter.js
@@ -1564,7 +1564,7 @@ define([
                 array.forEach(this.selectedOperationalLayer.types, lang.hitch(this, function (type) {
                     if (type.domains && type.domains[displayColumn] && type.domains[displayColumn].codedValues && type.domains[displayColumn].codedValues.length > 0) {
                         array.forEach(type.domains[displayColumn].codedValues, lang.hitch(this, function (codedValue) {
-                            if (codedValue.code === code && value.indexOf(codedValue.name) === -1) {
+                            if (codedValue.code === code) {
                                 value.push(codedValue.name);
                             }
                         }));

diff --git a/js/widgets/webmap-list/webmap-list.js b/js/widgets/webmap-list/webmap-list.js
@@ -258,11 +258,11 @@ define([
                                 this._layersToRemove[response[i][1].itemInfo.item.id] = [];
                             }
                             if (this.appConfig.showNonEditableLayers) {
-                                if (!(layerVisibility)) {
+                                if (!(response[i][1].itemInfo.itemData.operationalLayers[j].visibility)) {
                                     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" && layerVisibility)) {
+                                if (!(response[i][1].itemInfo.itemData.operationalLayers[j].layerType === "ArcGISFeatureLayer" && response[i][1].itemInfo.itemData.operationalLayers[j].visibility)) {
                                     this._layersToRemove[response[i][1].itemInfo.item.id].push(response[i][1].itemInfo.itemData.operationalLayers[j].id);
                                 }
                             }
@@ -766,11 +766,11 @@ define([
          */
         _validateLayerCapabilities: function (layerCapabilities) {
             // if layer has capability of create & update than return true
-            if ((layerCapabilities && layerCapabilities.indexOf("Create") > -1) || (layerCapabilities && layerCapabilities.indexOf("Update") > -1)) {
+            if ((layerCapabilities && layerCapabilities.indexOf("Create") > -1) || layerCapabilities.indexOf("Update") > -1) {
                 return true;
             }
             // if layer has capability of create & editing than return true
-            if ((layerCapabilities && layerCapabilities.indexOf("Create") > -1) || (layerCapabilities && layerCapabilities.indexOf("Editing") > -1)) {
+            if ((layerCapabilities && layerCapabilities.indexOf("Create") > -1) || layerCapabilities.indexOf("Editing") > -1) {
                 return true;
             }
             return false;
@@ -887,20 +887,15 @@ define([
          */
         _displayNonEditableLayers: function () {
             array.forEach(this._selectedMapResponse.itemInfo.itemData.operationalLayers, lang.hitch(this, function (currentLayer, index) { //ignore jslint
-                //With new MapViewer 'visibility' is an optional property with an implicit default of true
-                var layerVisibility = true;
-                if (currentLayer && 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)) && layerVisibility) {
+                    if ((currentLayer.resourceInfo.capabilities.indexOf("Create") === -1) && ((currentLayer.resourceInfo.capabilities.indexOf("Update") === -1) || (currentLayer.resourceInfo.capabilities.indexOf("Editing") === -1)) && currentLayer.visibility) {
                         currentLayer.layerObject.show();
                         // condition to check feature layer with create, edit, delete permissions and popup enabled, but all fields marked display only
                     } else if ((currentLayer.resourceInfo.capabilities.indexOf("Create") !== -1) && (currentLayer.resourceInfo.capabilities.indexOf("Editing") !== -1) && (currentLayer.resourceInfo.capabilities.indexOf("Update") !== -1) && (currentLayer.popupInfo) && this._checkDisplayPropertyOfFields(currentLayer.popupInfo, currentLayer.layerObject.fields) && this.selectedLayerId !== currentLayer.id) {
                         currentLayer.layerObject.show(); // display non-editable layer
                         // display layer which is not having popup
-                    } else if ((!currentLayer.popupInfo) && (layerVisibility)) {
+                    } else if ((!currentLayer.popupInfo) && (currentLayer.visibility)) {
                         currentLayer.layerObject.show(); // display non-editable layer
                     } else {
                         currentLayer.layerObject.hide();
@@ -909,7 +904,7 @@ define([
                     // Handle feature collection layers and show them on the map as non-editable layer
                     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)) && layerVisibility) {
+                            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.show();
                             }
                         }));