sr-npm 3.1.20 → 3.1.23

package/backend/fetchPositionsFromSRAPI.js

@@ -115,6 +115,7 @@ async function fetchJobDescription(jobId,testObject=undefined) {
 }
 
 async function htmlRichContentConverter(sections,richContentConverterToken) {
+  
   const richContentObject = {}
   for (const [sectionTitle, sectionData] of Object.entries(sections)) {
     if (sectionData.text) {
@@ -136,7 +137,8 @@ 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);
+        richContentObject[sectionTitle] = richContentWithSpacing
       }
       else {
         throw new Error("Error converting html to rich content response: "+response);
@@ -146,6 +148,178 @@ 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": "3.1.20",
+  "version": "3.1.23",
   "description": "",
   "main": "index.js",
   "scripts": {

package/pages/careersMultiBoxesPage.js

@@ -54,13 +54,14 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
   loadSelectedValuesRepeater(_$w);
   bindSearchInput(_$w);
   loadPaginationButtons(_$w);
-    if (await window.formFactor() === "Mobile") {
-      handleFilterInMobile(_$w);
-  }
+
     await handleUrlParams(_$w, urlParams);
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CLEAR_ALL_BUTTON_ID).onClick(async () => {
       await clearAll(_$w);
     });
+    if (await window.formFactor() === "Mobile") {
+      handleFilterInMobile(_$w);
+  }
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_MULTI_STATE_BOX).changeState("results");
 }
 
@@ -113,16 +114,26 @@ 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(()=>{
-      _$w(CAREERS_PAGE_SELECTORS.FILTER_BOX).expand();
+      mobileFilterBoxSelectors.forEach(selector => {
+        _$w(selector).expand();
+      });
       searchResultsSelectors.forEach(selector => {
           _$w(selector).collapse();
       });
   });
 
   const exitFilterBox = () => {
-      _$w(CAREERS_PAGE_SELECTORS.FILTER_BOX).collapse();
+      mobileFilterBoxSelectors.forEach(selector => {
+        _$w(selector).collapse();
+      });
       searchResultsSelectors.forEach(selector => {
           _$w(selector).expand();
       });
@@ -135,6 +146,11 @@ 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();
+  });
 }
 
 
@@ -237,6 +253,7 @@ async function handleParams(_$w,param,values) {
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = pagination.currentPage.toString();
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = nextPageJobs;
       handlePaginationButtons(_$w);
+      await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).scrollTo();
     });
 
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS).onClick(async () => {
@@ -245,6 +262,7 @@ async function handleParams(_$w,param,values) {
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text =   pagination.currentPage.toString();
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = previousPageJobs;
       handlePaginationButtons(_$w);
+      await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).scrollTo();
     });
   } catch (error) {
     console.error('Failed to load pagination buttons:', error);
@@ -466,6 +484,8 @@ function getValueFromValueId(valueIds, value) {
       ? withCounts.filter(o => (o.label || '').toLowerCase().includes(searchQuery))
       : withCounts;
 
+    // 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;

package/pages/careersPage.js

@@ -192,18 +192,18 @@ function init(_$w) {
         searchInputBlurredFirstTime=false;
         }
     });
