sr-npm 1.7.900 → 1.7.902

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -16,7 +16,7 @@ let currentJobs=[] // current jobs that are displayed in the jobs repeater
 let allsecondarySearchJobs=[] // secondary search results that are displayed in the jobs repeater
 let currentSecondarySearchJobs=[] // current secondary search results that are displayed in the jobs repeater
 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 keywordAllJobs; // all jobs that are displayed in the jobs repeater when the keyword is filled
 const pagination = {
   pageSize: 10,
   currentPage: 1,
@@ -49,7 +49,7 @@ async function clearAll(_$w) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value='';
     secondarySearchIsFilled=false;
     currentJobs=alljobs;
-    keywordAllJobs=alljobs;
+    keywordAllJobs=undefined;
     await updateJobsAndNumbersAndFilters(_$w,true);
     }
 }
@@ -58,12 +58,10 @@ async function clearAll(_$w) {
 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;   
     keywordAllJobs=_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
   }
@@ -77,8 +75,8 @@ async function handleUrlParams(_$w,urlParams) {
       applyFiltering=await handleParams(_$w,"category",urlParams.category)
     }
 
-    if(applyFiltering || keyword) {
-      await updateJobsAndNumbersAndFilters(_$w,false,keyword);
+    if(applyFiltering || keywordAllJobs) {
+      await updateJobsAndNumbersAndFilters(_$w);
     }
     if(urlParams.page) {
       if(Number.isNaN(Number(urlParams.page)) || Number(urlParams.page)<=1 || Number(urlParams.page)>Math.ceil(currentJobs.length/pagination.pageSize)) {
@@ -290,8 +288,8 @@ async function loadJobsRepeater(_$w) {
 
  
 
-  async function updateJobsAndNumbersAndFilters(_$w,clearAll=false,keyword=false) {
-    await applyJobFilters(_$w,keyword); // re-query jobs
+  async function updateJobsAndNumbersAndFilters(_$w,clearAll=false) {
+    await applyJobFilters(_$w); // re-query jobs
     await refreshFacetCounts(_$w,clearAll);    // recompute and update counts in all lists
     await updateSelectedValuesRepeater(_$w);
     updateTotalJobsCountText(_$w);
@@ -336,11 +334,11 @@ async function loadJobsRepeater(_$w) {
     _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value = preserved;
   }
 
-  async function applyJobFilters(_$w,keyword=false) {
+  async function applyJobFilters(_$w) {
     let tempFilteredJobs=[];
     let finalFilteredJobs=[];
     secondarySearchIsFilled? finalFilteredJobs=allsecondarySearchJobs:finalFilteredJobs=alljobs;
-    if(keyword) {
+    if(keywordAllJobs) {
       finalFilteredJobs=keywordAllJobs
     }
     let addedJobsIds=new Set();

package/pages/pagesUtils.js

@@ -110,8 +110,12 @@ _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
 
 _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onKeyPress(async (event) => {
   if( event.key==='Enter') {
+    console.log("primary search input key pressed");
+    console.log("_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value: ",_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
     if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
+      // _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
+      const baseUrl = await location.baseUrl();
+      location.to(`${baseUrl}/search`);
 
     } 
     else {
@@ -123,8 +127,11 @@ _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onKeyPress(async (even
 });
 
 _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
+  console.log("primary search button clicked");
+  console.log("_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value: ",_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
   if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
-    _$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);