sr-npm 1.7.230 → 1.7.232

package/package.json

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

package/pages/careersPage.js

@@ -17,6 +17,7 @@ const {
   let queryKeyWordVar;
   let queryDepartmentVar;
   let queryLocationVar;
+  let searchInputFocused = false;
 async function careersPageOnReady(_$w,thisObject,queryParams) {
 console.log("queryParams: ", queryParams);
 const { page, keyWord, department, location } = queryParams;
@@ -144,7 +145,6 @@ async function handlePageParam(_$w) {
 async function bind(_$w) {
 	await _$w('#jobsDataset').onReady(async () => {
 		await updateCount(_$w);
-        await updateMapMarkers(_$w);
 		
 	});
 
@@ -163,6 +163,8 @@ function init(_$w) {
     const debouncedSearch = debounce(()=>applyFilters(_$w), 400,thisObjectVar);
     
     _$w('#searchInput').onInput(debouncedSearch);
+    _$w('#searchInput').onFocus(() => { searchInputFocused = true; });
+    _$w('#searchInput').onBlur(() => { searchInputFocused = false; });
     _$w('#dropdownDepartment, #dropdownLocation, #dropdownJobType').onChange(()=>applyFilters(_$w));
 	_$w('#resetFiltersButton, #clearSearch').onClick(()=>resetFilters(_$w));
 
@@ -176,6 +178,7 @@ function init(_$w) {
 }
 
 async function applyFilters(_$w, skipUrlUpdate = false) {
+	
 	const dropdownFiltersMapping = [
 		{ elementId: '#dropdownDepartment', field: 'department', value: _$w('#dropdownDepartment').value },
 		{ elementId: '#dropdownLocation', field: 'cityText', value: _$w('#dropdownLocation').value },
@@ -237,9 +240,16 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
     await _$w('#jobsDataset').setFilter(filter);
     await _$w('#jobsDataset').refresh();
     
+
+	if (searchInputFocused) {
+        console.log("focusing search input");
+		_$w('#searchInput').focus();
+
+	}
+    
 	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');
     
@@ -259,13 +269,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) {
@@ -343,13 +349,14 @@ async function handleLocationParam(_$w,location) {
     
 }
 
-async function updateMapMarkers(_$w){
+async function updateMapMarkers(_$w,count){
+    if(count>0){
     const numOfItems = await _$w('#jobsDataset').getTotalCount();
-  //  if(numOfItems>0){
     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
@@ -358,23 +365,12 @@ async function updateMapMarkers(_$w){
              title: item.title,
         };
     });
-    console.log("markers: ", markers);
-    console.log("type of markers: ", typeof markers);
     //@ts-ignore
     _$w('#googleMaps').setMarkers(markers);
-    let getmarkers2=await _$w('#googleMaps').markers;
-    console.log("getmarkers2: ", getmarkers2);
-    //}
-    // else{
-    //     console.log("no positions found");
-    //     _$w('#googleMaps').setMarkers([{
-    //         location: {
-    //             latitude: 0,
-    //             longitude: 0
-    //         },
-    //         address: "No positions found",
-    //     }]);
-    // }
+    }
+    else{
+        _$w('#googleMaps').setMarkers([]);
+    }
 }