sr-npm 1.7.1214 → 1.7.1218

package/backend/careersMultiBoxesPageIds.js

@@ -34,6 +34,12 @@ 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',
@@ -82,4 +88,5 @@ module.exports = {
     CATEGORY_CUSTOM_FIELD_ID_IN_CMS,
     possibleUrlParams,
     TWG_JOBS_COLLECTION_FIELDS,
+    PRIMARY_SEARCH_STATES,
 }

package/backend/fetchPositionsFromSRAPI.js

@@ -136,7 +136,13 @@ async function htmlRichContentConverter(sections,richContentConverterToken) {
       );
       if (response.ok) {
         const data = await response.json();
-        richContentObject[sectionTitle] = data.richContent.richContent;
+        const richContentWithSpacing=addSpacingToRichContent(sectionData.text,data.richContent.richContent);
+        console.log("richContentWithSpacing ====");
+        console.log(richContentWithSpacing);
+
+        console.log("data.richContent.richContent ====");
+        console.log(data.richContent.richContent);
+        richContentObject[sectionTitle] = richContentWithSpacing
       }
       else {
         throw new Error("Error converting html to rich content response: "+response);
@@ -146,6 +152,180 @@ async function htmlRichContentConverter(sections,richContentConverterToken) {
   return richContentObject;
 }
 
+//Adds empty paragraph nodes between sections in rich content 
+// to create visual spacing that the Wix RICOS converter strips out
+function addSpacingToRichContent(html, richContent) {
+  if (!richContent || !richContent.nodes) {
+      return richContent;
+  }
+
+  // Extract paragraph texts from HTML that end with  
+  const htmlParagraphsWithSpace = [];
+  // Extract paragraphs with <br> tags
+  const htmlParagraphsWithBr = new Map(); // text -> array of parts split by <br>
+  
+  const pTagRegex = /<p>(.*?)<\/p>/gi;
+  let match;
+  
+  while ((match = pTagRegex.exec(html)) !== null) {
+      const content = match[1];
+      
+      // Check if this paragraph ends with &#xa0; (before closing tags)
+      if (content.includes('&#xa0;')) {
+          const textOnly = content.replace(/<[^>]+>/g, '').trim();
+          htmlParagraphsWithSpace.push(textOnly);
+      }
+      
+      // Check if this paragraph contains <br> tags
+      if (content.includes('<br>') || content.includes('<br/>') || content.includes('<br />')) {
+          // Split by <br> tags and extract text parts
+          const parts = content.split(/<br\s*\/?>/i).map(part => 
+              part.replace(/<[^>]+>/g, '').trim()
+          ).filter(part => part.length > 0);
+          
+          if (parts.length > 1) {
+              // Store the parts for this paragraph
+              const fullText = content.replace(/<[^>]+>/g, '').replace(/\s+/g, '').trim();
+              htmlParagraphsWithBr.set(fullText, parts);
+          }
+      }
+  }
+
+  const nodes = richContent.nodes;
+  const newNodes = [];
+  let nodeIdCounter = 0;
+  
+  // Check if a paragraph is bold (has BOLD decoration)
+  const isBoldParagraph = (node) => {
+      if (node.type !== 'PARAGRAPH') return false;
+      const decorations = node.nodes?.[0]?.textData?.decorations || [];
+      return decorations.some(d => d.type === 'BOLD');
+  };
+  
+  // Check if a paragraph node's text matches one with &#xa0; in HTML
+  const needsSpacingAfter = (node) => {
+      if (node.type !== 'PARAGRAPH') return false;
+      
+      // Add spacing after bold paragraphs
+      if (isBoldParagraph(node)) {
+          return true;
+      }
+      
+      const text = node.nodes?.[0]?.textData?.text || '';
+      const trimmedText = text.trim();
+      
+      // Check if this text matches any HTML paragraph that had &#xa0;
+      return htmlParagraphsWithSpace.some(htmlText => {
+          const cleanHtml = htmlText.replace(/&#xa0;/g, ' ').trim();
+          return trimmedText.includes(cleanHtml) || cleanHtml.includes(trimmedText);
+      });
+  };
+  
+  // Check if a paragraph contains text that should be split by <br>
+  const shouldSplitByBr = (node) => {
+      if (node.type !== 'PARAGRAPH') return null;
+      
+      const text = node.nodes?.[0]?.textData?.text || '';
+      const normalizedText = text.replace(/\s+/g, '').trim();
+      
+      // Find matching HTML paragraph with <br>
+      for (const [htmlText, parts] of htmlParagraphsWithBr.entries()) {
+          if (normalizedText.includes(htmlText) || htmlText.includes(normalizedText)) {
+              return parts;
+          }
+      }
+      return null;
+  };
+  
+  // Add spacing after bulleted lists
+  const isListEnd = (currentNode, nextNode) => {
+      return currentNode.type === 'BULLETED_LIST' && 
+             nextNode && 
+             nextNode.type === 'PARAGRAPH';
+  };
+
+  for (let i = 0; i < nodes.length; i++) {
+      const currentNode = nodes[i];
+      const nextNode = nodes[i + 1];
+      
+      // Check if this paragraph should be split by <br>
+      const brParts = shouldSplitByBr(currentNode);
+      if (brParts && brParts.length > 1) {
+          // Split into multiple paragraphs and add spacing between them
+          const decorations = currentNode.nodes?.[0]?.textData?.decorations || [];
+          
+          brParts.forEach((part, idx) => {
+              newNodes.push({
+                  ...currentNode,
+                  id: `${currentNode.id}_split_${idx}`,
+                  nodes: [{
+                      type: "TEXT",
+                      id: "",
+                      nodes: [],
+                      textData: {
+                          text: part,
+                          decorations: decorations
+                      }
+                  }]
+              });
+              
+              // Add empty paragraph after each split part except the last
+              if (idx < brParts.length - 1) {
+                  newNodes.push(createEmptyParagraph(`empty_br_${nodeIdCounter++}`));
+              }
+          });
+          
+          // Add spacing after the split paragraphs if there's a next node
+          if (nextNode) {
+              newNodes.push(createEmptyParagraph(`empty_${nodeIdCounter++}`));
+          }
+      } else {
+          newNodes.push(currentNode);
+          
+          // Add empty paragraph ONLY after paragraphs with &#xa0; or after lists
+          if ((needsSpacingAfter(currentNode) || isListEnd(currentNode, nextNode)) && nextNode) {
+              newNodes.push(createEmptyParagraph(`empty_${nodeIdCounter++}`));
+          }
+      }
+  }
+  
+  return {
+      ...richContent,
+      nodes: newNodes
+  };
+}
+
+function createEmptyParagraph(id) {
+  return {
+      type: "PARAGRAPH",
+      id: id,
+      nodes: [
+          {
+              type: "TEXT",
+              id: "",
+              nodes: [],
+              textData: {
+                  text: "",
+                  decorations: []
+              }
+          }
+      ],
+      paragraphData: {
+          textStyle: {
+              textAlignment: "AUTO"
+          }
+      }
+  };
+}
+
+
+
+
+
+
+
+
+
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.7.1214",
+  "version": "1.7.1218",
   "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.211",
+    "@wix/data": "^1.0.349",
     "@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 } = 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');
@@ -18,11 +18,9 @@ const { groupValuesByField,
         getFieldByTitle,
         getCorrectOption,
         getOptionIndexFromCheckBox,
-        loadPrimarySearchRepeater,
-        bindPrimarySearch,
-        primarySearch,
         getAllDatasetItems 
       } = require('./pagesUtils');
+const { handlePrimarySearch, queryPrimarySearchResults } = require('../public/primarySearchUtils');
 
 
 let dontUpdateThisCheckBox;
@@ -39,8 +37,6 @@ let currentSecondarySearchJobs=[] // current secondary search results that are d
 let secondarySearchIsFilled=false // whether the secondary search is filled with results
 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,
@@ -53,7 +49,7 @@ 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
-  loadPrimarySearchRepeater(_$w);
+  handlePrimarySearch(_$w, allvaluesobjects);
   await loadFilters(_$w);
   loadSelectedValuesRepeater(_$w);
   bindSearchInput(_$w);
@@ -148,10 +144,10 @@ async function handleUrlParams(_$w,urlParams,handleBackAndForth=false) {
   let currentApplyFilterFlag=false;
   //apply this first to determine all jobs
   if(urlParams.keyword) {
-    applyFiltering = await primarySearch(_$w, decodeURIComponent(urlParams.keyword));
+    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;
@@ -271,16 +267,11 @@ async function handleParams(_$w,param,values) {
             let fieldTitle=field.title.toLowerCase().replace(' ', '');
             fieldTitle==="brands"? fieldTitle="brand":fieldTitle;
             ActivateURLOnchange=false;
-            const previousSelectedSize=selectedByField.size;
             if (updated.length) {
               selectedByField.set(fieldId, updated);
-
-              
               queryParams.add({ [fieldTitle] : updated.map(val=>encodeURIComponent(val)).join(',') });
             } else {
               selectedByField.delete(fieldId);
-              handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
-            
               queryParams.remove([fieldTitle ]);
             }
 
@@ -389,12 +380,8 @@ async function loadJobsRepeater(_$w) {
         let fieldTitle=field.title.toLowerCase().replace(' ', '');
         fieldTitle==="brands"? fieldTitle="brand":fieldTitle;
         ActivateURLOnchange=false;
-        const previousSelectedSize=selectedByField.size;
-
         if (selected && selected.length) {
           selectedByField.set(field._id, selected); 
- 
-
           if(fieldTitle==="brand" || fieldTitle==="storename") {
             //in this case we need the label not valueid
             const valueLabels=getValueFromValueId(selected,value);
@@ -405,8 +392,7 @@ async function loadJobsRepeater(_$w) {
           }
           
         } else {
-          selectedByField.delete(field._id); 
-          handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
+          selectedByField.delete(field._id);  
           queryParams.remove([fieldTitle ]);
         }
        
@@ -447,35 +433,14 @@ 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) || [];
-    let countsMap=countsByFieldId.get(fieldId) || new Map();
-    //const countsMap = countsByFieldId.get(fieldId) || new Map();
-    if(considerAllJobs)
-    {
-      const selectedFieldId=Array.from( selectedByField.keys() )[0]
-      if(selectedFieldId===fieldId) {
-        const relevantFields=allvaluesobjects.filter(val=>val.customField===selectedFieldId)
-        countsMap = new Map(relevantFields.map(val=>[val.valueId, val.count]));
-        considerAllJobs=false;
-      }
-    }
+    const countsMap = countsByFieldId.get(fieldId) || new Map();
     if(dontUpdateThisCheckBox===fieldId && !clearAll && selectedByField.has(fieldId) )
     {
           dontUpdateThisCheckBox=null;
           return;
     }
-
     let filteredbase=[]
     for (const element of base)
     {
@@ -628,8 +593,8 @@ async function refreshFacetCounts(_$w,clearAll=false) {
 
   function countJobsPerField(jobs) {
     const fieldIds = Array.from(optionsByFieldId.keys());
-  
     const currentJobsIds=jobs.map(job=>job._id);
+    
     for (const fieldId of fieldIds) {
         let currentoptions = optionsByFieldId.get(fieldId)
         let counter=new Map();
@@ -700,8 +665,6 @@ 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 } = 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

@@ -4,7 +4,9 @@ const { filterBrokenMarkers } = require('../public/utils');
 const { location } = require('@wix/site-location');
 const {wixData} = require('wix-data');
 const { COLLECTIONS } = require('../backend/collectionConsts');
-const { bindPrimarySearch, getAllRecords, loadPrimarySearchRepeater } = require('./pagesUtils');
+const { getAllRecords } = require('./pagesUtils');
+const { handlePrimarySearch } = require('../public/primarySearchUtils');
+const { GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
 
 let thisObjectVar;
 let searchByCityFlag=false;
@@ -17,8 +19,7 @@ async function homePageOnReady(_$w,thisObject = null) {
 
     if(siteconfig.twg) {
         const allvaluesobjects  = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
-        bindPrimarySearch(_$w, allvaluesobjects);
-        loadPrimarySearchRepeater(_$w)
+        handlePrimarySearch(_$w, allvaluesobjects);
         console.log("siteconfig.twg: ",siteconfig.twg);
 
         if(siteconfig.twg === "external") {
@@ -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

@@ -1,9 +1,6 @@
 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();
@@ -81,7 +78,13 @@ function getFieldByTitle(title,allFields) {
 
 function getCorrectOption(value,options,param) {
   const standardizedValue = normalizeString(value.toLowerCase())
-  return options.find(option=>normalizeString(option.value.toLowerCase())===standardizedValue || normalizeString(option.label.toLowerCase())===standardizedValue);
+  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);
 }
 
 function getOptionIndexFromCheckBox(options,value) {
@@ -93,151 +96,6 @@ 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);
@@ -262,9 +120,6 @@ module.exports = {
   getFieldByTitle,
   getCorrectOption,
   getOptionIndexFromCheckBox,
-  loadPrimarySearchRepeater,
-  bindPrimarySearch,
-  primarySearch,
   getLatestJobsByValue,
   getValueFromValueId,
   getAllRecordsWithoutMultiRef,

package/public/index.js

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

package/public/primarySearchUtils.js

@@ -0,0 +1,156 @@
+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,
+}

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,
 }