sr-npm 1.7.916 → 1.7.918

package/backend/careersMultiBoxesPageIds.js

@@ -22,9 +22,7 @@ const CAREERS_MULTI_BOXES_PAGE_CONSTS={
     JOBS_MULTI_STATE_BOX:"#jobsMultiStateBox",
     PRIMARY_SEARCH_INPUT: '#primarySearchInput',
     JOB_RESULTS_REPEATER: '#jobResultsRepeater',
-    JOB_RESULTS_REPEATER_ITEM: '#jobResultsRepeaterItem',
     CATEGORY_RESULTS_REPEATER: '#categoryResultsRepeater',
-    CATEGORY_RESULTS_REPEATER_ITEM: '#categoryResultsRepeaterItem',
     PRIMARY_SEARCH_MULTI_BOX: '#primarySearchMultiBox',
     PRIMARY_SEARCH_POSITION_BUTTON: '#primarySearchPositionButton',
     PRIMARY_SEARCH_CATEGORY_BUTTON: '#primarySearchCategoryButton',

package/backend/consts.js

@@ -82,7 +82,6 @@ const TASK_TYPE = {
 
 const supportTeamsPageIds={
     RECENTLEY_ADDED_JOBS: "#recentleyAddedJobs",
-    RECENTLEY_ADDED_JOBS_ITEM: "#recentleyAddedJobsItem",
     JOB_LOCATION: "#jobLocation",
     JOB_TITLE: "#jobTitle",
     SEE_ALL_JOBS_TEXT: "#seeAllJobsText",
@@ -91,22 +90,27 @@ const supportTeamsPageIds={
     MOST_RECENT_JOBS_TITLE: "#mostRecentJobsTitle",
     valueToValueIdMap: {
         "Human Resouces":"PeopleSupport",
-        "Buying":"Merchandise",
-        "Tech":"InformationServices",
-        "Planning":"Merchandise",
+        "Merchandise - Buying":"Merchandise",
+        "Technology, Data and Digital":"InformationServices",
+        "Merchandise - Planning":"Merchandise",
         "Digital":"ecommerceandDigital",// this field doesnt exists in the database
-        "Marketing":"Marketing", 
-        "Finance":"Finance",// this field doesnt exists in the database
+        "Marketing and Market Media":"Marketing", 
+        "Finance, Property and Legal":"Finance",// this field doesnt exists in the database
         "Services":"ServicesInstallation",
-        "Design":"Merchandise",
-        "Retail Operations":"Operations",// this field doesnt exists in the database
+        "Merchandise - Design and Sourcing":"Merchandise",
+        "Store Operations":"Operations",// this field doesnt exists in the database
         "Data":"InsightsandDataScience",// this field doesnt exists in the database
         "Property":"Property",// this field doesnt exists in the database,
         "Legal":"Legal",// this field doesnt exists in the database,
-        "Supply Chain":"Logistics",
-        "Contact Centre":"CustomerEngagementCentres",// this field doesnt exists in the database
+        "Supply Chain and Logistics":"Logistics",
+        "Contact Centres":"CustomerEngagementCentres",// this field doesnt exists in the database
         "Commercial":"CommercialSales",// this field doesnt exists in the database
-    }
+    },
+    excludeValues: new Set([
+        "Noel Leeming Commercial",
+        "Noel Leeming Services",
+        "Sustainability"
+    ])
 }
 const LINKS={
   myApplication:'https://www.smartrecruiters.com/app/employee-portal/68246e5512d84f4c00a19e62/job-applications',

package/backend/data.js

@@ -75,7 +75,7 @@ function getVisibility(position,customFieldsValues) {
   let visibility;
   position.visibility.toLowerCase()==="public"? visibility="external" : visibility="internal";
   customFieldsValues["Visibility"][visibility] = visibility;
-  customValuesToJobs[visibility] ? customValuesToJobs[visibility].add(position.id) : customValuesToJobs[visibility]=new Set([position.id])
+  customValuesToJobs[visibility] ? customValuesToJobs[visibility].push(position.id) : customValuesToJobs[visibility]=[position.id]
 }
 
 function getEmploymentType(position,customFieldsValues) {
@@ -83,7 +83,7 @@ function getEmploymentType(position,customFieldsValues) {
     customFieldsValues["employmentType"] = {};
   }
   customFieldsValues["employmentType"][position.typeOfEmployment.id] = position.typeOfEmployment.label;
-  customValuesToJobs[position.typeOfEmployment.id] ? customValuesToJobs[position.typeOfEmployment.id].add(position.id) : customValuesToJobs[position.typeOfEmployment.id]=new Set([position.id])
+  customValuesToJobs[position.typeOfEmployment.id] ? customValuesToJobs[position.typeOfEmployment.id].push(position.id) : customValuesToJobs[position.typeOfEmployment.id]=[position.id]
 }
 
 function getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,customFieldsValues) {
@@ -101,7 +101,7 @@ function getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,custom
     }
     customFieldsValues[fieldId][valueId] = valueLabel;
 
-    customValuesToJobs[valueId] ? customValuesToJobs[valueId].add(position.id) : customValuesToJobs[valueId]=new Set([position.id])
+    customValuesToJobs[valueId] ? customValuesToJobs[valueId].push(position.id) : customValuesToJobs[valueId]=[position.id]
   }
 }
 async function saveJobsDataToCMS() {
@@ -111,9 +111,7 @@ async function saveJobsDataToCMS() {
   const customFieldsValues = {}
   
   const {companyId,templateType} = await getApiKeys();
-  if(siteconfig===undefined) {
-    await getSiteConfig();
-  }
+
   // bulk insert to jobs collection without descriptions first
   const jobsData = sourcePositions.map(position => {
     
@@ -137,7 +135,7 @@ async function saveJobsDataToCMS() {
       country: position.location?.country || '',
       remote: position.location?.remote || false,
       language: position.language?.label || '',
-      brand: siteconfig.disableMultiBrand==="false" ? getBrand(position.customField) : '',
+      brand: getBrand(position.customField),
       jobDescription: null, // Will be filled later
       employmentType: position.typeOfEmployment.label,
       releasedDate: position.releasedDate
@@ -151,9 +149,11 @@ async function saveJobsDataToCMS() {
     }
     return basicJob;
   });
-
+  if(siteconfig===undefined) {
+    await getSiteConfig();
+  }
   if (siteconfig.customFields==="true") {
-  await populateCustomFieldsCollection(customFieldsLabels,templateType);
+  await populateCustomFieldsCollection(customFieldsLabels);
   await populateCustomValuesCollection(customFieldsValues);
   }
   // Sort jobs by title (ascending, case-insensitive, numeric-aware)
@@ -194,15 +194,13 @@ async function saveJobsDataToCMS() {
 }
 
 async function insertJobsReference(valueId) {
-  await wixData.insertReference(COLLECTIONS.CUSTOM_VALUES, CUSTOM_VALUES_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES,valueId, Array.from(customValuesToJobs[valueId]));
+  await wixData.insertReference(COLLECTIONS.CUSTOM_VALUES, CUSTOM_VALUES_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES,valueId, customValuesToJobs[valueId]);
 }
 
-async function populateCustomFieldsCollection(customFields,templateType) {
+async function populateCustomFieldsCollection(customFields) {
   let fieldstoinsert=[]
   customFields["employmentType"] = "Employment Type";
-  if(templateType===TEMPLATE_TYPE.INTERNAL){
-    customFields["Visibility"] = "Visibility";
-  }
+  customFields["Visibility"] = "Visibility";
   for(const ID of Object.keys(customFields)){
     fieldstoinsert.push({
       title: customFields[ID],
@@ -220,8 +218,8 @@ async function populateCustomValuesCollection(customFieldsValues) {
         _id: valueId,
         title: valuesMap[valueId],
         customField: fieldId,
-        count:customValuesToJobs[valueId].size,
-        jobIds:Array.from(customValuesToJobs[valueId]),
+        count:customValuesToJobs[valueId].length,
+        jobIds:customValuesToJobs[valueId],
       })
     }
     
@@ -468,15 +466,9 @@ async function aggregateJobs() {
 
 async function referenceJobs() {
   console.log("Reference jobs");
-  if(siteconfig===undefined) {
-    await getSiteConfig();
-  }
   await referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.DEPARTMENT_REF, sourceCollection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT, jobField: JOBS_COLLECTION_FIELDS.DEPARTMENT });
   await referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.CITY, sourceCollection: COLLECTIONS.CITIES, jobField: JOBS_COLLECTION_FIELDS.CITY_TEXT });
-  if(siteconfig.disableMultiBrand==="false"){
-    await referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.BRAND_REF, sourceCollection: COLLECTIONS.BRANDS, jobField: JOBS_COLLECTION_FIELDS.BRAND });
-  }
-  
+  await referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.BRAND_REF, sourceCollection: COLLECTIONS.BRANDS, jobField: JOBS_COLLECTION_FIELDS.BRAND });
   console.log("finished referencing jobs");
 }
 

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -16,20 +16,21 @@ let currentJobs=[] // current jobs that are displayed in the jobs repeater
 let allsecondarySearchJobs=[] // secondary search results that are displayed in the jobs repeater
 let currentSecondarySearchJobs=[] // current secondary search results that are displayed in the jobs repeater
 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
 const pagination = {
   pageSize: 10,
   currentPage: 1,
 };
 async function careersMultiBoxesPageOnReady(_$w,urlParams) {
     await loadData(_$w);
-    loadJobsRepeater(_$w);
-    loadPrimarySearchRepeater(_$w);
-    await loadFilters(_$w);
-    loadSelectedValuesRepeater(_$w);
-    bindSearchInput(_$w);
-    loadPaginationButtons(_$w);
-    
+
+    await Promise.all([
+      loadJobsRepeater(_$w),
+      loadPrimarySearchRepeater(_$w),
+      loadFilters(_$w),
+      loadSelectedValuesRepeater(_$w),
+      bindSearchInput(_$w),
+      loadPaginationButtons(_$w)
+    ]);
     await handleUrlParams(_$w, urlParams);
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CLEAR_ALL_BUTTON_ID).onClick(async () => {
       await clearAll(_$w);
@@ -46,8 +47,6 @@ async function clearAll(_$w) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).value='';
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value='';
     secondarySearchIsFilled=false;
-    currentJobs=alljobs;
-    keywordAllJobs=undefined;
     await updateJobsAndNumbersAndFilters(_$w,true);
     }
 }
