sr-npm 1.7.250 → 1.7.252

package/backend/data.js

@@ -54,6 +54,13 @@ async function saveJobsDataToCMS() {
     return basicJob;
   });
 
+  // Sort jobs by title (ascending, case-insensitive, numeric-aware)
+  jobsData.sort((a, b) => {
+    const titleA = a.title || '';
+    const titleB = b.title || '';
+    return titleA.localeCompare(titleB, undefined, { sensitivity: 'base', numeric: true });
+  });
+
   const chunkSize = 1000;
   let totalSaved = 0;
   const totalChunks = Math.ceil(jobsData.length / chunkSize);

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.250",
+  "version": "1.7.252",
   "description": "",
   "main": "index.js",
   "scripts": {

package/pages/careersPage.js

@@ -18,9 +18,7 @@ const {
   let queryKeyWordVar;
   let queryDepartmentVar;
   let queryLocationVar;
-  let baseUrl;
 async function careersPageOnReady(_$w,thisObject,queryParams) {
-baseUrl = await location.baseUrl();
 console.log("queryParams: ", queryParams);
 const { page, keyWord, department, location } = queryParams;
 queryPageVar=page;
@@ -53,7 +51,6 @@ function activateAutoLoad(_$w)
 }
 
 async function loadMoreJobs(_$w) {
-    //const query = await location.query();
     let shouldLoad = false;
     if (pageParamSet == 0) {
         shouldLoad = true;
@@ -86,7 +83,6 @@ async function setPageParamInUrl() {
    
 }
 async function handleUrlParams(_$w) {
-   // const query = await location.query();
     if (queryKeyWordVar) {
         await handleKeyWordParam(_$w,queryKeyWordVar);
     }
@@ -147,15 +143,17 @@ async function handlePageParam(_$w) {
 async function bind(_$w) {
 	await _$w('#jobsDataset').onReady(async () => {
 		await updateCount(_$w);
+        await updateMapMarkers(_$w);
 		
 	});
 
-	if (await window.formFactor === "Mobile") {
+	if (await window.formFactor() === "Mobile") {
 		_$w('#dropdownsContainer').collapse();
     } 
 
 	_$w('#positionsRepeater').onItemReady(async ($item, itemData) => {
 		$item('#positionItem').onClick(async () => {
+            let baseUrl = await location.baseUrl();
 			to(`${baseUrl}/jobs/${itemData._id}`);
 		});
 	});
@@ -175,15 +173,18 @@ function init(_$w) {
 	_$w('#closeFiltersButton').onClick(()=>{
 		_$w('#dropdownsContainer, #closeFiltersButton').collapse();
 	});
+
 }
 
 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,count);
+    await updateMapMarkers(_$w);
     console.log("updating map markers completed");
     count ? _$w('#resultsMultiState').changeState('results') : _$w('#resultsMultiState').changeState('noResults');
     
@@ -261,9 +262,13 @@ async function resetFilters(_$w) {
 
 	_$w('#resetFiltersButton').disable();
 
-    queryParams.remove(["keyWord", "department","page"]);
+    queryParams.remove(["keyWord", "department","page","location"]);
+    
 
 	await updateCount(_$w);
+    console.log("reseting map markers");
+    await updateMapMarkers(_$w);
+    console.log("reseting map markers completed");
 }
 
 async function updateCount(_$w) {
@@ -341,27 +346,36 @@ async function handleLocationParam(_$w,location) {
     
 }
 
-async function updateMapMarkers(_$w,count){
-    if(count>0){
+async function updateMapMarkers(_$w){
     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,
-        };
-    });
+    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
+            };
+        });
     //@ts-ignore
-    _$w('#googleMaps').setMarkers(markers);
-    }
-    else{
-        _$w('#googleMaps').setMarkers([]);
-    }
+    await _$w('#googleMaps').setMarkers(markers);
+
 }