sr-npm 1.7.695 → 1.7.697

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -1,8 +1,7 @@
 const { COLLECTIONS,CUSTOM_VALUES_COLLECTION_FIELDS,JOBS_COLLECTION_FIELDS } = require('../backend/collectionConsts');
 const { items: wixData } = require('@wix/data');
 const {CAREERS_MULTI_BOXES_PAGE_CONSTS,FiltersIds} = require('../backend/careersMultiBoxesPageIds');
-
-let valuesByFieldIdGlobal = null; 
+const { groupValuesByField } = require('./pagesUtils');
 let dontUpdateThisCheckBox;
 const selectedByField = new Map(); // fieldId -> array of selected value IDs
 const optionsByFieldId = new Map(); // fieldId -> [{label, value}] array of objects with label which is the valueLabel and value which is the valueId
@@ -33,23 +32,17 @@ async function careersMultiBoxesPageOnReady(_$w) {
 
 async function loadPaginationButtons(_$w) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).onClick(async () => {
-      console.log("next page button clicked");
-      console.log("current page: ", pagination.currentPage);
       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++;
-      console.log("next page ", pagination.currentPage);
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = nextPageJobs;
       handlePaginationButtons(_$w);
     });
 
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS).onClick(async () => {
-      console.log("previous page button clicked");
-      console.log("current page: ", pagination.currentPage);
       let previousPageJobs=currentJobs.slice(pagination.pageSize*(pagination.currentPage-1),pagination.pageSize*pagination.currentPage);
       pagination.currentPage--;
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = (pagination.pageSize*pagination.currentPage).toString();
-      console.log("previous page ", pagination.currentPage);
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = previousPageJobs;
       handlePaginationButtons(_$w);
     });
@@ -92,7 +85,6 @@ async function loadSelectedValuesRepeater(_$w) {
 }
 
 async function loadData(_$w) {
-
     if(alljobs.length===0) {
         alljobs=await getAllRecords(COLLECTIONS.JOBS);
         currentJobs=alljobs;
@@ -117,13 +109,14 @@ 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 = jobsFirstPage.length.toString();
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = currentJobs.length.toString();
     updateTotalJobsCountText(_$w);
     handlePaginationButtons(_$w);
   }
 
   function updateTotalJobsCountText(_$w) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.TotalJobsCountText).text = `${currentJobs.length} Jobs`;
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = currentJobs.length.toString();
   }
 
   async function loadFilters(_$w) {
@@ -136,7 +129,6 @@ 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)
-      valuesByFieldIdGlobal = valuesByFieldId; // store globally
 
           // Build CheckboxGroup options for this field
         
@@ -293,6 +285,8 @@ async function loadJobsRepeater(_$w) {
     currentJobs=finalFilteredJobs;
     const jobsFirstPage=currentJobs.slice(0,pagination.pageSize);
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = jobsFirstPage;
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = jobsFirstPage.length.toString();
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = currentJobs.length.toString();
     pagination.currentPage=1;
     handlePaginationButtons(_$w);
   }
@@ -325,18 +319,7 @@ async function refreshFacetCounts(_$w,clearAll=false) {
     }
   }
 
-  function groupValuesByField(values, refKey) {
-    const map = new Map();
-    for (const v of values) {
-      const ref = v[refKey]; // should be the _id of the CustomFields item
-      if (!map.has(ref)) map.set(ref, []);
-      map.get(ref).push({
-        label: v.title ,
-        value: v._id
-      });
-    }
-    return map;
-  }
+ 
 
   function updateSelectedValuesRepeater(_$w) {
     const selectedItems = [];

package/pages/index.js

@@ -3,5 +3,6 @@ module.exports = {
     ...require('./homePage'),
     ...require('./careersPage'),
     ...require('./careersMultiBoxesPage'),
+    ...require('./pagesUtils'),
   };
   

package/pages/pagesUtils.js

@@ -0,0 +1,16 @@
+function groupValuesByField(values, refKey) {
+    const map = new Map();
+    for (const v of values) {
+      const ref = v[refKey]; // should be the _id of the CustomFields item
+      if (!map.has(ref)) map.set(ref, []);
+      map.get(ref).push({
+        label: v.title ,
+        value: v._id
+      });
+    }
+    return map;
+  }
+
+  module.exports = {
+    groupValuesByField,
+}