sr-npm 3.1.14 → 3.1.15

package/backend/careersMultiBoxesPageIds.js

@@ -31,16 +31,11 @@ const CAREERS_MULTI_BOXES_PAGE_CONSTS={
     PRIMARY_SEARCH_CATEGORY_BUTTON: '#primarySearchCategoryButton',
     RESULTS_CONTAINER: '#resultsContainer',
     PRIMARY_SEARCH_BUTTON: '#primarySearchButton',
-}
 
-const TWG_JOBS_COLLECTION_FIELDS={
-    LINK_JOBS_TITLE: 'link-jobs-title',
-    LINK_JOBS_REF_ID_SLUG: 'link-jobs-refId-slug',
 }
 
 const CATEGORY_CUSTOM_FIELD_ID_IN_CMS='5cd8c873c9e77c0008aa7d23';
 
-// used for filters - don't add anything else here
 const fieldTitlesInCMS={
     "brand": "Brands",
     category: "Category",
@@ -74,11 +69,16 @@ const possibleUrlParams=[
     "storename",
 ]
 
+
+const LINK_JOBS_TITLE = "link-jobs-title";
+const LINK_JOBS_REF_ID_SLUG = "link-jobs-refId-slug";
+
 module.exports = {
     CAREERS_MULTI_BOXES_PAGE_CONSTS,
     FiltersIds,
     fieldTitlesInCMS,   
     CATEGORY_CUSTOM_FIELD_ID_IN_CMS,
     possibleUrlParams,
-    TWG_JOBS_COLLECTION_FIELDS,
+    LINK_JOBS_TITLE,
+    LINK_JOBS_REF_ID_SLUG,
 }

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -4,13 +4,7 @@ const { CAREERS_PAGE_SELECTORS } = require('../public/selectors');
 const { window } = require('@wix/site-window');
 const { queryParams,onChange} = require('wix-location-frontend');
 const { location } = require("@wix/site-location");
-const {
-  CAREERS_MULTI_BOXES_PAGE_CONSTS,
-  FiltersIds,
-  fieldTitlesInCMS,
-  possibleUrlParams,
-  TWG_JOBS_COLLECTION_FIELDS
-} = require('../backend/careersMultiBoxesPageIds');
+const {CAREERS_MULTI_BOXES_PAGE_CONSTS,FiltersIds,fieldTitlesInCMS,possibleUrlParams} = require('../backend/careersMultiBoxesPageIds');
 const { groupValuesByField, 
         debounce, 
         getAllRecords, 
@@ -318,7 +312,7 @@ async function loadJobsRepeater(_$w) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).onItemReady(($item, itemData) => {
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_TITLE).text = itemData.title;
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_TITLE).onClick(() => {
-        location.to(itemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] || itemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]);
+        location.to(itemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_TITLE] || itemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_REF_ID_SLUG]);
       });
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_LOCATION).text=itemData.location.fullLocation
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_EMPLOYMENT_TYPE).text=itemData.employmentType
@@ -441,16 +435,20 @@ function getValueFromValueId(valueIds, value) {
   function updateOptionsUI(_$w,fieldTitle, fieldId, searchQuery,clearAll=false) {
     let base = optionsByFieldId.get(fieldId) || [];
     const countsMap = countsByFieldId.get(fieldId) || new Map();
-    if(dontUpdateThisCheckBox===fieldId && !clearAll)
+    if(dontUpdateThisCheckBox===fieldId && !clearAll && selectedByField.has(fieldId) )
     {
-        dontUpdateThisCheckBox=null;
-        return;
+          dontUpdateThisCheckBox=null;
+          return;
     }
     let filteredbase=[]
     for (const element of base)
     {
         if(countsMap.get(element.value))
         {
+          if(countsMap.get(element.value)==-1)
+          {
+            countsMap.set(element.value,0);
+          }
             filteredbase.push(element)
         }
     }
@@ -468,19 +466,31 @@ function getValueFromValueId(valueIds, value) {
       : withCounts;
 
     // Preserve currently selected values that are still visible
-    let prevSelected=[]
-    clearAll? prevSelected=[]:prevSelected= _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value;
+  //  let prevSelected=[]
+  //  clearAll? prevSelected=[]:prevSelected= _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value;
     const visibleSet = new Set(filtered.map(o => o.value));
-    const preserved = prevSelected.filter(v => visibleSet.has(v));
+    //const preserved = prevSelected.filter(v => visibleSet.has(v));
     if(filtered.length===0) {
       _$w(`#${FiltersIds[fieldTitle]}MultiBox`).changeState(`${FiltersIds[fieldTitle]}NoResults`);
     }
     else{
       _$w(`#${FiltersIds[fieldTitle]}MultiBox`).changeState(`${FiltersIds[fieldTitle]}Results`);
     _$w(`#${FiltersIds[fieldTitle]}CheckBox`).options = filtered;
-    _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value = preserved;
+    clearAll?_$w(`#${FiltersIds[fieldTitle]}CheckBox`).value=[]:_$w(`#${FiltersIds[fieldTitle]}CheckBox`).value = visibleSet
+    if(visibleSet.size>0 && selectedByField.has(fieldId)) {
+      let selectedindices=[];
+      for(const  value of selectedByField.get(fieldId)) {
+        const options = optionsByFieldId.get(fieldId) || [];
+        const option = getCorrectOption(value,options,fieldTitle);
+        if(option) {
+          const optionIndex = getOptionIndexFromCheckBox(_$w(`#${FiltersIds[fieldTitle]}CheckBox`).options,option.value);
+          selectedindices.push(optionIndex);
+        }
+      }
+      _$w(`#${FiltersIds[fieldTitle]}CheckBox`).selectedIndices = selectedindices;
     }
   }
+}
 
   async function applyJobFilters(_$w) {
     let tempFilteredJobs=[];
@@ -593,7 +603,18 @@ async function refreshFacetCounts(_$w,clearAll=false) {
                     counter.set(option.value, (counter.get(option.value) || 0) + 1);
                 }
             }
+        
+        }
+        if(selectedByField.has(fieldId)) {
+        for (const value of selectedByField.get(fieldId)) {
+          console.log("value: ",value)
+          if(counter.get(value)===undefined)
+          {
+            //it is -1 as a flag, so in case it was selected and after selecting more filters from different field and  suddenly no more jobs have it, we will show 0
+            counter.set(value, -1);
+          }
         }
+      }
         countsByFieldId.set(fieldId, counter);
     }
   }

