sr-npm 1.7.1201 → 1.7.1203

package/backend/careersMultiBoxesPageIds.js

@@ -34,12 +34,6 @@ const CAREERS_MULTI_BOXES_PAGE_CONSTS={
     RESULTS_MULTI_STATE_BOX: '#multiStateBox1',
 }
 
-const PRIMARY_SEARCH_STATES={
-    CATEGORY_RESULTS: 'categoryResults',
-    JOB_RESULTS: 'jobResults',
-    NO_RESULTS: 'noResults',
-}
-
 const TWG_JOBS_COLLECTION_FIELDS={
     LINK_JOBS_TITLE: 'link-jobs-title',
     LINK_JOBS_REF_ID_SLUG: 'link-jobs-refId-slug',
@@ -88,5 +82,4 @@ 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.7.1201",
+  "version": "1.7.1203",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -18,7 +18,7 @@
   "homepage": "https://github.com/psdevteamenterprise/sr-npm#readme",
   "dependencies": {
     "@hisense-staging/velo-npm": "3.0.19",
-    "@wix/data": "^1.0.349",
+    "@wix/data": "^1.0.211",
     "@wix/essentials": "^0.1.24",
     "@wix/secrets": "1.0.53",
     "@wix/site-location": "^1.0.0",

package/pages/careersMultiBoxesPage.js

@@ -1,5 +1,5 @@
 const { COLLECTIONS,CUSTOM_VALUES_COLLECTION_FIELDS,JOBS_COLLECTION_FIELDS } = require('../backend/collectionConsts');
-const { CAREERS_PAGE_SELECTORS, GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
+const { CAREERS_PAGE_SELECTORS } = require('../public/selectors');
 
 const { window } = require('@wix/site-window');
 const { queryParams,onChange} = require('wix-location-frontend');
@@ -18,9 +18,11 @@ const { groupValuesByField,
         getFieldByTitle,
         getCorrectOption,
         getOptionIndexFromCheckBox,
+        loadPrimarySearchRepeater,
+        bindPrimarySearch,
+        primarySearch,
         getAllDatasetItems 
       } = require('./pagesUtils');
-const { handlePrimarySearch, queryPrimarySearchResults } = require('../public/primarySearchUtils');
 
 
 let dontUpdateThisCheckBox;
@@ -38,6 +40,7 @@ let secondarySearchIsFilled=false // whether the secondary search is filled with
 let keywordAllJobs; // all jobs that are displayed in the jobs repeater when the keyword is filled
 let ActivateURLOnchange=true; // whether to activate the url onchange
 let considerAllJobs=false; // whether to consider all jobs or not
+
 const pagination = {
   pageSize: 10,
   currentPage: 1,
@@ -50,19 +53,18 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
   });
   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);
+  loadPrimarySearchRepeater(_$w);
   await loadFilters(_$w);
   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);
     });
-    if (await window.formFactor() === "Mobile") {
-      handleFilterInMobile(_$w);
-  }
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_MULTI_STATE_BOX).changeState("results");
 }
 
