sr-npm 1.2.74 → 1.2.76

package/backend/careersMultiBoxesPageIds.js

@@ -31,6 +31,7 @@ const CAREERS_MULTI_BOXES_PAGE_CONSTS={
     PRIMARY_SEARCH_CATEGORY_BUTTON: '#primarySearchCategoryButton',
     RESULTS_CONTAINER: '#resultsContainer',
     PRIMARY_SEARCH_BUTTON: '#primarySearchButton',
+    RESULTS_MULTI_STATE_BOX: '#multiStateBox1',
 }
 
 const TWG_JOBS_COLLECTION_FIELDS={

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -47,7 +47,6 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
   onChange(async ()=>{
     await handleBackAndForth(_$w);
   });
-
   await loadData(_$w);
   await loadJobsRepeater(_$w); // if we remove the await here the job list will be flaky , it doesn't fill it properly
   handlePrimarySearch(_$w, allvaluesobjects);
@@ -55,16 +54,14 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
   loadSelectedValuesRepeater(_$w);
   bindSearchInput(_$w);
   loadPaginationButtons(_$w);
-
     if (await window.formFactor() === "Mobile") {
       handleFilterInMobile(_$w);
   }
-    
     await handleUrlParams(_$w, urlParams);
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CLEAR_ALL_BUTTON_ID).onClick(async () => {
       await clearAll(_$w);
     });
-
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_MULTI_STATE_BOX).changeState("results");
 }
 
 async function handleBackAndForth(_$w){
@@ -439,16 +436,20 @@ function getValueFromValueId(valueIds, value) {
   function updateOptionsUI(_$w,fieldTitle, fieldId, searchQuery,clearAll=false) {
     let base = optionsByFieldId.get(fieldId) || [];
     const countsMap = countsByFieldId.get(fieldId) || new Map();
-    if(dontUpdateThisCheckBox===fieldId && !clearAll)
+    if(dontUpdateThisCheckBox===fieldId && !clearAll && selectedByField.has(fieldId) )
     {
-        dontUpdateThisCheckBox=null;
-        return;
+          dontUpdateThisCheckBox=null;
+          return;
     }
     let filteredbase=[]
     for (const element of base)
     {
         if(countsMap.get(element.value))
         {
+          if(countsMap.get(element.value)==-1)
+          {
+            countsMap.set(element.value,0);
+          }
             filteredbase.push(element)
         }
     }
@@ -466,19 +467,31 @@ function getValueFromValueId(valueIds, value) {
       : withCounts;
 
     // Preserve currently selected values that are still visible
-    let prevSelected=[]
-    clearAll? prevSelected=[]:prevSelected= _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value;
+  //  let prevSelected=[]
+  //  clearAll? prevSelected=[]:prevSelected= _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value;
     const visibleSet = new Set(filtered.map(o => o.value));
-    const preserved = prevSelected.filter(v => visibleSet.has(v));
+    //const preserved = prevSelected.filter(v => visibleSet.has(v));
     if(filtered.length===0) {
       _$w(`#${FiltersIds[fieldTitle]}MultiBox`).changeState(`${FiltersIds[fieldTitle]}NoResults`);
     }
     else{
       _$w(`#${FiltersIds[fieldTitle]}MultiBox`).changeState(`${FiltersIds[fieldTitle]}Results`);
     _$w(`#${FiltersIds[fieldTitle]}CheckBox`).options = filtered;
-    _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value = preserved;
+    clearAll?_$w(`#${FiltersIds[fieldTitle]}CheckBox`).value=[]:_$w(`#${FiltersIds[fieldTitle]}CheckBox`).value = visibleSet
+    if(visibleSet.size>0 && selectedByField.has(fieldId)) {
+      let selectedindices=[];
+      for(const  value of selectedByField.get(fieldId)) {
+        const options = optionsByFieldId.get(fieldId) || [];
+        const option = getCorrectOption(value,options,fieldTitle);
+        if(option) {
+          const optionIndex = getOptionIndexFromCheckBox(_$w(`#${FiltersIds[fieldTitle]}CheckBox`).options,option.value);
+          selectedindices.push(optionIndex);
+        }
+      }
+      _$w(`#${FiltersIds[fieldTitle]}CheckBox`).selectedIndices = selectedindices;
     }
   }
+}
 
   async function applyJobFilters(_$w) {
     let tempFilteredJobs=[];
@@ -591,7 +604,18 @@ async function refreshFacetCounts(_$w,clearAll=false) {
                     counter.set(option.value, (counter.get(option.value) || 0) + 1);
                 }
             }
+        
         }
+        if(selectedByField.has(fieldId)) {
+        for (const value of selectedByField.get(fieldId)) {
+          console.log("value: ",value)
+          if(counter.get(value)===undefined)
+          {
+            //it is -1 as a flag, so in case it was selected and after selecting more filters from different field and  suddenly no more jobs have it, we will show 0
+            counter.set(value, -1);
+          }
+        }
+      }
         countsByFieldId.set(fieldId, counter);
     }
   }

package/pages/pagesUtils.js

