sr-npm 1.7.529 → 1.7.531

package/backend/collectionConsts.js

@@ -97,6 +97,22 @@ const COLLECTIONS_FIELDS = {
     SMART_TOKEN: 'x-smarttoken',
     DESIRED_BRAND: 'desiredBrand',
   }
+
+  const URL_PARAMS = {
+    DEPARTMENT: "Department",
+    LOCATION: "Location",
+    BRAND: "Brand",
+  }
+  const DROPDOWN_IDS = {
+    DEPARTMENT: '#dropdownDepartment',
+    LOCATION: '#dropdownLocation',
+    BRAND: '#dropdownBrand',
+  } 
+  const DROPDOWN_COLLECTIONS = {
+    DEPARTMENT: 'AmountOfJobsPerDepartment',
+    LOCATION: 'cities',
+    BRAND: 'Brands',
+  }
   
 
   module.exports = {
@@ -108,4 +124,7 @@ const COLLECTIONS_FIELDS = {
     BRANDS_COLLECTION_FIELDS,
     TEMPLATE_TYPE,
     TOKEN_NAME,
+    URL_PARAMS,
+    DROPDOWN_IDS,
+    DROPDOWN_COLLECTIONS,
 };

package/backend/data.js

@@ -56,6 +56,7 @@ function addCustomFields(basicJob, position) {
   const customFieldsArray = Array.isArray(position?.customField) ? position.customField : [];
   const customFields = {};
   for (const field of customFieldsArray) {
+    if(field.fieldLabel==="Country" || field.fieldLabel==="Department") continue; //country and department are not custom fields, they are already in the job object
     const label = field.fieldLabel==="Brands" ? "brand" : field.fieldLabel
     const key = normalizeString(label);
     const value = field.valueLabel
@@ -352,6 +353,7 @@ async function aggregateJobs() {
     aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.CITY_TEXT, collection: COLLECTIONS.CITIES }),
     aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.BRAND, collection: COLLECTIONS.BRANDS })
   ]);
+
   console.log("finished aggregating jobs");
 }
 
@@ -374,7 +376,7 @@ async function syncJobsFast() {
   // console.log("saving jobs descriptions and location apply url to CMS");
   // await saveJobsDescriptionsAndLocationApplyUrlToCMS();
   // console.log("saved jobs descriptions and location apply url to CMS successfully");
-  // await aggregateJobs();
+ //  await aggregateJobs();
   // await referenceJobs();
   // console.log("syncing jobs fast finished successfully");
 }

package/package.json

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

package/pages/careersPage.js

@@ -3,7 +3,7 @@ const {wixData} = require('wix-data');
 const { window } = require('@wix/site-window');
 const { query,queryParams,onChange} = require("wix-location-frontend");
 const { location } = require("@wix/site-location");
