sr-npm 1.2.39 → 1.2.41

package/backend/collectionConsts.js

@@ -11,6 +11,7 @@ const COLLECTIONS = {
     SUPPORT_TEAMS: 'SupportTeams',
 
 }
+
 const JOBS_COLLECTION_FIELDS = {
   LOCATION: 'location',
   TITLE: 'title',
@@ -34,25 +35,31 @@ 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',
@@ -61,6 +68,7 @@ const CITIES_COLLECTION_FIELDS = {
   COUNTRY: 'country',
   JOB_IDS: 'jobIds',
 }
+
 const COLLECTIONS_FIELDS = {
     AMOUNT_OF_JOBS_PER_DEPARTMENT: [
       {key:'title', type: 'TEXT'},
@@ -85,7 +93,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'},     
@@ -114,6 +122,7 @@ 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,7 +40,6 @@ 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) {
@@ -93,78 +92,83 @@ 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 {companyId ,templateType} = await getApiKeys();
+  const { 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 || '';
@@ -202,8 +206,8 @@ async function saveJobsDataToCMS() {
   console.log(`✓ All chunks processed. Total jobs saved: ${totalSaved}/${jobsData.length}`);
 }
 
-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 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 populateCustomFieldsCollection(customFields,templateType) {
@@ -222,33 +226,38 @@ 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({
-        _id: valueId,
+        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);
+        await insertJobsReference(value._id, value.valueId);
       }
       console.log("inserted jobs references to custom values collection successfully");
     }
@@ -360,10 +369,12 @@ 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)
@@ -489,6 +500,7 @@ async function referenceJobs() {
 }
 
 async function syncJobsFast() {
+  try{
   console.log("Syncing jobs fast");
   await createCollections();
   await clearCollections();
@@ -505,6 +517,12 @@ async function syncJobsFast() {
   await aggregateJobs();
   await referenceJobs();
   console.log("syncing jobs fast finished successfully");
+  }
+  catch (error) {
+    error.message="Error syncing jobs: "+error.message;
+    throw error;
+  }
+  
 }
 
 
@@ -522,7 +540,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
   });
@@ -530,7 +548,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/backend/secretsData.js

@@ -37,9 +37,14 @@ const elevatedQuery = auth.elevate(wixData.query);
   }
   
   async function getApiKeys() {
-    const companyId = await getTokenFromCMS(TOKEN_NAME.COMPANY_ID);
-    const templateType = await getTemplateTypeFromCMS();
-    return {companyId,templateType};
+    try{
+      const companyId = await getTokenFromCMS(TOKEN_NAME.COMPANY_ID);
+      const templateType = await getTemplateTypeFromCMS();
+      return {companyId,templateType};
+    } catch (error) {
+      console.error("Error getting api keys: ", error);
+      throw error;
+    }
   }
 
   module.exports = {

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -21,6 +21,7 @@ let allsecondarySearchJobs=[] // secondary search results that are displayed in
 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
+let ActivateURLOnchange=true; // whether to activate the url onchange
 const pagination = {
   pageSize: 10,
   currentPage: 1,
@@ -33,7 +34,7 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
   });
 
   await loadData(_$w);
-  loadJobsRepeater(_$w);
+  await loadJobsRepeater(_$w); // if we remove the await here the job list will be flaky , it doesn't fill it properly
   loadPrimarySearchRepeater(_$w);
   await loadFilters(_$w);
   loadSelectedValuesRepeater(_$w);
@@ -52,15 +53,23 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
 }
 
 async function handleBackAndForth(_$w){
+  if(ActivateURLOnchange) {
     const newQueryParams=await location.query();
-    console.log("newQueryParams: ", newQueryParams);
-    await clearAll(_$w,true);
-    await handleUrlParams(_$w,newQueryParams);
-    
+      console.log("newQueryParams: ", newQueryParams);
+      ActivateURLOnchange=false;
+      await clearAll(_$w,true);
+      await handleUrlParams(_$w,newQueryParams,true); 
+      ActivateURLOnchange=true;
+
+    }
+    else{
+      ActivateURLOnchange=true;
+    }
 }
 
 async function clearAll(_$w,urlOnChange=false) {
   if(selectedByField.size>0 || _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).value || _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value) {
+    
     for(const field of allfields) {
       _$w(`#${FiltersIds[field.title]}CheckBox`).selectedIndices = [];
     }
@@ -71,9 +80,13 @@ async function clearAll(_$w,urlOnChange=false) {
     currentJobs=alljobs;
     keywordAllJobs=undefined;
     if(!urlOnChange) {
+      console.log("inside clearAll removing url params");
+      ActivateURLOnchange=false;
       queryParams.remove(possibleUrlParams.concat(["keyword", "page"]));
+
+      await updateJobsAndNumbersAndFilters(_$w,true);
     }
-    await updateJobsAndNumbersAndFilters(_$w,true);
+    
     }
 }
 