-    _$w(CAREERS_PAGE_SELECTORS.DROPDOWN_DEPARTMENT, CAREERS_PAGE_SELECTORS.DROPDOWN_LOCATION, CAREERS_PAGE_SELECTORS.DROPDOWN_JOB_TYPE, CAREERS_PAGE_SELECTORS.DROPDOWN_BRAND).onChange(()=>{
+    _$w(CAREERS_PAGE_SELECTORS.DROPDOWN_DEPARTMENT+', '+ CAREERS_PAGE_SELECTORS.DROPDOWN_LOCATION+', '+ CAREERS_PAGE_SELECTORS.DROPDOWN_JOB_TYPE+', '+ CAREERS_PAGE_SELECTORS.DROPDOWN_BRAND).onChange(()=>{
         console.log("dropdown onChange is triggered");
         applyFilters(_$w);
     });
-	_$w(CAREERS_PAGE_SELECTORS.RESET_FILTERS_BUTTON, CAREERS_PAGE_SELECTORS.CLEAR_SEARCH).onClick(()=>resetFilters(_$w));
+	_$w(CAREERS_PAGE_SELECTORS.RESET_FILTERS_BUTTON+', '+ CAREERS_PAGE_SELECTORS.CLEAR_SEARCH).onClick(()=>resetFilters(_$w));
 
 	_$w(CAREERS_PAGE_SELECTORS.OPEN_FILTERS_BUTTON).onClick(()=>{
-		_$w(CAREERS_PAGE_SELECTORS.DROPDOWN_CONTAINER, CAREERS_PAGE_SELECTORS.CLOSE_FILTERS_BUTTON).expand();
+		_$w(CAREERS_PAGE_SELECTORS.DROPDOWN_CONTAINER+', '+ CAREERS_PAGE_SELECTORS.CLOSE_FILTERS_BUTTON).expand();
 	});
 
 	_$w(CAREERS_PAGE_SELECTORS.CLOSE_FILTERS_BUTTON).onClick(()=>{
-		_$w(CAREERS_PAGE_SELECTORS.DROPDOWN_CONTAINER, CAREERS_PAGE_SELECTORS.CLOSE_FILTERS_BUTTON).collapse();
+		_$w(CAREERS_PAGE_SELECTORS.DROPDOWN_CONTAINER+', '+ CAREERS_PAGE_SELECTORS.CLOSE_FILTERS_BUTTON).collapse();
 	});
 
     //URL onChange
@@ -355,7 +355,7 @@ 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 = '';
+	_$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();
@@ -404,8 +404,7 @@ async function handleDepartmentParam(_$w,department) {
         queryParams.remove(["department" ]);
 
     }
-    
-    
+     
      
 }
 

package/pages/homePage.js

@@ -7,6 +7,7 @@ const { COLLECTIONS } = require('../backend/collectionConsts');
 const { getAllRecords } = require('./pagesUtils');
 const { handlePrimarySearch } = require('../public/primarySearchUtils');
 const { GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
+const { isElementExistOnPage } = require('psdev-utils');
 
 let thisObjectVar;
 let searchByCityFlag=false;
@@ -65,35 +66,22 @@ function bind(_$w) {
 function bindTeamRepeater(_$w) {
     _$w('#teamRepeater').onItemReady(($item, itemData) => {
         $item('#teamButton').label = `View ${itemData.count} Open Positions`;
-       // const department = encodeURIComponent(itemData.title);
-        // if (itemData.customField) {
-        //     [$item('#teamButton'), $item('#teamButton2')].forEach(btn => {
-        //         btn.onClick(() => {
-        //             location.to(`/search?category=${department}`);
-        //         });
-        //     });
-
-        // }
-        // else{
-        //     $item('#teamButton').onClick(()=>{
-        //         location.to(`/positions?department=${department}`);
-        //     });
-        // }
     });
     
     _$w("#teamRepeaterItem").onClick((event) => {
        
             const $item = _$w.at(event.context);
             
-            if(_$w("#categoriesDataset")) {
+            if(isElementExistOnPage(_$w("#categoriesDataset"))) {
                 const clickedItemData = $item("#categoriesDataset").getCurrentItem();
                 const department = encodeURIComponent(clickedItemData.title);
                 location.to(`/search?category=${department}`);
             }      
             else
             {
-                console.log("check SR templates  and do this ")
-               
+                const clickedItemData =  $item("#dataset1").getCurrentItem()
+                const department = encodeURIComponent(clickedItemData.title);
+                location.to(`/positions?department=${department}`);
             } 
       });
 

package/pages/positionPage.js

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

package/public/primarySearchUtils.js

@@ -153,4 +153,5 @@ return count > 0;
 
 module.exports = {
   handlePrimarySearch,
+  queryPrimarySearchResults
 }