sr-npm 3.1.23 → 3.1.25

package/backend/data.js

@@ -463,14 +463,18 @@ function fetchJobLocation(jobDetails) {
 
 async function createCollections() {
   console.log("Creating collections");
+  if(siteconfig===undefined) {
+    await getSiteConfig();
+  }
+  
   await Promise.all(
   [createCollectionIfMissing(COLLECTIONS.JOBS, COLLECTIONS_FIELDS.JOBS,{ insert: 'ADMIN', update: 'ADMIN', remove: 'ADMIN', read: 'ANYONE' }),
   createCollectionIfMissing(COLLECTIONS.CITIES, COLLECTIONS_FIELDS.CITIES),
   createCollectionIfMissing(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT, COLLECTIONS_FIELDS.AMOUNT_OF_JOBS_PER_DEPARTMENT),
   createCollectionIfMissing(COLLECTIONS.SECRET_MANAGER_MIRROR, COLLECTIONS_FIELDS.SECRET_MANAGER_MIRROR),
   createCollectionIfMissing(COLLECTIONS.BRANDS, COLLECTIONS_FIELDS.BRANDS),
-  createCollectionIfMissing(COLLECTIONS.CUSTOM_VALUES, COLLECTIONS_FIELDS.CUSTOM_VALUES),
-  createCollectionIfMissing(COLLECTIONS.CUSTOM_FIELDS, COLLECTIONS_FIELDS.CUSTOM_FIELDS)
+  siteconfig.customFields==="true" ? createCollectionIfMissing(COLLECTIONS.CUSTOM_VALUES, COLLECTIONS_FIELDS.CUSTOM_VALUES) : null,
+  siteconfig.customFields==="true" ? createCollectionIfMissing(COLLECTIONS.CUSTOM_FIELDS, COLLECTIONS_FIELDS.CUSTOM_FIELDS) : null
 ]);
   console.log("finished creating Collections");
 }
@@ -528,13 +532,16 @@ async function syncJobsFast() {
 
 async function clearCollections() {
   console.log("clearing collections");
+  if(siteconfig===undefined) {
+    await getSiteConfig();
+  }
   await Promise.all([
     wixData.truncate(COLLECTIONS.CITIES),
     wixData.truncate(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT),
     wixData.truncate(COLLECTIONS.JOBS),
     wixData.truncate(COLLECTIONS.BRANDS),
-    wixData.truncate(COLLECTIONS.CUSTOM_VALUES),
-    wixData.truncate(COLLECTIONS.CUSTOM_FIELDS),
+    siteconfig.customFields==="true" ? wixData.truncate(COLLECTIONS.CUSTOM_VALUES) : null,
+    siteconfig.customFields==="true" ? wixData.truncate(COLLECTIONS.CUSTOM_FIELDS) : null,
   ]);
   console.log("cleared collections successfully");
 }

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -37,6 +37,8 @@ let currentSecondarySearchJobs=[] // current secondary search results that are d
 let secondarySearchIsFilled=false // whether the secondary search is filled with results
 let keywordAllJobs; // all jobs that are displayed in the jobs repeater when the keyword is filled
 let ActivateURLOnchange=true; // whether to activate the url onchange
+let considerAllJobs=false; // whether to consider all jobs or not
+
 const pagination = {
   pageSize: 10,
   currentPage: 1,
@@ -285,11 +287,16 @@ async function handleParams(_$w,param,values) {
             let fieldTitle=field.title.toLowerCase().replace(' ', '');
             fieldTitle==="brands"? fieldTitle="brand":fieldTitle;
             ActivateURLOnchange=false;
+            const previousSelectedSize=selectedByField.size;
             if (updated.length) {
               selectedByField.set(fieldId, updated);
+
+              
               queryParams.add({ [fieldTitle] : updated.map(val=>encodeURIComponent(val)).join(',') });
             } else {
               selectedByField.delete(fieldId);
+              handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
+            
               queryParams.remove([fieldTitle ]);
             }
 
@@ -398,8 +405,12 @@ async function loadJobsRepeater(_$w) {
         let fieldTitle=field.title.toLowerCase().replace(' ', '');
         fieldTitle==="brands"? fieldTitle="brand":fieldTitle;
         ActivateURLOnchange=false;
+        const previousSelectedSize=selectedByField.size;
+
         if (selected && selected.length) {
           selectedByField.set(field._id, selected); 
+ 
+
           if(fieldTitle==="brand" || fieldTitle==="storename") {
             //in this case we need the label not valueid
             const valueLabels=getValueFromValueId(selected,value);
@@ -410,7 +421,8 @@ async function loadJobsRepeater(_$w) {
           }
           
         } else {
-          selectedByField.delete(field._id);  
+          selectedByField.delete(field._id); 
+          handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
           queryParams.remove([fieldTitle ]);
         }
        
@@ -451,14 +463,34 @@ function getValueFromValueId(valueIds, value) {
     updateTotalJobsCountText(_$w);  
   }
 
+  function handleConsiderAllJobs(previousSelectedSize,currentSelectedSize) {
+    if(previousSelectedSize===2 && currentSelectedSize===1) {
+
+      considerAllJobs=true;
+    }
+    else{
+      considerAllJobs=false;
+    }
+  }
+
   function updateOptionsUI(_$w,fieldTitle, fieldId, searchQuery,clearAll=false) {
     let base = optionsByFieldId.get(fieldId) || [];
-    const countsMap = countsByFieldId.get(fieldId) || new Map();
+    let countsMap=countsByFieldId.get(fieldId) || new Map();
+    if(considerAllJobs)
+    {
+      const selectedFieldId=Array.from( selectedByField.keys() )[0]
+      if(selectedFieldId===fieldId) {
+        const relevantFields=allvaluesobjects.filter(val=>val.customField===selectedFieldId)
+        countsMap = new Map(relevantFields.map(val=>[val.valueId, val.count]));
+        considerAllJobs=false;
+      }
+    }
     if(dontUpdateThisCheckBox===fieldId && !clearAll && selectedByField.has(fieldId) )
     {
           dontUpdateThisCheckBox=null;
           return;
     }
+
     let filteredbase=[]
     for (const element of base)
     {
@@ -613,8 +645,8 @@ async function refreshFacetCounts(_$w,clearAll=false) {
 
   function countJobsPerField(jobs) {
     const fieldIds = Array.from(optionsByFieldId.keys());
+  
     const currentJobsIds=jobs.map(job=>job._id);
-    
     for (const fieldId of fieldIds) {
         let currentoptions = optionsByFieldId.get(fieldId)
         let counter=new Map();

package/pages/pagesUtils.js

@@ -78,13 +78,7 @@ function getFieldByTitle(title,allFields) {
 
 function getCorrectOption(value,options,param) {
   const standardizedValue = normalizeString(value.toLowerCase())
-  if(param==="employmenttype" || param==="Employment Type" || param==="Store Name") //employmenttype have a problematic value, added Employment Type for updateOptionsUI fuinction, added Store Name because Store name and location have for example   Blenheim
-  {
-    //option.value is the id, 
-    return options.find(option=>normalizeString(option.value.toLowerCase())===standardizedValue);
-  }
-  //option.label is what we see live in the UI
-  return options.find(option=>normalizeString(option.label.toLowerCase())===standardizedValue);
+  return options.find(option=>normalizeString(option.value.toLowerCase())===standardizedValue || normalizeString(option.label.toLowerCase())===standardizedValue);
 }
 
 function getOptionIndexFromCheckBox(options,value) {