sr-npm 1.7.1286 → 1.7.1288

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -1,6 +1,6 @@
 const { COLLECTIONS,CUSTOM_VALUES_COLLECTION_FIELDS,JOBS_COLLECTION_FIELDS } = require('../backend/collectionConsts');
 const { CAREERS_PAGE_SELECTORS, GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
-const { wixWindow } = require('wix-window');
+
 const { window } = require('@wix/site-window');
 const { queryParams,onChange} = require('wix-location-frontend');
 const { location } = require("@wix/site-location");
@@ -39,10 +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 urlOnchangeIsActive=false
-let numbersofParamChanges=0;
-let selectedParamsList=[]
-let urlParamsIndex=0;
+
 const pagination = {
   pageSize: 10,
   currentPage: 1,
@@ -50,13 +47,8 @@ const pagination = {
 
 async function careersMultiBoxesPageOnReady(_$w,urlParams) {
   //to handle back and forth , url changes
-  
   onChange(async ()=>{
-    console.log("wixwindow.refere",wixWindow.referrer);
-    urlOnchangeIsActive=true;
     await handleBackAndForth(_$w);
-    urlOnchangeIsActive=false;
-
   });
   await loadData(_$w);
   await loadJobsRepeater(_$w); // if we remove the await here the job list will be flaky , it doesn't fill it properly
@@ -70,62 +62,26 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CLEAR_ALL_BUTTON_ID).onClick(async () => {
       await clearAll(_$w);
     });
-    if (await window.formFactor() === "Mobile") {
+    const formFactor = await window.formFactor();
+    if (formFactor === "Mobile" || formFactor === "Tablet") {
       handleFilterInMobile(_$w);
   }
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_MULTI_STATE_BOX).changeState("results");
-    selectedParamsList.push(urlParams);
 }
 
 async function handleBackAndForth(_$w){
-  //check the case when i click on a category then i click on 
-
-
-  const newQueryParams=await location.query();
-  selectedParamsList.push(newQueryParams);
-
-
-
   if(ActivateURLOnchange) {
-  const newQueryParams=await location.query();
-  await clearAll(_$w,true);
-  await handleUrlParams(_$w,newQueryParams,true); 
-  ActivateURLOnchange=true;
-  }
-  else{
-    numbersofParamChanges--;
-    if(numbersofParamChanges===0) {
-    ActivateURLOnchange=true;
-    }
-  }
-
+    const newQueryParams=await location.query();
+      console.log("newQueryParams: ", newQueryParams);
+      ActivateURLOnchange=false;
+      await clearAll(_$w,true);
+      await handleUrlParams(_$w,newQueryParams,true); 
+      ActivateURLOnchange=true;
 
-  // if(ActivateURLOnchange) {
-  //   const newQueryParams=await location.query();
-  //     console.log("newQueryParams: ", newQueryParams);
-  //     if(newQueryParams.page)
-  //       {
-  //           pageIsRemoved=false;
-  //       }
-  //       else
-  //       {
-  //         pageIsRemoved=true;
-  //       }
-  //     ActivateURLOnchange=false;
-  //     await clearAll(_$w,true);
-  //     await handleUrlParams(_$w,newQueryParams,true); 
-  //     ActivateURLOnchange=true;
-  //     if(pageIsRemoved)
-  //     {
-  //       handlePaginationButtons(_$w);
-  //       pageIsRemoved=false;
-  //     }
-      
-
-  //   }
-  //   else{
-  //     ActivateURLOnchange=true;
-  //   }
+    }
+    else{
+      ActivateURLOnchange=true;
+    }
 }
 
 async function clearAll(_$w,urlOnChange=false) {
@@ -142,7 +98,7 @@ async function clearAll(_$w,urlOnChange=false) {
     keywordAllJobs=undefined;
     if(!urlOnChange) {
       console.log("inside clearAll removing url params");
-     // ActivateURLOnchange=false;
+      ActivateURLOnchange=false;
       queryParams.remove(possibleUrlParams.concat(["keyword", "page"]));
 
       await updateJobsAndNumbersAndFilters(_$w,true);
@@ -251,8 +207,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);
-        handlePageUrlParam();
-
       }
   } catch (error) {
     console.error('Failed to handle url params:', error);
@@ -302,7 +256,6 @@ async function handleParams(_$w,param,values) {
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = pagination.currentPage.toString();
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = nextPageJobs;
       handlePaginationButtons(_$w);
-      handlePageUrlParam();
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).scrollTo();
     });
 
