Case Management Page: Fixes minor issues with saved polygon filters and disbursement

corehq/apps/geospatial/static/geospatial/js/case_management.js

@@ -1,4 +1,4 @@
 'use strict';
 
 hqDefine("geospatial/js/case_management", [
     "jquery",
@@ -48,7 +48,6 @@
         var self = {};
 
         self.isBusy = ko.observable(false);
-        self.showParams = ko.observable(false);
         self.parameters = ko.observableArray([]);
 
         self.disbursementErrorMessage = ko.observable('');
@@ -135,7 +134,7 @@
                 }
 
                 self.parameters(parametersList);
-                self.showParams(true);
+                $('#disbursement-params').show();
             };
 
             let userData = users.map(function (c) {

corehq/apps/geospatial/static/geospatial/js/models.js

@@ -1,4 +1,4 @@
 'use strict';
 hqDefine('geospatial/js/models', [
     'jquery',
     'knockout',
@@ -662,12 +662,40 @@
             }
         };
 
-        self.clearSelectedPolygonFilter = function clearSelectedPolygonFilter() {
+        self.clearSelectedPolygonFilter = function () {
+            if (!clearDisbursementBeforeProceeding()) {
+                return;
+            }
+
             self.selectedSavedPolygonId('');
             self.clearActivePolygon();
             updateSelectedSavedPolygonParam();
         };
 
+        function clearDisbursementBeforeProceeding() {
+            let proceedFurther = true;
+            if (self.mapObj.hasDisbursementLayers()) {
+                // hide it by default and show it only if necessary
+                $('#disbursement-clear-message').hide();
+                if (confirmForClearingDisbursement()) {
+                    self.mapObj.removeDisbursementLayers();
+                    $('#disbursement-clear-message').show();
+                    $('#disbursement-params').hide();
+                    proceedFurther = true;
+                } else {
+                    proceedFurther = false;
+                }
+            }
+            return proceedFurther;
+        }
+
+        function confirmForClearingDisbursement() {
+            return confirm(
+                gettext("Warning! This action will clear the current disbursement. " +
+                        "Please confirm if you want to proceed.")
+            );
+        }
+
         self.exportSelectedPolygonGeoJson = function (data, event) {
             if (self.activeSavedPolygon()) {
                 const convertedData = 'application/json;charset=utf-8,' + encodeURIComponent(JSON.stringify(self.activeSavedPolygon().geoJson));
@@ -679,6 +707,10 @@
         };
 
         self.deleteSelectedPolygonFilter = function () {
+            if (!clearDisbursementBeforeProceeding()) {
+                return;
+            }
+
             const deleteGeoJSONUrl = initialPageData.reverse('geo_polygon', self.selectedSavedPolygonId());
             $.ajax({
                 type: 'DELETE',
@@ -720,24 +752,13 @@
                 return;
             }
 
-            // hide it by default and show it only if necessary
-            $('#disbursement-clear-message').hide();
-            if (mapObj.hasDisbursementLayers()) {
-                let confirmation = confirm(
-                    gettext("Warning! This action will clear the current disbursement. " +
-                            "Please confirm if you want to proceed.")
-                );
-                if (confirmation) {
-                    if (mapObj.removeDisbursementLayers()) {
-                        $('#disbursement-clear-message').show();
-                    }
-                } else {
-                    // set flag
-                    self.resettingSavedPolygon = true;
-                    self.selectedSavedPolygonId(self.oldSelectedSavedPolygonId());
-                    return;
-                }
+            if (!clearDisbursementBeforeProceeding()) {
+                // set flag
+                self.resettingSavedPolygon = true;
+                self.selectedSavedPolygonId(self.oldSelectedSavedPolygonId());
+                return;
             }
+
             self.clearActivePolygon();
 
             createActivePolygonLayer(polygonObj);
@@ -775,6 +796,11 @@
                 if (!validateSavedPolygonName(name)) {
                     return;
                 }
+
+                if (!clearDisbursementBeforeProceeding()) {
+                    return;
+                }
+
                 data['name'] = name;
                 $.ajax({
                     type: 'post',

corehq/apps/geospatial/templates/case_management.html

@@ -95,7 +95,7 @@
         Previous disbursement was cleared.
     {% endblocktrans %}
 </div>
-<div id="disbursement-params" class="alert alert-info" data-bind="visible: showParams()">
+<div id="disbursement-params" class="alert alert-info" style="display: none">
   <h4>{% trans 'Disbursement parameters' %}</h4>
   <!-- ko foreach: parameters -->
   <span style="padding-right: 1em">