@@ -112,7 +125,8 @@ function handleFilterInMobile(_$w) {
   });
 }
 
-async function handleUrlParams(_$w,urlParams) {
+
+async function handleUrlParams(_$w,urlParams,handleBackAndForth=false) {
   try { 
   let applyFiltering=false;
   let currentApplyFilterFlag=false;
@@ -127,7 +141,7 @@ async function handleUrlParams(_$w,urlParams) {
 
       while (_$w("#jobsDataset").hasNextPage()) {
         const nextItems = await _$w("#jobsDataset").nextPage();
-        items.push(...nextItems.items);
+        items.push(...nextItems);
       }
       
       currentJobs = items;   
@@ -146,8 +160,9 @@ async function handleUrlParams(_$w,urlParams) {
     }
     currentApplyFilterFlag=false;
   }
-    if(applyFiltering || keywordAllJobs) {
+    if(applyFiltering || keywordAllJobs || handleBackAndForth) {
       await updateJobsAndNumbersAndFilters(_$w);
+      
     }
   
     if(urlParams.page) {
@@ -186,17 +201,15 @@ 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`);
@@ -248,6 +261,7 @@ async function handleParams(_$w,param,values) {
             const field=getFieldById(fieldId,allfields);
             let fieldTitle=field.title.toLowerCase().replace(' ', '');
             fieldTitle==="brands"? fieldTitle="brand":fieldTitle;
+            ActivateURLOnchange=false;
             if (updated.length) {
               selectedByField.set(fieldId, updated);
               queryParams.add({ [fieldTitle] : updated.map(val=>encodeURIComponent(val)).join(',') });
@@ -255,10 +269,12 @@ async function handleParams(_$w,param,values) {
               selectedByField.delete(fieldId);
               queryParams.remove([fieldTitle ]);
             }
+
             const currentVals = _$w(`#${FiltersIds[field.title]}CheckBox`).value || [];
             const nextVals = currentVals.filter(v => v !== valueId);
             _$w(`#${FiltersIds[field.title]}CheckBox`).value = nextVals;
             await updateJobsAndNumbersAndFilters(_$w);
+           
           });
     });
      updateSelectedValuesRepeater(_$w);
@@ -274,14 +290,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._id]= value.jobIds;
+            valueToJobs[value.valueId]= 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);
@@ -318,44 +334,47 @@ 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;
-
+        ActivateURLOnchange=false;
         if (selected && selected.length) {
           selectedByField.set(field._id, selected); 
           if(fieldTitle==="brand" || fieldTitle==="storename") {
@@ -371,10 +390,11 @@ async function loadJobsRepeater(_$w) {
           selectedByField.delete(field._id);  
           queryParams.remove([fieldTitle ]);
         }
-
+       
+        console.log("selectedByField: ",selectedByField)
         await updateJobsAndNumbersAndFilters(_$w);
-    
       });
+
       const runFilter = debounce(() => {
       const query = (_$w(`#${FiltersIds[field.title]}input`).value || '').toLowerCase().trim();
       updateOptionsUI(_$w, field.title, field._id, query);
@@ -389,11 +409,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);
     }
@@ -402,10 +422,10 @@ function getValueFromValueId(valueIds,value) {
 }
  
   async function updateJobsAndNumbersAndFilters(_$w,clearAll=false) {
-    await applyJobFilters(_$w); // re-query jobs
+    await applyJobFilters(_$w,clearAll); // re-query jobs
     await refreshFacetCounts(_$w,clearAll);    // recompute and update counts in all lists
     await updateSelectedValuesRepeater(_$w);
-    updateTotalJobsCountText(_$w);
+    updateTotalJobsCountText(_$w);  
   }
 
   function updateOptionsUI(_$w,fieldTitle, fieldId, searchQuery,clearAll=false) {
@@ -452,7 +472,8 @@ function getValueFromValueId(valueIds,value) {
     }
   }
 
