sr-npm 1.2.46 → 1.2.47

package/backend/careersMultiBoxesPageIds.js

@@ -31,11 +31,16 @@ const CAREERS_MULTI_BOXES_PAGE_CONSTS={
     PRIMARY_SEARCH_CATEGORY_BUTTON: '#primarySearchCategoryButton',
     RESULTS_CONTAINER: '#resultsContainer',
     PRIMARY_SEARCH_BUTTON: '#primarySearchButton',
+}
 
+const 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",
@@ -75,4 +80,5 @@ module.exports = {
     fieldTitlesInCMS,   
     CATEGORY_CUSTOM_FIELD_ID_IN_CMS,
     possibleUrlParams,
+    JOBS_COLLECTION_FIELDS,
 }

package/backend/utils.js

@@ -61,7 +61,8 @@ function normalizeString(str) {
   return str
     .normalize('NFD')
     .replace(/\p{Diacritic}/gu, '')
-    .replace(/[^A-Za-z0-9-]/g, '')
+    .replace(/-/g, '')                    // remove all hyphens
+    .replace(/[^A-Za-z0-9]/g, '')         // allow only alphanumerics (no hyphens now)
     .trim();
 }
 

package/package.json

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

package/pages/boardPeoplePage.js

@@ -6,18 +6,17 @@ async function boardPeoplePageOnReady(_$w,) {
 }
 
 async function bindBoardPeopleRepeaters(_$w) {
-
     _$w('#directorsRepeaterItem').onClick((event) => {
         const $item = _$w.at(event.context);
         const clickedItemData = $item('#dynamicDataset').getCurrentItem();
-        location.to(`/${clickedItemData['link-board-people-title_fld']}`);
+        location.to(`${clickedItemData['link-board-people-title_fld']}`);
 
     });
 
     _$w('#executivesRepeaterItem').onClick((event) => {
         const $item = _$w.at(event.context);
         const clickedItemData = $item('#dataset1').getCurrentItem();
-        location.to(`/${clickedItemData['link-board-people-title_fld']}`);
+        location.to(`${clickedItemData['link-board-people-title_fld']}`);
 
     });
 }

package/pages/careersMultiBoxesPage.js

@@ -4,7 +4,13 @@ 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} = require('../backend/careersMultiBoxesPageIds');
+const {
+  CAREERS_MULTI_BOXES_PAGE_CONSTS,
+  FiltersIds,
+  fieldTitlesInCMS,
+  possibleUrlParams,
+  JOBS_COLLECTION_FIELDS
+} = require('../backend/careersMultiBoxesPageIds');
 const { groupValuesByField, 
         debounce, 
         getAllRecords, 
@@ -312,7 +318,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["link-jobs-title"] || itemData["link-jobs-refId-slug"]);
+        location.to(itemData[JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] || itemData[JOBS_COLLECTION_FIELDS.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
@@ -498,7 +504,7 @@ function getValueFromValueId(valueIds, value) {
             }
             else{
             //if it is not location then we check if selecred values (which is an array) have one of the job values (whcih is also an array)
-            if(job[JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES].some(value=>values.includes(value._id))) {
+            if(job[JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES].some(value=>values.includes(value.valueId))) {
                 if(!addedJobsIds.has(job._id)) {
                     tempFilteredJobs.push(job);
                     addedJobsIds.add(job._id);

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 } = require('../backend/careersMultiBoxesPageIds');
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS, JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
 const { location } = require("@wix/site-location");
 const { normalizeString } = require('../backend/utils');
 const { getFilter } = require('../public/filterUtils');
@@ -98,24 +98,24 @@ function getOptionIndexFromCheckBox(options,value) {
 }
 
 function loadPrimarySearchRepeater(_$w) {
-
-_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER_ITEM).onClick((event) => {
-  const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
-  const clickedItemData = data.find(
-    (item) => item._id === event.context.itemId,
-    
-  );
   
-  // 'link-jobs-title' or 'link-copy-of-jobs-title'
-  const linkKey = Object.keys(clickedItemData).find(
-    key => key.startsWith('link') && key.includes('jobs') && key.includes('title')
-  );
-  if (linkKey && clickedItemData[linkKey] ) {
-    if(clickedItemData[linkKey].includes("copy-of-jobs")) {
-      clickedItemData[linkKey]=clickedItemData[linkKey].replace("copy-of-jobs","jobs")
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
+    $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_POSITION_BUTTON).label = itemData.title || '';   
+  });
+  
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER_ITEM).onClick((event) => {
+    const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
+    const clickedItemData = data.find(
+      (item) => item._id === event.context.itemId,
+      
+    );
+    if(!clickedItemData[JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] && !clickedItemData[JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]) {
+      console.error("clickedItemData does not have link-jobs-title or link-jobs-refId-slug");
+      return;
     }
-    location.to(clickedItemData[linkKey]);
-  }
+
+    location.to(clickedItemData[JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE]||clickedItemData[JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]);
+    
 
 });
 _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {

package/pages/positionPage.js

@@ -1,6 +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 { JOBS_COLLECTION_FIELDS: TWG_JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
 const { items: wixData } = require('@wix/data');
 const { location } = require("@wix/site-location");
 const{isElementExistOnPage} = require('psdev-utils');
@@ -73,7 +74,7 @@ async function getCategoryValue(customValues) {
       const clickedItemData = data.find(
         (item) => item._id === event.context.itemId,
       );
-      location.to(clickedItemData["link-jobs-title"]);
+      location.to(clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] || clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]);
     });
   }
     if(isElementExistOnPage(_$w('#relatedJobsDataset')))

package/pages/supportTeamsPage.js

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