sr-npm 3.1.10 → 3.1.12

package/backend/careersMultiBoxesPageIds.js

@@ -1,4 +1,5 @@
 const CAREERS_MULTI_BOXES_PAGE_CONSTS={
+    JOBS_DATASET: '#jobsDataset',
     FILTER_REPEATER: '#filterReapter',
     JOBS_REPEATER: '#jobsReapter',
     JOBS_REPEATER_ITEM_TITLE: '#jobTitle',
@@ -68,10 +69,16 @@ const possibleUrlParams=[
     "storename",
 ]
 
+
+const LINK_JOBS_TITLE = "link-jobs-title";
+const LINK_JOBS_REF_ID_SLUG = "link-jobs-refId-slug";
+
 module.exports = {
     CAREERS_MULTI_BOXES_PAGE_CONSTS,
     FiltersIds,
     fieldTitlesInCMS,   
     CATEGORY_CUSTOM_FIELD_ID_IN_CMS,
     possibleUrlParams,
+    LINK_JOBS_TITLE,
+    LINK_JOBS_REF_ID_SLUG,
 }

package/backend/utils.js

@@ -61,7 +61,8 @@ function normalizeString(str) {
   return str
     .normalize('NFD')
     .replace(/\p{Diacritic}/gu, '')
-    .replace(/[^A-Za-z0-9-]/g, '')
+    .replace(/-/g, '')                    // remove all hyphens
+    .replace(/[^A-Za-z0-9]/g, '')         // allow only alphanumerics (no hyphens now)
     .trim();
 }
 

package/package.json

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

package/pages/boardPeoplePage.js

@@ -6,18 +6,17 @@ async function boardPeoplePageOnReady(_$w,) {
 }
 
 async function bindBoardPeopleRepeaters(_$w) {
-
     _$w('#directorsRepeaterItem').onClick((event) => {
         const $item = _$w.at(event.context);
         const clickedItemData = $item('#dynamicDataset').getCurrentItem();
-        location.to(`/${clickedItemData['link-board-people-title_fld']}`);
+        location.to(`${clickedItemData['link-board-people-title_fld']}`);
 
     });
 
     _$w('#executivesRepeaterItem').onClick((event) => {
         const $item = _$w.at(event.context);
         const clickedItemData = $item('#dataset1').getCurrentItem();
-        location.to(`/${clickedItemData['link-board-people-title_fld']}`);
+        location.to(`${clickedItemData['link-board-people-title_fld']}`);
 
     });
 }

package/pages/careersMultiBoxesPage.js

@@ -5,7 +5,18 @@ const { window } = require('@wix/site-window');
 const { queryParams,onChange} = require('wix-location-frontend');
 const { location } = require("@wix/site-location");
 const {CAREERS_MULTI_BOXES_PAGE_CONSTS,FiltersIds,fieldTitlesInCMS,possibleUrlParams} = require('../backend/careersMultiBoxesPageIds');
-const { groupValuesByField, debounce, getAllRecords, getFieldById, getFieldByTitle,getCorrectOption,getOptionIndexFromCheckBox,loadPrimarySearchRepeater,bindPrimarySearch,primarySearch } = require('./pagesUtils');
+const { groupValuesByField, 
+        debounce, 
+        getAllRecords, 
+        getFieldById, 
+        getFieldByTitle,
+        getCorrectOption,
+        getOptionIndexFromCheckBox,
+        loadPrimarySearchRepeater,
+        bindPrimarySearch,
+        primarySearch,
+        getAllDatasetItems 
+      } = require('./pagesUtils');
 
 
 let dontUpdateThisCheckBox;
@@ -132,10 +143,13 @@ async function handleUrlParams(_$w,urlParams,handleBackAndForth=false) {
   let currentApplyFilterFlag=false;
   //apply this first to determine all jobs
   if(urlParams.keyword) {
-    applyFiltering=await primarySearch(_$w, decodeURIComponent(urlParams.keyword), alljobs);
-    _$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;
+    applyFiltering = await primarySearch(_$w, decodeURIComponent(urlParams.keyword));
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value = decodeURIComponent(urlParams.keyword);
+
+    const items = await getAllDatasetItems(_$w, CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_DATASET);
+
+    currentJobs = items;   
+    keywordAllJobs = items;
   }
   
   for (const url of possibleUrlParams)
@@ -149,10 +163,11 @@ async function handleUrlParams(_$w,urlParams,handleBackAndForth=false) {
     }
     currentApplyFilterFlag=false;
   }
-    if(applyFiltering || keywordAllJobs || handleBackAndForth) {
-      await updateJobsAndNumbersAndFilters(_$w);
-      
-    }
+
+  if(applyFiltering || keywordAllJobs || handleBackAndForth) {
+    await updateJobsAndNumbersAndFilters(_$w);
+    
+  }
   
     if(urlParams.page) {
       if(Number.isNaN(Number(urlParams.page)) || Number(urlParams.page)<=1 || Number(urlParams.page)>Math.ceil(currentJobs.length/pagination.pageSize)) {
@@ -297,7 +312,7 @@ async function loadJobsRepeater(_$w) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).onItemReady(($item, itemData) => {
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_TITLE).text = itemData.title;
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_TITLE).onClick(() => {
-        location.to(itemData["link-jobs-title"] || itemData["link-jobs-refId-slug"]);
+        location.to(itemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_TITLE] || itemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_REF_ID_SLUG]);
       });
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_LOCATION).text=itemData.location.fullLocation
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_EMPLOYMENT_TYPE).text=itemData.employmentType
@@ -461,8 +476,7 @@ function getValueFromValueId(valueIds, value) {
     }
   }
 