package/pages/pagesUtils.js

@@ -1,6 +1,6 @@
 const { items: wixData } = require('@wix/data');
 const { JOBS_COLLECTION_FIELDS,COLLECTIONS } = require('../backend/collectionConsts');
-const { CAREERS_MULTI_BOXES_PAGE_CONSTS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS, TWG_JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
+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');
@@ -81,10 +81,12 @@ function getFieldByTitle(title,allFields) {
 
 function getCorrectOption(value,options,param) {
   const standardizedValue = normalizeString(value.toLowerCase())
-  if(param==="employmenttype") //employmenttype have a problematic value
+  if(param==="employmenttype" || param==="Employment Type" || param==="Store Name") //employmenttype have a problematic value, added Employment Type for updateOptionsUI fuinction, added Store Name because Store name and location have for example   Blenheim
   {
+    //option.value is the id, 
     return options.find(option=>normalizeString(option.value.toLowerCase())===standardizedValue);
   }
+  //option.label is what we see live in the UI
   return options.find(option=>normalizeString(option.label.toLowerCase())===standardizedValue);
 }
 
@@ -109,12 +111,12 @@ function loadPrimarySearchRepeater(_$w) {
       (item) => item._id === event.context.itemId,
       
     );
-    if(!clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] && !clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]) {
+    if(!clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_TITLE] && !clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_REF_ID_SLUG]) {
       console.error("clickedItemData does not have link-jobs-title or link-jobs-refId-slug");
       return;
     }
 
-    location.to( clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE]|| clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]);
+    location.to(clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_TITLE]||clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_REF_ID_SLUG]);
     
 
 });

package/pages/positionPage.js

@@ -1,7 +1,7 @@
 const { query } = require("wix-location-frontend");
 const { getPositionWithMultiRefField } = require('../backend/queries');
 const { COLLECTIONS,JOBS_COLLECTION_FIELDS,CUSTOM_FIELDS_COLLECTION_FIELDS } = require('../backend/collectionConsts');
-const { TWG_JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS } = require('../backend/careersMultiBoxesPageIds');
 const { items: wixData } = require('@wix/data');
 const { location } = require("@wix/site-location");
 const{isElementExistOnPage} = require('psdev-utils');
@@ -74,7 +74,7 @@ async function getCategoryValue(customValues) {
       const clickedItemData = data.find(
         (item) => item._id === event.context.itemId,
       );
-      location.to(clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] || clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]);
+      location.to(clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_TITLE] || clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_REF_ID_SLUG]);
     });
   }
     if(isElementExistOnPage(_$w('#relatedJobsDataset')))

package/pages/supportTeamsPage.js

@@ -1,7 +1,7 @@
 const { getLatestJobsByValue, getValueFromValueId } = require('./pagesUtils');
 const { location } = require("@wix/site-location");
 const { supportTeamsPageIds,supportTeamsPageSections } = require('../backend/consts');
-const { TWG_JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS } = require('../backend/careersMultiBoxesPageIds');
 const { getAllRecordsWithoutMultiRef } = require('./pagesUtils');
 
 let currentItem;
@@ -61,7 +61,7 @@ async function handleRecentJobsSection(_$w) {
         const clickedItemData = data.find(
           (item) => item._id === event.context.itemId,
         );
-        location.to(clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] || clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]);
+        location.to(clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_TITLE] || clickedItemData[CAREERS_MULTI_BOXES_PAGE_CONSTS.LINK_JOBS_REF_ID_SLUG]);
       });
     
     _$w(supportTeamsPageIds.RECENT_JOBS_BUTTON).onClick( () => {