fixed merge conflict

OpenUpSA · Dec 14, 2023 · e1e2fd8 · e1e2fd8
2 parents 04cae97 + 229bde7
commit e1e2fd8
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 15 deletions.
diff --git a/__tests__/gui/common_cy_functions/general.js b/__tests__/gui/common_cy_functions/general.js
@@ -454,7 +454,7 @@ export function confirmNoChoroplethFilterSelected() {
     cy.get(`${mapBottomItems} .map-options .map-options__filter-row:visible`).should('have.length', 1);
     cy.get(`${mapBottomItems} .map-options .map-options__filter-row:visible .mapping-options__filter`)
         .eq(0)
-        .find('div.MuiSelect-select em')
+        .find('div.MuiSelect-select')
         .should('have.text', 'Select an attribute');
     cy.get(`${mapBottomItems} .map-options .map-options__filter-row:visible .mapping-options__filter`).eq(1).should('have.class', 'disabled');
 }
@@ -463,7 +463,7 @@ export function confirmNoChartFilterSelected() {
     cy.get('.rich-data-content .profile-indicator__filter-row:visible').should('have.length', 1);
     cy.get('.rich-data-content .profile-indicator__filter-row:visible .profile-indicator__filter')
         .eq(0)
-        .find('div.MuiSelect-select em')
+        .find('div.MuiSelect-select')
         .should('have.text', 'Select an attribute');
     cy.get('.rich-data-content .profile-indicator__filter-row:visible .profile-indicator__filter').eq(1).should('have.class', 'disabled');
 }

diff --git a/__tests__/gui/sharing_2/sharing.js b/__tests__/gui/sharing_2/sharing.js
@@ -106,7 +106,7 @@ Then(/^I confirm that the chart is not filtered$/, function () {
     // cy.get('.rich-data-content .profile-indicator__filter-row:visible:eq(0)').should('have.length', 1);
     cy.get('.rich-data-content .profile-indicator__filter-row:visible:eq(0) .profile-indicator__filter')
         .eq(0)
-        .find('div.MuiSelect-select em')
+        .find('div.MuiSelect-select')
         .should('have.text', 'Select an attribute');
     cy.get('.rich-data-content .profile-indicator__filter-row:visible:eq(0) .profile-indicator__filter').eq(1).should('have.class', 'disabled');
 });

diff --git a/cypress/downloads/map.png b/cypress/downloads/map.png
diff --git a/src/js/configurations/geography_sa.js b/src/js/configurations/geography_sa.js
@@ -67,6 +67,12 @@ export class Config {
         return false;
     }
 
+    get pointSearchEnabled(){
+        if(this.config["point_search_enabled"] != undefined)
+            return this.config["point_search_enabled"];
+        return true;
+    }
+
     get siteWideFiltersEnabled() {
         if (this.config["site_wide_filters_enabled"] != undefined)
             return this.config["site_wide_filters_enabled"];

diff --git a/src/js/elements/header/search.js b/src/js/elements/header/search.js
@@ -32,13 +32,14 @@ export class Search extends Component {
      * constructor of the class
      * sets the default values, calls init function(this.setSearchInput)
      * */
-    constructor(parent, api, profileId, minChars) {
+    constructor(parent, api, profileId, minChars, config) {
         super(parent);
 
         minLength = minChars;
         this.api = api;
         this.profileId = profileId;
         this.plate = null;
+        this.config = config;
 
         this.prepareDomElements();
         this.setSearchInput();
@@ -60,9 +61,11 @@ export class Search extends Component {
 
         this.updateGeoSearchHeader(titleRow);
         this.updateGeoSearch();
-        this.appendSearchSeparator();
-        this.appendPointsTitle(titleRow);
-        this.appendPointsNoData();
+        if (this.config.pointSearchEnabled) {
+            this.appendSearchSeparator();
+            this.appendPointsTitle(titleRow);
+            this.appendPointsNoData();
+        }
     }
 
     updateGeoSearchHeader(titleRow) {
@@ -282,13 +285,15 @@ export class Search extends Component {
                             response(data);
                         })
 
-                        const mapCenter = self.getMapCenter();
-                        self.api.searchPointsByDistance(self.profileId, searchTerm, mapCenter.lat, mapCenter.lng).then(data => {
-                            self.removePointsNoData();
-                            self.appendPointsHeaderRow();
-                            self.appendPointsTable(searchTerm, data);
-                            self.updatePointsHeaderSummary(data);
-                        })
+                        if (self.config.pointSearchEnabled) {
+                            const mapCenter = self.getMapCenter();
+                            self.api.searchPointsByDistance(self.profileId, searchTerm, mapCenter.lat, mapCenter.lng).then(data => {
+                                self.removePointsNoData();
+                                self.appendPointsHeaderRow();
+                                self.appendPointsTable(searchTerm, data);
+                                self.updatePointsHeaderSummary(data);
+                            })
+                        }
                     }, 0)
                 }
             })

diff --git a/src/js/load.js b/src/js/load.js
@@ -77,8 +77,8 @@ class Application extends Component {
         const pointData = new PointData(this, api, mapcontrol.map, profileId, config);
         const pointDataTray = new PointDataTray(this, api, profileId, config.watermarkEnabled, config.ccLicenseEnabled);
         const mapchip = new MapChip(this, config.choropleth, config.siteWideFiltersEnabled, config.restrictValues, config.defaultFilters);
-        const search = new Search(this, api, profileId, 2);
         const profileLoader = new ProfileLoader(this, formattingConfig, api, profileId, config.config, config.watermarkEnabled, config.siteWideFiltersEnabled, config.restrictValues, config.defaultFilters, config.chartColorRange, config.ccLicenseEnabled);
+        const search = new Search(this, api, profileId, 2, config);
         const locationInfoBox = new LocationInfoBox(this, formattingConfig);
         const zoomToggle = new ZoomToggle(this);
         const preferredChildToggle = new PreferredChildToggle(this);