@@ -56,13 +55,7 @@ async function clearAll(_$w) {
 async function handleUrlParams(_$w,urlParams) {
   try { 
   let applyFiltering=false;
-
-  if(urlParams.keyword) {
-    applyFiltering=await primarySearch(_$w, decodeURIComponent(urlParams.keyword), alljobs);
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value=decodeURIComponent(urlParams.keyword);
-    currentJobs=_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;   
-    keywordAllJobs=_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
-  }
+  let keyword=false
     if(urlParams.brand) {
       applyFiltering=await handleParams(_$w,"brand",urlParams.brand)
     }
@@ -72,9 +65,18 @@ async function handleUrlParams(_$w,urlParams) {
     if(urlParams.category) {
       applyFiltering=await handleParams(_$w,"category",urlParams.category)
     }
-
-    if(applyFiltering || keywordAllJobs) {
-      await updateJobsAndNumbersAndFilters(_$w);
+    if(urlParams.keyword) {
+      applyFiltering=await primarySearch(_$w, decodeURIComponent(urlParams.keyword), alljobs);
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value=decodeURIComponent(urlParams.keyword);
+      keyword=true;
+      if(applyFiltering)
+      {
+        currentJobs=_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
+      }
+      
+    }
+    if(applyFiltering) {
+      await updateJobsAndNumbersAndFilters(_$w,false,keyword);
     }
     if(urlParams.page) {
       if(Number.isNaN(Number(urlParams.page)) || Number(urlParams.page)<=1 || Number(urlParams.page)>Math.ceil(currentJobs.length/pagination.pageSize)) {
@@ -119,7 +121,7 @@ async function handleParams(_$w,param,value) {
       return applyFiltering;
 }
 
- function loadPaginationButtons(_$w) {
+async function loadPaginationButtons(_$w) {
   try {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).onClick(async () => {
       let nextPageJobs=currentJobs.slice(pagination.pageSize*pagination.currentPage,pagination.pageSize*(pagination.currentPage+1));
@@ -141,7 +143,7 @@ async function handleParams(_$w,param,value) {
   }
 }
 
- function loadSelectedValuesRepeater(_$w) {
+async function loadSelectedValuesRepeater(_$w) {
   try {
        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER).onItemReady(($item, itemData) => {
         $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER_ITEM_LABEL).text = itemData.label || '';
@@ -168,7 +170,7 @@ async function handleParams(_$w,param,value) {
             await updateJobsAndNumbersAndFilters(_$w);
           });
     });
-     updateSelectedValuesRepeater(_$w);
+    await updateSelectedValuesRepeater(_$w);
   } catch (error) {
     console.error('Failed to load selected values repeater:', error);
   }
@@ -286,8 +288,8 @@ async function loadJobsRepeater(_$w) {
 
  
 
-  async function updateJobsAndNumbersAndFilters(_$w,clearAll=false) {
-    await applyJobFilters(_$w); // re-query jobs
+  async function updateJobsAndNumbersAndFilters(_$w,clearAll=false,keyword=false) {
+    await applyJobFilters(_$w,keyword); // re-query jobs
     await refreshFacetCounts(_$w,clearAll);    // recompute and update counts in all lists
     await updateSelectedValuesRepeater(_$w);
     updateTotalJobsCountText(_$w);
@@ -295,7 +297,15 @@ async function loadJobsRepeater(_$w) {
 
   function updateOptionsUI(_$w,fieldTitle, fieldId, searchQuery,clearAll=false) {
     let base = optionsByFieldId.get(fieldId) || [];
+    console.log("base: ",base)
+    console.log("optionsByFieldId : ",optionsByFieldId)
+    console.log("countsByFieldId : ",countsByFieldId)
     const countsMap = countsByFieldId.get(fieldId) || new Map();
+    console.log("countsMap: ",countsMap)
+    console.log("fieldTitle: ",fieldTitle)
+    console.log("fieldId: ",fieldId)
+    console.log("searchQuery: ",searchQuery)
+    console.log("clearAll: ",clearAll)
     
     if(dontUpdateThisCheckBox===fieldId && !clearAll)
     {
@@ -310,6 +320,7 @@ async function loadJobsRepeater(_$w) {
             filteredbase.push(element)
         }
     }
+    console.log("filteredbase: ",filteredbase)
     // Build display options with counts
     const withCounts = filteredbase.map(o => {
       const count = countsMap.get(o.value)
@@ -319,6 +330,7 @@ async function loadJobsRepeater(_$w) {
       };
     });
     // Apply search
+    console.log("withCounts: ",withCounts)
     const filtered = searchQuery
       ? withCounts.filter(o => (o.label || '').toLowerCase().includes(searchQuery))
       : withCounts;
@@ -327,23 +339,19 @@ async function loadJobsRepeater(_$w) {
     let prevSelected=[]
     clearAll? prevSelected=[]:prevSelected= _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value;
     const visibleSet = new Set(filtered.map(o => o.value));
+    console.log("visibleSet: ",visibleSet)
     const preserved = prevSelected.filter(v => visibleSet.has(v));
-    if(filtered.length===0) {
-      _$w(`#${FiltersIds[fieldTitle]}MultiBox`).changeState(`${FiltersIds[fieldTitle]}NoResults`);
-    }
-    else{
-      _$w(`#${FiltersIds[fieldTitle]}MultiBox`).changeState(`${FiltersIds[fieldTitle]}Results`);
+    console.log("preserved: ",preserved)
     _$w(`#${FiltersIds[fieldTitle]}CheckBox`).options = filtered;
     _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value = preserved;
-    }
   }
 
-  async function applyJobFilters(_$w) {
+  async function applyJobFilters(_$w,keyword=false) {
     let tempFilteredJobs=[];
     let finalFilteredJobs=[];
     secondarySearchIsFilled? finalFilteredJobs=allsecondarySearchJobs:finalFilteredJobs=alljobs;
-    if(keywordAllJobs) {
-      finalFilteredJobs=keywordAllJobs
+    if(keyword) {
+      finalFilteredJobs=currentJobs
     }
     let addedJobsIds=new Set();
     // AND across categories, OR within each category
@@ -433,7 +441,6 @@ 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();
@@ -492,9 +499,10 @@ async function secondarySearch(_$w,query) {
     await refreshFacetCounts(_$w); 
     return allsecondarySearchJobs;
 }
-   function bindSearchInput(_$w) {
+  async function bindSearchInput(_$w) {
     try {
-       bindPrimarySearch(_$w,allvaluesobjects,alljobs);
+      await bindPrimarySearch(_$w,allvaluesobjects,alljobs);
+
 
     const secondarySearchDebounced = debounce(async () => {
       const query = (_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).value || '').toLowerCase().trim();

package/pages/careersPage.js

@@ -507,16 +507,11 @@ async function updateMapMarkers(_$w){
 }
 
 async function handleBrandDropdown(_$w){
-    if(siteconfig.disableMultiBrand==="false"){
     const brands=await wixData.query(COLLECTIONS.BRANDS).find();
     if(brands.items.length>1){
         console.log("showing brand dropdown");
         _$w('#dropdownBrand').show();
     }
-}
-else{
-    _$w('#dropdownBrand').hide();
-}
 }  
 module.exports = {
     careersPageOnReady,

package/pages/homePage.js

@@ -18,10 +18,13 @@ async function homePageOnReady(_$w,thisObject=null) {
     if(siteconfig.categorySearch==="true") {
         const allJobs=await getAllRecords(COLLECTIONS.JOBS);
         const allvaluesobjects=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
-        bindPrimarySearch(_$w,allvaluesobjects,allJobs);
-        loadPrimarySearchRepeater(_$w)
-        bindTeamRepeater(_$w)
-        bindViewAllButton(_$w)
+       await Promise.all([
+            bindPrimarySearch(_$w,allvaluesobjects,allJobs),
+            loadPrimarySearchRepeater(_$w),
+            bindTeamRepeater(_$w),
+            bindViewAllButton(_$w),
+
+        ]);
     }
     else{
 

package/pages/pagesUtils.js

@@ -60,36 +60,30 @@ function groupValuesByField(values, refKey) {
     }
   }
 
-function loadPrimarySearchRepeater(_$w) {
-  
+async function loadPrimarySearchRepeater(_$w) {
+  try {
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
-    $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_POSITION_BUTTON).label = itemData.title || '';   
-  });
-  
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER_ITEM).onClick((event) => {
-    const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER_ITEM).data;
-    const clickedItemData = data.find(
-      (item) => item._id === event.context.itemId,
-    );
-    location.to(clickedItemData["link-jobs-title"]);
+    $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_POSITION_BUTTON).label = itemData.title || '';
+    $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_POSITION_BUTTON).onClick(() => {
+       location.to(itemData["link-jobs-title"]);
+    })
+   
   });
+
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
     $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_CATEGORY_BUTTON).label = itemData.title || '';
-  }); 
-
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER_ITEM).onClick(async (event) => {
-    const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data;
-    const clickedItemData = data.find(
-      (item) => item._id === event.context.itemId,
-    );
-    const baseUrl = await location.baseUrl();
-      const encodedCategory=encodeURIComponent(clickedItemData._id);
+    $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_CATEGORY_BUTTON).onClick(async () => {  
+      const baseUrl = await location.baseUrl();
+      const encodedCategory=encodeURIComponent(itemData._id);
       location.to(`${baseUrl}/search?category=${encodedCategory}`);
-  });
-
+    });
+  }); 
+  } catch (error) {
+    console.error('Failed to load primary search repeater:', error);
+  }
 }
 
- function bindPrimarySearch(_$w,allvaluesobjects,alljobs) {
+async function bindPrimarySearch(_$w,allvaluesobjects,alljobs) {
 
   const primarySearchDebounced = debounce(async () => {
     const query = (_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value || '').toLowerCase().trim();
@@ -116,12 +110,8 @@ _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
 
 _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onKeyPress(async (event) => {
   if( event.key==='Enter') {
-    console.log("primary search input key pressed");
-    console.log("_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value: ",_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
     if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
-      // _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
-      const baseUrl = await location.baseUrl();
-      location.to(`${baseUrl}/search`);
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
 
     } 
     else {
@@ -133,11 +123,8 @@ _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onKeyPress(async (even
 });
 
 _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
-  console.log("primary search button clicked");
-  console.log("_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value: ",_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
   if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
-    const baseUrl = await location.baseUrl();
-    location.to(`${baseUrl}/search`);
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
   }
   else {
     let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
@@ -168,26 +155,25 @@ async function primarySearch(_$w,query,alljobs) {
   let filteredJobs=alljobs.filter(job=>job.title.toLowerCase().includes(query));
   if(filteredJobs.length>0) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data = filteredJobs
+    return true;
   }
   else {
     console.log("searching by location")
+    //search by location
      filteredJobs=alljobs.filter(job=>job.location.fullLocation.toLowerCase().includes(query));
     if(filteredJobs.length>0) {
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data = filteredJobs
+      return true;
     }
-    else{
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
-    }
+    return false;
   }
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data = filteredJobs
-    return filteredJobs.length>0;
-  
 }
 
   async function getValueFromValueId(valueId) {
     const result=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
-    console.log("result: ",result);
-    console.log("valueId: ",valueId);
     return result.find(value=>value._id===valueId);
     
   }

package/pages/positionPage.js

@@ -10,7 +10,7 @@ const {
   } = require('../public/utils');
   
   
-
+let siteconfig;
 
   async function positionPageOnReady(_$w) {
 
@@ -32,11 +32,24 @@ async function getCategoryValueId(customValues) {
 
 
   async function bind(_$w) {
+    siteconfig=await wixData.query(COLLECTIONS.SITE_CONFIGS).find().then(result => result.items[0]);
     _$w('#datasetJobsItem').onReady(async () => {
 
         const item = await _$w('#datasetJobsItem').getCurrentItem();
+        if(siteconfig.customFields==="true"){
         const multiRefField=await getPositionWithMultiRefField(item._id);
         const categoryValueId=await getCategoryValueId(multiRefField);
+        const relatedJobs=await getRelatedJobs(categoryValueId,item._id,5);
+        if(_$w('#relatedJobsRepNoDepartment')) // when there is no department, we filter based on category
+        {
+        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;
+        }
+        }
         handleReferFriendButton(_$w,item);
         handleApplyButton(_$w,item);
         
@@ -49,25 +62,18 @@ async function getCategoryValueId(customValues) {
         {
           _$w('#additionalInfoText').text = htmlToText(item.jobDescription.additionalInformation.text);
         }
-        if(_$w('#relatedJobsRepNoDepartment')) // when there is no department, we filter based on category
-        {
-        const relatedJobs = await getRelatedJobs({ categoryValueId, itemId: item._id ,limit:5});
-          _$w('#relatedJobsRepNoDepartment').onItemReady(($item, itemData) => {
-            $item('#relatedJobTitle').text = itemData.title;
-            $item('#relatedJobLocation').text = itemData.location.fullLocation;
-          });
-          _$w('#relatedJobsRepNoDepartment').data = relatedJobs;
-
-
-        }
+ 
     });
+    if(isElementExistOnPage(_$w('#relatedJobsNoDepartmentItem')))
+    {
     _$w('#relatedJobsNoDepartmentItem').onClick((event) => {   
       const data = _$w("#relatedJobsRepNoDepartment").data;
-      const clickedItemData = data.find(
-        (item) => item._id === event.context.itemId,
-      );
-      location.to(clickedItemData["link-jobs-title"]);
-    });
+        const clickedItemData = data.find(
+          (item) => item._id === event.context.itemId,
+        );
+        location.to(clickedItemData["link-jobs-title"]);
+      });
+    }
     if(isElementExistOnPage(_$w('#relatedJobsDataset')))
     {
     _$w('#relatedJobsDataset').onReady(() => {
@@ -89,8 +95,7 @@ async function getCategoryValueId(customValues) {
   function handleApplyButton(_$w,item) {
     try{
     _$w('#applyButton').target="_blank";//so it can open in new tab
-    
-      const url=buildApplyLinkWithQueryParams(item.applyLink,query);
+      const url=appendQueryParams(item.applyLink,query);
       _$w('#applyButton').link=url; //so it can be clicked
     }
     catch(error){
@@ -100,23 +105,7 @@ async function getCategoryValueId(customValues) {
     }
   }
 
-  function buildApplyLinkWithQueryParams(url, query) {
-    if (!url || typeof url !== 'string' || !url.startsWith('http')) {
-      console.warn(`Invalid URL ${url}, button link will not be set`);
-      return null;
-    }
-  
-    if (!query || typeof query !== 'object') {
-      console.warn(`Invalid query params ${query}, button link will not be set`);
-      return null;
-    }
-  
-    return appendQueryParams(url, query);
-  }
-
-  async function getRelatedJobs({ categoryValueId, itemId, limit = 1000 }) {
-    
-
+  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/pages/supportTeamsPage.js

@@ -15,10 +15,13 @@ async function handleRecentJobsSection(_$w) {
 
     const currentItem= _$w(supportTeamsPageIds.TEAM_SUPPORT_DYNAMIC_DATASET).getCurrentItem();
     console.log("currentItem: ",currentItem);
+    if(supportTeamsPageIds.excludeValues.has(currentItem.title_fld)) {
+        console.log("Value is excluded , collapsing recently Jobs Section ");
+        await collapseSection(_$w);
+        return;
+    }
     const valueId=supportTeamsPageIds.valueToValueIdMap[currentItem.title_fld]
-    console.log("valueId: ",valueId);
     const Value=await getValueFromValueId(valueId);
-    console.log("Value: ",Value);
     const latestsJobs=await getLatestJobsByValue(Value);
 
     if(latestsJobs.length === 0) {
@@ -29,17 +32,12 @@ async function handleRecentJobsSection(_$w) {
     _$w(supportTeamsPageIds.RECENTLEY_ADDED_JOBS).onItemReady(($item, itemData) => {
         $item(supportTeamsPageIds.JOB_TITLE).text = itemData.title;
         $item(supportTeamsPageIds.JOB_LOCATION).text = itemData.location.fullLocation;
-
+        $item(supportTeamsPageIds.JOB_TITLE).onClick( () => {  
+             location.to(itemData["link-jobs-title"]);
+          })
     });
    
     _$w(supportTeamsPageIds.RECENTLEY_ADDED_JOBS).data = latestsJobs;
-    _$w(supportTeamsPageIds.RECENTLEY_ADDED_JOBS_ITEM).onClick((event) => {
-        const data = _$w(supportTeamsPageIds.RECENTLEY_ADDED_JOBS).data;
-        const clickedItemData = data.find(
-          (item) => item._id === event.context.itemId,
-        );
-        location.to(clickedItemData["link-jobs-title"]);
-      });
     
     _$w(supportTeamsPageIds.SEE_ALL_JOBS_TEXT).onClick( () => {
          location.to(`/search?category=${Value.title}`);

package/tests/multiSearchBoxCareers.spec.js

@@ -160,7 +160,7 @@ describe('primarySearch function tests', () => {
      
      
      expect(mockprimarySearchMultiBox.changeState).toHaveBeenCalledWith('noResults');
-     expect(mockprimarySearcJobResult.data.length).toBe(0);
+     expect(mockprimarySearcJobResult.data).toBeNull();
    });
 
    it('should fill category repeater when clicking on empty primary search input', async () => {