-const { COLLECTIONS } = require('../backend/collectionConsts');
+const { COLLECTIONS, URL_PARAMS, DROPDOWN_IDS, DROPDOWN_COLLECTIONS } = require('../backend/collectionConsts');
 
 const {
     debounce,
@@ -25,21 +25,22 @@ const {
   let queryCustomFields={};
   let searchInputBlurredFirstTime=true;
   let deletedParam=false;
-async function careersPageOnReady(_$w,thisObject,queryParams,customFieldsObject=null) {
+async function careersPageOnReady(_$w,thisObject,queryParams,customFieldsDropdownObject=null) {
 console.log("queryParams: ", queryParams);
+console.log("customFieldsDropdownObject: ", customFieldsDropdownObject)
 await retrieveQueryParams(queryParams);
 thisObjectVar=thisObject;
 allJobs=await getAllPositions();
 await activateAutoLoad(_$w);
 await bind(_$w);
-await init(_$w);
+await init(_$w,customFieldsDropdownObject);
 await handleBrandDropdown(_$w);
 await handleUrlParams(_$w);
 
 
 }
 
-async function retrieveQueryParams(queryParams){
+async function retrieveQueryParams(queryParams,customFieldsDropdownObject=null){
 const { page, keyWord, department, location,jobType,brand } = queryParams;
 queryPageVar=page;
 queryKeyWordVar=keyWord;
@@ -47,14 +48,16 @@ queryDepartmentVar=department;
 queryLocationVar=location;
 queryJobTypeVar=jobType;
 queryBrandVar=brand;
-const customFieldKeys=await getCustomFieldKeys()
+if(customFieldsDropdownObject){
+const customFieldKeys=Object.keys(customFieldsDropdownObject);
 console.log("customFieldKeys: ", customFieldKeys)
 for(const customFieldKey of customFieldKeys)
 {
-    queryCustomFields[customFieldKey]=queryParams[customFieldKey]
+    queryCustomFields[customFieldKey]={elementId:customFieldsDropdownObject[customFieldKey], field:customFieldKey, queryParamValue:queryParams[customFieldKey],queryParamKey:customFieldKey}
 }
 console.log("queryCustomFields",queryCustomFields)
 }
+}
 
 function activateAutoLoad(_$w)
 {
@@ -111,16 +114,24 @@ async function handleUrlParams(_$w) {
         await handlePageParam(_$w);    
     }
     if (queryDepartmentVar) {
-        await handleDepartmentParam(_$w,queryDepartmentVar);
+        await handleGivenURLParam(_$w,URL_PARAMS.DEPARTMENT,queryDepartmentVar);
+        //await handleDepartmentParam(_$w,queryDepartmentVar);
     }
     if (queryLocationVar) {
-        await handleLocationParam(_$w,queryLocationVar);
+       // await handleLocationParam(_$w,queryLocationVar);
+       await handleGivenURLParam(_$w,URL_PARAMS.LOCATION,queryLocationVar);
     }
     if (queryJobTypeVar) {
         await handleJobTypeParam(_$w,queryJobTypeVar);
     }
     if (queryBrandVar && _$w('#dropdownBrand').isVisible) { //if it is not visible, ignore it
-        await handleBrandParam(_$w,queryBrandVar);
+        //await handleBrandParam(_$w,queryBrandVar);
+        await handleGivenURLParam(_$w,URL_PARAMS.BRAND,queryBrandVar);
+    }
+    if (queryCustomFields) {
+        for(const customFieldKey of Object.keys(queryCustomFields)){
+            await handleGivenURLParam(_$w,customFieldKey,queryCustomFields[customFieldKey].queryParamValue);
+        }
     }
     await applyFilters(_$w, true); // Skip URL update since we're handling initial URL params
 }
@@ -180,7 +191,7 @@ async function bind(_$w) {
 
 }
 
-function init(_$w) {
+function init(_$w,customFieldsDropdownObject=null) {
     const debouncedSearch = debounce(()=>applyFilters(_$w), 400,thisObjectVar);
     _$w('#searchInput').onInput(debouncedSearch);
     _$w('#searchInput').onBlur(()=>{
@@ -194,6 +205,14 @@ function init(_$w) {
         console.log("dropdown onChange is triggered");
         applyFilters(_$w);
     });
+    if (customFieldsDropdownObject){
+        for(const customFieldKey of Object.keys(customFieldsDropdownObject)){
+            _$w(customFieldsDropdownObject[customFieldKey]).onChange(()=>{
+                console.log("custom field onChange is triggered");
+                applyFilters(_$w);
+            }); 
+        }
+    }
 	_$w('#resetFiltersButton, #clearSearch').onClick(()=>resetFilters(_$w));
 
 	_$w('#openFiltersButton').onClick(()=>{
@@ -260,17 +279,27 @@ async function handleBackAndForth(_$w){
         
 }
 
+async function applyCustomFieldFilters(filters) {
+    for(const customFieldKey of Object.keys(queryCustomFields)){
+        filters.push({ field: customFieldKey, searchTerm: queryCustomFields[customFieldKey] });
+    }
+}
+
 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: '#dropdownBrand', field: 'brand', value: _$w('#dropdownBrand').value},
-		{ elementId: '#searchInput', field: 'title', value: _$w('#searchInput').value }
+		{ elementId: '#dropdownDepartment', field: 'department', value: _$w('#dropdownDepartment').value,queryParamKey:"department" },
+		{ elementId: '#dropdownLocation', field: 'cityText', value: _$w('#dropdownLocation').value,queryParamKey:"location" },
+		{ elementId: '#dropdownJobType', field: 'remote', value: _$w('#dropdownJobType').value,queryParamKey:"jobType" },
+		{ elementId: '#dropdownBrand', field: 'brand', value: _$w('#dropdownBrand').value,queryParamKey:"brand" },
+		{ elementId: '#searchInput', field: 'title', value: _$w('#searchInput').value,queryParamKey:"keyWord" }
 		];
+    //adding custom field filters to the dropdownFiltersMapping
+    for(const customFieldKey of Object.keys(queryCustomFields)){
+        dropdownFiltersMapping.push({ elementId: queryCustomFields[customFieldKey].elementId, field: queryCustomFields[customFieldKey].field, value: _$w(queryCustomFields[customFieldKey].elementId).value,queryParamKey:queryCustomFields[customFieldKey].queryParamKey });
+    }
     console.log("dropdownFiltersMapping: ", dropdownFiltersMapping);
-    
+ 
 
 
 	let filters = [];
@@ -289,23 +318,29 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
                 if(filter.field === 'title'){
                     queryParams.add({ keyWord: filter.value });
                 }
-                if(filter.field === 'department'){
-                    queryParams.add({ department: encodeURIComponent(filter.value) });
-                }
-                if(filter.field === 'cityText'){
-                    queryParams.add({ location:  encodeURIComponent(filter.value) });
-                }
-                if(filter.field === 'remote'){
-                    if(filter.value === 'true'){
-                        queryParams.add({ jobType: encodeURIComponent("remote") });
+                else{
+                    if(filter.field === 'remote'){
+                        if(filter.value === 'true'){
+                            queryParams.add({ jobType: encodeURIComponent("remote") });
+                        }
+                        else{
+                            queryParams.add({ jobType: encodeURIComponent("onsite") });
+                        }
                     }
                     else{
-                        queryParams.add({ jobType: encodeURIComponent("onsite") });
+                        queryParams.add({ [filter.queryParamKey] : encodeURIComponent(filter.value) });
                     }
                 }
-                if(filter.field === 'brand'){
-                    queryParams.add({ brand: encodeURIComponent(filter.value) });
-                }
+                // if(filter.field === 'department'){
+                //     queryParams.add({ department: encodeURIComponent(filter.value) });
+                // }
+                // if(filter.field === 'cityText'){
+                //     queryParams.add({ location:  encodeURIComponent(filter.value) });
+                // }
+     
+                // if(filter.field === 'brand'){
+                //     queryParams.add({ brand: encodeURIComponent(filter.value) });
+                // }
             }
 			if(filter.field === 'remote') {	
 				value = filter.value === 'true';
@@ -316,28 +351,32 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
 		}
     else{
         if (!skipUrlUpdate) {
-            if(filter.field === 'title'){
-                queryParams.remove(["keyWord" ]);
-            }
-            if(filter.field === 'department'){
-                console.log("removing department from url")
-                queryParams.remove(["department" ]);
-            }
-            if(filter.field === 'cityText'){
-                console.log("removing location from url")
-                queryParams.remove(["location" ]);
-            }
-            if(filter.field === 'remote'){
-                console.log("removing jobType from url")
-                queryParams.remove(["jobType" ]);
-            }
-            if(filter.field === 'brand'){
-                console.log("removing brand from url")
-                queryParams.remove(["brand" ]);
-            }
+            queryParams.remove([filter.queryParamKey]);
+            // if(filter.field === 'title'){
+            //     queryParams.remove(["keyWord" ]);
+            // }
+            // if(filter.field === 'department'){
+            //     console.log("removing department from url")
+            //     queryParams.remove(["department" ]);
+            // }
+            // if(filter.field === 'cityText'){
+            //     console.log("removing location from url")
+            //     queryParams.remove(["location" ]);
+            // }
+            // if(filter.field === 'remote'){
+            //     console.log("removing jobType from url")
+            //     queryParams.remove(["jobType" ]);
+            // }
+            // if(filter.field === 'brand'){
+            //     console.log("removing brand from url")
+            //     queryParams.remove(["brand" ]);
+            // }
         }
     }
 	});
+
+    //applyCustomFieldFilters(filters);
+    console.log("dropdownFiltersMapping after applying filters: ", dropdownFiltersMapping);
 	
 	const filter = await getFilter(filters, 'and');
     await _$w('#jobsDataset').setFilter(filter);
@@ -359,6 +398,9 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
 
 async function resetFilters(_$w) {
 	_$w('#searchInput, #dropdownDepartment, #dropdownLocation, #dropdownJobType, #dropdownBrand').value = '';
+    for(const customFieldKey of Object.keys(queryCustomFields)){
+        _$w(queryCustomFields[customFieldKey].elementId).value = '';
+    }
 
     await _$w('#jobsDataset').setFilter(wixData.filter());
     await _$w('#jobsDataset').refresh();
@@ -368,7 +410,9 @@ async function resetFilters(_$w) {
 	_$w('#resetFiltersButton').disable();
 
     queryParams.remove(["keyWord", "department","page","location","jobType","brand"]);
-    
+    for(const customFieldKey of Object.keys(queryCustomFields)){
+        queryParams.remove([queryCustomFields[customFieldKey].queryParamKey]);
+    }
 
 	await updateCount(_$w);
     console.log("reseting map markers");
@@ -383,16 +427,33 @@ async function updateCount(_$w) {
 	return count;
 }
 
+async function handleGivenURLParam(_$w,param,value,isCustomField=false) {
+    const paramValue = decodeURIComponent(value);
+    let dropdownOptions = _$w(DROPDOWN_IDS[param]).options;
+    console.log("dropdown options:", dropdownOptions);
+    let optionsFromCMS;
+    if(!isCustomField){
+        optionsFromCMS=await wixData.query(DROPDOWN_COLLECTIONS[param]).find();
+        if(dropdownOptions.length!==optionsFromCMS.items.length+1){
+            fixDropdownOptions(DROPDOWN_IDS[param],optionsFromCMS, _$w);
+        }
+    }
+    const option=_$w(DROPDOWN_IDS[param]).options.find(option => option.value.toLowerCase() === paramValue.toLowerCase())
+    if(option){
+        _$w(DROPDOWN_IDS[param]).value = option.value;
+    }
+    else{
+        console.warn("param value not found in dropdown options");
+        queryParams.remove([param]);
+    }
+}
+
 async function handleDepartmentParam(_$w,department) {
     const departmentValue = decodeURIComponent(department);
-    
-        
-    
     let dropdownOptions = _$w('#dropdownDepartment').options;
     console.log("dropdown options:", dropdownOptions);
     const optionsFromCMS=await wixData.query("AmountOfJobsPerDepartment").find();
     //+1 because of the "All" option
-
     if(dropdownOptions.length!==optionsFromCMS.items.length+1){
         fixDropdownOptions('#dropdownDepartment',optionsFromCMS, _$w);
     }