sr-npm 1.7.979 → 1.7.980

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -48,7 +48,6 @@ async function clearAll(_$w) {
     secondarySearchIsFilled=false;
     currentJobs=alljobs;
     keywordAllJobs=undefined;
-    queryParams.remove(["keyword", "brand","visibility","category","page"]);
     await updateJobsAndNumbersAndFilters(_$w,true);
     }
 }
@@ -84,14 +83,14 @@ async function handleUrlParams(_$w,urlParams) {
         return;
       }
         pagination.currentPage=Number(urlParams.page);
-        let paginationCurrentText=urlParams.page;
+        let paginationCurrentText=Number(urlParams.page)*pagination.pageSize
         let startSlicIndex=pagination.pageSize*(pagination.currentPage-1);
         let endSlicIndex=(pagination.pageSize)*(pagination.currentPage);
         if(Number(urlParams.page)==Math.ceil(currentJobs.length/pagination.pageSize)) {
-          paginationCurrentText=(paginationCurrentText-(pagination.pageSize-(currentJobs.length%pagination.pageSize))).toString();          
+          paginationCurrentText=paginationCurrentText-(pagination.pageSize-(currentJobs.length%pagination.pageSize));          
           endSlicIndex=currentJobs.length;
         }
-        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = paginationCurrentText
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = paginationCurrentText.toString();
         const jobsFirstPage=currentJobs.slice(startSlicIndex,endSlicIndex);
         _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = jobsFirstPage;
         handlePaginationButtons(_$w);
@@ -124,9 +123,8 @@ async function handleParams(_$w,param,value) {
   try {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).onClick(async () => {
       let nextPageJobs=currentJobs.slice(pagination.pageSize*pagination.currentPage,pagination.pageSize*(pagination.currentPage+1));
-      
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = (nextPageJobs.length+pagination.pageSize*pagination.currentPage).toString();
       pagination.currentPage++;
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = pagination.currentPage.toString();
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = nextPageJobs;
       handlePaginationButtons(_$w);
     });
@@ -134,7 +132,7 @@ async function handleParams(_$w,param,value) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS).onClick(async () => {
       let previousPageJobs=currentJobs.slice(pagination.pageSize*(pagination.currentPage-2),pagination.pageSize*(pagination.currentPage-1));
       pagination.currentPage--;
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text =   pagination.currentPage.toString();
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = (pagination.pageSize*pagination.currentPage).toString();
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = previousPageJobs;
       handlePaginationButtons(_$w);
     });
@@ -210,8 +208,8 @@ async function loadJobsRepeater(_$w) {
 
     const jobsFirstPage=alljobs.slice(0,pagination.pageSize);
     _$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 = Math.ceil(currentJobs.length/pagination.pageSize).toString();
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = jobsFirstPage.length.toString();
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = currentJobs.length.toString();
     updateTotalJobsCountText(_$w);
     handlePaginationButtons(_$w);
   } catch (error) {
@@ -383,8 +381,8 @@ async function loadJobsRepeater(_$w) {
     let jobsFirstPage=[];
     secondarySearchIsFilled? jobsFirstPage=currentSecondarySearchJobs.slice(0,pagination.pageSize):jobsFirstPage=currentJobs.slice(0,pagination.pageSize);
     _$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();
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = jobsFirstPage.length.toString();
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = secondarySearchIsFilled? currentSecondarySearchJobs.length.toString():currentJobs.length.toString();
     if(jobsFirstPage.length===0) {
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_MULTI_STATE_BOX).changeState("noJobs");
     }
@@ -482,10 +480,9 @@ async function secondarySearch(_$w,query) {
     currentSecondarySearchJobs=allsecondarySearchJobs;
     const jobsFirstPage=allsecondarySearchJobs.slice(0,pagination.pageSize);
     _$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 = Math.ceil(allsecondarySearchJobs.length/pagination.pageSize).toString();
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = jobsFirstPage.length.toString();
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = allsecondarySearchJobs.length.toString();
     pagination.currentPage=1;
-
     if(jobsFirstPage.length===0) {
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_MULTI_STATE_BOX).changeState("noJobs");
     }

package/pages/homePage.js

@@ -15,13 +15,16 @@ async function homePageOnReady(_$w,thisObject=null) {
 
     const queryResult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
     const siteconfig = queryResult.items[0];
-    if(siteconfig.categorySearch==="true") {
+    if(siteconfig.twg) {
         const allJobs=await getAllRecords(COLLECTIONS.JOBS);
         const allvaluesobjects=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
         bindPrimarySearch(_$w,allvaluesobjects,allJobs);
         loadPrimarySearchRepeater(_$w)
+        console.log("siteconfig.twg: ",siteconfig.twg);
+        if(siteconfig.twg==="external") {
         bindTeamRepeater(_$w)
         bindViewAllButton(_$w)
+        }
     }
     else{
 

package/pages/pagesUtils.js

@@ -85,11 +85,23 @@ function loadPrimarySearchRepeater(_$w) {
     const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
     const clickedItemData = data.find(
       (item) => item._id === event.context.itemId,
-      
     );
-    console.log("clickedItemData: ",clickedItemData);
-    console.log("clickedItemData['link-jobs-title']: ",clickedItemData["link-jobs-title"]);
-    location.to(clickedItemData["link-jobs-title"]);
+    // 'link-jobs-title' or 'link-copy-of-jobs-title'
+    const linkKey = Object.keys(clickedItemData).find(
+      key => key.startsWith('link') && key.includes('jobs') && key.includes('title')
+    );
+    if (linkKey && clickedItemData[linkKey] ) {
+      console.log("original link: ",clickedItemData[linkKey]);
+      console.log("original clickedItemData: ",clickedItemData);
+      if(clickedItemData[linkKey].contains("copy-of")) {
+        clickedItemData[linkKey]=clickedItemData[linkKey].replace("copy-of-jobs","jobs")
+      }
+      console.log("new link: ",clickedItemData[linkKey]);
+      console.log("new clickedItemData: ",clickedItemData);
+      console.log("redirecting to: ",clickedItemData[linkKey]);
+      location.to(clickedItemData[linkKey]);
+    }
+
   });
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
     $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_CATEGORY_BUTTON).label = itemData.title || '';