sr-npm 1.2.47 → 1.2.49

package/backend/careersMultiBoxesPageIds.js

@@ -1,5 +1,4 @@
 const CAREERS_MULTI_BOXES_PAGE_CONSTS={
-    JOBS_DATASET: '#jobsDataset',
     FILTER_REPEATER: '#filterReapter',
     JOBS_REPEATER: '#jobsReapter',
     JOBS_REPEATER_ITEM_TITLE: '#jobTitle',
@@ -24,16 +23,15 @@ const CAREERS_MULTI_BOXES_PAGE_CONSTS={
     PRIMARY_SEARCH_INPUT: '#primarySearchInput',
     JOB_RESULTS_REPEATER: '#jobResultsRepeater',
     JOB_RESULTS_REPEATER_ITEM: '#jobResultsRepeaterItem',
+    CATEGORY_RESULTS: '#categoryResults',
     CATEGORY_RESULTS_REPEATER: '#categoryResultsRepeater',
     CATEGORY_RESULTS_REPEATER_ITEM: '#categoryResultsRepeaterItem',
     PRIMARY_SEARCH_MULTI_BOX: '#primarySearchMultiBox',
     PRIMARY_SEARCH_POSITION_BUTTON: '#primarySearchPositionButton',
     PRIMARY_SEARCH_CATEGORY_BUTTON: '#primarySearchCategoryButton',
-    RESULTS_CONTAINER: '#resultsContainer',
-    PRIMARY_SEARCH_BUTTON: '#primarySearchButton',
 }
 
-const JOBS_COLLECTION_FIELDS={
+const TWG_JOBS_COLLECTION_FIELDS={
     LINK_JOBS_TITLE: 'link-jobs-title',
     LINK_JOBS_REF_ID_SLUG: 'link-jobs-refId-slug',
 }
@@ -80,5 +78,5 @@ module.exports = {
     fieldTitlesInCMS,   
     CATEGORY_CUSTOM_FIELD_ID_IN_CMS,
     possibleUrlParams,
-    JOBS_COLLECTION_FIELDS,
+    TWG_JOBS_COLLECTION_FIELDS,
 }

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -1,15 +1,15 @@
-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,
   fieldTitlesInCMS,
   possibleUrlParams,
-  JOBS_COLLECTION_FIELDS
+  TWG_JOBS_COLLECTION_FIELDS
 } = require('../backend/careersMultiBoxesPageIds');
 const { groupValuesByField, 
         debounce, 
@@ -22,7 +22,7 @@ const { groupValuesByField,
         bindPrimarySearch,
         primarySearch,
         getAllDatasetItems 
-      } = require('./pagesUtils');
+} = require('./pagesUtils');
 
 
 let dontUpdateThisCheckBox;
@@ -152,7 +152,7 @@ async function handleUrlParams(_$w,urlParams,handleBackAndForth=false) {
     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);
+    const items = await getAllDatasetItems(_$w, GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET); 
 
     currentJobs = items;   
     keywordAllJobs = items;
@@ -318,7 +318,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[JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] || itemData[JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]);
+        location.to(itemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] || itemData[TWG_JOBS_COLLECTION_FIELDS.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

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

@@ -4,6 +4,7 @@ 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 { bindPrimarySearch, getAllRecords, loadPrimarySearchRepeater } = require('./pagesUtils');
 
 let thisObjectVar;
@@ -114,9 +115,6 @@ function bindViewAllButton(_$w) {
     });
 }
 
-
-
-
 function init(_$w) {
     const debouncedInput = debounce(() => handleSearchInput(_$w), 400, thisObjectVar);
 
@@ -131,15 +129,15 @@ function init(_$w) {
     });
 
     _$w('#searchInput').onFocus(() => {
-        if (_$w(`#resultsContainer`).collapsed) {
-            _$w(`#resultsContainer`).expand();
+        if (_$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).collapsed) {
+            _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
         }
     });
 
     _$w('#searchInput').onBlur(() => {
         setTimeout(() => {
-            if (!_$w(`#resultsContainer`).collapsed) {
-                _$w(`#resultsContainer`).collapse();
+            if (!_$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).collapsed) {
+                _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).collapse();
             }
         }, 250);
     });
