sr-npm 3.1.8 → 3.1.10

package/backend/data.js

@@ -500,6 +500,7 @@ async function referenceJobs() {
 }
 
 async function syncJobsFast() {
+  try{
   console.log("Syncing jobs fast");
   await createCollections();
   await clearCollections();
@@ -516,6 +517,12 @@ async function syncJobsFast() {
   await aggregateJobs();
   await referenceJobs();
   console.log("syncing jobs fast finished successfully");
+  }
+  catch (error) {
+    error.message="Error syncing jobs: "+error.message;
+    throw error;
+  }
+  
 }
 
 

package/backend/secretsData.js

@@ -37,9 +37,14 @@ const elevatedQuery = auth.elevate(wixData.query);
   }
   
   async function getApiKeys() {
-    const companyId = await getTokenFromCMS(TOKEN_NAME.COMPANY_ID);
-    const templateType = await getTemplateTypeFromCMS();
-    return {companyId,templateType};
+    try{
+      const companyId = await getTokenFromCMS(TOKEN_NAME.COMPANY_ID);
+      const templateType = await getTemplateTypeFromCMS();
+      return {companyId,templateType};
+    } catch (error) {
+      console.error("Error getting api keys: ", error);
+      throw error;
+    }
   }
 
   module.exports = {

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -21,6 +21,7 @@ let allsecondarySearchJobs=[] // secondary search results that are displayed in
 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 ActivateURLOnchange=true; // whether to activate the url onchange
 const pagination = {
   pageSize: 10,
   currentPage: 1,
@@ -33,7 +34,7 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
   });
 
   await loadData(_$w);
-  loadJobsRepeater(_$w);
+  await loadJobsRepeater(_$w); // if we remove the await here the job list will be flaky , it doesn't fill it properly
   loadPrimarySearchRepeater(_$w);
   await loadFilters(_$w);
   loadSelectedValuesRepeater(_$w);
@@ -52,15 +53,23 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
 }
 
 async function handleBackAndForth(_$w){
+  if(ActivateURLOnchange) {
     const newQueryParams=await location.query();
-    console.log("newQueryParams: ", newQueryParams);
-    await clearAll(_$w,true);
-    await handleUrlParams(_$w,newQueryParams);
-    
+      console.log("newQueryParams: ", newQueryParams);
+      ActivateURLOnchange=false;
+      await clearAll(_$w,true);
+      await handleUrlParams(_$w,newQueryParams,true); 
+      ActivateURLOnchange=true;
+
+    }
+    else{
+      ActivateURLOnchange=true;
+    }
 }
 
 async function clearAll(_$w,urlOnChange=false) {
   if(selectedByField.size>0 || _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).value || _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value) {
+    
     for(const field of allfields) {
       _$w(`#${FiltersIds[field.title]}CheckBox`).selectedIndices = [];
     }
@@ -71,9 +80,13 @@ async function clearAll(_$w,urlOnChange=false) {
     currentJobs=alljobs;
     keywordAllJobs=undefined;
     if(!urlOnChange) {
+      console.log("inside clearAll removing url params");
+      ActivateURLOnchange=false;
       queryParams.remove(possibleUrlParams.concat(["keyword", "page"]));
+
+      await updateJobsAndNumbersAndFilters(_$w,true);
     }
-    await updateJobsAndNumbersAndFilters(_$w,true);
+    
     }
 }
 
@@ -113,7 +126,7 @@ function handleFilterInMobile(_$w) {
 }
 
 
