sr-npm 1.7.228 → 1.7.229

package/backend/utils.js

@@ -48,7 +48,7 @@ function prepareToSaveArray(jobsPerField, cityLocations, field,citylocationAddre
   } else {
     return Object.entries(jobsPerField).map(([value, amount]) => ({
       title: value,
-      _id: value.replace(/\s+/g, '').replace(/&/g, 'and'),
+      _id: sanitizeId(value),
       count: amount,
     }));
   }
@@ -63,6 +63,15 @@ function normalizeCityName(city) {
     .trim();
 }
 
+function sanitizeId(input) {
+  if (!input) return '';
+  const withoutDiacritics = String(input)
+    .normalize('NFD')
+    .replace(/\p{Diacritic}/gu, '');
+  const withAnd = withoutDiacritics.replace(/&/g, 'and');
+  return withAnd.replace(/[^A-Za-z0-9-]/g, '');
+}
+
 module.exports = {
   chunkedBulkOperation,
   delay,
@@ -70,4 +79,5 @@ module.exports = {
   fillCityLocationAndLocationAddress,
   prepareToSaveArray,
   normalizeCityName,
+  sanitizeId,
 };

package/package.json

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

package/pages/careersPage.js

@@ -144,7 +144,6 @@ async function handlePageParam(_$w) {
 async function bind(_$w) {
 	await _$w('#jobsDataset').onReady(async () => {
 		await updateCount(_$w);
-        await updateMapMarkers(_$w);
 		
 	});
 
@@ -239,7 +238,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');
     
@@ -259,13 +258,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,9 +338,9 @@ 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;
@@ -358,24 +353,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);
-    _$w('#googleMaps').markers=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",
-    //     }]);
-    // }
+    _$w('#googleMaps').setMarkers(markers);
+    }
+    else{
+        _$w('#googleMaps').setMarkers([]);
+    }
 }