sr-npm 1.7.888 → 1.7.890

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

@@ -219,7 +219,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.888",
+  "version": "1.7.890",
   "description": "",
   "main": "index.js",
   "scripts": {

package/pages/careersMultiBoxesPage.js

@@ -255,7 +255,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/careersPage.js

@@ -110,8 +110,6 @@ async function handleUrlParams(_$w) {
     if (queryBrandVar && _$w('#dropdownBrand').isVisible) { //if it is not visible, ignore it
         await handleBrandParam(_$w,queryBrandVar);
     }
-
-
         if (queryPageVar) {
             await handlePageParam(_$w);    
         }
@@ -124,8 +122,6 @@ async function handleUrlParams(_$w) {
         if (queryJobTypeVar) {
             await handleJobTypeParam(_$w,queryJobTypeVar);
         }
-
-
     await applyFilters(_$w, true); // Skip URL update since we're handling initial URL params
 }
 

package/pages/homePage.js

@@ -10,6 +10,7 @@ const { COLLECTIONS } = require('../backend/collectionConsts');
 const { bindPrimarySearch,getAllRecords,loadPrimarySearchRepeater } = require('./pagesUtils');
 let thisObjectVar;
 let searchByCityFlag=false;
+let loadedCategories=false;
 async function homePageOnReady(_$w,thisObject=null) {
 
     const queryResult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
@@ -19,7 +20,10 @@ 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),
+            bindViewAllButton(_$w),
+
         ]);
     }
     else{
@@ -32,13 +36,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 +64,45 @@ async function homePageOnReady(_$w,thisObject=null) {
     });
 }
 
+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}`);
+            });
+        }
+    });
+}
+
+function bindViewAllButton(_$w) {
+            
+    _$w('#viewAllCategoriesButton').onClick(()=>{
+        if(!loadedCategories) {
+            loadedCategories=true;
+            _$w('#viewAllCategoriesButton').label = "View Less";
+            _$w("#categoriesDataset").loadMore();
+        }
+        else{
+            loadedCategories=false;
+            _$w('#viewAllCategoriesButton').label = "View All";
+            _$w("#categoriesDataset").loadPage(1);
+        }
+    });
+}
+
+
+
+
 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);
@@ -52,12 +51,12 @@ async function getCategoryValueId(customValues) {
         }
         if(_$w('#relatedJobsRepNoDepartment')) // when there is no department, we filter based on category
         {
-        const relatedJobs=await getRelatedJobs(categoryValueId,item._id);
+        const relatedJobs=await getRelatedJobs(categoryValueId,item._id,5);
           _$w('#relatedJobsRepNoDepartment').onItemReady(($item, itemData) => {
             $item('#relatedJobTitle').text = itemData.title;
             $item('#relatedJobLocation').text = itemData.location.fullLocation;
           });
-          _$w('#relatedJobsRepNoDepartment').data = relatedJobs
+          _$w('#relatedJobsRepNoDepartment').data = relatedJobs;
 
 
         }
@@ -83,19 +82,25 @@ 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) {
-    const relatedJobs=await wixData.query(COLLECTIONS.JOBS).include(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES).hasSome(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES,[categoryValueId]).ne("_id",itemId).find();
+  async function getRelatedJobs(categoryValueId,itemId,limit=1000) {
+    const relatedJobs=await wixData.query(COLLECTIONS.JOBS).include(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES).hasSome(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES,[categoryValueId]).ne("_id",itemId).limit(limit).find();
     return relatedJobs.items;
   }
 

package/tests/multiSearchBoxCareers.spec.js

@@ -158,15 +158,16 @@ describe('primarySearch function tests', () => {
  
      await primarySearch(mockW, 'unicorn hunter',mockJobs);
      
+     
      expect(mockprimarySearchMultiBox.changeState).toHaveBeenCalledWith('noResults');
      expect(mockprimarySearcJobResult.data).toBeNull();
    });
 
    it('should fill category repeater when clicking on empty primary search input', async () => {
      const mockCategoryValues = [
-       { _id: 'cat1', title: 'Engineering', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, totalJobs: 5 },
-       { _id: 'cat2', title: 'Marketing', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, totalJobs: 3 },
-       { _id: 'cat3', title: 'Sales', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, totalJobs: 7 }
+       { _id: 'cat1', title: 'Engineering', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, count: 5 },
+       { _id: 'cat2', title: 'Marketing', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, count: 3 },
+       { _id: 'cat3', title: 'Sales', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, count: 7 }
      ];
      
      careersMultiBoxesPage.__set__('allvaluesobjects', mockCategoryValues);