-async function handleUrlParams(_$w,urlParams) {
+async function handleUrlParams(_$w,urlParams,handleBackAndForth=false) {
   try { 
   let applyFiltering=false;
   let currentApplyFilterFlag=false;
@@ -136,8 +149,9 @@ async function handleUrlParams(_$w,urlParams) {
     }
     currentApplyFilterFlag=false;
   }
-    if(applyFiltering || keywordAllJobs) {
+    if(applyFiltering || keywordAllJobs || handleBackAndForth) {
       await updateJobsAndNumbersAndFilters(_$w);
+      
     }
   
     if(urlParams.page) {
@@ -236,6 +250,7 @@ async function handleParams(_$w,param,values) {
             const field=getFieldById(fieldId,allfields);
             let fieldTitle=field.title.toLowerCase().replace(' ', '');
             fieldTitle==="brands"? fieldTitle="brand":fieldTitle;
+            ActivateURLOnchange=false;
             if (updated.length) {
               selectedByField.set(fieldId, updated);
               queryParams.add({ [fieldTitle] : updated.map(val=>encodeURIComponent(val)).join(',') });
@@ -243,10 +258,12 @@ async function handleParams(_$w,param,values) {
               selectedByField.delete(fieldId);
               queryParams.remove([fieldTitle ]);
             }
+
             const currentVals = _$w(`#${FiltersIds[field.title]}CheckBox`).value || [];
             const nextVals = currentVals.filter(v => v !== valueId);
             _$w(`#${FiltersIds[field.title]}CheckBox`).value = nextVals;
             await updateJobsAndNumbersAndFilters(_$w);
+           
           });
     });
      updateSelectedValuesRepeater(_$w);
@@ -313,8 +330,7 @@ async function loadJobsRepeater(_$w) {
       // 2) Load all values once and group them by referenced field
       let valuesByFieldId = groupValuesByField(allvaluesobjects, CUSTOM_VALUES_COLLECTION_FIELDS.CUSTOM_FIELD);
       valuesByFieldId.set("Location",cities)
-      
-      // Build CheckboxGroup options for this field  
+          // Build CheckboxGroup options for this field  
       const counter={}
       for(const city of cities) {
         counter[city.city]=city.count
@@ -343,27 +359,28 @@ async function loadJobsRepeater(_$w) {
 
         _$w(`#${FiltersIds[field.title]}CheckBox`).selectedIndices = []; // start empty
         _$w(`#${FiltersIds[field.title]}CheckBox`).onChange(async (ev) => {
-          dontUpdateThisCheckBox = field._id;
-          const selected = ev.target.value; // array of selected value IDs
-          let fieldTitle=field.title.toLowerCase().replace(' ', '');
-          fieldTitle === "brands"? fieldTitle = "brand" : fieldTitle;
-
-          if (selected && selected.length) {
-            selectedByField.set(field._id, selected); 
-            if(fieldTitle==="brand" || fieldTitle==="storename") {
-              //in this case we need the label not valueid
-              const valueLabels = getValueFromValueId(selected, value);
-              queryParams.add({ [fieldTitle] : valueLabels.map(val=>encodeURIComponent(val)).join(',') });
-            }
-            else{
-              queryParams.add({ [fieldTitle] : selected.map(val=>encodeURIComponent(val)).join(',') });
-            }
-          
-          } else {
-            selectedByField.delete(field._id);  
-            queryParams.remove([fieldTitle ]);
+          dontUpdateThisCheckBox=field._id;
+        const selected = ev.target.value; // array of selected value IDs
+        let fieldTitle=field.title.toLowerCase().replace(' ', '');
+        fieldTitle==="brands"? fieldTitle="brand":fieldTitle;
+        ActivateURLOnchange=false;
+        if (selected && selected.length) {
+          selectedByField.set(field._id, selected); 
+          if(fieldTitle==="brand" || fieldTitle==="storename") {
+            //in this case we need the label not valueid
+            const valueLabels=getValueFromValueId(selected,value);
+            queryParams.add({ [fieldTitle] : valueLabels.map(val=>encodeURIComponent(val)).join(',') });
           }
-
+          else{
+            queryParams.add({ [fieldTitle] : selected.map(val=>encodeURIComponent(val)).join(',') });
+          }
+          
+        } else {
+          selectedByField.delete(field._id);  
+          queryParams.remove([fieldTitle ]);
+        }
+       
+        console.log("selectedByField: ",selectedByField)
         await updateJobsAndNumbersAndFilters(_$w);
       });
 
@@ -394,10 +411,10 @@ function getValueFromValueId(valueIds, value) {
 }
  
   async function updateJobsAndNumbersAndFilters(_$w,clearAll=false) {
-    await applyJobFilters(_$w); // re-query jobs
+    await applyJobFilters(_$w,clearAll); // re-query jobs
     await refreshFacetCounts(_$w,clearAll);    // recompute and update counts in all lists
     await updateSelectedValuesRepeater(_$w);
-    updateTotalJobsCountText(_$w);
+    updateTotalJobsCountText(_$w);  
   }
 
   function updateOptionsUI(_$w,fieldTitle, fieldId, searchQuery,clearAll=false) {
@@ -444,7 +461,8 @@ function getValueFromValueId(valueIds, value) {
     }
   }
 
-  async function applyJobFilters(_$w) {
+  async function applyJobFilters(_$w,clearAll=false) {
+   // if(!clearAll) {
     let tempFilteredJobs=[];
     let finalFilteredJobs=[];
     secondarySearchIsFilled? finalFilteredJobs=allsecondarySearchJobs:finalFilteredJobs=alljobs;
@@ -478,12 +496,13 @@ function getValueFromValueId(valueIds, value) {
         finalFilteredJobs=tempFilteredJobs;
         tempFilteredJobs=[];
     }
-    
     secondarySearchIsFilled? currentSecondarySearchJobs=finalFilteredJobs:currentJobs=finalFilteredJobs;
    
     
     let jobsFirstPage=[];
+    console.log("currentSecondarySearchJobs: ",currentSecondarySearchJobs)
     secondarySearchIsFilled? jobsFirstPage=currentSecondarySearchJobs.slice(0,pagination.pageSize):jobsFirstPage=currentJobs.slice(0,pagination.pageSize);
+    console.log("jobsFirstPage: ",jobsFirstPage)
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = jobsFirstPage;
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = "1";
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = secondarySearchIsFilled? Math.ceil(currentSecondarySearchJobs.length/pagination.pageSize).toString():Math.ceil(currentJobs.length/pagination.pageSize).toString();
@@ -496,6 +515,7 @@ function getValueFromValueId(valueIds, value) {
     pagination.currentPage=1;
     handlePaginationButtons(_$w);
   }
+ // }
 
 function handlePaginationButtons(_$w)
 {
@@ -519,14 +539,15 @@ function handlePaginationButtons(_$w)
 }
 
 function handlePageUrlParam() {
+  ActivateURLOnchange=false;
   if(pagination.currentPage==1)
   {
+    
       queryParams.remove(["page"]);
   }
   else{
     queryParams.add({ page: pagination.currentPage });
   }
-  
 }
 async function refreshFacetCounts(_$w,clearAll=false) { 
 

package/pages/positionPage.js

@@ -15,7 +15,6 @@ const {
     console.log("positionPageOnReady called");
     await bind(_$w);
     
-    
 
   }