sr-npm 1.2.54 → 1.2.55

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',
@@ -28,6 +29,8 @@ const CAREERS_MULTI_BOXES_PAGE_CONSTS={
     PRIMARY_SEARCH_MULTI_BOX: '#primarySearchMultiBox',
     PRIMARY_SEARCH_POSITION_BUTTON: '#primarySearchPositionButton',
     PRIMARY_SEARCH_CATEGORY_BUTTON: '#primarySearchCategoryButton',
+    RESULTS_CONTAINER: '#resultsContainer',
+    PRIMARY_SEARCH_BUTTON: '#primarySearchButton',
 }
 
 const TWG_JOBS_COLLECTION_FIELDS={
@@ -35,7 +38,7 @@ const TWG_JOBS_COLLECTION_FIELDS={
     LINK_JOBS_REF_ID_SLUG: 'link-jobs-refId-slug',
 }
 
-const CATEGORY_CUSTOM_FIELD_ID_IN_CMS = '5cd8c873c9e77c0008aa7d23';
+const CATEGORY_CUSTOM_FIELD_ID_IN_CMS='5cd8c873c9e77c0008aa7d23';
 
 // used for filters - don't add anything else here
 const fieldTitlesInCMS={

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.2.54",
+  "version": "1.2.55",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "@eslint/js": "^9.39.0",
     "eslint": "^9.38.0",
     "globals": "^16.4.0",
-    "prettier": "^3.7.3",
+    "prettier": "^3.6.2",
     "rewire": "^9.0.1"
   }
 }

package/pages/careersMultiBoxesPage.js

@@ -1,9 +1,9 @@
+const { COLLECTIONS,CUSTOM_VALUES_COLLECTION_FIELDS,JOBS_COLLECTION_FIELDS } = require('../backend/collectionConsts');
+const { CAREERS_PAGE_SELECTORS } = require('../public/selectors');
+
 const { window } = require('@wix/site-window');
 const { queryParams,onChange} = require('wix-location-frontend');
 const { location } = require("@wix/site-location");
