sr-npm 1.7.191 → 1.7.193

package/package.json

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

package/pages/careersPage.js

@@ -16,11 +16,12 @@ const {
   let queryPageVar;
   let queryKeyWordVar;
   let queryDepartmentVar;
-
-async function careersPageOnReady(_$w,thisObject,querypage,querykeyWord,querydepartment) {
+  let queryLocationVar;
+async function careersPageOnReady(_$w,thisObject,querypage,querykeyWord,querydepartment,querylocation) {
 queryPageVar=querypage;
 queryKeyWordVar=querykeyWord;
 queryDepartmentVar=querydepartment;
+queryLocationVar=querylocation;
 thisObjectVar=thisObject;
 allJobs=await getAllPositions();
 await handleUrlParams(_$w);
@@ -90,6 +91,9 @@ async function handleUrlParams(_$w) {
     if (queryDepartmentVar) {
         await handleDepartmentParam(_$w,queryDepartmentVar);
     }
+    if (queryLocationVar) {
+        await handleLocationParam(_$w,queryLocationVar);
+    }
 }
 
 async function handleKeyWordParam(_$w,keyWord) {
@@ -200,6 +204,9 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
                 if(filter.field === 'department'){
                     queryParams.add({ department: encodeURIComponent(filter.value) });
                 }
+                if(filter.field === 'cityText'){
+                    queryParams.add({ location:  encodeURIComponent(filter.value) });
+                }
             }
 			if(filter.field === 'remote') {	
 				value = filter.value === 'true';
@@ -216,6 +223,9 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
             if(filter.field === 'department'){
                 queryParams.remove(["department" ]);
             }
+            if(filter.field === 'cityText'){
+                queryParams.remove(["location" ]);
+            }
         }
     }
 	});
@@ -266,7 +276,7 @@ async function handleDepartmentParam(_$w,department) {
     //+1 because of the "All" option
 
     if(dropdownOptions.length!==optionsFromCMS.items.length+1){
-        fixDropdownOptions(optionsFromCMS, _$w);
+        fixDropdownOptions('#dropdownDepartment',optionsFromCMS, _$w);
     }
 
     if (_$w('#dropdownDepartment').options.find(option => option.value === departmentValue))
@@ -284,7 +294,7 @@ async function handleDepartmentParam(_$w,department) {
      
 }
 
-function fixDropdownOptions(optionsFromCMS, _$w){
+function fixDropdownOptions(dropdown,optionsFromCMS, _$w){
     let dropdownOptions = [];
     dropdownOptions=[{
         label: "All",
@@ -294,11 +304,34 @@ function fixDropdownOptions(optionsFromCMS, _$w){
         label: item.title,
         value: item.title
     })));
-    _$w('#dropdownDepartment').options=dropdownOptions;
+    _$w(dropdown).options=dropdownOptions;
     console.warn("something is wrong with the dropdown options, fixing it");
 
 }
 
+async function handleLocationParam(_$w,location) {
+    let dropdownOptions = _$w('#dropdownLocation').options;
+    console.log("location dropdown options:", dropdownOptions);
+    const optionsFromCMS=await wixData.query("Cities").find();
+    //+1 because of the "All" option
+
+    if(dropdownOptions.length!==optionsFromCMS.items.length+1){
+        fixDropdownOptions('#dropdownLocation',optionsFromCMS, _$w);
+    }
+
+    if (_$w('#dropdownLocation').options.find(option => option.value === locationValue))
+    {
+        _$w('#dropdownLocation').value = locationValue;
+        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" ]);
+
+    }
+    
+}
+
 
 
 module.exports = {

package/pages/homePage.js

@@ -25,11 +25,10 @@ async function homePageOnReady(_$w,thisObject) {
         const numOfItems = await _$w('#citiesDataset').getTotalCount();
         const items = await _$w('#citiesDataset').getItems(0, numOfItems);
         let baseUrl = await location.baseUrl();
-        const linkUrl = `${baseUrl}/positions`;
         const markers = items.items.map(item => {
             const location = item.locationAddress.location;
             const cityName = encodeURIComponent(item.title); // Use the city name from the item
-            const cityLinkUrl = `${linkUrl}?keyWord=${cityName}`; // Add city as search parameter
+            const cityLinkUrl = `${baseUrl}/positions?location=${cityName}`; // Add city as search parameter
             return {
                 location: {
                     latitude: location.latitude,
@@ -43,25 +42,6 @@ async function homePageOnReady(_$w,thisObject) {
         //@ts-ignore
         _$w('#googleMaps').setMarkers(markers);
     });
-    _$w('#googleMaps').onMarkerClicked((event) => {
-        console.log("event: ", event);
-        
-        // Get all markers from the map
-        const allMarkers = _$w('#googleMaps').markers;
-        console.log("allMarkers: ", allMarkers);
-        const getMarker = _$w('#googleMaps').getMarkers();
-        console.log("getMarker: ", getMarker);
-        
-        // Find the clicked marker by matching coordinates
-        const clickedMarker = allMarkers.find(marker => 
-            marker.location.latitude === event.location.latitude &&
-            marker.location.longitude === event.location.longitude
-        );
-        
-        if (clickedMarker && clickedMarker.linkUrl) {
-            location.to(clickedMarker.linkUrl);
-        }
-    });
 }
 
 function init(_$w) {