sr-npm 1.7.1199 → 1.7.1201

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -37,6 +37,7 @@ 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,
@@ -54,13 +55,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);
     });
+    if (await window.formFactor() === "Mobile") {
+      handleFilterInMobile(_$w);
+  }
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_MULTI_STATE_BOX).changeState("results");
 }
 
@@ -91,6 +93,7 @@ async function clearAll(_$w,urlOnChange=false) {
     secondarySearchIsFilled=false;
     currentJobs=alljobs;
     keywordAllJobs=undefined;
+    considerAllJobs=false;
     if(!urlOnChange) {
       console.log("inside clearAll removing url params");
       ActivateURLOnchange=false;
@@ -113,16 +116,26 @@ function handleFilterInMobile(_$w) {
       CAREERS_PAGE_SELECTORS.SECTION_3, 
       CAREERS_PAGE_SELECTORS.LINE_3,
       CAREERS_PAGE_SELECTORS.FILTER_ICON];
+    
+  const mobileFilterBoxSelectors = [
+    CAREERS_PAGE_SELECTORS.FILTER_BOX,
+    CAREERS_PAGE_SELECTORS.REFINE_SEARCH_BUTTON,
+    CAREERS_PAGE_SELECTORS.EXIT_BUTTON,
+  ];
 
   _$w(CAREERS_PAGE_SELECTORS.FILTER_ICON).onClick(()=>{
-      _$w(CAREERS_PAGE_SELECTORS.FILTER_BOX).expand();
+      mobileFilterBoxSelectors.forEach(selector => {
+        _$w(selector).expand();
+      });
       searchResultsSelectors.forEach(selector => {
           _$w(selector).collapse();
       });
   });
 
   const exitFilterBox = () => {
-      _$w(CAREERS_PAGE_SELECTORS.FILTER_BOX).collapse();
+      mobileFilterBoxSelectors.forEach(selector => {
+        _$w(selector).collapse();
+      });
       searchResultsSelectors.forEach(selector => {
           _$w(selector).expand();
       });
@@ -135,6 +148,11 @@ function handleFilterInMobile(_$w) {
   _$w(CAREERS_PAGE_SELECTORS.REFINE_SEARCH_BUTTON).onClick(()=>{
       exitFilterBox();
   });
+
+  //onmobile we should collapse the filter box and the refine search button by default 
+  mobileFilterBoxSelectors.forEach(selector => {
+    _$w(selector).collapse();
+  });
 }
 
 
@@ -267,11 +285,15 @@ 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);
+              handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
               queryParams.add({ [fieldTitle] : updated.map(val=>encodeURIComponent(val)).join(',') });
             } else {
               selectedByField.delete(fieldId);
+              handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
               queryParams.remove([fieldTitle ]);
             }
 
@@ -380,8 +402,11 @@ 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); 
+          handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
           if(fieldTitle==="brand" || fieldTitle==="storename") {
             //in this case we need the label not valueid
             const valueLabels=getValueFromValueId(selected,value);
@@ -393,6 +418,7 @@ async function loadJobsRepeater(_$w) {
           
         } else {
           selectedByField.delete(field._id);  
+          handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
           queryParams.remove([fieldTitle ]);
         }
        
@@ -414,6 +440,17 @@ async function loadJobsRepeater(_$w) {
     }
   }
 
