sr-npm 1.7.618 → 1.7.620

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -2,14 +2,13 @@ const { COLLECTIONS,CUSTOM_VALUES_COLLECTION_FIELDS,JOBS_COLLECTION_FIELDS } = r
 const { items: wixData } = require('@wix/data');
 const {CAREERS_MULTI_BOXES_PAGE_CONSTS} = require('../backend/careersMultiBoxesPageIds');
 
-let valuesByFieldIdGlobal = null; 
 const selectedByField = new Map(); // fieldId -> array of selected value IDs
 const optionsByFieldId = new Map(); // fieldId -> [{label, value}]
 const countsByFieldId = new Map();
-let alljobs=[]
-let allvaluesobjects=[]
-let valueToJobs={}
-let currentJobs=[]
+let alljobs=[] // all jobs in the database
+let allvaluesobjects=[] // all values in the database
+let valueToJobs={} // valueId -> array of jobIds
+let currentJobs=[] // current jobs that are displayed in the jobs repeater
 async function careersMultiBoxesPageOnReady(_$w) {
     if(alljobs.length===0) {
         alljobs=await getAllRecords(COLLECTIONS.JOBS);
@@ -37,6 +36,7 @@ async function careersMultiBoxesPageOnReady(_$w) {
             const updated = existing.filter(v => v !== valueId);
             if (updated.length) {
               selectedByField.set(fieldId, updated);
+              console.log("selectedByField: ",selectedByField)
             } else {
               selectedByField.delete(fieldId);
             }
@@ -53,6 +53,7 @@ async function careersMultiBoxesPageOnReady(_$w) {
             await applyJobFilters(_$w,JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES);
             await refreshFacetCounts(_$w);
             await updateSelectedValuesRepeater(_$w);
+            updateTotalJobsCountText(_$w);
           });
     });
     await updateSelectedValuesRepeater(_$w);
@@ -65,15 +66,11 @@ async function loadJobs(_$w) {
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_LOCATION).text=itemData.location.fullLocation
     });
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = alljobs;
-  
-    // return wixData.query(COLLECTIONS.JOBS)
-    //   .find()
-    //   .then((res) => {
-    //     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = res.items;
-    //   })
-    //   .catch((err) => {
-    //     console.error('Failed to load jobs:', err);
-    //   });
+    updateTotalJobsCountText(_$w);
+  }
+
+  function updateTotalJobsCountText(_$w) {
+    _$w('#totalJobsCountText').text = `${currentJobs.length} Jobs`;
   }
 
   async function loadFilters(_$w) {
@@ -105,6 +102,7 @@ async function loadJobs(_$w) {
           value: v._id
         }));
         optionsByFieldId.set(fieldId, originalOptions);
+        console.log("optionsByFieldId: ",optionsByFieldId)
         const counter={}
 
         for (const val of allvaluesobjects) {
@@ -112,11 +110,11 @@ async function loadJobs(_$w) {
         }
 
         countsByFieldId.set(fieldId, new Map(originalOptions.map(o => [o.value, counter[o.label]])));
+        console.log("countsByFieldId: ",countsByFieldId)
   
         // Initialize UI
         updateOptionsUI($item, fieldId, ''); // no search query
   
-        //$item(CHECKBOX_GROUP_ID).options = originalOptions;
         $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.FILTER_REPEATER_ITEM_CHECKBOX).selectedIndices = []; // start empty
         $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.FILTER_REPEATER_ITEM_CHECKBOX).onChange(async (ev) => {
       const selected = ev.target.value; // array of selected value IDs
@@ -128,7 +126,7 @@ async function loadJobs(_$w) {
       await applyJobFilters(_$w,JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES); // re-query jobs
       await refreshFacetCounts(_$w);    // recompute and update counts in all lists
       await updateSelectedValuesRepeater(_$w);
-  
+      updateTotalJobsCountText(_$w);
     });
     
           // Input typing -> only filter this list’s visible options (no Jobs query)
@@ -187,14 +185,10 @@ async function loadJobs(_$w) {
         value: o.value
       };
     });
-    console.log("base: ",base)
-    console.log("countsMap: ",countsMap)
-    console.log("withCounts: ",withCounts)
     // Apply search
     const filtered = searchQuery
       ? withCounts.filter(o => (o.label || '').toLowerCase().includes(searchQuery))
       : withCounts;
-      console.log("filte@$@#@#$red: ",filtered)
   
     // Preserve currently selected values that are still visible
     const prevSelected = $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.FILTER_REPEATER_ITEM_CHECKBOX).value || [];