@@ -93,7 +95,6 @@ async function clearAll(_$w,urlOnChange=false) {
     secondarySearchIsFilled=false;
     currentJobs=alljobs;
     keywordAllJobs=undefined;
-    considerAllJobs=false;
     if(!urlOnChange) {
       console.log("inside clearAll removing url params");
       ActivateURLOnchange=false;
@@ -116,26 +117,16 @@ function handleFilterInMobile(_$w) {
       CAREERS_PAGE_SELECTORS.SECTION_3, 
       CAREERS_PAGE_SELECTORS.LINE_3,
       CAREERS_PAGE_SELECTORS.FILTER_ICON];
-    
-  const mobileFilterBoxSelectors = [
-    CAREERS_PAGE_SELECTORS.FILTER_BOX,
-    CAREERS_PAGE_SELECTORS.REFINE_SEARCH_BUTTON,
-    CAREERS_PAGE_SELECTORS.EXIT_BUTTON,
-  ];
 
   _$w(CAREERS_PAGE_SELECTORS.FILTER_ICON).onClick(()=>{
-      mobileFilterBoxSelectors.forEach(selector => {
-        _$w(selector).expand();
-      });
+      _$w(CAREERS_PAGE_SELECTORS.FILTER_BOX).expand();
       searchResultsSelectors.forEach(selector => {
           _$w(selector).collapse();
       });
   });
 
   const exitFilterBox = () => {
-      mobileFilterBoxSelectors.forEach(selector => {
-        _$w(selector).collapse();
-      });
+      _$w(CAREERS_PAGE_SELECTORS.FILTER_BOX).collapse();
       searchResultsSelectors.forEach(selector => {
           _$w(selector).expand();
       });
@@ -148,11 +139,6 @@ function handleFilterInMobile(_$w) {
   _$w(CAREERS_PAGE_SELECTORS.REFINE_SEARCH_BUTTON).onClick(()=>{
       exitFilterBox();
   });
-
-  //onmobile we should collapse the filter box and the refine search button by default 
-  mobileFilterBoxSelectors.forEach(selector => {
-    _$w(selector).collapse();
-  });
 }
 
 
@@ -162,10 +148,10 @@ async function handleUrlParams(_$w,urlParams,handleBackAndForth=false) {
   let currentApplyFilterFlag=false;
   //apply this first to determine all jobs
   if(urlParams.keyword) {
-    applyFiltering = await queryPrimarySearchResults(_$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;
@@ -286,14 +272,14 @@ async function handleParams(_$w,param,values) {
             fieldTitle==="brands"? fieldTitle="brand":fieldTitle;
             ActivateURLOnchange=false;
             const previousSelectedSize=selectedByField.size;
-          
             if (updated.length) {
               selectedByField.set(fieldId, updated);
-              handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
+              
               queryParams.add({ [fieldTitle] : updated.map(val=>encodeURIComponent(val)).join(',') });
             } else {
               selectedByField.delete(fieldId);
               handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
+            
               queryParams.remove([fieldTitle ]);
             }
 
@@ -403,10 +389,11 @@ async function loadJobsRepeater(_$w) {
         fieldTitle==="brands"? fieldTitle="brand":fieldTitle;
         ActivateURLOnchange=false;
         const previousSelectedSize=selectedByField.size;
+
         if (selected && selected.length) {
-          
           selectedByField.set(field._id, selected); 
-          handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
+ 
+
           if(fieldTitle==="brand" || fieldTitle==="storename") {
             //in this case we need the label not valueid
             const valueLabels=getValueFromValueId(selected,value);
@@ -417,7 +404,7 @@ async function loadJobsRepeater(_$w) {
           }
           
         } else {
-          selectedByField.delete(field._id);  
+          selectedByField.delete(field._id); 
           handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
           queryParams.remove([fieldTitle ]);
         }
@@ -440,17 +427,6 @@ async function loadJobsRepeater(_$w) {
     }
   }
 
-
-  function handleConsiderAllJobs(previousSelectedSize,currentSelectedSize) {
-    if(previousSelectedSize===2 && currentSelectedSize===1) {
-      considerAllJobs=true;
-    }
-    else{
-      considerAllJobs=false;
-    }
-  }
-
-
 function getValueFromValueId(valueIds, value) {
   let valueLabels = [];
   let currentVal
@@ -470,14 +446,35 @@ function getValueFromValueId(valueIds, value) {
     updateTotalJobsCountText(_$w);  
   }
 
+  function handleConsiderAllJobs(previousSelectedSize,currentSelectedSize) {
+    if(previousSelectedSize===2 && currentSelectedSize===1) {
+
+      considerAllJobs=true;
+    }
+    else{
+      considerAllJobs=false;
+    }
+  }
+
   function updateOptionsUI(_$w,fieldTitle, fieldId, searchQuery,clearAll=false) {
     let base = optionsByFieldId.get(fieldId) || [];
-    const countsMap = countsByFieldId.get(fieldId) || new Map();
+    let countsMap;
+    //const countsMap = countsByFieldId.get(fieldId) || new Map();
+    if(considerAllJobs)
+    {
+      const selectedFieldId=Array.from( selectedByField.keys() )[0]
+      const relevantFields=allvaluesobjects.filter(val=>val.customField===selectedFieldId)
+      countsMap = new Map(relevantFields.map(val=>[val.valueId, val.count]));
+    }
+    else{
+      countsMap = countsByFieldId.get(fieldId) || new Map();
+    }
     if(dontUpdateThisCheckBox===fieldId && !clearAll && selectedByField.has(fieldId) )
     {
           dontUpdateThisCheckBox=null;
           return;
     }
+
     let filteredbase=[]
     for (const element of base)
     {
@@ -630,8 +627,8 @@ async function refreshFacetCounts(_$w,clearAll=false) {
 
   function countJobsPerField(jobs) {
     const fieldIds = Array.from(optionsByFieldId.keys());
-    let currentJobsIds;
-    considerAllJobs? currentJobsIds=alljobs.map(job=>job._id):currentJobsIds=jobs.map(job=>job._id);
+  
+    const currentJobsIds=jobs.map(job=>job._id);
     for (const fieldId of fieldIds) {
         let currentoptions = optionsByFieldId.get(fieldId)
         let counter=new Map();
@@ -702,6 +699,8 @@ async function secondarySearch(_$w,query) {
 }
   function bindSearchInput(_$w) {
     try {
+      bindPrimarySearch(_$w, allvaluesobjects);
+
       const secondarySearchDebounced = debounce(async () => {
       const query = (_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).value || '').toLowerCase().trim();
       await secondarySearch(_$w, query);

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;
@@ -58,10 +58,10 @@ async function careersPageOnReady(_$w,thisObject=null,queryParams=null) {
   
 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 {
@@ -81,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;
@@ -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(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).loadMore();
+           await _$w(CAREERS_PAGE_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(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).onReady(async () => {
+	await _$w(CAREERS_PAGE_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(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");
@@ -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(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');
 
@@ -374,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;
@@ -485,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,9 +4,7 @@ const { filterBrokenMarkers } = require('../public/utils');
 const { location } = require('@wix/site-location');
 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');
+const { bindPrimarySearch, getAllRecords, loadPrimarySearchRepeater } = require('./pagesUtils');
 
 let thisObjectVar;
 let searchByCityFlag=false;
@@ -19,7 +17,8 @@ async function homePageOnReady(_$w,thisObject = null) {
 
     if(siteconfig.twg) {
         const allvaluesobjects  = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
-        handlePrimarySearch(_$w, allvaluesobjects);
+        bindPrimarySearch(_$w, allvaluesobjects);
+        loadPrimarySearchRepeater(_$w)
         console.log("siteconfig.twg: ",siteconfig.twg);
 
         if(siteconfig.twg === "external") {
@@ -162,10 +161,10 @@ 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;
@@ -173,9 +172,9 @@ async function handleSearchInput(_$w) {
         _$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;

package/pages/pagesUtils.js

@@ -1,6 +1,9 @@
 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, TWG_JOBS_COLLECTION_FIELDS } = 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();
@@ -78,13 +81,7 @@ function getFieldByTitle(title,allFields) {
 
 function getCorrectOption(value,options,param) {
   const standardizedValue = normalizeString(value.toLowerCase())
-  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);
+  return options.find(option=>normalizeString(option.value.toLowerCase())===standardizedValue || normalizeString(option.label.toLowerCase())===standardizedValue);
 }
 
 function getOptionIndexFromCheckBox(options,value) {
@@ -96,6 +93,151 @@ function getOptionIndexFromCheckBox(options,value) {
   }
 }
 
+function loadPrimarySearchRepeater(_$w) {
+  
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
+    $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_POSITION_BUTTON).label = itemData.title || '';   
+  });
+  
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER_ITEM).onClick((event) => {
+    const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
+    const clickedItemData = data.find(
+      (item) => item._id === event.context.itemId,
+      
+    );
+    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]);
+    
+
+});
+_$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) {
+
+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);
+
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => { 
+  await primarySearchDebounced();
+});
+
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
+
+  if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()!=='') {
+    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.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");
+
+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}];
+
+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{
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
+  }
+}
+
+return count > 0;
+}
+
 async function getValueFromValueId(valueId) {
 const result = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
 console.log("result: ",result);
@@ -120,6 +262,9 @@ module.exports = {
   getFieldByTitle,
   getCorrectOption,
   getOptionIndexFromCheckBox,
+  loadPrimarySearchRepeater,
+  bindPrimarySearch,
+  primarySearch,
   getLatestJobsByValue,
   getValueFromValueId,
   getAllRecordsWithoutMultiRef,

package/pages/positionPage.js

@@ -10,6 +10,8 @@ const {
   } = require('../public/utils');
   
   
+
+
   async function positionPageOnReady(_$w) {
     console.log("positionPageOnReady called");
     await bind(_$w);
@@ -88,14 +90,8 @@ async function getCategoryValue(customValues) {
 }
 
   function handleReferFriendButton(_$w,item) {
-    if(isElementExistOnPage(_$w('#referFriendButton'))){
-      if(!item.referFriendLink){
-        _$w('#referFriendButton').hide();
-      }
-      else {
-        _$w('#referFriendButton').target="_blank";
-        _$w('#referFriendButton').link=item.referFriendLink;
-      }
+    if(!item.referFriendLink &&  isElementExistOnPage(_$w('#referFriendButton'))){
+      _$w('#referFriendButton').hide();
     }
   }
 

package/public/index.js

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

package/public/selectors.js

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

package/public/primarySearchUtils.js

@@ -1,157 +0,0 @@
-const { location } = require("@wix/site-location");
-
-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; 
-}
-
-async function bindPrimarySearch(_$w) {
-    handleCategoryEvents(_$w);
-
-    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 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(
-      (item) => item._id === event.context.itemId,
-    );
-    const baseUrl = await location.baseUrl();
-      const encodedCategory=encodeURIComponent(clickedItemData._id);
-      location.to(`${baseUrl}/search?category=${encodedCategory}`);
-  });
-  
-}
-
-function getSearchQuery(_$w) {
-    return _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
-}
-
-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));
-      } 
-          
-    _$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();
-        
-        const searchQuery = getSearchQuery(_$w);
-        if(searchQuery !== '') {
-            await queryPrimarySearchResults(_$w, searchQuery);
-        }
-        else {
-            _$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}`);
-            }
-        }
-    });
-}
-    
-async function queryPrimarySearchResults(_$w, query) {
-    if(query === undefined || query === '') {
-        _$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);    
-
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(filter); 
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
-
-    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(PRIMARY_SEARCH_STATES.JOB_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();
-        if  (count > 0) {
-        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
-        _$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(PRIMARY_SEARCH_STATES.NO_RESULTS);
-        }
-}
-
-return count > 0;
-}
-
-module.exports = {
-  handlePrimarySearch,
-  queryPrimarySearchResults
-}