sr-npm 1.7.874 → 1.7.876

package/backend/collectionConsts.js

@@ -41,7 +41,7 @@ const CUSTOM_VALUES_COLLECTION_FIELDS = {
   TITLE: 'title',
   CUSTOM_FIELD: 'customField',
   MULTI_REF_JOBS_CUSTOM_VALUES: 'multiRefJobsCustomValues',
-  TOTAL_JOBS: 'totalJobs',
+  count: 'count',
   JOB_IDS: 'jobIds',
 }
 const CUSTOM_FIELDS_COLLECTION_FIELDS = {
@@ -112,7 +112,7 @@ const COLLECTIONS_FIELDS = {
     CUSTOM_VALUES: [
       {key:'title', type: 'TEXT'},
       {key:'customField', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.CUSTOM_FIELDS } } },
-      {key:'totalJobs', type: 'NUMBER'},
+      {key:'count', type: 'NUMBER'},
       {key:'multiRefJobsCustomValues', type: 'MULTI_REFERENCE', typeMetadata: { multiReference: { referencedCollectionId: COLLECTIONS.JOBS,referencingFieldKey:CUSTOM_VALUES_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES,referencingDisplayName:CUSTOM_VALUES_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES } } },
       {key:'jobIds', type: 'ARRAY'},
     ],

package/backend/data.js

@@ -202,7 +202,7 @@ async function populateCustomValuesCollection(customFieldsValues) {
         _id: valueId,
         title: valuesMap[valueId],
         customField: fieldId,
-        totalJobs:customValuesToJobs[valueId].length,
+        count:customValuesToJobs[valueId].length,
         jobIds:customValuesToJobs[valueId],
       })
     }

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -260,7 +260,7 @@ async function loadJobsRepeater(_$w) {
 
         optionsByFieldId.set(key, originalOptions);
         for (const val of allvaluesobjects) {
-          counter[val.title]=val.totalJobs
+          counter[val.title]=val.count
         }
 
         countsByFieldId.set(key, new Map(originalOptions.map(o => [o.value, counter[o.label]])));

package/pages/homePage.js

@@ -19,7 +19,8 @@ async function homePageOnReady(_$w,thisObject=null) {
         const allvaluesobjects=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
        await Promise.all([
             bindPrimarySearch(_$w,allvaluesobjects,allJobs),
-            loadPrimarySearchRepeater(_$w)
+            loadPrimarySearchRepeater(_$w),
+            bindTeamRepeater(_$w)
         ]);
     }
     else{
@@ -32,13 +33,9 @@ async function homePageOnReady(_$w,thisObject=null) {
   }
 
   function bind(_$w) {
-    _$w('#teamRepeater').onItemReady(($item, itemData) => {
-        $item('#teamButton').label = `View ${itemData.count} Open Positions`;
-        $item('#teamButton').onClick(()=>{
-            const department = encodeURIComponent(itemData.title);
-            location.to(`/positions?department=${department}`);
-        });
-    });
+
+    bindTeamRepeater(_$w);
+
 
     _$w('#citiesDataset').onReady(async () => {
         const numOfItems = await _$w('#citiesDataset').getTotalCount();
@@ -64,6 +61,20 @@ async function homePageOnReady(_$w,thisObject=null) {
     });
 }
 
+function bindTeamRepeater(_$w) {
+    _$w('#teamRepeater').onItemReady(($item, itemData) => {
+        $item('#teamButton').label = `View ${itemData.count} Open Positions`;
+        console.log("itemData: ", itemData);
+        $item('#teamButton').onClick(()=>{
+            const department = encodeURIComponent(itemData.title);
+            itemData.customField?
+            location.to(`/search?category=${department}`)
+            :
+            location.to(`/positions?department=${department}`);
+        });
+    });
+}
+
 function init(_$w) {
     const debouncedInput = debounce(()=>handleSearchInput(_$w), 400,thisObjectVar);
 

package/pages/pagesUtils.js

@@ -141,7 +141,7 @@ async function loadCategoriesListPrimarySearch(_$w,allvaluesobjects) {
   let categoryValues=[]
   for(const value of allvaluesobjects) {
     if(value.customField===CATEGORY_CUSTOM_FIELD_ID_IN_CMS) {
-      categoryValues.push({title:value.title+` (${value.totalJobs})` ,_id:value._id});
+      categoryValues.push({title:value.title+` (${value.count})` ,_id:value._id});
     }
   }
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;

package/pages/positionPage.js

@@ -37,10 +37,9 @@ async function getCategoryValueId(customValues) {
         const item = await _$w('#datasetJobsItem').getCurrentItem();
         const multiRefField=await getPositionWithMultiRefField(item._id);
         const categoryValueId=await getCategoryValueId(multiRefField);
-
         handleReferFriendButton(_$w,item);
-
         handleApplyButton(_$w,item);
+        
 
         _$w('#companyDescriptionText').text = htmlToText(item.jobDescription.companyDescription.text);        
         _$w('#responsibilitiesText').text = htmlToText(item.jobDescription.jobDescription.text);
@@ -83,15 +82,21 @@ async function getCategoryValueId(customValues) {
     
   function handleReferFriendButton(_$w,item) {
     if(!item.referFriendLink &&  isElementExistOnPage(_$w('#referFriendButton'))){
-      console.log("hiding referFriendButton");
       _$w('#referFriendButton').hide();
     }
   }
 
   function handleApplyButton(_$w,item) {
+    try{
     _$w('#applyButton').target="_blank";//so it can open in new tab
-    const url=appendQueryParams(item.applyLink,query);
-    _$w('#applyButton').link=url; //so it can be clicked
+      const url=appendQueryParams(item.applyLink,query);
+      _$w('#applyButton').link=url; //so it can be clicked
+    }
+    catch(error){
+      console.warn("error in handleApplyButton: , using applyLink directly", error);
+      _$w('#applyButton').target="_blank";
+      _$w('#applyButton').link=item.applyLink;
+    }
   }
 
   async function getRelatedJobs(categoryValueId,itemId,limit=1000) {

package/public/utils.js

@@ -40,15 +40,10 @@ function filterBrokenMarkers(items) {
 
 
 function appendQueryParams(url,query){
-  console.log("appendQueryParams url: ", url);
-  console.log("appendQueryParams query: ", query);
   const urlObj=new URL(url);
-  console.log("urlObj urlObj: ", urlObj);
   Object.entries(query).forEach(([key,value])=>{
     urlObj.searchParams.set(key,value);
   });
-  console.log("urlObj urlObj: ", urlObj);
-  console.log("urlObj urlObj.toString(): ", urlObj.toString());
   return urlObj.toString();
 }