+
+  function handleConsiderAllJobs(previousSelectedSize,currentSelectedSize) {
+    if(previousSelectedSize===2 && currentSelectedSize===1) {
+      considerAllJobs=true;
+    }
+    else{
+      considerAllJobs=false;
+    }
+  }
+
+
 function getValueFromValueId(valueIds, value) {
   let valueLabels = [];
   let currentVal
@@ -593,8 +630,8 @@ async function refreshFacetCounts(_$w,clearAll=false) {
 
   function countJobsPerField(jobs) {
     const fieldIds = Array.from(optionsByFieldId.keys());
-    const currentJobsIds=jobs.map(job=>job._id);
-    
+    let currentJobsIds;
+    considerAllJobs? currentJobsIds=alljobs.map(job=>job._id):currentJobsIds=jobs.map(job=>job._id);
     for (const fieldId of fieldIds) {
         let currentoptions = optionsByFieldId.get(fieldId)
         let counter=new Map();

package/pages/careersPage.js

@@ -192,18 +192,18 @@ function init(_$w) {
         searchInputBlurredFirstTime=false;
         }
     });
-    _$w(CAREERS_PAGE_SELECTORS.DROPDOWN_DEPARTMENT+', '+ CAREERS_PAGE_SELECTORS.DROPDOWN_LOCATION+', '+ CAREERS_PAGE_SELECTORS.DROPDOWN_JOB_TYPE+', '+ CAREERS_PAGE_SELECTORS.DROPDOWN_BRAND).onChange(()=>{
+    _$w(CAREERS_PAGE_SELECTORS.DROPDOWN_DEPARTMENT, CAREERS_PAGE_SELECTORS.DROPDOWN_LOCATION, CAREERS_PAGE_SELECTORS.DROPDOWN_JOB_TYPE, CAREERS_PAGE_SELECTORS.DROPDOWN_BRAND).onChange(()=>{
         console.log("dropdown onChange is triggered");
         applyFilters(_$w);
     });
-	_$w(CAREERS_PAGE_SELECTORS.RESET_FILTERS_BUTTON+', '+ CAREERS_PAGE_SELECTORS.CLEAR_SEARCH).onClick(()=>resetFilters(_$w));
+	_$w(CAREERS_PAGE_SELECTORS.RESET_FILTERS_BUTTON, CAREERS_PAGE_SELECTORS.CLEAR_SEARCH).onClick(()=>resetFilters(_$w));
 
 	_$w(CAREERS_PAGE_SELECTORS.OPEN_FILTERS_BUTTON).onClick(()=>{
-		_$w(CAREERS_PAGE_SELECTORS.DROPDOWN_CONTAINER+', '+ CAREERS_PAGE_SELECTORS.CLOSE_FILTERS_BUTTON).expand();
+		_$w(CAREERS_PAGE_SELECTORS.DROPDOWN_CONTAINER, CAREERS_PAGE_SELECTORS.CLOSE_FILTERS_BUTTON).expand();
 	});
 
 	_$w(CAREERS_PAGE_SELECTORS.CLOSE_FILTERS_BUTTON).onClick(()=>{
-		_$w(CAREERS_PAGE_SELECTORS.DROPDOWN_CONTAINER+', '+ CAREERS_PAGE_SELECTORS.CLOSE_FILTERS_BUTTON).collapse();
+		_$w(CAREERS_PAGE_SELECTORS.DROPDOWN_CONTAINER, CAREERS_PAGE_SELECTORS.CLOSE_FILTERS_BUTTON).collapse();
 	});
 
     //URL onChange
@@ -355,7 +355,7 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
 }
 
 async function resetFilters(_$w) {
-	_$w(CAREERS_PAGE_SELECTORS.SEARCH_INPUT+', '+ CAREERS_PAGE_SELECTORS.DROPDOWN_DEPARTMENT+', '+ CAREERS_PAGE_SELECTORS.DROPDOWN_LOCATION+', '+ CAREERS_PAGE_SELECTORS.DROPDOWN_JOB_TYPE+', '+ CAREERS_PAGE_SELECTORS.DROPDOWN_BRAND).value = '';
+	_$w(CAREERS_PAGE_SELECTORS.SEARCH_INPUT, CAREERS_PAGE_SELECTORS.DROPDOWN_DEPARTMENT, CAREERS_PAGE_SELECTORS.DROPDOWN_LOCATION, CAREERS_PAGE_SELECTORS.DROPDOWN_JOB_TYPE, CAREERS_PAGE_SELECTORS.DROPDOWN_BRAND).value = '';
 
     await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(wixData.filter());
     await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
@@ -404,7 +404,8 @@ async function handleDepartmentParam(_$w,department) {
         queryParams.remove(["department" ]);
 
     }
-     
+    
+    
      
 }
 

package/pages/homePage.js

@@ -7,7 +7,6 @@ const { COLLECTIONS } = require('../backend/collectionConsts');
 const { getAllRecords } = require('./pagesUtils');
 const { handlePrimarySearch } = require('../public/primarySearchUtils');
 const { GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
-const { isElementExistOnPage } = require('psdev-utils');
 
 let thisObjectVar;
 let searchByCityFlag=false;
@@ -86,16 +85,15 @@ function bindTeamRepeater(_$w) {
        
             const $item = _$w.at(event.context);
             
-            if(isElementExistOnPage(_$w("#categoriesDataset"))) {
+            if(_$w("#categoriesDataset")) {
                 const clickedItemData = $item("#categoriesDataset").getCurrentItem();
                 const department = encodeURIComponent(clickedItemData.title);
                 location.to(`/search?category=${department}`);
             }      
             else
             {
-                const clickedItemData =  $item("#dataset1").getCurrentItem()
-                const department = encodeURIComponent(clickedItemData.title);
-                location.to(`/positions?department=${department}`);
+                console.log("check SR templates  and do this ")
+               
             } 
       });
 

package/pages/positionPage.js

@@ -10,8 +10,6 @@ const {
   } = require('../public/utils');
   
   
-
-
   async function positionPageOnReady(_$w) {
     console.log("positionPageOnReady called");
     await bind(_$w);
@@ -90,8 +88,14 @@ async function getCategoryValue(customValues) {
 }
 
   function handleReferFriendButton(_$w,item) {
-    if(!item.referFriendLink &&  isElementExistOnPage(_$w('#referFriendButton'))){
-      _$w('#referFriendButton').hide();
+    if(isElementExistOnPage(_$w('#referFriendButton'))){
+      if(!item.referFriendLink){
+        _$w('#referFriendButton').hide();
+      }
+      else {
+        _$w('#referFriendButton').target="_blank";
+        _$w('#referFriendButton').link=item.referFriendLink;
+      }
     }
   }
 

package/public/primarySearchUtils.js

@@ -153,4 +153,5 @@ return count > 0;
 
 module.exports = {
   handlePrimarySearch,
+  queryPrimarySearchResults
 }