-  async function applyJobFilters(_$w,clearAll=false) {
-   // if(!clearAll) {
+  async function applyJobFilters(_$w) {
     let tempFilteredJobs=[];
     let finalFilteredJobs=[];
     secondarySearchIsFilled? finalFilteredJobs=allsecondarySearchJobs:finalFilteredJobs=alljobs;
@@ -484,7 +498,7 @@ function getValueFromValueId(valueIds, value) {
             }
             else{
             //if it is not location then we check if selecred values (which is an array) have one of the job values (whcih is also an array)
-            if(job[JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES].some(value=>values.includes(value._id))) {
+            if(job[JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES].some(value=>values.includes(value.valueId))) {
                 if(!addedJobsIds.has(job._id)) {
                     tempFilteredJobs.push(job);
                     addedJobsIds.add(job._id);
@@ -514,8 +528,7 @@ function getValueFromValueId(valueIds, value) {
     }
     pagination.currentPage=1;
     handlePaginationButtons(_$w);
-  }
- // }
+}
 
 function handlePaginationButtons(_$w)
 {
@@ -622,16 +635,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 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,28 +1,23 @@
-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);
+    if(siteconfig.twg) {
+        const allvaluesobjects  = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
+        bindPrimarySearch(_$w, allvaluesobjects);
         loadPrimarySearchRepeater(_$w)
         console.log("siteconfig.twg: ",siteconfig.twg);
 
@@ -32,17 +27,16 @@ async function homePageOnReady(_$w,thisObject=null) {
         }
     }
     else{
-        thisObjectVar=thisObject;
+        thisObjectVar = thisObject;
         bind(_$w);
         init(_$w);
     }
-  }
+    
+}
 
 function bind(_$w) {
-
     bindTeamRepeater(_$w);
 
-
     _$w('#citiesDataset').onReady(async () => {
         const numOfItems = await _$w('#citiesDataset').getTotalCount();
         const items = await _$w('#citiesDataset').getItems(0, numOfItems);
@@ -56,8 +50,8 @@ function bind(_$w) {
                     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`
             };
@@ -106,7 +100,6 @@ function bindTeamRepeater(_$w) {
 }
 
 function bindViewAllButton(_$w) {
-            
     _$w('#viewAllCategoriesButton').onClick(()=>{
         if(!loadedCategories) {
             loadedCategories=true;
@@ -125,11 +118,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') {
@@ -174,17 +167,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();
@@ -15,71 +16,86 @@ function groupValuesByField(values, refKey) {
       });
     }
     return map;
-  }
+}
 
-  const debounce = (fn, ms = 150) => {
-    let t;
-    return (...args) => {
-      clearTimeout(t);
-      t = setTimeout(() => fn(...args), ms);
-    };
+const debounce = (fn, ms = 150) => {
+  let t;
+  return (...args) => {
+    clearTimeout(t);
+    t = setTimeout(() => fn(...args), ms);
   };
+};
 
-  async function getAllRecords(collectionId) {
-    const q = wixData.query(collectionId).include(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES)
-  
-  
-    const items = [];
-    let res = await q.limit(1000).find();
-    items.push(...res.items);
-  
-    while (res.hasNext()) {
-      res = await res.next();
-      items.push(...res.items);
-    }
-    return items;
+async function getAllDatasetItems(_$w, datasetSelector) {
+  await _$w(datasetSelector).onReadyAsync();
+
+  let items = [];
+  let data = await _$w(datasetSelector).getItems(0, 1000);
+  items.push(...data.items);
+
+  while (_$w(datasetSelector).hasNextPage()) {
+    const nextItems = await _$w(datasetSelector).nextPage();
+    items.push(...nextItems);
   }
 
-  async function getAllRecordsWithoutMultiRef(collectionId) {
-    const q = wixData.query(collectionId)
-  
-  
-    const items = [];
-    let res = await q.limit(1000).find();
+  return items;
+}
+
+async function getAllRecords(collectionId) {
+  const q = wixData.query(collectionId).include(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES)
+
+
+  const items = [];
+  let res = await q.limit(1000).find();
+  items.push(...res.items);
+
+  while (res.hasNext()) {
+    res = await res.next();
     items.push(...res.items);
-  
-    while (res.hasNext()) {
-      res = await res.next();
-      items.push(...res.items);
-    }
-    return items;
   }
+  return items;
+}
 
-  function getFieldById(fieldId,allFields) {
-    return allFields.find(field=>field._id===fieldId);
-  }
+async function getAllRecordsWithoutMultiRef(collectionId) {
+  const q = wixData.query(collectionId)
+
+
+  const items = [];
+  let res = await q.limit(1000).find();
+  items.push(...res.items);
 
-  function getFieldByTitle(title,allFields) {
-    return allFields.find(field=>field.title===title);
+  while (res.hasNext()) {
+    res = await res.next();
+    items.push(...res.items);
   }
+  return items;
+}
 
-  function getCorrectOption(value,options,param) {
-    const standardizedValue = normalizeString(value.toLowerCase())
-    if(param==="employmenttype") //employmenttype have a problematic value
-    {
-      return options.find(option=>normalizeString(option.value.toLowerCase())===standardizedValue);
-    }
-    return options.find(option=>normalizeString(option.label.toLowerCase())===standardizedValue);
+function getFieldById(fieldId,allFields) {
+  return allFields.find(field=>field._id===fieldId);
+}
+
+function getFieldByTitle(title,allFields) {
+  return allFields.find(field=>field.title===title);
+}
+
+function getCorrectOption(value,options,param) {
+  const standardizedValue = normalizeString(value.toLowerCase())
+  if(param==="employmenttype") //employmenttype have a problematic value
+  {
+    return options.find(option=>normalizeString(option.value.toLowerCase())===standardizedValue);
   }
+  return options.find(option=>normalizeString(option.label.toLowerCase())===standardizedValue);
+}
 
-  function getOptionIndexFromCheckBox(options,value) {
-    const normalizedValue=normalizeString(value.toLowerCase());
-    for(let index=0;index<options.length;index++) {
-      if(normalizeString(options[index].value.toLowerCase())===normalizedValue) {
-        return index;
-      }
+function getOptionIndexFromCheckBox(options,value) {
+  const normalizedValue=normalizeString(value.toLowerCase());
+  for(let index=0;index<options.length;index++) {
+    if(normalizeString(options[index].value.toLowerCase())===normalizedValue) {
+      return index;
     }
   }
+}
 
 function loadPrimarySearchRepeater(_$w) {
   
@@ -93,159 +109,168 @@ function loadPrimarySearchRepeater(_$w) {
       (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')
-    );
-    if (linkKey && clickedItemData[linkKey] ) {
-      if(clickedItemData[linkKey].includes("copy-of-jobs")) {
-        clickedItemData[linkKey]=clickedItemData[linkKey].replace("copy-of-jobs","jobs")
-      }
-      location.to(clickedItemData[linkKey]);
+    if(!clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_TITLE] && !clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_REF_ID_SLUG]) {
+      console.error("clickedItemData does not have link-jobs-title or link-jobs-refId-slug");
+      return;
     }
 
-  });
-  _$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 || '';
-  }); 
+    location.to(clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_TITLE]||clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_REF_ID_SLUG]);
+    
 
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER_ITEM).onClick(async (event) => {
-    const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data;
-    const clickedItemData = data.find(
-      (item) => item._id === event.context.itemId,
-    );
-    const baseUrl = await location.baseUrl();
-      const encodedCategory=encodeURIComponent(clickedItemData._id);
-      location.to(`${baseUrl}/search?category=${encodedCategory}`);
-  });
+});
+_$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 || '';
+}); 
+
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER_ITEM).onClick(async (event) => {
+  const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data;
+  const clickedItemData = data.find(
+    (item) => item._id === event.context.itemId,
+  );
+  const baseUrl = await location.baseUrl();
+    const encodedCategory=encodeURIComponent(clickedItemData._id);
+    location.to(`${baseUrl}/search?category=${encodedCategory}`);
+});
 
 }
 
- 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);
-  }, 300);
+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 () => {
-    await primarySearchDebounced();
-  });
+const primarySearchDebounced = debounce(() => handleSearchInput(), 400);
 
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => { 
+  await primarySearchDebounced();
+});
 
-    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);
-    }
-    else {
-      await loadCategoriesListPrimarySearch(_$w, allvaluesobjects);
-    }
-  });
-
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
-  });
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
 
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onKeyPress(async (event) => {
-    if( event.key==='Enter') {
-      console.log("primary search input key pressed");
-      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()==='') {
-        // _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
-        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}`);
-      }
-    }
-  });
+  if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()!=='') {
+    const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
+    await primarySearch(_$w, query);
+  }
+  else {
+    await loadCategoriesListPrimarySearch(_$w,allvaluesobjects);
+  }
+});
 