-  async function applyJobFilters(_$w) {
+  async function applyJobFilters(_$w,clearAll=false) {
+   // if(!clearAll) {
     let tempFilteredJobs=[];
     let finalFilteredJobs=[];
     secondarySearchIsFilled? finalFilteredJobs=allsecondarySearchJobs:finalFilteredJobs=alljobs;
@@ -486,12 +507,13 @@ function getValueFromValueId(valueIds,value) {
         finalFilteredJobs=tempFilteredJobs;
         tempFilteredJobs=[];
     }
-    
     secondarySearchIsFilled? currentSecondarySearchJobs=finalFilteredJobs:currentJobs=finalFilteredJobs;
    
     
     let jobsFirstPage=[];
+    console.log("currentSecondarySearchJobs: ",currentSecondarySearchJobs)
     secondarySearchIsFilled? jobsFirstPage=currentSecondarySearchJobs.slice(0,pagination.pageSize):jobsFirstPage=currentJobs.slice(0,pagination.pageSize);
+    console.log("jobsFirstPage: ",jobsFirstPage)
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = jobsFirstPage;
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = "1";
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = secondarySearchIsFilled? Math.ceil(currentSecondarySearchJobs.length/pagination.pageSize).toString():Math.ceil(currentJobs.length/pagination.pageSize).toString();
@@ -504,6 +526,7 @@ function getValueFromValueId(valueIds,value) {
     pagination.currentPage=1;
     handlePaginationButtons(_$w);
   }
+ // }
 
 function handlePaginationButtons(_$w)
 {
@@ -527,14 +550,15 @@ function handlePaginationButtons(_$w)
 }
 
 function handlePageUrlParam() {
+  ActivateURLOnchange=false;
   if(pagination.currentPage==1)
   {
+    
       queryParams.remove(["page"]);
   }
   else{
     queryParams.add({ page: pagination.currentPage });
   }
-  
 }
 async function refreshFacetCounts(_$w,clearAll=false) { 
 
@@ -553,7 +577,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) {
@@ -566,8 +590,7 @@ 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) || [];
@@ -578,7 +601,7 @@ async function refreshFacetCounts(_$w,clearAll=false) {
       }
     }
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER).data = selectedItems;
-  }
+}
 
 
 

package/pages/homePage.js

@@ -14,14 +14,16 @@ async function homePageOnReady(_$w,thisObject = null) {
     const queryResult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
     const siteconfig = queryResult.items[0];
 
+
     if(siteconfig.twg) {
         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{

package/pages/pagesUtils.js

@@ -12,7 +12,7 @@ function groupValuesByField(values, refKey) {
       if (!map.has(ref)) map.set(ref, []);
       map.get(ref).push({
         label: v.title ,
-        value: v._id
+        value: v.valueId
       });
     }
     return map;
@@ -144,6 +144,9 @@ function bindPrimarySearch(_$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();
   });
@@ -163,6 +166,14 @@ function bindPrimarySearch(_$w, allvaluesobjects) {
       }
     }
   });
+      } 
+      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 () => {
     if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
@@ -177,13 +188,13 @@ function bindPrimarySearch(_$w, allvaluesobjects) {
   });
 }
 
-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._id});
+    if(value.customField === CATEGORY_CUSTOM_FIELD_ID_IN_CMS) {
+      categoryValues.push({title: value.title+` (${value.count})` , _id: value.valueId});
     }
   }
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
@@ -227,11 +238,13 @@ async function primarySearch(_$w, query) {
   return count > 0;
 }
 
-  async function getValueFromValueId(valueId) {
-    const result = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
-    return result.find(value => value._id === valueId);
-    
-  }
+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 getLatestJobsByValue(Value) {
     const jobs=Value.multiRefJobsCustomValues;

package/pages/positionPage.js

@@ -15,7 +15,6 @@ const {
     console.log("positionPageOnReady called");
     await bind(_$w);
     
-    
 
   }
 
@@ -58,7 +57,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,8 +123,6 @@ 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;