@@ -78,10 +78,12 @@ function getFieldByTitle(title,allFields) {
 
 function getCorrectOption(value,options,param) {
   const standardizedValue = normalizeString(value.toLowerCase())
-  if(param==="employmenttype") //employmenttype have a problematic value
+  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);
 }
 

package/public/primarySearchUtils.js

@@ -6,26 +6,55 @@ const { debounce } = require('../pages/pagesUtils');
 
 async function handlePrimarySearch(_$w, allvaluesobjects) {
     // load the categories list before clicking on the primary search input
+    loadCategoryRepeaterData(_$w, allvaluesobjects);
+
+    // wait for the jobs dataset to be ready
+    await _$w("#jobsDataset").onReadyAsync();
+
+    await bindPrimarySearch(_$w);
+}
+
+function loadCategoryRepeaterData(_$w, allvaluesobjects) {
     let categoryValues=[]
     for(const value of allvaluesobjects) {
       if(value.customField === CATEGORY_CUSTOM_FIELD_ID_IN_CMS) {
         categoryValues.push({title: value.title+` (${value.count})` , _id: value.valueId});
       }
     }
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues; 
+}
 
-    // wait for the jobs dataset to be ready
-    await _$w("#jobsDataset").onReadyAsync();
+async function bindPrimarySearch(_$w) {
+    handleCategoryEvents(_$w);
 
-    await bindPrimarySearch(_$w, allvaluesobjects);
+    await handleSearchInput(_$w);
+
+    // on mouse out collapse the results container
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
+    });
+    
+    // handle the click on the search button
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
+      if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
+        const baseUrl = await location.baseUrl();
+        location.to(`${baseUrl}/search`);
+      }
+      else {
+        let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
+        const baseUrl = await location.baseUrl();
+        location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
+      }
+    });
 }
 
-function loadPrimarySearchRepeater(_$w) {
-  // handle category state
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
+function handleCategoryEvents(_$w) {
+    // set the label of the category repeater item
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
     $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_CATEGORY_BUTTON).label = itemData.title || '';
   }); 
   
+  // handle the category repeater item on click
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER_ITEM).onClick(async (event) => {
     const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data;
     const clickedItemData = data.find(
@@ -42,9 +71,10 @@ function getSearchQuery(_$w) {
     return _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
 }
 
-async function handleSearchInput(_$w, allvaluesobjects) {
-    _$w('primarySearchInput').enable();
+async function handleSearchInput(_$w) {
+    _$w('#primarySearchInput').enable();
 
+    // on Input call the queryPrimarySearchResults function
     const callQueryPrimarySearchResults = async () => { 
         await queryPrimarySearchResults(_$w, getSearchQuery(_$w));
       } 
@@ -52,7 +82,7 @@ async function handleSearchInput(_$w, allvaluesobjects) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => { 
         await debounce(() => callQueryPrimarySearchResults(), 300)();
     });
-    
+
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
         _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
         
@@ -61,62 +91,26 @@ async function handleSearchInput(_$w, allvaluesobjects) {
             await queryPrimarySearchResults(_$w, searchQuery);
         }
         else {
-            await loadCategoriesListPrimarySearch(_$w, allvaluesobjects);
+            _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
         }
     });
 
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onKeyPress(async (event) => {
-    if( event.key === 'Enter') {
-        if(getSearchQuery(_$w) === '') {
-        // _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
-        const baseUrl = await location.baseUrl();
-        location.to(`${baseUrl}/search`);
-    
-        } 
-        else {
-        let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
-        const baseUrl = await location.baseUrl();
-        location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
+        if( event.key === 'Enter') {
+            if(getSearchQuery(_$w) === '') {
+            // _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
+            const baseUrl = await location.baseUrl();
+            location.to(`${baseUrl}/search`);
+        
+            } 
+            else {
+            let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
+            const baseUrl = await location.baseUrl();
+            location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
+            }
         }
-    }
-    });
-}
-
-async function bindPrimarySearch(_$w, allvaluesobjects) {
-    loadPrimarySearchRepeater(_$w);
-
-    await handleSearchInput(_$w, allvaluesobjects);
-
-    // on mouse out collapse the results container
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
-    });
-    
-    // handle the click on the search button
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
-      if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
-        const baseUrl = await location.baseUrl();
-        location.to(`${baseUrl}/search`);
-      }
-      else {
-        let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
-        const baseUrl = await location.baseUrl();
-        location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
-      }
     });
 }
-
-async function loadCategoriesListPrimarySearch(_$w, allvaluesobjects) {
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
-    
-    let categoryValues=[]
-    for(const value of allvaluesobjects) {
-      if(value.customField === CATEGORY_CUSTOM_FIELD_ID_IN_CMS) {
-        categoryValues.push({title: value.title+` (${value.count})` , _id: value.valueId});
-      }
-    }
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
-}
     
 async function queryPrimarySearchResults(_$w, query) {
     if(query === undefined || query === '') {
@@ -157,8 +151,5 @@ return count > 0;
 }
 
 module.exports = {
-  loadPrimarySearchRepeater,
-  bindPrimarySearch,
-  queryPrimarySearchResults,
   handlePrimarySearch,
 }