sr-npm 3.1.7 → 3.1.9

package/backend/collectionConsts.js

@@ -11,7 +11,6 @@ const COLLECTIONS = {
     SUPPORT_TEAMS: 'SupportTeams',
 
 }
-
 const JOBS_COLLECTION_FIELDS = {
   LOCATION: 'location',
   TITLE: 'title',
@@ -35,31 +34,25 @@ const JOBS_COLLECTION_FIELDS = {
   RELEASED_DATE: 'releasedDate',
   REF_ID: 'refId',
 }
-
 const AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION_FIELDS = {
   TITLE: 'title',
   COUNT: 'count',
   IMAGE: 'image',
 }
-
 const CUSTOM_VALUES_COLLECTION_FIELDS = {
-  VALUE_ID: 'valueId',
   TITLE: 'title',
   CUSTOM_FIELD: 'customField',
   MULTI_REF_JOBS_CUSTOM_VALUES: 'multiRefJobsCustomValues',
   count: 'count',
   JOB_IDS: 'jobIds',
 }
-
 const CUSTOM_FIELDS_COLLECTION_FIELDS = {
   TITLE: 'title',
 }
-
 const BRANDS_COLLECTION_FIELDS = {
   TITLE: 'title',
   COUNT: 'count',
 }
-
 const CITIES_COLLECTION_FIELDS = {
   TITLE: 'title',
   CITY: 'city',
@@ -68,7 +61,6 @@ const CITIES_COLLECTION_FIELDS = {
   COUNTRY: 'country',
   JOB_IDS: 'jobIds',
 }
-
 const COLLECTIONS_FIELDS = {
     AMOUNT_OF_JOBS_PER_DEPARTMENT: [
       {key:'title', type: 'TEXT'},
@@ -93,7 +85,7 @@ const COLLECTIONS_FIELDS = {
         {key:'language', type: 'TEXT'},
         {key:'remote', type: 'BOOLEAN'},
         {key:'jobDescription', type: 'OBJECT'},  
-        {key:'multiRefJobsCustomValues', type: 'MULTI_REFERENCE', typeMetadata: { multiReference: { referencedCollectionId: COLLECTIONS.CUSTOM_VALUES, referencingFieldKey:JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES,referencingDisplayName:JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES } } },
+        {key:'multiRefJobsCustomValues', type: 'MULTI_REFERENCE', typeMetadata: { multiReference: { referencedCollectionId: COLLECTIONS.CUSTOM_VALUES,referencingFieldKey:JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES,referencingDisplayName:JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES } } },
         {key:'cityText', type: 'TEXT'},
         {key:'applyLink', type: 'URL'},
         {key:'referFriendLink', type: 'URL'},     
@@ -122,7 +114,6 @@ const COLLECTIONS_FIELDS = {
       { key: 'count', type: 'NUMBER' },
     ],
     CUSTOM_VALUES: [
-      {key:'valueId', type: 'TEXT'},
       {key:'title', type: 'TEXT'},
       {key:'customField', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.CUSTOM_FIELDS } } },
       {key:'count', type: 'NUMBER'},

package/backend/data.js

@@ -40,6 +40,7 @@ function validatePosition(position) {
   if (!position.location || !position.location.city ||  typeof position.location.remote !== 'boolean') {
     throw new Error('Position location is required and must have a city and remote');
   }
+
 }
 
 async function filterBasedOnBrand(positions) {
@@ -92,83 +93,78 @@ function getEmploymentType(position,customFieldsValues) {
   customValuesToJobs[position.typeOfEmployment.id] ? customValuesToJobs[position.typeOfEmployment.id].add(position.id) : customValuesToJobs[position.typeOfEmployment.id]=new Set([position.id])
 }
 
-function getCustomFieldsAndValuesFromPosition(position, customFieldsLabels, customFieldsValues) {
+function getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,customFieldsValues) {
   const customFieldsArray = Array.isArray(position?.customField) ? position.customField : [];
-
   for (const field of customFieldsArray) {
     if(EXCLUDED_CUSTOM_FIELDS.has(field.fieldLabel)) continue; //country and department are not custom fields, they are already in the job object
-
-    const fieldId = normalizeString(field.fieldId)
+    const fieldId=normalizeString(field.fieldId)
     const fieldLabel = field.fieldLabel;
-    const valueId = normalizeString(field.valueId)
+    const valueId=normalizeString(field.valueId)
     const valueLabel = field.valueLabel
     customFieldsLabels[fieldId] = fieldLabel
-
     // Build nested dictionary: fieldId -> { valueId: valueLabel }
     if (!customFieldsValues[fieldId]) {
       customFieldsValues[fieldId] = {};
     }
     
     customFieldsValues[fieldId][valueId] = valueLabel;
-    customValuesToJobs[valueId] ? customValuesToJobs[valueId].add(position.id) : customValuesToJobs[valueId] = new Set([position.id])
+    customValuesToJobs[valueId] ? customValuesToJobs[valueId].add(position.id) : customValuesToJobs[valueId]=new Set([position.id])
   }
 }
-
 async function saveJobsDataToCMS() {
   const positions = await fetchPositionsFromSRAPI();
   const sourcePositions = await filterBasedOnBrand(positions);
   const customFieldsLabels = {}
   const customFieldsValues = {}
   
-  const { templateType } = await getApiKeys();
+  const {companyId ,templateType} = await getApiKeys();
   if(siteconfig===undefined) {
     await getSiteConfig();
   }
   // bulk insert to jobs collection without descriptions first
   const jobsData = sourcePositions.map(position => {
-      const basicJob = {
-        _id: position.id,
-        title: position.name || '',
-        slug: generateSlug(position.name || ''),
-        department: position.department?.label || 'Other',
-        cityText: normalizeString(position.location?.city),
-        location: position.location && Object.keys(position.location).length > 0
-          ? position.location
-          : {
-              countryCode: "",
-              country: "",
-              city: "",
-              postalCode: "",
-              address: "",
-              manual: false,
-              remote: false,
-              regionCode: ""
-            },
-        country: position.location?.country || '',
-        remote: position.location?.remote || false,
-        language: position.language?.label || '',
-        brand: siteconfig.disableMultiBrand==="false" ? getBrand(position.customField) : '',
-        jobDescription: null, // Will be filled later
-        employmentType: position.typeOfEmployment.label,
-        releasedDate: position.releasedDate,
-        refId: position.refNumber
-      };
-
-      getCustomFieldsAndValuesFromPosition(position, customFieldsLabels, customFieldsValues);
-      getEmploymentType(position, customFieldsValues);
-      getLocation(position,basicJob);
-
-      if(templateType === TEMPLATE_TYPE.INTERNAL){
-        getVisibility(position,customFieldsValues);
-      }
-      return basicJob;
+    
+    const basicJob = {
+      _id: position.id,
+      title: position.name || '',
+      slug: generateSlug(position.name || ''),
+      department: position.department?.label || 'Other',
+      cityText: normalizeString(position.location?.city),
+      location: position.location && Object.keys(position.location).length > 0
+        ? position.location
+        : {
+            countryCode: "",
+            country: "",
+            city: "",
+            postalCode: "",
+            address: "",
+            manual: false,
+            remote: false,
+            regionCode: ""
+          },
+      country: position.location?.country || '',
+      remote: position.location?.remote || false,
+      language: position.language?.label || '',
+      brand: siteconfig.disableMultiBrand==="false" ? getBrand(position.customField) : '',
+      jobDescription: null, // Will be filled later
+      employmentType: position.typeOfEmployment.label,
+      releasedDate: position.releasedDate,
+      refId: position.refNumber
+    };
+
+    getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,customFieldsValues);
+    getEmploymentType(position,customFieldsValues);
+    getLocation(position,basicJob);
+    if(templateType===TEMPLATE_TYPE.INTERNAL){
+     getVisibility(position,customFieldsValues);
+    }
+    return basicJob;
   });
 
   if (siteconfig.customFields==="true") {
-    await populateCustomFieldsCollection(customFieldsLabels,templateType);
-    await populateCustomValuesCollection(customFieldsValues);
+  await populateCustomFieldsCollection(customFieldsLabels,templateType);
+  await populateCustomValuesCollection(customFieldsValues);
   }
-
   // Sort jobs by title (ascending, case-insensitive, numeric-aware)
   jobsData.sort((a, b) => {
     const titleA = a.title || '';
@@ -206,8 +202,8 @@ async function saveJobsDataToCMS() {
   console.log(`✓ All chunks processed. Total jobs saved: ${totalSaved}/${jobsData.length}`);
 }
 
-async function insertJobsReference(id, valueId) {
-  await wixData.insertReference(COLLECTIONS.CUSTOM_VALUES, CUSTOM_VALUES_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES, id, Array.from(customValuesToJobs[valueId]));
+async function insertJobsReference(valueId) {
+  await wixData.insertReference(COLLECTIONS.CUSTOM_VALUES, CUSTOM_VALUES_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES,valueId, Array.from(customValuesToJobs[valueId]));
 }
 
 async function populateCustomFieldsCollection(customFields,templateType) {
@@ -226,38 +222,33 @@ async function populateCustomFieldsCollection(customFields,templateType) {
 }
 async function populateCustomValuesCollection(customFieldsValues) {
   let valuesToinsert=[]
-
   for (const fieldId of Object.keys(customFieldsValues)) {
     const valuesMap = customFieldsValues[fieldId] || {};
-
     for (const valueId of Object.keys(valuesMap)) {
       valuesToinsert.push({
-        valueId,
+        _id: valueId,
         title: valuesMap[valueId],
         customField: fieldId,
-        count: customValuesToJobs[valueId].size,
-        jobIds: Array.from(customValuesToJobs[valueId]),
+        count:customValuesToJobs[valueId].size,
+        jobIds:Array.from(customValuesToJobs[valueId]),
       })
     }
+    
   }
   await wixData.bulkSave(COLLECTIONS.CUSTOM_VALUES, valuesToinsert);
 }
-
 async function saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS() {
   console.log('🚀 Starting job descriptions update process for ALL jobs');
 
   try {
     let jobsWithNoDescriptions = await getJobsWithNoDescriptions();
-
     if (siteconfig.customFields==="true") {
-      let customValues = await getAllCustomValues();
-
+      let customValues=await getAllCustomValues();
       console.log("inserting jobs references to custom values collection");
       console.log("customValues: ",customValues)
       console.log("customValues.items: ",customValues.items)
-
       for (const value of customValues.items) {
-        await insertJobsReference(value._id, value.valueId);
+        await insertJobsReference(value._id);
       }
       console.log("inserted jobs references to custom values collection successfully");
     }
@@ -369,12 +360,10 @@ async function aggregateJobsByFieldToCMS({ field, collection }) {
     return { success: false, error: err.message };
   }
 }
-
 async function getAllCustomValues() {
   let customValuesQuery = await wixData.query(COLLECTIONS.CUSTOM_VALUES).limit(1000).find();
   return customValuesQuery;
 }
-
 async function getJobsWithNoDescriptions() {
   let jobswithoutdescriptionsQuery = await wixData
     .query(COLLECTIONS.JOBS)
@@ -533,7 +522,7 @@ async function clearCollections() {
 }
 
 async function markTemplateAsExternal() {
-  await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE, null, 'singleItem');
+  await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE,null,'singleItem');
   const tempalte = await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
     templateType: TEMPLATE_TYPE.EXTERNAL
   });
@@ -541,7 +530,7 @@ async function markTemplateAsExternal() {
 }
 
 async function markTemplateAsInternal() {
-  await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE, null, 'singleItem');
+  await createCollectionIfMissing(COLLECTIONS.TEMPLATE_TYPE, COLLECTIONS_FIELDS.TEMPLATE_TYPE,null,'singleItem');
   const tempalte = await wixData.save(COLLECTIONS.TEMPLATE_TYPE, {
     templateType: TEMPLATE_TYPE.INTERNAL
   });

package/backend/queries.js

@@ -21,7 +21,7 @@ async function getPositionsByField(field, value) {
 async function getPositionWithMultiRefField(jobId)
 {
   return wixData
-    .queryReferenced(COLLECTIONS.JOBS, jobId,JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES)
+    .queryReferenced(COLLECTIONS.JOBS,jobId,JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES)
     .then(result => result.items);
 }
 

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -119,10 +119,10 @@ async function handleUrlParams(_$w,urlParams) {
   let currentApplyFilterFlag=false;
   //apply this first to determine all jobs
   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;
+    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;
   }
   
   for (const url of possibleUrlParams)
@@ -176,15 +176,17 @@ async function handleParams(_$w,param,values) {
   for(const value of valuesAsArray) {
     
        const decodedValue = decodeURIComponent(value);
-      const options = optionsByFieldId.get(field._id);
-      const option = getCorrectOption(decodedValue, options, param);
+    
+      const options=optionsByFieldId.get(field._id);
+    
+      const option=getCorrectOption(decodedValue,options,param);
     
       if(option) {
-        const optionIndex = getOptionIndexFromCheckBox(_$w(`#${FiltersIds[field.title]}CheckBox`).options,option.value);
-        selectedIndices.push(optionIndex);
-        existing.push(option.value);
-        applyFiltering = true;
-        dontUpdateThisCheckBox = field._id;
+       const optionIndex=getOptionIndexFromCheckBox(_$w(`#${FiltersIds[field.title]}CheckBox`).options,option.value);
+       selectedIndices.push(optionIndex);
+       existing.push(option.value);
+        applyFiltering=true;
+        dontUpdateThisCheckBox=field._id;
       }
       else {
         console.warn(`${param} value not found in dropdown options`);
@@ -262,14 +264,14 @@ async function loadData() {
         currentJobs=alljobs;
       }
     if(Object.keys(valueToJobs).length === 0){
-        allvaluesobjects = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
+        allvaluesobjects=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
         for (const value of allvaluesobjects) {
-            valueToJobs[value.valueId]= value.jobIds;
+            valueToJobs[value._id]= value.jobIds;
         }
     }
     if(allfields.length===0) {
-        allfields = await getAllRecords(COLLECTIONS.CUSTOM_FIELDS);
-        allfields.push({ _id:"Location", title:"Location" }); 
+        allfields=await getAllRecords(COLLECTIONS.CUSTOM_FIELDS);
+        allfields.push({_id:"Location",title:"Location"}); 
     }
   } catch (error) {
     console.error('Failed to load data:', error);
@@ -306,67 +308,63 @@ async function loadJobsRepeater(_$w) {
   async function loadFilters(_$w) {
     try {
       // 1) Load all categories (fields)
-      const cities = await getAllRecords(COLLECTIONS.CITIES);
+      const cities=await getAllRecords(COLLECTIONS.CITIES);
       for(const city of cities) {
-        valueToJobs[city._id] = city.jobIds;
+        valueToJobs[city._id]=city.jobIds;
       }
       // 2) Load all values once and group them by referenced field
       let valuesByFieldId = groupValuesByField(allvaluesobjects, CUSTOM_VALUES_COLLECTION_FIELDS.CUSTOM_FIELD);
       valuesByFieldId.set("Location",cities)
-      
-      // Build CheckboxGroup options for this field  
+          // Build CheckboxGroup options for this field
+        
       const counter={}
       for(const city of cities) {
         counter[city.city]=city.count
       }
-
       for(const [key, value] of valuesByFieldId) {
-        const field = getFieldById(key,allfields);
+        const field=getFieldById(key,allfields);
         let originalOptions=[];
-        if(key === "Location") {
-          originalOptions = value.map(city=>({
+        if(key==="Location") {
+          originalOptions=value.map(city=>({
               label: city.city,
               value: city._id
           }));
         }
         else{
-            originalOptions = value
+            originalOptions=value
         }
-
         optionsByFieldId.set(key, originalOptions);
-
         for (const val of allvaluesobjects) {
           counter[val.title]=val.count
         }
         countsByFieldId.set(key, new Map(originalOptions.map(o => [o.value, counter[o.label]])));
-        updateOptionsUI(_$w, field.title, field._id, ''); // no search query
-
+        updateOptionsUI(_$w,field.title, field._id, ''); // no search query
         _$w(`#${FiltersIds[field.title]}CheckBox`).selectedIndices = []; // start empty
         _$w(`#${FiltersIds[field.title]}CheckBox`).onChange(async (ev) => {
-          dontUpdateThisCheckBox = field._id;
-          const selected = ev.target.value; // array of selected value IDs
-          let fieldTitle=field.title.toLowerCase().replace(' ', '');
-          fieldTitle === "brands"? fieldTitle = "brand" : fieldTitle;
-
-          if (selected && selected.length) {
-            selectedByField.set(field._id, selected); 
-            if(fieldTitle==="brand" || fieldTitle==="storename") {
-              //in this case we need the label not valueid
-              const valueLabels = getValueFromValueId(selected, value);
-              queryParams.add({ [fieldTitle] : valueLabels.map(val=>encodeURIComponent(val)).join(',') });
-            }
-            else{
-              queryParams.add({ [fieldTitle] : selected.map(val=>encodeURIComponent(val)).join(',') });
-            }
-          
-          } else {
-            selectedByField.delete(field._id);  
-            queryParams.remove([fieldTitle ]);
+          dontUpdateThisCheckBox=field._id;
+        const selected = ev.target.value; // array of selected value IDs
+        let fieldTitle=field.title.toLowerCase().replace(' ', '');
+        fieldTitle==="brands"? fieldTitle="brand":fieldTitle;
+
+        if (selected && selected.length) {
+          selectedByField.set(field._id, selected); 
+          if(fieldTitle==="brand" || fieldTitle==="storename") {
+            //in this case we need the label not valueid
+            const valueLabels=getValueFromValueId(selected,value);
+            queryParams.add({ [fieldTitle] : valueLabels.map(val=>encodeURIComponent(val)).join(',') });
+          }
+          else{
+            queryParams.add({ [fieldTitle] : selected.map(val=>encodeURIComponent(val)).join(',') });
           }
+          
+        } else {
+          selectedByField.delete(field._id);  
+          queryParams.remove([fieldTitle ]);
+        }
 
         await updateJobsAndNumbersAndFilters(_$w);
+    
       });
-
       const runFilter = debounce(() => {
       const query = (_$w(`#${FiltersIds[field.title]}input`).value || '').toLowerCase().trim();
       updateOptionsUI(_$w, field.title, field._id, query);
@@ -381,11 +379,11 @@ async function loadJobsRepeater(_$w) {
     }
   }
 
-function getValueFromValueId(valueIds, value) {
-  let valueLabels = [];
+function getValueFromValueId(valueIds,value) {
+  let valueLabels=[];
   let currentVal
-  for (const valueId of valueIds) {
-    currentVal = value.find(val => val.value === valueId);
+  for(const valueId of valueIds) {
+    currentVal=value.find(val=>val.value===valueId);
     if(currentVal) {
       valueLabels.push(currentVal.label);
     }
@@ -545,7 +543,7 @@ async function refreshFacetCounts(_$w,clearAll=false) {
     const currentJobsIds=jobs.map(job=>job._id);
     
     for (const fieldId of fieldIds) {
-        let currentoptions = optionsByFieldId.get(fieldId)
+        let currentoptions=optionsByFieldId.get(fieldId)
         let counter=new Map();
         for(const option of currentoptions) {
             for (const jobId of currentJobsIds) {
@@ -558,7 +556,8 @@ async function refreshFacetCounts(_$w,clearAll=false) {
     }
   }
  
-function updateSelectedValuesRepeater(_$w) {
+
+  function updateSelectedValuesRepeater(_$w) {
     const selectedItems = [];
     for (const [fieldId, valueIds] of selectedByField.entries()) {
       const opts = optionsByFieldId.get(fieldId) || [];
@@ -569,7 +568,7 @@ function updateSelectedValuesRepeater(_$w) {
       }
     }
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER).data = selectedItems;
-}
+  }
 
 
 
@@ -601,16 +600,15 @@ async function secondarySearch(_$w,query) {
     await refreshFacetCounts(_$w); 
     return allsecondarySearchJobs;
 }
-   function bindSearchInput(_$w) {
+  function bindSearchInput(_$w) {
     try {
-       bindPrimarySearch(_$w,allvaluesobjects,alljobs);
+       bindPrimarySearch(_$w, allvaluesobjects);
 
     const secondarySearchDebounced = debounce(async () => {
       const query = (_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).value || '').toLowerCase().trim();
       await secondarySearch(_$w, query);
     }, 150);
 
-   
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).onInput(secondarySearchDebounced);
 
   } catch (error) {

package/pages/homePage.js

@@ -1,48 +1,40 @@
-const {
-    debounce,
-    getFilter,
-  } = require('../public/filterUtils');
-  const { handleOnLocationClick } = require('../public/mapUtils');
-  const { filterBrokenMarkers } = require('../public/utils');
+const { debounce, getFilter } = require('../public/filterUtils');
+const { handleOnLocationClick } = require('../public/mapUtils');
+const { filterBrokenMarkers } = require('../public/utils');
 const { location } = require('@wix/site-location');
 const {wixData} = require('wix-data');
 const { COLLECTIONS } = require('../backend/collectionConsts');
-const { bindPrimarySearch,getAllRecords,loadPrimarySearchRepeater } = require('./pagesUtils');
-
+const { bindPrimarySearch, getAllRecords, loadPrimarySearchRepeater } = require('./pagesUtils');
 
 let thisObjectVar;
 let searchByCityFlag=false;
 let loadedCategories=false;
 
-async function homePageOnReady(_$w,thisObject=null) {
+async function homePageOnReady(_$w,thisObject = null) {
     const queryResult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
     const siteconfig = queryResult.items[0];
 
     if(siteconfig.twg) {
-        const allJobs = await getAllRecords(COLLECTIONS.JOBS);
-        const allvaluesobjects = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
-
-        bindPrimarySearch(_$w, allvaluesobjects, allJobs);
+        const allvaluesobjects=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
+        bindPrimarySearch(_$w, allvaluesobjects);
         loadPrimarySearchRepeater(_$w)
         console.log("siteconfig.twg: ",siteconfig.twg);
-
-        if(siteconfig.twg === "external") {
-            bindTeamRepeater(_$w)
-            bindViewAllButton(_$w)
+        if(siteconfig.twg==="external") {
+        bindTeamRepeater(_$w)
+        bindViewAllButton(_$w)
         }
     }
     else{
-        thisObjectVar=thisObject;
+        thisObjectVar = thisObject;
         bind(_$w);
         init(_$w);
     }
-  }
+    
+}
 
 function bind(_$w) {
-
     bindTeamRepeater(_$w);
 
-
     _$w('#citiesDataset').onReady(async () => {
         const numOfItems = await _$w('#citiesDataset').getTotalCount();
         const items = await _$w('#citiesDataset').getItems(0, numOfItems);
@@ -56,8 +48,8 @@ function bind(_$w) {
                     latitude: location.latitude,
                     longitude: location.longitude
                 },
-                 address: item.locationAddress.formatted,
-                 title: item.title,
+                address: item.locationAddress.formatted,
+                title: item.title,
                 link: cityLinkUrl,
                 linkTitle:`View ${item.count} Open Positions`
             };
@@ -106,7 +98,6 @@ function bindTeamRepeater(_$w) {
 }
 
 function bindViewAllButton(_$w) {
-            
     _$w('#viewAllCategoriesButton').onClick(()=>{
         if(!loadedCategories) {
             loadedCategories=true;
@@ -125,11 +116,11 @@ function bindViewAllButton(_$w) {
 
 
 function init(_$w) {
-    const debouncedInput = debounce(()=>handleSearchInput(_$w), 400,thisObjectVar);
+    const debouncedInput = debounce(() => handleSearchInput(_$w), 400, thisObjectVar);
 
     _$w('#searchInput').onInput(debouncedInput);
     _$w('#searchInput').maxLength = 40;
-    _$w('#searchButton').onClick(()=>handleSearch(_$w('#searchInput').value));
+    _$w('#searchButton').onClick(() => handleSearch(_$w('#searchInput').value));
 
     _$w('#searchInput').onKeyPress((event) => {
         if (event.key === 'Enter') {
@@ -174,17 +165,17 @@ async function handleSearchInput(_$w) {
     count = _$w('#jobsDataset').getTotalCount();
 
     if (count > 0) {
-        searchByCityFlag=false;
+        searchByCityFlag = false;
         _$w('#resultsContainer').expand();
         _$w('#searchMultiStateBox').changeState('results');
     } else {    
-        filter=await getFilter(searchByCity);
+        filter = await getFilter(searchByCity);
         await _$w('#jobsDataset').setFilter(filter);
         await _$w('#jobsDataset').refresh();
         count = _$w('#jobsDataset').getTotalCount();
-        if(count > 0)
+        if( count > 0 )
         {
-            searchByCityFlag=true;
+            searchByCityFlag = true;
             _$w('#resultsContainer').expand();
             _$w('#searchMultiStateBox').changeState('results');
         }

package/pages/pagesUtils.js

@@ -3,6 +3,7 @@ const { JOBS_COLLECTION_FIELDS,COLLECTIONS } = require('../backend/collectionCon
 const { CAREERS_MULTI_BOXES_PAGE_CONSTS,CATEGORY_CUSTOM_FIELD_ID_IN_CMS } = require('../backend/careersMultiBoxesPageIds');
 const { location } = require("@wix/site-location");
 const { normalizeString } = require('../backend/utils');
+const { getFilter } = require('../public/filterUtils');
 
 function groupValuesByField(values, refKey) {
     const map = new Map();
@@ -11,7 +12,7 @@ function groupValuesByField(values, refKey) {
       if (!map.has(ref)) map.set(ref, []);
       map.get(ref).push({
         label: v.title ,
-        value: v.valueId
+        value: v._id
       });
     }
     return map;
@@ -84,6 +85,9 @@ function groupValuesByField(values, refKey) {
 function loadPrimarySearchRepeater(_$w) {
   
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
+    if(!itemData.title) {
+      console.log("!!!!!!!!!!!! itemData has no title: ",itemData);
+    }
     $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_POSITION_BUTTON).label = itemData.title || '';   
   });
   
@@ -121,55 +125,51 @@ function loadPrimarySearchRepeater(_$w) {
 
 }
 
- function bindPrimarySearch(_$w, allvaluesobjects, alljobs) {
+function bindPrimarySearch(_$w, allvaluesobjects) {
+
+  const handleSearchInput = async () => { await primarySearch(_$w) } 
 
-  const primarySearchDebounced = debounce(async () => {
-    const query = (_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value || '').toLowerCase().trim();
-    await primarySearch(_$w, query, alljobs);
-  }, 300);
+  const primarySearchDebounced = debounce(() => handleSearchInput(), 400);
 
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => {
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => { 
     await primarySearchDebounced();
   });
 
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
+  if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()!=='') {
+    await primarySearch(_$w);
+  }
+  else {
+    await loadCategoriesListPrimarySearch(_$w,allvaluesobjects);
+  }
+});
 
-    if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()!=='') {
-      await primarySearch(_$w, _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim(), alljobs);
-    }
-    else {
-      await loadCategoriesListPrimarySearch(_$w, allvaluesobjects);
-    }
-  });
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
+});
 
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
-  });
+_$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.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`);
-
-      } 
-      else {
-        let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
-        const baseUrl = await location.baseUrl();
-        location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
-      }
+    } 
+    else {
+      let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
+      const baseUrl = await location.baseUrl();
+      location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
     }
-  });
+  }
+});
 
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
+_$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`);
@@ -182,49 +182,60 @@ function loadPrimarySearchRepeater(_$w) {
   });
 }
 
-async function loadCategoriesListPrimarySearch(_$w, allvaluesobjects) {
+async function loadCategoriesListPrimarySearch(_$w,allvaluesobjects) {
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
-
   let categoryValues=[]
   for(const value of allvaluesobjects) {
-    if(value.customField === CATEGORY_CUSTOM_FIELD_ID_IN_CMS) {
-      categoryValues.push({title: value.title+` (${value.count})` , _id: value.valueId});
+    if(value.customField===CATEGORY_CUSTOM_FIELD_ID_IN_CMS) {
+      categoryValues.push({title:value.title+` (${value.count})` ,_id:value._id});
     }
   }
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
 }
 
-async function primarySearch(_$w,query,alljobs) {
-  if(query.length===0 || query===undefined || query==='') {
+async function primarySearch(_$w) {
+  const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
+
+  if(query === undefined || query === '') {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
     return false;
   }
-  let filteredJobs=alljobs.filter(job=>job.title.toLowerCase().includes(query));
-  if(filteredJobs.length>0) {
+
+  const searchByTitle = [{field: 'title', searchTerm: query}];
+  const searchByCity = [{field: 'location.fullLocation', searchTerm: query}];
+
+  let filter = await getFilter(searchByTitle);
+
+  await _$w('#jobsDataset').setFilter(filter);
+  await _$w('#jobsDataset').refresh();
+
+  let count = _$w('#jobsDataset').getTotalCount();
+
+  if( count > 0 ) {
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
   }
   else {
-    console.log("searching by location")
-     filteredJobs=alljobs.filter(job=>job.location.fullLocation.toLowerCase().includes(query));
-    if(filteredJobs.length>0) {
+    filter = await getFilter(searchByCity);
+    await _$w('#jobsDataset').setFilter(filter);
+    await _$w('#jobsDataset').refresh();
+  
+    count = _$w('#jobsDataset').getTotalCount();
+    if  (count > 0) {
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
     }
     else{
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
     }
   }
-  _$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.valueId === valueId);
-}
+  async function getValueFromValueId(valueId) {
+    const result = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
+    return result.find(value => value._id === valueId);
+    
+  }
 
   async function getLatestJobsByValue(Value) {
     const jobs=Value.multiRefJobsCustomValues;

package/pages/positionPage.js

@@ -58,7 +58,7 @@ async function getCategoryValue(customValues) {
               _$w('#jobCategory').text = categoryValue.title;
             }
 
-        const relatedJobs = await getRelatedJobs({ categoryValueId: categoryValue._id, itemId: item._id ,limit:5});
+        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;
@@ -124,6 +124,8 @@ async function getCategoryValue(customValues) {
   }
 
   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

@@ -32,16 +32,16 @@ async function handlePeopleSection(_$w) {
 }
 
 async function handleRecentJobsSection(_$w) {
+
+    
     if(supportTeamsPageIds.excludeValues.has(currentItem.title_fld)) {
         console.log("Value is excluded , collapsing recently Jobs Section ");
-        await collapseSection(_$w, supportTeamsPageSections.RECENT_JOBS);
+        await collapseSection(_$w,supportTeamsPageSections.RECENT_JOBS);
         return;
     }
-
-    const valueId = supportTeamsPageIds.valueToValueIdMap[currentItem.title_fld]
-    const Value = await getValueFromValueId(valueId);
-
-    if( Value === undefined ) {
+    const valueId=supportTeamsPageIds.valueToValueIdMap[currentItem.title_fld]
+    const Value=await getValueFromValueId(valueId);
+    if(Value===undefined) {
         console.log("Value is undefined , collapsing recently Jobs Section ");
         await collapseSection(_$w,supportTeamsPageSections.RECENT_JOBS);
         return;

package/public/filterUtils.js

@@ -23,7 +23,7 @@ function getFilter(fieldsToSearch = [], mode = 'or') {
     return filter;
 }
 
-function debounce(fn, delay = 400,thisObject) {
+function debounce(fn, delay = 400, thisObject) {
     let timeout;
     return function (...args) {
         clearTimeout(timeout);