sr-npm 1.2.31 → 1.2.33

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -119,10 +119,11 @@ async function handleUrlParams(_$w,urlParams) {
   let currentApplyFilterFlag=false;
   //apply this first to determine all jobs
   if(urlParams.keyword) {
-    applyFiltering = await primarySearch(_$w, decodeURIComponent(urlParams.keyword), alljobs);
+    applyFiltering = await primarySearch(_$w, decodeURIComponent(urlParams.keyword));
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value = decodeURIComponent(urlParams.keyword);
-    currentJobs = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;   
-    keywordAllJobs = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
+    const data = _$w("#jobsDataset").getItems()?.items || [];
+    currentJobs = data;   
+    keywordAllJobs = data;
   }
   
   for (const url of possibleUrlParams)
@@ -600,16 +601,15 @@ async function secondarySearch(_$w,query) {
     await refreshFacetCounts(_$w); 
     return allsecondarySearchJobs;
 }
-   function bindSearchInput(_$w) {
+  function bindSearchInput(_$w) {
     try {
-       bindPrimarySearch(_$w,allvaluesobjects,alljobs);
+       bindPrimarySearch(_$w, allvaluesobjects);
 
     const secondarySearchDebounced = debounce(async () => {
       const query = (_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).value || '').toLowerCase().trim();
       await secondarySearch(_$w, query);
     }, 150);
 
-   
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).onInput(secondarySearchDebounced);
 
   } catch (error) {

package/pages/homePage.js

@@ -1,24 +1,22 @@
-const {
-    debounce,
-    getFilter,
-  } = require('../public/filterUtils');
-  const { handleOnLocationClick } = require('../public/mapUtils');
-  const { filterBrokenMarkers } = require('../public/utils');
+const { debounce, getFilter } = require('../public/filterUtils');
+const { handleOnLocationClick } = require('../public/mapUtils');
+const { filterBrokenMarkers } = require('../public/utils');
 const { location } = require('@wix/site-location');
 const {wixData} = require('wix-data');
 const { COLLECTIONS } = require('../backend/collectionConsts');
-const { bindPrimarySearch,getAllRecords,loadPrimarySearchRepeater } = require('./pagesUtils');
+const { bindPrimarySearch, getAllRecords, loadPrimarySearchRepeater } = require('./pagesUtils');
+
 let thisObjectVar;
 let searchByCityFlag=false;
 let loadedCategories=false;
-async function homePageOnReady(_$w,thisObject=null) {
 
+async function homePageOnReady(_$w,thisObject = null) {
     const queryResult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
     const siteconfig = queryResult.items[0];
+
     if(siteconfig.twg) {
-        const allJobs=await getAllRecords(COLLECTIONS.JOBS);
-        const allvaluesobjects=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
-        bindPrimarySearch(_$w,allvaluesobjects,allJobs);
+        const allvaluesobjects  = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
+        bindPrimarySearch(_$w, allvaluesobjects);
         loadPrimarySearchRepeater(_$w)
         console.log("siteconfig.twg: ",siteconfig.twg);
         if(siteconfig.twg==="external") {
@@ -27,19 +25,16 @@ async function homePageOnReady(_$w,thisObject=null) {
         }
     }
     else{
-
-    thisObjectVar=thisObject;
-    await bind(_$w);
-    await init(_$w);
+        thisObjectVar = thisObject;
+        bind(_$w);
+        init(_$w);
     }
     
-  }
-
-  function bind(_$w) {
+}
 
+function bind(_$w) {
     bindTeamRepeater(_$w);
 
-
     _$w('#citiesDataset').onReady(async () => {
         const numOfItems = await _$w('#citiesDataset').getTotalCount();
         const items = await _$w('#citiesDataset').getItems(0, numOfItems);
@@ -53,8 +48,8 @@ async function homePageOnReady(_$w,thisObject=null) {
                     latitude: location.latitude,
                     longitude: location.longitude
                 },
-                 address: item.locationAddress.formatted,
-                 title: item.title,
+                address: item.locationAddress.formatted,
+                title: item.title,
                 link: cityLinkUrl,
                 linkTitle:`View ${item.count} Open Positions`
             };
@@ -103,7 +98,6 @@ function bindTeamRepeater(_$w) {
 }
 
 function bindViewAllButton(_$w) {
-            
     _$w('#viewAllCategoriesButton').onClick(()=>{
         if(!loadedCategories) {
             loadedCategories=true;
@@ -122,11 +116,11 @@ function bindViewAllButton(_$w) {
 
 
 function init(_$w) {
-    const debouncedInput = debounce(()=>handleSearchInput(_$w), 400,thisObjectVar);
+    const debouncedInput = debounce(() => handleSearchInput(_$w), 400, thisObjectVar);
 
     _$w('#searchInput').onInput(debouncedInput);
     _$w('#searchInput').maxLength = 40;
-    _$w('#searchButton').onClick(()=>handleSearch(_$w('#searchInput').value));
+    _$w('#searchButton').onClick(() => handleSearch(_$w('#searchInput').value));
 
     _$w('#searchInput').onKeyPress((event) => {
         if (event.key === 'Enter') {
@@ -171,17 +165,17 @@ async function handleSearchInput(_$w) {
     count = _$w('#jobsDataset').getTotalCount();
 
     if (count > 0) {
-        searchByCityFlag=false;
+        searchByCityFlag = false;
         _$w('#resultsContainer').expand();
         _$w('#searchMultiStateBox').changeState('results');
     } else {    
-        filter=await getFilter(searchByCity);
+        filter = await getFilter(searchByCity);
         await _$w('#jobsDataset').setFilter(filter);
         await _$w('#jobsDataset').refresh();
         count = _$w('#jobsDataset').getTotalCount();
-        if(count > 0)
+        if( count > 0 )
         {
-            searchByCityFlag=true;
+            searchByCityFlag = true;
             _$w('#resultsContainer').expand();
             _$w('#searchMultiStateBox').changeState('results');
         }

package/pages/pagesUtils.js

@@ -3,6 +3,7 @@ const { JOBS_COLLECTION_FIELDS,COLLECTIONS } = require('../backend/collectionCon
 const { CAREERS_MULTI_BOXES_PAGE_CONSTS,CATEGORY_CUSTOM_FIELD_ID_IN_CMS } = require('../backend/careersMultiBoxesPageIds');
 const { location } = require("@wix/site-location");
 const { normalizeString } = require('../backend/utils');
+const { getFilter } = require('../public/filterUtils');
 
 function groupValuesByField(values, refKey) {
     const map = new Map();
@@ -83,19 +84,13 @@ function groupValuesByField(values, refKey) {
 
 function loadPrimarySearchRepeater(_$w) {
   
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
-    if(!itemData.title) {
-      console.log("!!!!!!!!!!!! itemData has no title: ",itemData);
-    }
-    $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_POSITION_BUTTON).label = itemData.title || '';   
-  });
-  
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER_ITEM).onClick((event) => {
     const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
     const clickedItemData = data.find(
       (item) => item._id === event.context.itemId,
       
     );
+    
     // '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')
@@ -124,21 +119,24 @@ function loadPrimarySearchRepeater(_$w) {
 
 }
 
- function bindPrimarySearch(_$w,allvaluesobjects,alljobs) {
+function bindPrimarySearch(_$w, allvaluesobjects) {
 
-  const primarySearchDebounced = debounce(async () => {
-    const query = (_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value || '').toLowerCase().trim();
-    await primarySearch(_$w, query, alljobs);
-  }, 400);
+  const handleSearchInput = async () => { 
+    const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
+    await primarySearch(_$w, query);
+  } 
 
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => {
+  const primarySearchDebounced = debounce(() => handleSearchInput(), 400);
+
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => { 
     await primarySearchDebounced();
   });
 
 _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
   if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()!=='') {
-    await primarySearch(_$w, _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim(), alljobs);
+    const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
+    await primarySearch(_$w, query);
   }
   else {
     await loadCategoriesListPrimarySearch(_$w,allvaluesobjects);
@@ -162,30 +160,29 @@ _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onKeyPress(async (even
     else {
       let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
       const baseUrl = await location.baseUrl();
-       location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
+      location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
     }
   }
 });
 
 _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
-  console.log("primary search button clicked");
-  console.log("_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value: ",_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
-  if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
-    const baseUrl = await location.baseUrl();
-    location.to(`${baseUrl}/search`);
-  }
-  else {
-    let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
-    const baseUrl = await location.baseUrl();
-     location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
-  }
-});
-  
-
+    console.log("primary search button clicked");
+    console.log("_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value: ",_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
+    if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
+      const baseUrl = await location.baseUrl();
+      location.to(`${baseUrl}/search`);
+    }
+    else {
+      let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
+      const baseUrl = await location.baseUrl();
+      location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
+    }
+  });
 }
 
 async function loadCategoriesListPrimarySearch(_$w,allvaluesobjects) {
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
+  
   let categoryValues=[]
   for(const value of allvaluesobjects) {
     if(value.customField===CATEGORY_CUSTOM_FIELD_ID_IN_CMS) {
@@ -195,39 +192,45 @@ async function loadCategoriesListPrimarySearch(_$w,allvaluesobjects) {
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
 }
 
-async function primarySearch(_$w,query,alljobs) {
-  if(query.length===0 || query===undefined || query==='') {
+async function primarySearch(_$w, query) {
+  if(query === undefined || query === '') {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
     return false;
   }
- 
-  let filteredJobs = alljobs.filter(job=>job.title.toLowerCase().includes(query));
-  if(filteredJobs.length>0) {
-    console.log('filteredJobs is not empty');
+
+  const searchByTitle = [{field: 'title', searchTerm: query}];
+  const searchByCity = [{field: 'location.fullLocation', searchTerm: query}];
+
+  let filter = await getFilter(searchByTitle);
+
+  await _$w('#jobsDataset').setFilter(filter);
+  await _$w('#jobsDataset').refresh();
+
+  let count = _$w('#jobsDataset').getTotalCount();
+
+  if( count > 0 ) {
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
   }
   else {
-    console.log("searching by location")
-     filteredJobs = alljobs.filter(job=>job.location.fullLocation.toLowerCase().includes(query));
-    if  (filteredJobs.length>0) {
+    filter = await getFilter(searchByCity);
+    await _$w('#jobsDataset').setFilter(filter);
+    await _$w('#jobsDataset').refresh();
+  
+    count = _$w('#jobsDataset').getTotalCount();
+    if  (count > 0) {
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
     }
     else{
-      console.log('filteredJobs is empty');
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
     }
   }
-
-  console.log("filteredJobs: ",filteredJobs);
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data = filteredJobs
-  return filteredJobs.length>0; 
 }
 
   async function getValueFromValueId(valueId) {
-    const result=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
-    console.log("result: ",result);
-    console.log("valueId: ",valueId);
-    return result.find(value=>value._id===valueId);
+    const result = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
+    return result.find(value => value._id === valueId);
     
   }
 

package/public/filterUtils.js

@@ -23,7 +23,7 @@ function getFilter(fieldsToSearch = [], mode = 'or') {
     return filter;
 }
 
-function debounce(fn, delay = 400,thisObject) {
+function debounce(fn, delay = 400, thisObject) {
     let timeout;
     return function (...args) {
         clearTimeout(timeout);