sr-npm 1.7.1065 → 1.7.1066

package/.github/workflows/update-sites.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - main
   workflow_dispatch:
-      
+    
 permissions:
   contents: write
   packages: write

package/backend/careersMultiBoxesPageIds.js

@@ -39,6 +39,11 @@ const fieldTitlesInCMS={
     "brand": "Brands",
     category: "Category",
     visibility: "Visibility",
+    location: "Location",
+    employmenttype: "Employment Type",
+    contracttype: "Contract Type",
+    companysegment: "Company Segment",
+    storename: "Store Name",
 }
 
 const FiltersIds={
@@ -52,10 +57,21 @@ const FiltersIds={
    Visibility: 'Visibility',
 }
 
+const possibleUrlParams=[
+     "brand",
+     "location",
+    "employmenttype",
+    "contracttype",
+    "visibility",
+    "category",
+    "companysegment",
+    "storename",
+]
 
 module.exports = {
     CAREERS_MULTI_BOXES_PAGE_CONSTS,
     FiltersIds,
     fieldTitlesInCMS,   
     CATEGORY_CUSTOM_FIELD_ID_IN_CMS,
+    possibleUrlParams,
 }

package/backend/collectionConsts.js

@@ -31,6 +31,7 @@ const JOBS_COLLECTION_FIELDS = {
   MULTI_REF_JOBS_CUSTOM_VALUES: 'multiRefJobsCustomValues',
   EMPLOYMENT_TYPE: 'employmentType',
   RELEASED_DATE: 'releasedDate',
+  REF_ID: 'refId',
 }
 const AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION_FIELDS = {
   TITLE: 'title',
@@ -93,6 +94,7 @@ const COLLECTIONS_FIELDS = {
         {key: 'image', type: 'IMAGE' },
         {key:'employmentType', type: 'TEXT'},
         {key:'releasedDate', type: 'TEXT'},
+        {key:'refId', type: 'TEXT'},
     ],  
     TEMPLATE_TYPE: [
       {key:'templateType', type: 'TEXT'},

package/backend/consts.js

@@ -72,9 +72,6 @@ const TASKS = {
     }
 }
 
-
-
-
 const TASK_TYPE = {
   SCHEDULED: 'scheduled',
   EVENT: 'event',
@@ -92,10 +89,6 @@ const supportTeamsPageIds={
     VIDEO_TITLE: "#videoTitle",
     VIDEO_PLAYER: "#videoPlayer",
 
-
-
-
-
     RECENTLEY_ADDED_JOBS_ITEM: "#recentleyAddedJobsItem",
     JOB_LOCATION: "#jobLocation",
     JOB_TITLE: "#jobTitle",
@@ -137,12 +130,13 @@ const supportTeamsPageSections={
   VIDEO: "video",
 }
 
-  module.exports = {
-    TASKS_NAMES,
-    TASK_TYPE,
-    TASKS,
-    QUERY_MAX_LIMIT,
-    supportTeamsPageIds,
-    LINKS,
-    supportTeamsPageSections,
+
+module.exports = {
+  TASKS_NAMES,
+  TASK_TYPE,
+  TASKS,
+  QUERY_MAX_LIMIT,
+  supportTeamsPageIds,
+  LINKS,
+  supportTeamsPageSections,
 };

package/backend/data.js

@@ -1,13 +1,11 @@
 const { items: wixData } = require('@wix/data');
-const { fetchPositionsFromSRAPI, fetchJobDescription, htmlRichContentConverter } = require('./fetchPositionsFromSRAPI');
+const { fetchPositionsFromSRAPI, fetchJobDescription } = require('./fetchPositionsFromSRAPI');
 const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend');
 const { COLLECTIONS, COLLECTIONS_FIELDS,JOBS_COLLECTION_FIELDS,TEMPLATE_TYPE,TOKEN_NAME,CUSTOM_VALUES_COLLECTION_FIELDS } = require('./collectionConsts');
 const { chunkedBulkOperation, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeString} = require('./utils');
 const { getAllPositions } = require('./queries');
 const { retrieveSecretVal, getTokenFromCMS ,getApiKeys} = require('./secretsData');
 
-
-
 let customValuesToJobs = {}
 let locationToJobs = {}
 let siteconfig;
@@ -21,6 +19,7 @@ async function getSiteConfig() {
   const queryresult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
   siteconfig = queryresult.items[0];
 }
+
 function validatePosition(position) {
   if (!position.id) {
     throw new Error('Position id is required');
@@ -40,22 +39,22 @@ function validatePosition(position) {
 async function filterBasedOnBrand(positions) {
   try{
 
-  const desiredBrand = await getTokenFromCMS(TOKEN_NAME.DESIRED_BRAND);
-  validateSingleDesiredBrand(desiredBrand);
-  console.log("filtering positions based on brand: ", desiredBrand);
-  return positions.content.filter(position => {
-    const brand = getBrand(position.customField);
-    if (!brand) return false;
-    return brand === desiredBrand;
-  });
-} catch (error) {
-  if(error.message==="[getTokenFromCMS], No desiredBrand found")
-  {
-    console.log("no desiredBrand found, fetching all positions")
-    return positions.content;
+    const desiredBrand = await getTokenFromCMS(TOKEN_NAME.DESIRED_BRAND);
+    validateSingleDesiredBrand(desiredBrand);
+    console.log("filtering positions based on brand: ", desiredBrand);\
+    return positions.content.filter(position => {
+      const brand = getBrand(position.customField);
+      if (!brand) return false;
+      return brand === desiredBrand;
+    });
+  } catch (error) {
+    if(error.message==="[getTokenFromCMS], No desiredBrand found")
+    {
+      console.log("no desiredBrand found, fetching all positions")
+      return positions.content;
+    }
+    throw error;
   }
-  throw error;
-}
 }
 
 function validateSingleDesiredBrand(desiredBrand) {
@@ -63,11 +62,12 @@ function validateSingleDesiredBrand(desiredBrand) {
     throw new Error("Desired brand must be a single brand");
   }
 }
-function getLocation(position,basicJob) {
 
+function getLocation(position,basicJob) {
   locationToJobs[basicJob.cityText] ? locationToJobs[basicJob.cityText].push(position.id) : locationToJobs[basicJob.cityText]=[position.id]
 
 }
+
 function getVisibility(position,customFieldsValues) {
   if (!customFieldsValues["Visibility"]) {
     customFieldsValues["Visibility"] = {};
@@ -99,8 +99,8 @@ function getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,custom
     if (!customFieldsValues[fieldId]) {
       customFieldsValues[fieldId] = {};
     }
+    
     customFieldsValues[fieldId][valueId] = valueLabel;
-
     customValuesToJobs[valueId] ? customValuesToJobs[valueId].add(position.id) : customValuesToJobs[valueId]=new Set([position.id])
   }
 }
@@ -140,7 +140,8 @@ async function saveJobsDataToCMS() {
       brand: siteconfig.disableMultiBrand==="false" ? getBrand(position.customField) : '',
       jobDescription: null, // Will be filled later
       employmentType: position.typeOfEmployment.label,
-      releasedDate: position.releasedDate
+      releasedDate: position.releasedDate,
+      refId: position.refNumber
     };
 
     getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,customFieldsValues);
@@ -269,13 +270,14 @@ async function saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS() {
         const chunkPromises = chunk.map(async job => {
           try {
             const jobDetails = await fetchJobDescription(job._id);
-            const richContentDescription=await htmlRichContentConverter(jobDetails.jobAd.sections);
             const jobLocation = fetchJobLocation(jobDetails);
             const {applyLink , referFriendLink} = fetchApplyAndReferFriendLink(jobDetails);
+
+            
             const updatedJob = {
               ...job,
               locationAddress: jobLocation,
-              jobDescription: richContentDescription,
+              jobDescription: jobDetails.jobAd.sections,
               applyLink: applyLink,
               referFriendLink: referFriendLink,
             };
@@ -484,11 +486,14 @@ async function syncJobsFast() {
   await createCollections();
   await clearCollections();
   await fillSecretManagerMirror();
+
   console.log("saving jobs data to CMS");
   await saveJobsDataToCMS();
   console.log("saved jobs data to CMS successfully");
+  
   console.log("saving jobs descriptions and location apply url to CMS");
   await saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS();
+
   console.log("saved jobs descriptions and location apply url to CMS successfully");
   await aggregateJobs();
   await referenceJobs();

package/backend/fetchPositionsFromSRAPI.js

@@ -1,8 +1,9 @@
 const { fetch } = require('wix-fetch');
 const { TEMPLATE_TYPE,TOKEN_NAME } = require('./collectionConsts');
 const { getTokenFromCMS,getApiKeys } = require('./secretsData');
+
 async function makeSmartRecruitersRequest(path,templateType) {
-   const baseUrl = 'https://api.smartrecruiters.com';
+  const baseUrl = 'https://api.smartrecruiters.com';
   const fullUrl = `${baseUrl}${path}`;
   
   try {
@@ -113,49 +114,11 @@ async function fetchJobDescription(jobId,testObject=undefined) {
   return await makeSmartRecruitersRequest(`/v1/companies/${companyId}/postings/${jobId}`,templateType);
 }
 
-async function htmlRichContentConverter(sections) {
-  
-  console.log("sections: are  ",sections);
-  const richContentObject = {}
-  for (const section of sections) {
-    console.log("section: is  ",section);
-    if (section.text) {
-      const raw = JSON.stringify({
-        content: section.text,
-      });
-      const requestOptions = {
-        method: 'post',
-        headers: {
-          'Content-Type': 'application/json',
-          Cookie: 'XSRF-TOKEN=1753949844|p--a7HsuVjR4',
-          Authorization: 'Bearer 2e19efe5f44d29d74480f5b744a5a90f19ba6ca7012ced19e7b14edb1ad6a641',
-        },
-        body: raw,
-      };
-      const response = await fetch(
-        'https://www.wixapis.com/data-sync/v1/abmp-content-converter',
-        requestOptions
-      );
-      if (response.ok) {
-        const data = await response.json();
-        console.log("response is ok")
-        richContentObject[section.title] = data.richContent.richContent;
-      }
-      else {
-        throw new Error("Error converting html to rich content response: "+response);
-      }
-    }
-  }
-  console.log("richContentObject: are  ",richContentObject);
-  return richContentObject;
-}
-
 
 
 
 module.exports = {
   fetchPositionsFromSRAPI,
   fetchJobDescription,
-  makeSmartRecruitersRequest,
-  htmlRichContentConverter
+  makeSmartRecruitersRequest
 };

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -1,9 +1,11 @@
 const { COLLECTIONS,CUSTOM_VALUES_COLLECTION_FIELDS,JOBS_COLLECTION_FIELDS } = require('../backend/collectionConsts');
-const { queryParams} = require('wix-location-frontend');
+
+const { queryParams,onChange} = require('wix-location-frontend');
 const { location } = require("@wix/site-location");
-const {CAREERS_MULTI_BOXES_PAGE_CONSTS,FiltersIds,fieldTitlesInCMS} = require('../backend/careersMultiBoxesPageIds');
+const {CAREERS_MULTI_BOXES_PAGE_CONSTS,FiltersIds,fieldTitlesInCMS,possibleUrlParams} = require('../backend/careersMultiBoxesPageIds');
 const { groupValuesByField, debounce, getAllRecords, getFieldById, getFieldByTitle,getCorrectOption,getOptionIndexFromCheckBox,loadPrimarySearchRepeater,bindPrimarySearch,primarySearch } = require('./pagesUtils');
 
+
 let dontUpdateThisCheckBox;
 const selectedByField = new Map(); // fieldId -> array of selected value IDs
 const optionsByFieldId = new Map(); // fieldId -> [{label, value}] array of objects with label which is the valueLabel and value which is the valueId
@@ -22,6 +24,10 @@ const pagination = {
   currentPage: 1,
 };
 async function careersMultiBoxesPageOnReady(_$w,urlParams) {
+  //to handle back and forth , url changes
+  onChange(async ()=>{
+    await handleBackAndForth(_$w);
+  });
     await loadData(_$w);
     loadJobsRepeater(_$w);
     loadPrimarySearchRepeater(_$w);
@@ -29,6 +35,10 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
     loadSelectedValuesRepeater(_$w);
     bindSearchInput(_$w);
     loadPaginationButtons(_$w);
+
+    if (await window.formFactor() === "Mobile") {
+      handleFilterInMobile(_$w);
+  }
     
     await handleUrlParams(_$w, urlParams);
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CLEAR_ALL_BUTTON_ID).onClick(async () => {
@@ -37,7 +47,15 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
 
 }
 
-async function clearAll(_$w) {
+async function handleBackAndForth(_$w){
+    const newQueryParams=await location.query();
+    console.log("newQueryParams: ", newQueryParams);
+    await clearAll(_$w,true);
+    await handleUrlParams(_$w,newQueryParams);
+    
+}
+
+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 = [];
@@ -48,34 +66,76 @@ async function clearAll(_$w) {
     secondarySearchIsFilled=false;
     currentJobs=alljobs;
     keywordAllJobs=undefined;
+    if(!urlOnChange) {
+      queryParams.remove(possibleUrlParams.concat(["keyword", "page"]));
+    }
     await updateJobsAndNumbersAndFilters(_$w,true);
     }
 }
 
+function handleFilterInMobile(_$w) {
+  const searchResultsSelectors = [
+      CAREERS_PAGE_SELECTORS.RESULT_BOX,
+      CAREERS_PAGE_SELECTORS.PAGINATION_BTN, 
+      CAREERS_PAGE_SELECTORS.HEAD_BTNS, 
+      CAREERS_PAGE_SELECTORS.SELECTED_VALUES_REPEATER, 
+      CAREERS_PAGE_SELECTORS.BUTTOM_TXT, 
+      CAREERS_PAGE_SELECTORS.SECTION_24, 
+      CAREERS_PAGE_SELECTORS.SECTION_3, 
+      CAREERS_PAGE_SELECTORS.LINE_3,
+      CAREERS_PAGE_SELECTORS.FILTER_ICON];
+
+  _$w(CAREERS_PAGE_SELECTORS.FILTER_ICON).onClick(()=>{
+      _$w(CAREERS_PAGE_SELECTORS.FILTER_BOX).expand();
+      searchResultsSelectors.forEach(selector => {
+          _$w(selector).collapse();
+      });
+  });
+
+  const exitFilterBox = () => {
+      _$w(CAREERS_PAGE_SELECTORS.FILTER_BOX).collapse();
+      searchResultsSelectors.forEach(selector => {
+          _$w(selector).expand();
+      });
+  }
+
+  _$w(CAREERS_PAGE_SELECTORS.EXIT_BUTTON).onClick(()=>{
+      exitFilterBox();
+  });
+
+  _$w(CAREERS_PAGE_SELECTORS.REFINE_SEARCH_BUTTON).onClick(()=>{
+      exitFilterBox();
+  });
+}
+
 
 async function handleUrlParams(_$w,urlParams) {
   try { 
   let applyFiltering=false;
-
+  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;
   }
-    if(urlParams.brand) {
-      applyFiltering=await handleParams(_$w,"brand",urlParams.brand)
-    }
-    if(urlParams.visibility) {
-      applyFiltering=await handleParams(_$w,"visibility",urlParams.visibility)
-    }
-    if(urlParams.category) {
-      applyFiltering=await handleParams(_$w,"category",urlParams.category)
+  
+  for (const url of possibleUrlParams)
+  {
+    if(urlParams[url])
+    {
+      currentApplyFilterFlag=await handleParams(_$w,url,urlParams[url])
+      if(currentApplyFilterFlag) {
+        applyFiltering=true;
+      }
     }
-
+    currentApplyFilterFlag=false;
+  }
     if(applyFiltering || keywordAllJobs) {
       await updateJobsAndNumbersAndFilters(_$w);
     }
+  
     if(urlParams.page) {
       if(Number.isNaN(Number(urlParams.page)) || Number(urlParams.page)<=1 || Number(urlParams.page)>Math.ceil(currentJobs.length/pagination.pageSize)) {
         console.warn("page number is invalid, removing page from url");
@@ -83,14 +143,14 @@ async function handleUrlParams(_$w,urlParams) {
         return;
       }
         pagination.currentPage=Number(urlParams.page);
-        let paginationCurrentText=Number(urlParams.page)*pagination.pageSize
+        //let paginationCurrentText=urlParams.page;
         let startSlicIndex=pagination.pageSize*(pagination.currentPage-1);
         let endSlicIndex=(pagination.pageSize)*(pagination.currentPage);
         if(Number(urlParams.page)==Math.ceil(currentJobs.length/pagination.pageSize)) {
-          paginationCurrentText=paginationCurrentText-(pagination.pageSize-(currentJobs.length%pagination.pageSize));          
+         // paginationCurrentText=(paginationCurrentText-(pagination.pageSize-(currentJobs.length%pagination.pageSize))).toString();          
           endSlicIndex=currentJobs.length;
         }
-        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = paginationCurrentText.toString();
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = urlParams.page
         const jobsFirstPage=currentJobs.slice(startSlicIndex,endSlicIndex);
         _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = jobsFirstPage;
         handlePaginationButtons(_$w);
@@ -100,31 +160,49 @@ async function handleUrlParams(_$w,urlParams) {
   }
 }
 
-async function handleParams(_$w,param,value) {
+async function handleParams(_$w,param,values) {
   let applyFiltering=false;
+  let valuesAsArray = values.split(',')
+  valuesAsArray=valuesAsArray.filter(value=>value.trim()!=='');
+
+  let selectedIndices=[];
+  const field=getFieldByTitle(fieldTitlesInCMS[param],allfields);
+
+  let existing = selectedByField.get(field._id) || [];
+  for(const value of valuesAsArray) {
+    
        const decodedValue = decodeURIComponent(value);
-      const field=getFieldByTitle(fieldTitlesInCMS[param],allfields);
+    
       const options=optionsByFieldId.get(field._id);
-      const option=getCorrectOption(decodedValue,options);
+    
+      const option=getCorrectOption(decodedValue,options,param);
+    
       if(option) {
        const optionIndex=getOptionIndexFromCheckBox(_$w(`#${FiltersIds[field.title]}CheckBox`).options,option.value);
-       _$w(`#${FiltersIds[field.title]}CheckBox`).selectedIndices = [optionIndex];
-        selectedByField.set(field._id, [option.value]);
+       selectedIndices.push(optionIndex);
+       existing.push(option.value);
         applyFiltering=true;
         dontUpdateThisCheckBox=field._id;
       }
       else {
         console.warn(`${param} value not found in dropdown options`);
       }
-      return applyFiltering;
+    }
+
+    selectedByField.set(field._id, existing);
+    _$w(`#${FiltersIds[field.title]}CheckBox`).selectedIndices=selectedIndices;
+
+    return applyFiltering;
+
 }
 
  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));
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = (nextPageJobs.length+pagination.pageSize*pagination.currentPage).toString();
+      
       pagination.currentPage++;
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = pagination.currentPage.toString();
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = nextPageJobs;
       handlePaginationButtons(_$w);
     });
@@ -132,7 +210,7 @@ async function handleParams(_$w,param,value) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS).onClick(async () => {
       let previousPageJobs=currentJobs.slice(pagination.pageSize*(pagination.currentPage-2),pagination.pageSize*(pagination.currentPage-1));
       pagination.currentPage--;
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = (pagination.pageSize*pagination.currentPage).toString();
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text =   pagination.currentPage.toString();
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = previousPageJobs;
       handlePaginationButtons(_$w);
     });
@@ -147,21 +225,22 @@ async function handleParams(_$w,param,value) {
         $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER_ITEM_LABEL).text = itemData.label || '';
         // Deselect this value from both the selected map and the multibox
           $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.DESELECT_BUTTON_ID).onClick(async () => {
-            
             const fieldId = itemData.fieldId;
             const valueId = itemData.valueId;
             dontUpdateThisCheckBox=fieldId;
             if (!fieldId || !valueId) return;
-
             const existing = selectedByField.get(fieldId) || [];
             const updated = existing.filter(v => v !== valueId);
+            const field=getFieldById(fieldId,allfields);
+            let fieldTitle=field.title.toLowerCase().replace(' ', '');
+            fieldTitle==="brands"? fieldTitle="brand":fieldTitle;
             if (updated.length) {
               selectedByField.set(fieldId, updated);
+              queryParams.add({ [fieldTitle] : updated.map(val=>encodeURIComponent(val)).join(',') });
             } else {
               selectedByField.delete(fieldId);
+              queryParams.remove([fieldTitle ]);
             }
-
-            const field=getFieldById(fieldId,allfields);
             const currentVals = _$w(`#${FiltersIds[field.title]}CheckBox`).value || [];
             const nextVals = currentVals.filter(v => v !== valueId);
             _$w(`#${FiltersIds[field.title]}CheckBox`).value = nextVals;
@@ -208,8 +287,8 @@ async function loadJobsRepeater(_$w) {
 
     const jobsFirstPage=alljobs.slice(0,pagination.pageSize);
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = jobsFirstPage;
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = jobsFirstPage.length.toString();
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = currentJobs.length.toString();
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = "1"
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = Math.ceil(currentJobs.length/pagination.pageSize).toString();
     updateTotalJobsCountText(_$w);
     handlePaginationButtons(_$w);
   } catch (error) {
@@ -250,28 +329,35 @@ async function loadJobsRepeater(_$w) {
         else{
             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
         _$w(`#${FiltersIds[field.title]}CheckBox`).selectedIndices = []; // start empty
         _$w(`#${FiltersIds[field.title]}CheckBox`).onChange(async (ev) => {
-          console.log("i am here !!!!!")
-          console.log("field.title: ",field.title)
-          console.log("value: ",value)
           dontUpdateThisCheckBox=field._id;
         const selected = ev.target.value; // array of selected value IDs
-        console.log("ev: ",ev)
-        console.log("ev.target: ",ev.target)
+        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);
     
       });
@@ -289,8 +375,18 @@ async function loadJobsRepeater(_$w) {
     }
   }
 
+function getValueFromValueId(valueIds,value) {
+  let valueLabels=[];
+  let currentVal
+  for(const valueId of valueIds) {
+    currentVal=value.find(val=>val.value===valueId);
+    if(currentVal) {
+      valueLabels.push(currentVal.label);
+    }
+  }
+  return valueLabels
+}
  
-
   async function updateJobsAndNumbersAndFilters(_$w,clearAll=false) {
     await applyJobFilters(_$w); // re-query jobs
     await refreshFacetCounts(_$w,clearAll);    // recompute and update counts in all lists
@@ -301,7 +397,6 @@ async function loadJobsRepeater(_$w) {
   function updateOptionsUI(_$w,fieldTitle, fieldId, searchQuery,clearAll=false) {
     let base = optionsByFieldId.get(fieldId) || [];
     const countsMap = countsByFieldId.get(fieldId) || new Map();
-    
     if(dontUpdateThisCheckBox===fieldId && !clearAll)
     {
         dontUpdateThisCheckBox=null;
@@ -377,12 +472,15 @@ async function loadJobsRepeater(_$w) {
         finalFilteredJobs=tempFilteredJobs;
         tempFilteredJobs=[];
     }
+    
     secondarySearchIsFilled? currentSecondarySearchJobs=finalFilteredJobs:currentJobs=finalFilteredJobs;
+   
+    
     let jobsFirstPage=[];
     secondarySearchIsFilled? jobsFirstPage=currentSecondarySearchJobs.slice(0,pagination.pageSize):jobsFirstPage=currentJobs.slice(0,pagination.pageSize);
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = jobsFirstPage;
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = jobsFirstPage.length.toString();
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = secondarySearchIsFilled? currentSecondarySearchJobs.length.toString():currentJobs.length.toString();
+    _$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();
     if(jobsFirstPage.length===0) {
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_MULTI_STATE_BOX).changeState("noJobs");
     }
@@ -428,6 +526,7 @@ async function refreshFacetCounts(_$w,clearAll=false) {
 
   secondarySearchIsFilled? countJobsPerField(currentSecondarySearchJobs):countJobsPerField(currentJobs);
     for(const field of allfields) {
+
         const query = (_$w(`#${FiltersIds[field.title]}input`).value || '').toLowerCase().trim();
         clearAll? updateOptionsUI(_$w,field.title, field._id, '',true):updateOptionsUI(_$w,field.title, field._id, query);
         // no search query
@@ -480,9 +579,10 @@ async function secondarySearch(_$w,query) {
     currentSecondarySearchJobs=allsecondarySearchJobs;
     const jobsFirstPage=allsecondarySearchJobs.slice(0,pagination.pageSize);
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = jobsFirstPage;
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = jobsFirstPage.length.toString();
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = allsecondarySearchJobs.length.toString();
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = "1";
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = Math.ceil(allsecondarySearchJobs.length/pagination.pageSize).toString();
     pagination.currentPage=1;
+
     if(jobsFirstPage.length===0) {
       await _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_MULTI_STATE_BOX).changeState("noJobs");
     }