sr-npm 3.1.24 → 3.1.26

package/backend/fetchPositionsFromSRAPI.js

@@ -119,8 +119,10 @@ async function htmlRichContentConverter(sections,richContentConverterToken) {
   const richContentObject = {}
   for (const [sectionTitle, sectionData] of Object.entries(sections)) {
     if (sectionData.text) {
+      // Strip span tags but keep their content , since <span> tags paragraphs are deleted by the converter
+      const cleanedHtml = sectionData.text.replace(/<\/?span[^>]*>/gi, '');
       const raw = JSON.stringify({
-        content: sectionData.text,
+        content: cleanedHtml,
       });
       const requestOptions = {
         method: 'post',
@@ -137,7 +139,10 @@ async function htmlRichContentConverter(sections,richContentConverterToken) {
       );
       if (response.ok) {
         const data = await response.json();
-        const richContentWithSpacing=addSpacingToRichContent(sectionData.text,data.richContent.richContent);
+        // Fix list items with nested paragraphs (causes line breaks after bold text)
+        const flattenedContent = flattenListItems(data.richContent.richContent);
+       // const richContentWithSpacing=addSpacingToRichContent(cleanedHtml,flattenedContent);
+       const richContentWithSpacing=addEmptyParagraphsBetweenConsecutive(cleanedHtml,flattenedContent);
         richContentObject[sectionTitle] = richContentWithSpacing
       }
       else {
@@ -148,148 +153,6 @@ 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 &#xa0;
-  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 {
@@ -314,6 +177,84 @@ function createEmptyParagraph(id) {
   };
 }
 
+// Flattens LIST_ITEM nodes by removing nested PARAGRAPH wrappers
+// Fixes Wix converter bug where bold text + regular text in <li> creates line breaks
+function flattenListItems(richContent) {
+  if (!richContent || !richContent.nodes) return richContent;
+  
+  const processNode = (node) => {
+    if (node.type === 'BULLETED_LIST' || node.type === 'ORDERED_LIST') {
+      return {
+        ...node,
+        nodes: node.nodes.map(listItem => {
+          if (listItem.type !== 'LIST_ITEM') return listItem;
+          
+          // Flatten: extract TEXT nodes from nested PARAGRAPHs
+          const flattenedChildren = [];
+          for (const child of listItem.nodes) {
+            if (child.type === 'PARAGRAPH' && child.nodes) {
+              // Pull TEXT nodes out of the PARAGRAPH
+              flattenedChildren.push(...child.nodes);
+            } else {
+              flattenedChildren.push(child);
+            }
+          }
+          
+          return { ...listItem, nodes: flattenedChildren };
+        })
+      };
+    }
+    return node;
+  };
+  
+  return {
+    ...richContent,
+    nodes: richContent.nodes.map(processNode)
+  };
+}
+
+// Adds empty paragraph nodes between consecutive paragraphs and before lists
+function addEmptyParagraphsBetweenConsecutive(html, richContent) {
+  if (!richContent || !richContent.nodes) return richContent;
+  const hasConsecutiveParagraphs = /<\/p>\s*<p/i.test(html);
+  const hasParagraphBeforeList = /<\/p>\s*<ul/i.test(html);
+  const hasParagraphAfterList = /<\/ul>\s*<p/i.test(html);
+  
+  if (!hasConsecutiveParagraphs && !hasParagraphBeforeList && !hasParagraphAfterList) return richContent;
+  
+  const nodes = richContent.nodes;
+  const newNodes = [];
+  let nodeIdCounter = 0;
+  
+  for (let i = 0; i < nodes.length; i++) {
+    const currentNode = nodes[i];
+    const nextNode = nodes[i + 1];
+    
+    newNodes.push(currentNode);
+    
+    if (currentNode.type === 'PARAGRAPH' && nextNode) {
+      // Add empty paragraph between consecutive paragraphs
+      if (hasConsecutiveParagraphs && nextNode.type === 'PARAGRAPH') {
+        newNodes.push(createEmptyParagraph(`empty_consecutive_${nodeIdCounter++}`));
+      }
+      // Add empty paragraph before list
+      if (hasParagraphBeforeList && nextNode.type === 'BULLETED_LIST') {
+        newNodes.push(createEmptyParagraph(`empty_before_list_${nodeIdCounter++}`));
+      }
+    }
+    
+    // Add empty paragraph after list
+    if (hasParagraphAfterList && currentNode.type === 'BULLETED_LIST' && nextNode && nextNode.type === 'PARAGRAPH') {
+      newNodes.push(createEmptyParagraph(`empty_after_list_${nodeIdCounter++}`));
+    }
+  }
+  
+  return {
+    ...richContent,
+    nodes: newNodes
+  };
+}
+
 
 
 

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -30,6 +30,7 @@ const countsByFieldId = new Map(); // fieldId -> {valueId: count} map of counts
 let allfields=[] // all fields in the database
 let alljobs=[] // all jobs in the database
 let allvaluesobjects=[] // all values in the database
+let cities=[] // all cities in the database
 let valueToJobs={} // valueId -> array of jobIds
 let currentJobs=[] // current jobs that are displayed in the jobs repeater
 let allsecondarySearchJobs=[] // secondary search results that are displayed in the jobs repeater
@@ -37,6 +38,8 @@ 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,
@@ -81,10 +84,10 @@ async function handleBackAndForth(_$w){
 }
 
 async function clearAll(_$w,urlOnChange=false) {
-  if(selectedByField.size>0 || _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).value || _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value) {
     
     for(const field of allfields) {
       _$w(`#${FiltersIds[field.title]}CheckBox`).selectedIndices = [];
+      _$w(`#${FiltersIds[field.title]}input`).value='';
     }
     selectedByField.clear();
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).value='';
@@ -100,7 +103,6 @@ async function clearAll(_$w,urlOnChange=false) {
       await updateJobsAndNumbersAndFilters(_$w,true);
     }
     
-    }
 }
 
 function handleFilterInMobile(_$w) {
@@ -285,11 +287,16 @@ 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 ]);
             }
 
@@ -357,7 +364,7 @@ async function loadJobsRepeater(_$w) {
   async function loadFilters(_$w) {
     try {
       // 1) Load all categories (fields)
-      const cities = await getAllRecords(COLLECTIONS.CITIES);
+      cities = await getAllRecords(COLLECTIONS.CITIES);
       for(const city of cities) {
         valueToJobs[city._id] = city.jobIds;
       }
@@ -398,8 +405,12 @@ 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);
@@ -410,7 +421,8 @@ async function loadJobsRepeater(_$w) {
           }
           
         } else {
-          selectedByField.delete(field._id);  
+          selectedByField.delete(field._id); 
+          handleConsiderAllJobs(previousSelectedSize,selectedByField.size);
           queryParams.remove([fieldTitle ]);
         }
        
@@ -451,14 +463,39 @@ 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=countsByFieldId.get(fieldId) || new Map();
+    if(considerAllJobs)
+    {
+      const selectedFieldId=Array.from( selectedByField.keys() )[0]
+      if(selectedFieldId===fieldId) {
+        if(selectedFieldId==="Location") {
+          countsMap = new Map(cities.map(city=>[city._id, city.count]));
+        }
+        else{
+        const relevantFields=allvaluesobjects.filter(val=>val.customField===selectedFieldId)
+        countsMap = new Map(relevantFields.map(val=>[val.valueId, val.count]));
+        }
+        considerAllJobs=false;
+      }
+    }
     if(dontUpdateThisCheckBox===fieldId && !clearAll && selectedByField.has(fieldId) )
     {
           dontUpdateThisCheckBox=null;
           return;
     }
+
     let filteredbase=[]
     for (const element of base)
     {
@@ -486,11 +523,7 @@ function getValueFromValueId(valueIds, value) {
 
     // Sort alphabetically by label
     filtered.sort((a, b) => (a.label || '').localeCompare(b.label || ''));
-    // Preserve currently selected values that are still visible
-  //  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));
     if(filtered.length===0) {
       _$w(`#${FiltersIds[fieldTitle]}MultiBox`).changeState(`${FiltersIds[fieldTitle]}NoResults`);
     }
@@ -559,11 +592,14 @@ function getValueFromValueId(valueIds, value) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = secondarySearchIsFilled? Math.ceil(currentSecondarySearchJobs.length/pagination.pageSize).toString():Math.ceil(currentJobs.length/pagination.pageSize).toString();
     if(jobsFirstPage.length===0) {
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_MULTI_STATE_BOX).changeState("noJobs");
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = "0";
+      pagination.currentPage=0;
     }
     else{
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_MULTI_STATE_BOX).changeState("searchResult");
+      pagination.currentPage=1;
     }
-    pagination.currentPage=1;
+    
     handlePaginationButtons(_$w);
 }
 
@@ -571,7 +607,7 @@ function handlePaginationButtons(_$w)
 {
   handlePageUrlParam();
 
-  pagination.currentPage===1? _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS).disable():_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS).enable();
+  pagination.currentPage===1 || pagination.currentPage===0? _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS).disable():_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS).enable();
   if(secondarySearchIsFilled) {
     if(currentSecondarySearchJobs.length===0) {
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).disable();
@@ -590,9 +626,8 @@ function handlePaginationButtons(_$w)
 
 function handlePageUrlParam() {
   ActivateURLOnchange=false;
-  if(pagination.currentPage==1)
+  if(pagination.currentPage==1 || pagination.currentPage==0)
   {
-    
       queryParams.remove(["page"]);
   }
   else{
@@ -613,8 +648,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();
@@ -672,6 +707,8 @@ async function secondarySearch(_$w,query) {
 
     if(jobsFirstPage.length===0) {
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_MULTI_STATE_BOX).changeState("noJobs");
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = "0";
+      pagination.currentPage=0;
     }
     else{
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_MULTI_STATE_BOX).changeState("searchResult");
@@ -698,6 +735,7 @@ async function secondarySearch(_$w,query) {
 }
 
 
+
 module.exports = {
     careersMultiBoxesPageOnReady,
     secondarySearch

package/pages/pagesUtils.js

@@ -78,13 +78,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) {