sr-npm 1.2.75 → 1.2.77

package/backend/careersMultiBoxesPageIds.js

@@ -31,6 +31,13 @@ const CAREERS_MULTI_BOXES_PAGE_CONSTS={
     PRIMARY_SEARCH_CATEGORY_BUTTON: '#primarySearchCategoryButton',
     RESULTS_CONTAINER: '#resultsContainer',
     PRIMARY_SEARCH_BUTTON: '#primarySearchButton',
+    RESULTS_MULTI_STATE_BOX: '#multiStateBox1',
+}
+
+const PRIMARY_SEARCH_STATES={
+    CATEGORY_RESULTS: 'categoryResults',
+    JOB_RESULTS: 'jobResults',
+    NO_RESULTS: 'noResults',
 }
 
 const TWG_JOBS_COLLECTION_FIELDS={
@@ -81,4 +88,5 @@ module.exports = {
     CATEGORY_CUSTOM_FIELD_ID_IN_CMS,
     possibleUrlParams,
     TWG_JOBS_COLLECTION_FIELDS,
+    PRIMARY_SEARCH_STATES,
 }

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -1,5 +1,5 @@
 const { COLLECTIONS,CUSTOM_VALUES_COLLECTION_FIELDS,JOBS_COLLECTION_FIELDS } = require('../backend/collectionConsts');
-const { CAREERS_PAGE_SELECTORS } = require('../public/selectors');
+const { CAREERS_PAGE_SELECTORS, GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
 
 const { window } = require('@wix/site-window');
 const { queryParams,onChange} = require('wix-location-frontend');
@@ -47,7 +47,6 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
   onChange(async ()=>{
     await handleBackAndForth(_$w);
   });
-
   await loadData(_$w);
   await loadJobsRepeater(_$w); // if we remove the await here the job list will be flaky , it doesn't fill it properly
   handlePrimarySearch(_$w, allvaluesobjects);
@@ -55,16 +54,14 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
   loadSelectedValuesRepeater(_$w);
   bindSearchInput(_$w);
   loadPaginationButtons(_$w);
-
     if (await window.formFactor() === "Mobile") {
       handleFilterInMobile(_$w);
   }
-    
     await handleUrlParams(_$w, urlParams);
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CLEAR_ALL_BUTTON_ID).onClick(async () => {
       await clearAll(_$w);
     });
-
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_MULTI_STATE_BOX).changeState("results");
 }
 
 async function handleBackAndForth(_$w){
@@ -150,7 +147,7 @@ async function handleUrlParams(_$w,urlParams,handleBackAndForth=false) {
     applyFiltering = await queryPrimarySearchResults(_$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);
+    const items = await getAllDatasetItems(_$w, GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET);
 
     currentJobs = items;   
     keywordAllJobs = items;
@@ -439,16 +436,20 @@ function getValueFromValueId(valueIds, value) {
   function updateOptionsUI(_$w,fieldTitle, fieldId, searchQuery,clearAll=false) {
     let base = optionsByFieldId.get(fieldId) || [];
     const countsMap = countsByFieldId.get(fieldId) || new Map();
-    if(dontUpdateThisCheckBox===fieldId && !clearAll)
+    if(dontUpdateThisCheckBox===fieldId && !clearAll && selectedByField.has(fieldId) )
     {
-        dontUpdateThisCheckBox=null;
-        return;
+          dontUpdateThisCheckBox=null;
+          return;
     }
     let filteredbase=[]
     for (const element of base)
     {
         if(countsMap.get(element.value))
         {
+          if(countsMap.get(element.value)==-1)
+          {
+            countsMap.set(element.value,0);
+          }
             filteredbase.push(element)
         }
     }
@@ -466,19 +467,31 @@ function getValueFromValueId(valueIds, value) {
       : withCounts;
 
     // Preserve currently selected values that are still visible
-    let prevSelected=[]
-    clearAll? prevSelected=[]:prevSelected= _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value;
+  //  let prevSelected=[]
+  //  clearAll? prevSelected=[]:prevSelected= _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value;
     const visibleSet = new Set(filtered.map(o => o.value));
-    const preserved = prevSelected.filter(v => visibleSet.has(v));
+    //const preserved = prevSelected.filter(v => visibleSet.has(v));
     if(filtered.length===0) {
       _$w(`#${FiltersIds[fieldTitle]}MultiBox`).changeState(`${FiltersIds[fieldTitle]}NoResults`);
     }
     else{
       _$w(`#${FiltersIds[fieldTitle]}MultiBox`).changeState(`${FiltersIds[fieldTitle]}Results`);
     _$w(`#${FiltersIds[fieldTitle]}CheckBox`).options = filtered;
-    _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value = preserved;
+    clearAll?_$w(`#${FiltersIds[fieldTitle]}CheckBox`).value=[]:_$w(`#${FiltersIds[fieldTitle]}CheckBox`).value = visibleSet
+    if(visibleSet.size>0 && selectedByField.has(fieldId)) {
+      let selectedindices=[];
+      for(const  value of selectedByField.get(fieldId)) {
+        const options = optionsByFieldId.get(fieldId) || [];
+        const option = getCorrectOption(value,options,fieldTitle);
+        if(option) {
+          const optionIndex = getOptionIndexFromCheckBox(_$w(`#${FiltersIds[fieldTitle]}CheckBox`).options,option.value);
+          selectedindices.push(optionIndex);
+        }
+      }
+      _$w(`#${FiltersIds[fieldTitle]}CheckBox`).selectedIndices = selectedindices;
     }
   }
+}
 
   async function applyJobFilters(_$w) {
     let tempFilteredJobs=[];
@@ -591,7 +604,18 @@ async function refreshFacetCounts(_$w,clearAll=false) {
                     counter.set(option.value, (counter.get(option.value) || 0) + 1);
                 }
             }
+        
         }
+        if(selectedByField.has(fieldId)) {
+        for (const value of selectedByField.get(fieldId)) {
+          console.log("value: ",value)
+          if(counter.get(value)===undefined)
+          {
+            //it is -1 as a flag, so in case it was selected and after selecting more filters from different field and  suddenly no more jobs have it, we will show 0
+            counter.set(value, -1);
+          }
+        }
+      }
         countsByFieldId.set(fieldId, counter);
     }
   }

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 } = require('../public/selectors');
+const { CAREERS_PAGE_SELECTORS, FILTER_FIELDS, GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
 const { filterBrokenMarkers } = require('../public/utils');
   
   let currentLoadedItems =100;
@@ -58,10 +58,10 @@ async function careersPageOnReady(_$w,thisObject=null,queryParams=null) {
   
 function activateAutoLoad(_$w)
 {
-    _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).onReady(() => {
+    _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).onReady(() => {
         updateCount(_$w);
         _$w(CAREERS_PAGE_SELECTORS.FOOTER).onViewportEnter(() => {
-            if (currentLoadedItems<_$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).getTotalCount()) {
+            if (currentLoadedItems<_$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount()) {
                 loadMoreJobs(_$w);  
             }   
             else {
@@ -81,7 +81,7 @@ async function loadMoreJobs(_$w) {
         pageParamSet = Number(pageParamSet) + 1;
     }
     if (shouldLoad) {
-        _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).loadMore();
+        _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).loadMore();
         console.log("loading more jobs");
 
         currentLoadedItems = currentLoadedItems + itemsPerPage;
@@ -148,7 +148,7 @@ async function handlePageParam(_$w) {
         //scrolls a bit to load the dataset data
         await window.scrollTo(0, 200,{scrollAnimation:false});
         for (let i = 2; i <= queryPageVar; i++) {
-           await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).loadMore();
+           await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).loadMore();
             currentLoadedItems=currentLoadedItems+itemsPerPage
         }
         // the timeout is to wait for the repeater to render, then scroll to the last item.
@@ -170,7 +170,7 @@ async function handlePageParam(_$w) {
 }
 
 async function bind(_$w) {
-	await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).onReady(async () => {
+	await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).onReady(async () => {
 		await updateCount(_$w);
         await updateMapMarkers(_$w);
 		
@@ -337,8 +337,8 @@ async function applyFilters(_$w, skipUrlUpdate = false) {
 	});
 	
 	const filter = await getFilter(filters, 'and');
-    await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).setFilter(filter);
-    await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).refresh();
+    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(filter);
+    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
     
 	const count = await updateCount(_$w);
     console.log("updating map markers");
@@ -357,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(CAREERS_PAGE_SELECTORS.JOBS_DATASET).setFilter(wixData.filter());
-    await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).refresh();
+    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(wixData.filter());
+    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
 
 	_$w(CAREERS_PAGE_SELECTORS.RESULTS_MULTI_STATE).changeState('results');
 
@@ -374,7 +374,7 @@ async function resetFilters(_$w) {
 }
 
 async function updateCount(_$w) {
-	const count = await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).getTotalCount();
+	const count = await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
     _$w('#numOfPositionText').text = `Showing ${count} Open Positions`;
 
 	return count;
@@ -485,8 +485,8 @@ async function handleJobTypeParam(_$w,jobType) {
 }
 
 async function updateMapMarkers(_$w){
-    const numOfItems = await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).getTotalCount();
-    const items = await _$w(CAREERS_PAGE_SELECTORS.JOBS_DATASET).getItems(0, numOfItems);
+    const numOfItems = await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
+    const items = await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getItems(0, numOfItems);
     const markers = filterBrokenMarkers(items.items).map(item => {
             const location = item.locationAddress.location;
             return {

package/pages/homePage.js

@@ -6,6 +6,7 @@ const {wixData} = require('wix-data');
 const { COLLECTIONS } = require('../backend/collectionConsts');
 const { getAllRecords } = require('./pagesUtils');
 const { handlePrimarySearch } = require('../public/primarySearchUtils');
+const { GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
 
 let thisObjectVar;
 let searchByCityFlag=false;
@@ -161,10 +162,10 @@ async function handleSearchInput(_$w) {
     
     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();
 
-    count = _$w('#jobsDataset').getTotalCount();
+    count = _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
 
     if (count > 0) {
         searchByCityFlag = false;
@@ -172,9 +173,9 @@ async function handleSearchInput(_$w) {
         _$w('#searchMultiStateBox').changeState('results');
     } else {    
         filter = await getFilter(searchByCity);
-        await _$w('#jobsDataset').setFilter(filter);
-        await _$w('#jobsDataset').refresh();
-        count = _$w('#jobsDataset').getTotalCount();
+        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 )
         {
             searchByCityFlag = true;

package/pages/pagesUtils.js

@@ -78,10 +78,12 @@ function getFieldByTitle(title,allFields) {
 
 function getCorrectOption(value,options,param) {
   const standardizedValue = normalizeString(value.toLowerCase())
-  if(param==="employmenttype") //employmenttype have a problematic value
+  if(param==="employmenttype" || param==="Employment Type" || param==="Store Name") //employmenttype have a problematic value, added Employment Type for updateOptionsUI fuinction, added Store Name because Store name and location have for example   Blenheim
   {
+    //option.value is the id, 
     return options.find(option=>normalizeString(option.value.toLowerCase())===standardizedValue);
   }
+  //option.label is what we see live in the UI
   return options.find(option=>normalizeString(option.label.toLowerCase())===standardizedValue);
 }
 

package/public/primarySearchUtils.js

@@ -1,31 +1,61 @@
 const { location } = require("@wix/site-location");
 
-const { CAREERS_MULTI_BOXES_PAGE_CONSTS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS } = require('../backend/careersMultiBoxesPageIds');
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS, PRIMARY_SEARCH_STATES } = require('../backend/careersMultiBoxesPageIds');
+const { GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
 const { getFilter } = require('../public/filterUtils');
 const { debounce } = require('../pages/pagesUtils');
 
 async function handlePrimarySearch(_$w, allvaluesobjects) {
     // load the categories list before clicking on the primary search input
+    loadCategoryRepeaterData(_$w, allvaluesobjects);
+
+    // wait for the jobs dataset to be ready
+    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).onReadyAsync();
+
+    await bindPrimarySearch(_$w);
+}
+
+function loadCategoryRepeaterData(_$w, allvaluesobjects) {
     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; 
+}
 
-    // wait for the jobs dataset to be ready
-    await _$w("#jobsDataset").onReadyAsync();
+async function bindPrimarySearch(_$w) {
+    handleCategoryEvents(_$w);
 
-    await bindPrimarySearch(_$w, allvaluesobjects);
+    await handleSearchInput(_$w);
+
+    // on mouse out collapse the results container
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
+    });
+    
+    // handle the click on the search button
+    _$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}`);
+      }
+    });
 }
 
-function loadPrimarySearchRepeater(_$w) {
-  // handle category state
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
+function handleCategoryEvents(_$w) {
+    // set the label of the category repeater item
+    _$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 || '';
   }); 
   
+  // handle the category repeater item on click
   _$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(
@@ -42,9 +72,10 @@ function getSearchQuery(_$w) {
     return _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
 }
 
-async function handleSearchInput(_$w, allvaluesobjects) {
-    _$w('#primarySearchInput').enable();
+async function handleSearchInput(_$w) {
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).enable();
 
+    // on Input call the queryPrimarySearchResults function
     const callQueryPrimarySearchResults = async () => { 
         await queryPrimarySearchResults(_$w, getSearchQuery(_$w));
       } 
@@ -52,7 +83,7 @@ async function handleSearchInput(_$w, allvaluesobjects) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => { 
         await debounce(() => callQueryPrimarySearchResults(), 300)();
     });
-    
+
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
         _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
         
@@ -61,95 +92,59 @@ async function handleSearchInput(_$w, allvaluesobjects) {
             await queryPrimarySearchResults(_$w, searchQuery);
         }
         else {
-            await loadCategoriesListPrimarySearch(_$w, allvaluesobjects);
+            _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(PRIMARY_SEARCH_STATES.CATEGORY_RESULTS);
         }
     });
 
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onKeyPress(async (event) => {
-    if( event.key === 'Enter') {
-        if(getSearchQuery(_$w) === '') {
-        // _$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( event.key === 'Enter') {
+            if(getSearchQuery(_$w) === '') {
+            // _$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}`);
+            }
         }
-    }
     });
 }
-
-async function bindPrimarySearch(_$w, allvaluesobjects) {
-    loadPrimarySearchRepeater(_$w);
-
-    await handleSearchInput(_$w, allvaluesobjects);
-
-    // on mouse out collapse the results container
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
-    });
-    
-    // handle the click on the search button
-    _$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");
-    
-    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 queryPrimarySearchResults(_$w, query) {
     if(query === undefined || query === '') {
-        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(PRIMARY_SEARCH_STATES.CATEGORY_RESULTS);
         return false;
     }
 
     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");
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(PRIMARY_SEARCH_STATES.JOB_RESULTS);
     }
     else {
         filter = await getFilter(searchByCity);
-        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();
 
-        count = _$w('#jobsDataset').getTotalCount();
+        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");
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(PRIMARY_SEARCH_STATES.JOB_RESULTS);
         }
         else{
-        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(PRIMARY_SEARCH_STATES.NO_RESULTS);
         }
 }
 
@@ -157,8 +152,5 @@ return count > 0;
 }
 
 module.exports = {
-  loadPrimarySearchRepeater,
-  bindPrimarySearch,
-  queryPrimarySearchResults,
   handlePrimarySearch,
 }

package/public/selectors.js

@@ -26,19 +26,22 @@ 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 = {
+    JOBS_DATASET: '#jobsDataset',
+
+}
+
 const   FILTER_FIELDS = {
     DEPARTMENT: 'department',
     LOCATION: 'cityText',
@@ -49,5 +52,6 @@ const   FILTER_FIELDS = {
 
 module.exports = {
     CAREERS_PAGE_SELECTORS,
+    GLOBAL_SECTIONS_SELECTORS,
     FILTER_FIELDS,
 }