-  _$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);
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
+});
 
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onKeyPress(async (event) => {
+  if( event.key === 'Enter') {
     if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
+      // _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
       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}`);
     }
-  });
+  }
+});
+
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
+  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");
+_$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) {
-      categoryValues.push({title: value.title+` (${value.count})` , _id: value.valueId});
-    }
+let categoryValues=[]
+for(const value of allvaluesobjects) {
+  if(value.customField === CATEGORY_CUSTOM_FIELD_ID_IN_CMS) {
+    categoryValues.push({title: value.title+` (${value.count})` , _id: value.valueId});
   }
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
+}
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
 }
 
-async function primarySearch(_$w,query,alljobs) {
-  if(query.length===0 || 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) {
+async function primarySearch(_$w, query) {
+if(query === undefined || query === '') {
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
+  return false;
+}
+
+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 {
+  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("searching by location")
-     filteredJobs=alljobs.filter(job=>job.location.fullLocation.toLowerCase().includes(query));
-    if(filteredJobs.length>0) {
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
-    }
-    else{
+  else{
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
-    }
   }
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data = filteredJobs
-    return filteredJobs.length>0;
-  
+}
+
+return count > 0;
 }
 
 async function getValueFromValueId(valueId) {
-  const result = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
-  console.log("result: ",result);
-  console.log("valueId: ",valueId);
+const result = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
+console.log("result: ",result);
+console.log("valueId: ",valueId);
 
-  return result.find(value => value.valueId === valueId);
+return result.find(value => value.valueId === valueId);
 }
 
-  async function getLatestJobsByValue(Value) {
-    const jobs=Value.multiRefJobsCustomValues;
-    const latestJobs = jobs
-    .sort((a, b) => new Date(b.releasedDate) - new Date(a.releasedDate))
-    .slice(0, 5);
-    return latestJobs;
-  }
+async function getLatestJobsByValue(Value) {
+  const jobs=Value.multiRefJobsCustomValues;
+  const latestJobs = jobs
+  .sort((a, b) => new Date(b.releasedDate) - new Date(a.releasedDate))
+  .slice(0, 5);
+  return latestJobs;
+}
 
-  module.exports = {
-    groupValuesByField,
-    debounce,
-    getAllRecords,
-    getFieldById,
-    getFieldByTitle,
-    getCorrectOption,
-    getOptionIndexFromCheckBox,
-    loadPrimarySearchRepeater,
-    bindPrimarySearch,
-    primarySearch,
-    getLatestJobsByValue,
-    getValueFromValueId,
-    getAllRecordsWithoutMultiRef
+module.exports = {
+  groupValuesByField,
+  debounce,
+  getAllRecords,
+  getFieldById,
+  getFieldByTitle,
+  getCorrectOption,
+  getOptionIndexFromCheckBox,
+  loadPrimarySearchRepeater,
+  bindPrimarySearch,
+  primarySearch,
+  getLatestJobsByValue,
+  getValueFromValueId,
+  getAllRecordsWithoutMultiRef,
+  getAllDatasetItems
 }

package/pages/positionPage.js

@@ -1,6 +1,7 @@
 const { query } = require("wix-location-frontend");
 const { getPositionWithMultiRefField } = require('../backend/queries');
 const { COLLECTIONS,JOBS_COLLECTION_FIELDS,CUSTOM_FIELDS_COLLECTION_FIELDS } = require('../backend/collectionConsts');
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS } = require('../backend/careersMultiBoxesPageIds');
 const { items: wixData } = require('@wix/data');
 const { location } = require("@wix/site-location");
 const{isElementExistOnPage} = require('psdev-utils');
@@ -73,7 +74,7 @@ async function getCategoryValue(customValues) {
       const clickedItemData = data.find(
         (item) => item._id === event.context.itemId,
       );
-      location.to(clickedItemData["link-jobs-title"]);
+      location.to(clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_TITLE] || clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_REF_ID_SLUG]);
     });
   }
     if(isElementExistOnPage(_$w('#relatedJobsDataset')))

package/pages/supportTeamsPage.js

@@ -1,6 +1,7 @@
 const { getLatestJobsByValue, getValueFromValueId } = require('./pagesUtils');
 const { location } = require("@wix/site-location");
 const { supportTeamsPageIds,supportTeamsPageSections } = require('../backend/consts');
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS } = require('../backend/careersMultiBoxesPageIds');
 const { getAllRecordsWithoutMultiRef } = require('./pagesUtils');
 
 let currentItem;
@@ -60,7 +61,7 @@ async function handleRecentJobsSection(_$w) {
         const clickedItemData = data.find(
           (item) => item._id === event.context.itemId,
         );
-        location.to(clickedItemData["link-jobs-title"]);
+        location.to(clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_TITLE] || clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_REF_ID_SLUG]);
       });
     
     _$w(supportTeamsPageIds.RECENT_JOBS_BUTTON).onClick( () => {

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);