-
-const { COLLECTIONS,CUSTOM_VALUES_COLLECTION_FIELDS,JOBS_COLLECTION_FIELDS } = require('../backend/collectionConsts');
-const { CAREERS_PAGE_SELECTORS, GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
 const {
   CAREERS_MULTI_BOXES_PAGE_CONSTS,
   FiltersIds,
@@ -19,8 +19,8 @@ const { groupValuesByField,
         getCorrectOption,
         getOptionIndexFromCheckBox,
         getAllDatasetItems 
-} = require('./pagesUtils');
-const { loadPrimarySearchRepeater, bindPrimarySearch, filterPrimarySearchResults } = require('../public/primarySearchUtil');
+      } = require('./pagesUtils');
+const { loadPrimarySearchRepeater, bindPrimarySearch, primarySearch } = require('../public/primarySearchUtil');
 
 
 let dontUpdateThisCheckBox;
@@ -147,10 +147,10 @@ async function handleUrlParams(_$w,urlParams,handleBackAndForth=false) {
   let currentApplyFilterFlag=false;
   //apply this first to determine all jobs
   if(urlParams.keyword) {
-    applyFiltering = await filterPrimarySearchResults(_$w, decodeURIComponent(urlParams.keyword));
+    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, GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET); 
+    const items = await getAllDatasetItems(_$w, CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_DATASET);
 
     currentJobs = items;   
     keywordAllJobs = items;
@@ -432,7 +432,7 @@ function getValueFromValueId(valueIds, value) {
   async function updateJobsAndNumbersAndFilters(_$w,clearAll=false) {
     await applyJobFilters(_$w,clearAll); // re-query jobs
     await refreshFacetCounts(_$w,clearAll);    // recompute and update counts in all lists
-    updateSelectedValuesRepeater(_$w);
+    await updateSelectedValuesRepeater(_$w);
     updateTotalJobsCountText(_$w);  
   }
 
@@ -475,8 +475,8 @@ function getValueFromValueId(valueIds, value) {
     }
     else{
       _$w(`#${FiltersIds[fieldTitle]}MultiBox`).changeState(`${FiltersIds[fieldTitle]}Results`);
-      _$w(`#${FiltersIds[fieldTitle]}CheckBox`).options = filtered;
-      _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value = preserved;
+    _$w(`#${FiltersIds[fieldTitle]}CheckBox`).options = filtered;
+    _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value = preserved;
     }
   }
 
@@ -524,7 +524,6 @@ function getValueFromValueId(valueIds, value) {
     _$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();
-    
     if(jobsFirstPage.length===0) {
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_MULTI_STATE_BOX).changeState("noJobs");
     }
@@ -640,8 +639,7 @@ async function secondarySearch(_$w,query) {
     await refreshFacetCounts(_$w); 
     return allsecondarySearchJobs;
 }
-
-function bindSearchInput(_$w) {
+  function bindSearchInput(_$w) {
     try {
       bindPrimarySearch(_$w, allvaluesobjects);
 

package/pages/careersPage.js

@@ -6,7 +6,7 @@ const { location } = require("@wix/site-location");
 const { COLLECTIONS } = require('../backend/collectionConsts');
 const { careersMultiBoxesPageOnReady } = require('./careersMultiBoxesPage');
 const { debounce, getFilter} = require('../public/filterUtils');
-const { CAREERS_PAGE_SELECTORS, FILTER_FIELDS, GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
+const { CAREERS_PAGE_SELECTORS, FILTER_FIELDS } = require('../public/selectors');
 const { filterBrokenMarkers } = require('../public/utils');
   
   let currentLoadedItems =100;
@@ -52,14 +52,16 @@ async function careersPageOnReady(_$w,thisObject=null,queryParams=null) {
         await handleUrlParams(_$w);
 
     }
+
+
 }
   
 function activateAutoLoad(_$w)
 {
-    _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).onReady(() => {
+    _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).onReady(() => {
         updateCount(_$w);
         _$w(CAREERS_PAGE_SELECTORS.FOOTER).onViewportEnter(() => {
-            if (currentLoadedItems<_$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount()) {
+            if (currentLoadedItems<_$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).getTotalCount()) {
                 loadMoreJobs(_$w);  
             }   
             else {
@@ -79,7 +81,7 @@ async function loadMoreJobs(_$w) {
         pageParamSet = Number(pageParamSet) + 1;
     }
     if (shouldLoad) {
-        _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).loadMore(); 
+        _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).loadMore();
         console.log("loading more jobs");
 
         currentLoadedItems = currentLoadedItems + itemsPerPage;
@@ -168,7 +170,7 @@ async function handlePageParam(_$w) {
 }
 
 async function bind(_$w) {
-	await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).onReady(async () => {
+	await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).onReady(async () => {
 		await updateCount(_$w);
         await updateMapMarkers(_$w);
 		
@@ -335,8 +337,8 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
 	});
 	
 	const filter = await getFilter(filters, 'and');
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(filter);
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
+    await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).setFilter(filter);
+    await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).refresh();
     
 	const count = await updateCount(_$w);
     console.log("updating map markers");
@@ -355,8 +357,8 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
 async function resetFilters(_$w) {
 	_$w(CAREERS_PAGE_SELECTORS.SEARCH_INPUT, CAREERS_PAGE_SELECTORS.DROPDOWN_DEPARTMENT, CAREERS_PAGE_SELECTORS.DROPDOWN_LOCATION, CAREERS_PAGE_SELECTORS.DROPDOWN_JOB_TYPE, CAREERS_PAGE_SELECTORS.DROPDOWN_BRAND).value = '';
 
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(wixData.filter());
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
+    await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).setFilter(wixData.filter());
+    await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).refresh();
 
 	_$w(CAREERS_PAGE_SELECTORS.RESULTS_MULTI_STATE).changeState('results');
 
@@ -372,7 +374,7 @@ async function resetFilters(_$w) {
 }
 
 async function updateCount(_$w) {
-	const count = await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
+	const count = await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).getTotalCount();
     _$w('#numOfPositionText').text = `Showing ${count} Open Positions`;
 
 	return count;
@@ -483,8 +485,8 @@ async function handleJobTypeParam(_$w,jobType) {
 }
 
 async function updateMapMarkers(_$w){
-    const numOfItems = await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
-    const items = await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getItems(0, numOfItems);
+    const numOfItems = await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).getTotalCount();
+    const items = await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).getItems(0, numOfItems);
     const markers = filterBrokenMarkers(items.items).map(item => {
             const location = item.locationAddress.location;
             return {

package/pages/homePage.js

@@ -4,7 +4,6 @@ const { filterBrokenMarkers } = require('../public/utils');
 const { location } = require('@wix/site-location');
 const {wixData} = require('wix-data');
 const { COLLECTIONS } = require('../backend/collectionConsts');
-const { GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
 const { getAllRecords } = require('./pagesUtils');
 const { bindPrimarySearch, loadPrimarySearchRepeater } = require('../public/primarySearchUtil');
 
@@ -116,6 +115,9 @@ function bindViewAllButton(_$w) {
     });
 }
 
+
+
+
 function init(_$w) {
     const debouncedInput = debounce(() => handleSearchInput(_$w), 400, thisObjectVar);
 
@@ -130,15 +132,15 @@ function init(_$w) {
     });
 
     _$w('#searchInput').onFocus(() => {
-        if (_$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).collapsed) {
-            _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
+        if (_$w(`#resultsContainer`).collapsed) {
+            _$w(`#resultsContainer`).expand();
         }
     });
 
     _$w('#searchInput').onBlur(() => {
         setTimeout(() => {
-            if (!_$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).collapsed) {
-                _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).collapse();
+            if (!_$w(`#resultsContainer`).collapsed) {
+                _$w(`#resultsContainer`).collapse();
             }
         }, 250);
     });
@@ -160,24 +162,24 @@ async function handleSearchInput(_$w) {
     
     let filter = await getFilter(searchByTitle);
 
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(filter);
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
+    await _$w('#jobsDataset').setFilter(filter);
+    await _$w('#jobsDataset').refresh();
 
-    count = _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
+    count = _$w('#jobsDataset').getTotalCount();
 
     if (count > 0) {
         searchByCityFlag = false;
-        _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
+        _$w('#resultsContainer').expand();
         _$w('#searchMultiStateBox').changeState('results');
     } else {    
         filter = await getFilter(searchByCity);
-        await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(filter);
-        await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
-        count = _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
+        await _$w('#jobsDataset').setFilter(filter);
+        await _$w('#jobsDataset').refresh();
+        count = _$w('#jobsDataset').getTotalCount();
         if( count > 0 )
         {
             searchByCityFlag = true;
-            _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
+            _$w('#resultsContainer').expand();
             _$w('#searchMultiStateBox').changeState('results');
         }
         else{

package/pages/pagesUtils.js

@@ -1,7 +1,5 @@
 const { items: wixData } = require('@wix/data');
 const { JOBS_COLLECTION_FIELDS,COLLECTIONS } = require('../backend/collectionConsts');
-const { CAREERS_MULTI_BOXES_PAGE_CONSTS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS } = require('../backend/careersMultiBoxesPageIds');
-const { GLOBAL_SECTIONS_SELECTORS} = require('../public/selectors');
 const { normalizeString } = require('../backend/utils');
 
 function groupValuesByField(values, refKey) {

package/public/index.js

@@ -2,5 +2,6 @@ module.exports = {
     ...require('./utils'),
     ...require('./filterUtils'),
     ...require('./mapUtils'),
+    ...require('./primarySearchUtils'),
   };
   

package/public/{primarySearchUtil.js → primarySearchUtils.js}

@@ -1,23 +1,28 @@
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS, TWG_JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
 const { location } = require("@wix/site-location");
-const { CAREERS_MULTI_BOXES_PAGE_CONSTS, TWG_JOBS_COLLECTION_FIELDS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS } = require('../backend/careersMultiBoxesPageIds');
-const { GLOBAL_SECTIONS_SELECTORS} = require('../public/selectors');
 const { getFilter } = require('../public/filterUtils');
-const { debounce } = require('../public/filterUtils');
+const { debounce } = require('./utils');
 
 function loadPrimarySearchRepeater(_$w) {
-    
+  
     _$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,
+    //   );
+
       const $item = _$w.at(event.context);
-      const clickedItemData = $item(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getCurrentItem();
+      const clickedItemData = $item("#jobsDataset").getCurrentItem();
+
 
       if(!clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] && !clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]) {
         console.error("clickedItemData does not have link-jobs-title or link-jobs-refId-slug");
         return;
       }
   
-      location.to(clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] || clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]);
-    });
-  
+      location.to( clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE]|| clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]);
+  });
+
   _$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 || '';
   }); 
@@ -34,46 +39,42 @@ function loadPrimarySearchRepeater(_$w) {
   
 }
 
-function getPrimarySearchInputValue(_$w) {
-  return _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
-}
+function bindPrimarySearch(_$w, allvaluesobjects) {
 
-async function bindPrimarySearch(_$w, allvaluesobjects) {
-    // wait for the jobs dataset to be ready
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).onReadyAsync();
-  
     const handleSearchInput = async () => { 
-      const query = getPrimarySearchInputValue(_$w);
-      await filterPrimarySearchResults(_$w, query);
+      const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
+      await primarySearch(_$w, query);
     } 
     
+    const primarySearchDebounced = debounce(() => handleSearchInput(), 400);
+    
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => { 
-        await debounce(() => handleSearchInput(), 300);
+      await primarySearchDebounced();
     });
-  
+    
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
-      _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
-
-      const query = getPrimarySearchInputValue(_$w);
-      if( query !== '') {
-        await filterPrimarySearchResults(_$w, query);
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
+    
+      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(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).onMouseOut(async () => {
-      _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).collapse();
+    
+    _$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(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).collapse();
+          // _$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);
@@ -82,8 +83,8 @@ async function bindPrimarySearch(_$w, allvaluesobjects) {
         }
       }
     });
-  
-    _$w(GLOBAL_SECTIONS_SELECTORS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
+    
+    _$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`);
@@ -96,58 +97,58 @@ async function bindPrimarySearch(_$w, allvaluesobjects) {
     });
 }
 
-async function filterPrimarySearchResults(_$w, query) {
-    if(query === undefined || query === '') {
-        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.CATEGORY_RESULTS);
-        return false;
+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) {
+        categoryValues.push({title: value.title+` (${value.count})` , _id: value.valueId});
+      }
     }
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
+    }
+    
+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}];
 
-    const searchByTitle = [{field: 'title', searchTerm: query}];
-    const searchByCity = [{field: 'location.fullLocation', searchTerm: query}];
+let filter = await getFilter(searchByTitle);
 
-    let filter = await getFilter(searchByTitle);
+await _$w('#jobsDataset').setFilter(filter);
+await _$w('#jobsDataset').refresh();
 
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(filter);
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
+let count = _$w('#jobsDataset').getTotalCount();
 
-    let count = _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).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();
 
-    if( count > 0 ) {
-        _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
-        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.JOB_RESULTS);
+    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(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(filter);
-        await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
-
-        count = _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
-        if  (count > 0) {
-        _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
-        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.JOB_RESULTS);
-        }
-        else{
-        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.NO_RESULTS);
-        }
+    else{
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
     }
-
-    return count > 0;
 }
 
-async function loadCategoriesListPrimarySearch(_$w, allvaluesobjects) {
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.CATEGORY_RESULTS);
-  
-    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;
+return count > 0;
 }
 
 module.exports = {
   loadPrimarySearchRepeater,
   bindPrimarySearch,
-  filterPrimarySearchResults,
+  primarySearch,
 }

package/public/selectors.js

@@ -26,30 +26,19 @@ const CAREERS_PAGE_SELECTORS = {
     OPEN_FILTERS_BUTTON: '#openFiltersButton',
     CLOSE_FILTERS_BUTTON: '#closeFiltersButton',
     RESET_FILTERS_BUTTON: '#resetFiltersButton',
+    RESET_FILTERS_BUTTON: '#resetFiltersButton',
 
     RESULTS_MULTI_STATE: '#resultsMultiState',
     BRANDS_DATASET: '#brandsDataset',
     DEPARTMENTS_DATASET: '#departmentsDataset',
     LOCATIONS_DATASET: '#locationsDataset',
     JOB_TYPES_DATASET: '#jobTypesDataset',
+    JOBS_DATASET: '#jobsDataset',
     
     GOOGLE_MAPS: '#googleMaps',
     FOOTER: '#footer',
 }
 
-const GLOBAL_SECTIONS_SELECTORS = {
-    // primary search selectors
-    RESULTS_CONTAINER: '#resultsContainer',
-    PRIMARY_SEARCH_BUTTON: '#primarySearchButton',
-    JOBS_DATASET: '#jobsDataset',
-
-    // multiStateBox states
-    CATEGORY_RESULTS: 'categoryResults',
-    JOB_RESULTS: 'jobResults',
-    NO_RESULTS: 'noResults',
-}
-
-
 const   FILTER_FIELDS = {
     DEPARTMENT: 'department',
     LOCATION: 'cityText',
@@ -61,5 +50,4 @@ const   FILTER_FIELDS = {
 module.exports = {
     CAREERS_PAGE_SELECTORS,
     FILTER_FIELDS,
-    GLOBAL_SECTIONS_SELECTORS,
 }