sr-npm 1.7.1269 → 1.7.1271

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -39,7 +39,7 @@ let secondarySearchIsFilled=false // whether the secondary search is filled with
 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
-let finishedUrlOnChange=false;
+let urlOnchangeIsActive=false
 const pagination = {
   pageSize: 10,
   currentPage: 1,
@@ -48,7 +48,9 @@ const pagination = {
 async function careersMultiBoxesPageOnReady(_$w,urlParams) {
   //to handle back and forth , url changes
   onChange(async ()=>{
-    finishedUrlOnChange? finishedUrlOnChange=false : await handleBackAndForth(_$w);
+    urlOnchangeIsActive=true;
+    await handleBackAndForth(_$w);
+    urlOnchangeIsActive=false;
 
   });
   await loadData(_$w);
@@ -208,10 +210,6 @@ async function handleUrlParams(_$w,urlParams,handleBackAndForth=false) {
         const jobsFirstPage=currentJobs.slice(startSlicIndex,endSlicIndex);
         _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = jobsFirstPage;
         handlePaginationButtons(_$w);
-        if(!ActivateURLOnchange)
-        {
-          finishedUrlOnChange=true;
-        }
 
       }
   } catch (error) {
@@ -284,6 +282,11 @@ async function handleParams(_$w,param,values) {
         $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER_ITEM_LABEL).text = itemData.label || '';
         // Deselect this value from both the selected map and the multibox
           $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.DESELECT_BUTTON_ID).onClick(async () => {
+            const currentQueryParams=await location.query();
+            if(currentQueryParams.page)
+            {
+              queryParams.remove(["page"]);
+            }
             const fieldId = itemData.fieldId;
             const valueId = itemData.valueId;
             dontUpdateThisCheckBox=fieldId;
@@ -407,6 +410,11 @@ async function loadJobsRepeater(_$w) {
 
         _$w(`#${FiltersIds[field.title]}CheckBox`).selectedIndices = []; // start empty
         _$w(`#${FiltersIds[field.title]}CheckBox`).onChange(async (ev) => {
+          const currentQueryParams=await location.query();
+          if(currentQueryParams.page)
+          {
+            queryParams.remove(["page"]);
+          }
           dontUpdateThisCheckBox=field._id;
         const selected = ev.target.value; // array of selected value IDs
         let fieldTitle=field.title.toLowerCase().replace(' ', '');
@@ -606,12 +614,16 @@ function getValueFromValueId(valueIds, value) {
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_MULTI_STATE_BOX).changeState("searchResult");
       pagination.currentPage=1;
     }
+    if(!urlOnchangeIsActive)
+    {
+      handlePaginationButtons(_$w);
+    }
     
-    handlePaginationButtons(_$w);
 }
 
 function handlePaginationButtons(_$w)
 {
+  console.log("iamhere")
   handlePageUrlParam();
 
   pagination.currentPage===1 || pagination.currentPage===0? _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS).disable():_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS).enable();