sr-npm 1.7.891 → 1.7.893

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -56,6 +56,14 @@ async function handleUrlParams(_$w,urlParams) {
   try { 
   let applyFiltering=false;
   let keyword=false
+
+  if(urlParams.keyword) {
+    applyFiltering=await primarySearch(_$w, decodeURIComponent(urlParams.keyword), alljobs);
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value=decodeURIComponent(urlParams.keyword);
+    keyword=true;
+    currentJobs=_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;    
+  }
+
     if(urlParams.brand) {
       applyFiltering=await handleParams(_$w,"brand",urlParams.brand)
     }
@@ -65,17 +73,8 @@ async function handleUrlParams(_$w,urlParams) {
     if(urlParams.category) {
       applyFiltering=await handleParams(_$w,"category",urlParams.category)
     }
-    if(urlParams.keyword) {
-      applyFiltering=await primarySearch(_$w, decodeURIComponent(urlParams.keyword), alljobs);
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value=decodeURIComponent(urlParams.keyword);
-      keyword=true;
-      if(applyFiltering)
-      {
-        currentJobs=_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
-      }
-      
-    }
-    if(applyFiltering) {
+
+    if(applyFiltering || keyword) {
       await updateJobsAndNumbersAndFilters(_$w,false,keyword);
     }
     if(urlParams.page) {
@@ -297,7 +296,16 @@ async function loadJobsRepeater(_$w) {
 
   function updateOptionsUI(_$w,fieldTitle, fieldId, searchQuery,clearAll=false) {
     let base = optionsByFieldId.get(fieldId) || [];
+    console.log("base: ",base)
+    console.log("optionsByFieldId : ",optionsByFieldId)
+    console.log("countsByFieldId : ",countsByFieldId)
     const countsMap = countsByFieldId.get(fieldId) || new Map();
+    console.log("countsMap: ",countsMap)
+    console.log("fieldTitle: ",fieldTitle)
+    console.log("fieldId: ",fieldId)
+    console.log("searchQuery: ",searchQuery)
+    console.log("clearAll: ",clearAll)
+    
     if(dontUpdateThisCheckBox===fieldId && !clearAll)
     {
         dontUpdateThisCheckBox=null;
@@ -311,6 +319,7 @@ async function loadJobsRepeater(_$w) {
             filteredbase.push(element)
         }
     }
+    console.log("filteredbase: ",filteredbase)
     // Build display options with counts
     const withCounts = filteredbase.map(o => {
       const count = countsMap.get(o.value)
@@ -320,6 +329,7 @@ async function loadJobsRepeater(_$w) {
       };
     });
     // Apply search
+    console.log("withCounts: ",withCounts)
     const filtered = searchQuery
       ? withCounts.filter(o => (o.label || '').toLowerCase().includes(searchQuery))
       : withCounts;
@@ -328,7 +338,9 @@ async function loadJobsRepeater(_$w) {
     let prevSelected=[]
     clearAll? prevSelected=[]:prevSelected= _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value;
     const visibleSet = new Set(filtered.map(o => o.value));
+    console.log("visibleSet: ",visibleSet)
     const preserved = prevSelected.filter(v => visibleSet.has(v));
+    console.log("preserved: ",preserved)
     _$w(`#${FiltersIds[fieldTitle]}CheckBox`).options = filtered;
     _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value = preserved;
   }

package/pages/pagesUtils.js

@@ -155,21 +155,20 @@ async function primarySearch(_$w,query,alljobs) {
   let filteredJobs=alljobs.filter(job=>job.title.toLowerCase().includes(query));
   if(filteredJobs.length>0) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data = filteredJobs
-    return true;
   }
   else {
     console.log("searching by location")
-    //search by location
      filteredJobs=alljobs.filter(job=>job.location.fullLocation.toLowerCase().includes(query));
     if(filteredJobs.length>0) {
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data = filteredJobs
-      return true;
     }
+    else{
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
-    return false;
+    }
   }
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data = filteredJobs
+    return filteredJobs.length>0;
+  
 }
 
   async function getValueFromValueId(valueId) {

package/tests/multiSearchBoxCareers.spec.js

@@ -160,7 +160,7 @@ describe('primarySearch function tests', () => {
      
      
      expect(mockprimarySearchMultiBox.changeState).toHaveBeenCalledWith('noResults');
-     expect(mockprimarySearcJobResult.data).toBeNull();
+     expect(mockprimarySearcJobResult.data.length).toBe(0);
    });
 
    it('should fill category repeater when clicking on empty primary search input', async () => {