@@ -312,7 +265,6 @@ async function handleParams(_$w,param,values) {
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text =   pagination.currentPage.toString();
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = previousPageJobs;
       handlePaginationButtons(_$w);
-      handlePageUrlParam();
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).scrollTo();
     });
   } catch (error) {
@@ -326,12 +278,6 @@ 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"]);
-            //   queryParams.add({ ["page"]: 1 });
-            // }
             const fieldId = itemData.fieldId;
             const valueId = itemData.valueId;
             dontUpdateThisCheckBox=fieldId;
@@ -341,24 +287,18 @@ async function handleParams(_$w,param,values) {
             const field=getFieldById(fieldId,allfields);
             let fieldTitle=field.title.toLowerCase().replace(' ', '');
             fieldTitle==="brands"? fieldTitle="brand":fieldTitle;
-           // ActivateURLOnchange=false;
+            ActivateURLOnchange=false;
             const previousSelectedSize=selectedByField.size;
             if (updated.length) {
               selectedByField.set(fieldId, updated);
 
               
               queryParams.add({ [fieldTitle] : updated.map(val=>encodeURIComponent(val)).join(',') });
-              if(urlOnchangeIsActive){
-              numbersofParamChanges++;
-              }
             } else {
               selectedByField.delete(fieldId);
               handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
             
               queryParams.remove([fieldTitle ]);
-              if(urlOnchangeIsActive){
-                numbersofParamChanges++;
-              }
             }
 
             const currentVals = _$w(`#${FiltersIds[field.title]}CheckBox`).value || [];
@@ -412,7 +352,6 @@ async function loadJobsRepeater(_$w) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = Math.ceil(currentJobs.length/pagination.pageSize).toString();
     updateTotalJobsCountText(_$w);
     handlePaginationButtons(_$w);
-    handlePageUrlParam();
   } catch (error) {
     console.error('Failed to load jobs repeater:', error);
   }
@@ -462,16 +401,6 @@ 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)
-           {
-          //   //try instead of removing to add page = 1
-          //   //queryParams.remove(["page"]);
-          //   queryParams.add({ ["page"]: 1 });
-          pageIsRemoved=true
-          //save the selected param
-
-           }
           dontUpdateThisCheckBox=field._id;
         const selected = ev.target.value; // array of selected value IDs
         let fieldTitle=field.title.toLowerCase().replace(' ', '');
@@ -487,26 +416,15 @@ async function loadJobsRepeater(_$w) {
             //in this case we need the label not valueid
             const valueLabels=getValueFromValueId(selected,value);
             queryParams.add({ [fieldTitle] : valueLabels.map(val=>encodeURIComponent(val)).join(',') });
-            
-            if(urlOnchangeIsActive){
-              numbersofParamChanges++;
-            }
           }
           else{
             queryParams.add({ [fieldTitle] : selected.map(val=>encodeURIComponent(val)).join(',') });
-            if(urlOnchangeIsActive){
-              numbersofParamChanges++;
-            }
           }
           
         } else {
           selectedByField.delete(field._id); 
           handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
           queryParams.remove([fieldTitle ]);
-         
-          if(urlOnchangeIsActive){
-            numbersofParamChanges++;
-          }
         }
        
         console.log("selectedByField: ",selectedByField)
@@ -682,19 +600,13 @@ function getValueFromValueId(valueIds, value) {
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_MULTI_STATE_BOX).changeState("searchResult");
       pagination.currentPage=1;
     }
-    handlePaginationButtons(_$w);
-    if(!urlOnchangeIsActive)
-    {
-      
-      handlePageUrlParam();
-    }
     
+    handlePaginationButtons(_$w);
 }
 
 function handlePaginationButtons(_$w)
 {
-  console.log("iamhere")
- // handlePageUrlParam();
+  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();
   if(secondarySearchIsFilled) {
@@ -718,11 +630,9 @@ function handlePageUrlParam() {
   if(pagination.currentPage==1 || pagination.currentPage==0)
   {
       queryParams.remove(["page"]);
-      numbersofParamChanges++;
   }
   else{
-    queryParams.add({ ["page"]: pagination.currentPage });
-    numbersofParamChanges++;
+    queryParams.add({ page: pagination.currentPage });
   }
 }
 async function refreshFacetCounts(_$w,clearAll=false) { 
@@ -807,7 +717,6 @@ async function secondarySearch(_$w,query) {
     secondarySearchIsFilled=true
   }
     handlePaginationButtons(_$w);
-    handlePageUrlParam();
     updateTotalJobsCountText(_$w);
     await refreshFacetCounts(_$w); 
     return allsecondarySearchJobs;