sr-npm 1.7.952 → 1.7.954

package/package.json

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

package/pages/positionPage.js

@@ -24,7 +24,7 @@ async function getCategoryValueId(customValues) {
   const categoryCustomField=await wixData.query(COLLECTIONS.CUSTOM_FIELDS).eq(CUSTOM_FIELDS_COLLECTION_FIELDS.TITLE,"Category").find().then(result => result.items[0]);
   for(const value of customValues) {
     if(value.customField===categoryCustomField._id) {
-      return value._id;
+      return value;
       
     }
   }
@@ -35,11 +35,14 @@ async function getCategoryValueId(customValues) {
     _$w('#datasetJobsItem').onReady(async () => {
 
         const item = await _$w('#datasetJobsItem').getCurrentItem();
-     
+     console.log("item: ",item);
+
         handleReferFriendButton(_$w,item);
         handleApplyButton(_$w,item);
         
 
+        
+
         _$w('#companyDescriptionText').text = htmlToText(item.jobDescription.companyDescription.text);        
         _$w('#responsibilitiesText').text = htmlToText(item.jobDescription.jobDescription.text);
         _$w('#qualificationsText').text = htmlToText(item.jobDescription.qualifications.text);
@@ -52,9 +55,10 @@ async function getCategoryValueId(customValues) {
         {
           
             const multiRefField=await getPositionWithMultiRefField(item._id);
-            const categoryValueId=await getCategoryValueId(multiRefField);
-          
-        const relatedJobs = await getRelatedJobs({ categoryValueId, itemId: item._id ,limit:5});
+            const categoryValue=await getCategoryValueId(multiRefField);
+            handleJobDetails(_$w,item,categoryValue);
+
+        const relatedJobs = await getRelatedJobs({ categoryValueId:categoryValue._id, itemId: item._id ,limit:5});
           _$w('#relatedJobsRepNoDepartment').onItemReady(($item, itemData) => {
             $item('#relatedJobTitle').text = itemData.title;
             $item('#relatedJobLocation').text = itemData.location.fullLocation;
@@ -84,7 +88,18 @@ async function getCategoryValueId(customValues) {
   }
  
 }
+  function handleJobDetails(_$w,item,categoryValue) {
+    if(isElementExistOnPage(_$w('#jobLocation'))) {
+      _$w('#jobLocation').text = item.location.fullLocation;
+    }
+    if(isElementExistOnPage(_$w('#jobCategory'))) {
+      _$w('#jobCategory').text = categoryValue.title;
+    }
+    if(isElementExistOnPage(_$w('#jobEmploymentTime'))) {
+      _$w('#jobEmploymentTime').text = item.employmentType;
+    }
     
+  }
   function handleReferFriendButton(_$w,item) {
     if(!item.referFriendLink &&  isElementExistOnPage(_$w('#referFriendButton'))){
       _$w('#referFriendButton').hide();

package/public/utils.js

@@ -1,21 +1,21 @@
 
 function htmlToText(html) {
-  if (!html) return '';
-
-  // Remove HTML tags and decode entities
-  let text = html
+  
+  // Let the browser decode ALL HTML entities automatically
+  const textarea = document.createElement('textarea');
+  console.log("textarea: ",textarea);
+  textarea.innerHTML = html;
+  console.log("textarea.innerHTML: ",textarea.innerHTML);
+  let decoded = textarea.value;
+  console.log("decoded: ",decoded);
+  // Now clean up the HTML tags and formatting
+  let text = decoded
       .replace(/<br\s*\/?>/gi, '\n')
       .replace(/<\/?(p|div|h[1-6])\s*\/?>/gi, '\n')
       .replace(/<li[^>]*>/gi, '• ')
       .replace(/<\/li>/gi, '\n')
-      .replace(/<[^>]*>/g, '')
-      .replace(/&amp;/g, '&')
-      .replace(/&lt;/g, '<')
-      .replace(/&gt;/g, '>')
-      .replace(/&quot;/g, '"')
-      .replace(/&#39;/g, "'")
-      .replace(/&nbsp;/g, ' ');
-
+      .replace(/<[^>]*>/g, '');
+  console.log("text: ",text);
   // Clean up whitespace
   return text.replace(/\n\s*\n+/g, '\n\n').replace(/[ \t]+\n/g, '\n').trim();
 }