sr-npm 1.7.198 → 1.7.200

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.7.198",
+  "version": "1.7.200",
   "description": "",
   "main": "index.js",
   "scripts": {

package/pages/careersPage.js

@@ -92,8 +92,6 @@ async function handleUrlParams(_$w) {
         await handleDepartmentParam(_$w,queryDepartmentVar);
     }
     if (queryLocationVar) {
-
-        console.log("queryLocationVar:@!#$#@%^%$&%&^%&^% ", queryLocationVar);
         await handleLocationParam(_$w,queryLocationVar);
     }
 }
@@ -175,8 +173,6 @@ function init(_$w) {
 }
 
 async function applyFilters(_$w, skipUrlUpdate = false) {
-    console.log("applyFilters");
-    console.log("dropdownLocation value: ", _$w('#dropdownLocation').value);
 	const dropdownFiltersMapping = [
 		{ elementId: '#dropdownDepartment', field: 'department', value: _$w('#dropdownDepartment').value },
 		{ elementId: '#dropdownLocation', field: 'cityText', value: _$w('#dropdownLocation').value },
@@ -195,7 +191,7 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
 			_$w(filter.elementId).value = '';
 			filter.value = '';
             if (!skipUrlUpdate) {
-                queryParams.remove(["keyWord", "department","page"]);
+                queryParams.remove(["keyWord", "department","page","location"]);
             }
 		}
 
@@ -239,9 +235,10 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
     await _$w('#jobsDataset').refresh();
     
 	const count = await updateCount(_$w);
-    
+    updateMapMarkers(_$w,count);
     count ? _$w('#resultsMultiState').changeState('results') : _$w('#resultsMultiState').changeState('noResults');
     
+    
     // Update reset button state
 	const hasActiveFilters = filters.length > 0;
 	hasActiveFilters? _$w('#resetFiltersButton').enable() : _$w('#resetFiltersButton').disable();
@@ -330,13 +327,35 @@ async function handleLocationParam(_$w,location) {
         await applyFilters(_$w, true); // Skip URL update since we're handling initial URL params
     }
     else{
-        console.warn("department value not found in dropdown options");
-        queryParams.remove(["department" ]);
+        console.warn("location value not found in dropdown options");
+        queryParams.remove(["location" ]);
 
     }
     
 }
 
+async function updateMapMarkers(_$w,count){
+    if(count>0){
+    const numOfItems = await _$w('#jobsDataset').getTotalCount();
+    const items = await _$w('#jobsDataset').getItems(0, numOfItems);
+    const markers = items.items.map(item => {
+        const location = item.locationAddress.location;
+        return {
+            location: {
+                latitude: location.latitude,
+                longitude: location.longitude
+            },
+             address: item.locationAddress.formatted,
+             title: item.title,
+        };
+    });
+    //@ts-ignore
+    _$w('#googleMaps').setMarkers(markers);
+    }
+    else{
+        _$w('#googleMaps').setMarkers([]);
+    }
+}
 
 
 module.exports = {