@@ -206,9 +200,6 @@ async function loadJobs(_$w) {
   }
 
   async function applyJobFilters(_$w,filterByField) {
-    console.log("applying job filters")
-    console.log("selectedByField: ",selectedByField)
-
     let q = wixData.query(COLLECTIONS.JOBS)
   
     // AND across categories, OR within each category
@@ -221,103 +212,26 @@ async function loadJobs(_$w) {
    await q.find()
       .then(async (res) => { _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = res.items;
        await updateCurrentJobs(res);
-        // currentJobs=res.items.map(job=>job._id);
-        console.log("updated currentJobs adfger fucniton: ",currentJobs)
       })
       .catch((err) => { console.error('Failed to filter jobs:', err); });
   }
 
 
-async function refreshFacetCounts(_$w) {
-    // if (!valuesByFieldIdGlobal)
-    // {
-    //    return;
-    // }
-    
+async function refreshFacetCounts(_$w) {    
     console.log("current countsByFieldId: ",countsByFieldId)
     const fieldIds = Array.from(optionsByFieldId.keys());
     for (const fieldId of fieldIds) {
         let currentoptions=optionsByFieldId.get(fieldId)
-        //console.log("currentoptions@@@@@@@@@@@@@: ",currentoptions)
         let counter=new Map();
         for(const option of currentoptions) {
-            console.log("currentJobs length: ",currentJobs.length)
             for (const jobId of currentJobs) {
                 if (valueToJobs[option.value].includes(jobId)) {
                     counter.set(option.value, (counter.get(option.value) || 0) + 1);
                 }
             }
         }
-        console.log("counter: ",counter)
-        console.log("fieldId: ",fieldId)
         countsByFieldId.set(fieldId, counter);
     }
-    console.log("new countsByFieldId: ",countsByFieldId)
-    //     for (const valueId of Object.keys(valueToJobs)) {
-    //         for (const jobId of currentJobs) {
-    //             if (valueToJobs[valueId].includes(jobId)) {
-    //                 counter.set(valueId, (countsByFieldId.get(valueId) || 0) + 1);
-    //             }
-    //         }
-    //     }
-    // }
-    // for (const valueId of Object.keys(valueToJobs)) {
-    //     for (const jobId of currentJobs) {
-    //         if (valueToJobs[valueId].includes(jobId)) {
-    //             counter.set(valueId, (countsByFieldId.get(valueId) || 0) + 1);
-    //         }
-    //     }
-    // }
-
-
-
-
-
-    // // Run per-field queries in parallel
-    // const tasks = fieldIds.map(async (fieldId) => {
-    //   // Build query with selections from all other fields
-    //   let q = wixData.query(COLLECTIONS.JOBS);
-    //   for (const [fid, values] of selectedByField.entries()) {
-    //     if (fid !== fieldId && values && values.length) {
-    //       q = q.hasSome(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES, values);
-    //     }
-    //   }
-  
-    //   // Fetch all matching jobs (paged)
-    //   const jobs = await findAll(q);
-  
-  
-    //   // Prepare a set of valid option IDs for this field
-    //   const options = optionsByFieldId.get(fieldId) || [];
-    //   const optionSet = new Set(options.map(o => o.value));
-  
-    //   // Tally counts
-    //   const counts = new Map(); // valueId -> count
-    //   for (const job of jobs) {
-    //     const referencedfield= await  wixData.queryReferenced(COLLECTIONS.JOBS, job, JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES)  
-    //     //console.log("referencedfield: ",referencedfield)
-    //     const vals = referencedfield.items
-    //     //const vals = job[JOB_VALUES_FIELD] || [];
-    //     for (const val of vals) {
-    //       if (optionSet.has(val._id)) {
-    //         counts.set(val._id, (counts.get(val._id) || 0) + 1);
-    //       }
-    //     }
-  
-    //   }
-  
-    //   // Ensure every option has a count (zero if absent)
-    //   for (const o of options) {
-    //     if (!counts.has(o.value)) 
-    //     {
-    //       counts.set(o.value, 0);}
-    //   }
-  
-    //   countsByFieldId.set(fieldId, counts);
-    // });
-  
-    // await Promise.all(tasks);
-  
     // // After counts are ready, update all items currently rendered
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.FILTER_REPEATER).forEachItem(($item, itemData) => {
       const query = ($item(CAREERS_MULTI_BOXES_PAGE_CONSTS.FILTER_LABEL).value || '').toLowerCase().trim();
@@ -337,7 +251,6 @@ async function refreshFacetCounts(_$w) {
   }
 
   function updateSelectedValuesRepeater(_$w) {
-    console.log("updating selected values repeater")
     const selectedItems = [];
     for (const [fieldId, valueIds] of selectedByField.entries()) {
       const opts = optionsByFieldId.get(fieldId) || [];
@@ -345,7 +258,8 @@ async function refreshFacetCounts(_$w) {
       for (const id of valueIds) {
         const label = byId.get(id);
         if (label) {
-          selectedItems.push({ _id: `${fieldId}:${id}`, label, fieldId, valueId: id });
+          //selectedItems.push({ _id: `${fieldId}:${id}`, label, fieldId, valueId: id });
+          selectedItems.push({ label, fieldId, valueId: id });
         }
       }
     }
@@ -364,18 +278,6 @@ async function refreshFacetCounts(_$w) {
     console.log("updated currentJobs inisde new function: ",currentJobs)
   }
 
-  async function findAll(q) {
-    const out = [];
-    let res = await q.limit(1000).find();
-    out.push(...res.items);
-    while (res.hasNext()) {
-      res = await res.next();
-      out.push(...res.items);
-    }
-    return out;
-  }
-
-
 module.exports = {
     careersMultiBoxesPageOnReady
 };