@@ -161,24 +159,24 @@ 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;
-        _$w('#resultsContainer').expand();
+        _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
         _$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;
-            _$w('#resultsContainer').expand();
+            _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
             _$w('#searchMultiStateBox').changeState('results');
         }
         else{

package/pages/pagesUtils.js

@@ -1,6 +1,7 @@
 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, JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS, TWG_JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
+const { GLOBAL_SECTIONS_SELECTORS} = require('../public/selectors');
 const { location } = require("@wix/site-location");
 const { normalizeString } = require('../backend/utils');
 const { getFilter } = require('../public/filterUtils');
@@ -109,12 +110,12 @@ function loadPrimarySearchRepeater(_$w) {
       (item) => item._id === event.context.itemId,
       
     );
-    if(!clickedItemData[JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] && !clickedItemData[JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]) {
+    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[JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE]||clickedItemData[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]);
     
 
 });
@@ -135,65 +136,67 @@ _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER_ITEM).onClick(asyn
 }
 
 function bindPrimarySearch(_$w, allvaluesobjects) {
+  // wait for the jobs dataset to be ready
+  _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).onReadyAsync();
+  
+  const handleSearchInput = async () => { 
+    const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
+    await primarySearch(_$w, query);
+  } 
 
-const handleSearchInput = async () => { 
-  const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
-  await primarySearch(_$w, query);
-} 
-
-const primarySearchDebounced = debounce(() => handleSearchInput(), 400);
+  const primarySearchDebounced = debounce(() => handleSearchInput(), 400);
 
-_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => { 
+  _$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();
+  _$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()!=='') {
-    const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
-    await primarySearch(_$w, query);
-  }
-  else {
-    await loadCategoriesListPrimarySearch(_$w,allvaluesobjects);
-  }
-});
+    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.RESULTS_CONTAINER).onMouseOut(async () => {
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.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(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_INPUT).onKeyPress(async (event) => {
-  if( event.key === 'Enter') {
+  _$w(GLOBAL_SECTIONS_SELECTORS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
     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(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS);
 
 let categoryValues=[]
 for(const value of allvaluesobjects) {
@@ -205,41 +208,41 @@ _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryVa
 }
 
 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}];
+  if(query === undefined || query === '') {
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS);
+    return false;
+  }
 
-let filter = await getFilter(searchByTitle);
+  const searchByTitle = [{field: 'title', searchTerm: query}];
+  const searchByCity = [{field: 'location.fullLocation', searchTerm: query}];
 
-await _$w('#jobsDataset').setFilter(filter);
-await _$w('#jobsDataset').refresh();
+  let filter = await getFilter(searchByTitle);
 
-let count = _$w('#jobsDataset').getTotalCount();
+  await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(filter);
+  await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
 
-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();
+  let count = _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
 
-  count = _$w('#jobsDataset').getTotalCount();
-  if  (count > 0) {
+  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{
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
+  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(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
+    }
+    else{
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
+    }
   }
-}
 
-return count > 0;
+  return count > 0;
 }
 
 async function getValueFromValueId(valueId) {

package/pages/positionPage.js

@@ -1,7 +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 { JOBS_COLLECTION_FIELDS: TWG_JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
+const { TWG_JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
 const { items: wixData } = require('@wix/data');
 const { location } = require("@wix/site-location");
 const{isElementExistOnPage} = require('psdev-utils');

package/pages/supportTeamsPage.js

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

package/public/selectors.js

@@ -26,19 +26,26 @@ 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 = {
+    RESULTS_CONTAINER: '#resultsContainer',
+    PRIMARY_SEARCH_BUTTON: '#primarySearchButton',
+
+    JOBS_DATASET: '#jobsDataset',
+
+}
+
+
 const   FILTER_FIELDS = {
     DEPARTMENT: 'department',
     LOCATION: 'cityText',
@@ -50,4 +57,5 @@ const   FILTER_FIELDS = {
 module.exports = {
     CAREERS_PAGE_SELECTORS,
     FILTER_FIELDS,
+    GLOBAL_SECTIONS_SELECTORS,
 }