sr-npm 1.7.244 → 1.7.246

package/package.json

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

package/pages/careersPage.js

@@ -18,6 +18,7 @@ const {
   let queryDepartmentVar;
   let queryLocationVar;
 async function careersPageOnReady(_$w,thisObject,queryParams) {
+console.log("careersPageOn@!$%#$%##$%$#$#$%#$%#Ready");
 console.log("queryParams: ", queryParams);
 const { page, keyWord, department, location } = queryParams;
 queryPageVar=page;
@@ -144,7 +145,6 @@ async function handlePageParam(_$w) {
 async function bind(_$w) {
 	await _$w('#jobsDataset').onReady(async () => {
 		await updateCount(_$w);
-        await updateMapMarkers(_$w);
 		
 	});
 
@@ -154,6 +154,9 @@ async function bind(_$w) {
 
 	_$w('#positionsRepeater').onItemReady(async ($item, itemData) => {
 		$item('#positionItem').onClick(() => {
+            console.log("itemData: ", itemData);
+            console.log("$item: ", $item);
+            console.log("itemData['link-jobs-title']: ", itemData['link-jobs-title']);
 			to(`${itemData['link-jobs-title']}`);
 		});
 	});
@@ -176,14 +179,12 @@ function init(_$w) {
 }
 
 async function applyFilters(_$w, skipUrlUpdate = false) {
-    console.log("applying filters");
 	const dropdownFiltersMapping = [
 		{ elementId: '#dropdownDepartment', field: 'department', value: _$w('#dropdownDepartment').value },
 		{ elementId: '#dropdownLocation', field: 'cityText', value: _$w('#dropdownLocation').value },
 		{ elementId: '#dropdownJobType', field: 'remote', value: _$w('#dropdownJobType').value},
 		{ elementId: '#searchInput', field: 'title', value: _$w('#searchInput').value }
 		];
-    console.log("dropdownFiltersMapping: ", dropdownFiltersMapping);
     
 
 
@@ -241,7 +242,7 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
     
 	const count = await updateCount(_$w);
     console.log("updating map markers");
-    await updateMapMarkers(_$w);
+    await updateMapMarkers(_$w,count);
     console.log("updating map markers completed");
     count ? _$w('#resultsMultiState').changeState('results') : _$w('#resultsMultiState').changeState('noResults');
     
@@ -261,13 +262,9 @@ async function resetFilters(_$w) {
 
 	_$w('#resetFiltersButton').disable();
 
-    queryParams.remove(["keyWord", "department","page","location"]);
-    
+    queryParams.remove(["keyWord", "department","page"]);
 
 	await updateCount(_$w);
-    console.log("reseting map markers");
-    await updateMapMarkers(_$w);
-    console.log("reseting map markers completed");
 }
 
 async function updateCount(_$w) {
@@ -345,40 +342,27 @@ async function handleLocationParam(_$w,location) {
     
 }
 
-async function updateMapMarkers(_$w){
+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
-        .filter(item => {
-            const locationAddress = item.locationAddress;
-            const location = locationAddress && locationAddress.location;
-            return (
-                location !== undefined &&
-                location !== null &&
-                location.latitude !== undefined &&
-                location.latitude !== null &&
-                location.longitude !== undefined &&
-                location.longitude !== null
-            );
-        })
-        .map(item => {
-            const location = item.locationAddress.location;
-            return {
-                location: {
-                    latitude: location.latitude,
-                    longitude: location.longitude
-                },
-                address: item.locationAddress.formatted,
-                title: item.title
-            };
-        });
-    console.log("markers: ", markers);
-    console.log("type of markers: ", typeof markers);
+    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
-    await _$w('#googleMaps').setMarkers(markers);
-    let getmarkers2=await _$w('#googleMaps').markers;
-    console.log("getmarkers2: ", getmarkers2);
-
+    _$w('#googleMaps').setMarkers(markers);
+    }
+    else{
+        _$w('#googleMaps').setMarkers([]);
+    }
 }