sr-npm 1.2.20 → 1.2.22

package/backend/collectionConsts.js

@@ -14,6 +14,7 @@ const COLLECTIONS = {
 const JOBS_COLLECTION_FIELDS = {
   LOCATION: 'location',
   TITLE: 'title',
+  SLUG: 'slug',
   LOCATION_ADDRESS: 'locationAddress',
   COUNTRY: 'country',
   DEPARTMENT: 'department',
@@ -77,6 +78,7 @@ const COLLECTIONS_FIELDS = {
     JOBS: [
         {key:'location', type: 'OBJECT'},
         {key:'title', type: 'TEXT'},
+        {key:'slug', type: 'TEXT'},
         {key:'locationAddress', type: 'ADDRESS'},
         {key:'country', type: 'TEXT'},
         {key:'department', type: 'TEXT'},

package/backend/data.js

@@ -1,10 +1,17 @@
 const { items: wixData } = require('@wix/data');
 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');
+const { COLLECTIONS, COLLECTIONS_FIELDS,JOBS_COLLECTION_FIELDS,TEMPLATE_TYPE,TOKEN_NAME,CUSTOM_VALUES_COLLECTION_FIELDS } = require('./collectionConsts');
+const { chunkedBulkOperation, 
+        countJobsPerGivenField, 
+        fillCityLocationAndLocationAddress,
+        prepareToSaveArray,
+        normalizeString,
+        generateSlug} 
+        = require('./utils');
 
 let customValuesToJobs = {}
 let locationToJobs = {}
@@ -41,7 +48,7 @@ async function filterBasedOnBrand(positions) {
 
     const desiredBrand = await getTokenFromCMS(TOKEN_NAME.DESIRED_BRAND);
     validateSingleDesiredBrand(desiredBrand);
-    console.log("filtering positions based on brand: ", desiredBrand);\
+    console.log("filtering positions based on brand: ", desiredBrand);
     return positions.content.filter(position => {
       const brand = getBrand(position.customField);
       if (!brand) return false;
@@ -110,7 +117,7 @@ async function saveJobsDataToCMS() {
   const customFieldsLabels = {}
   const customFieldsValues = {}
   
-  const {companyId,templateType} = await getApiKeys();
+  const {companyId ,templateType} = await getApiKeys();
   if(siteconfig===undefined) {
     await getSiteConfig();
   }
@@ -120,6 +127,7 @@ async function saveJobsDataToCMS() {
     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

package/backend/utils.js

@@ -65,6 +65,12 @@ function normalizeString(str) {
     .trim();
 }
 
+function generateSlug(title){
+  return title
+  .replace(/[^a-zA-Z0-9-]+/g, "-")  // allow uppercase AND lowercase letters
+  .replace(/-+/g, "-")             // collapse multiple hyphens
+  .replace(/^-|-$/g, "");          // remove leading/trailing hyphens
+}
 
 
 module.exports = {
@@ -74,5 +80,5 @@ module.exports = {
   fillCityLocationAndLocationAddress,
   prepareToSaveArray,
   normalizeString,
-  
+  generateSlug,
 };

package/package.json

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

package/pages/boardPeoplePage.js

@@ -1,11 +1,9 @@
 
 const { location } = require("@wix/site-location");
-async function boardPeoplePageOnReady(_$w,) {
 
+async function boardPeoplePageOnReady(_$w,) {
     await bindBoardPeopleRepeaters(_$w);
-
-
-  }
+}
 
 async function bindBoardPeopleRepeaters(_$w) {
 

package/pages/brandPage.js

@@ -1,5 +1,6 @@
 
 const { location } = require("@wix/site-location");
+
 async function brandPageOnReady(_$w,brand) {
     const decodedBrand = decodeURIComponent(brand);
     _$w('#seeJobsButton').onClick(() => {

package/pages/careersMultiBoxesPage.js

@@ -1,10 +1,13 @@
 const { COLLECTIONS,CUSTOM_VALUES_COLLECTION_FIELDS,JOBS_COLLECTION_FIELDS } = require('../backend/collectionConsts');
+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 { 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,27 +25,29 @@ const pagination = {
   pageSize: 10,
   currentPage: 1,
 };
+
 async function careersMultiBoxesPageOnReady(_$w,urlParams) {
   //to handle back and forth , url changes
   onChange(async ()=>{
     await handleBackAndForth(_$w);
   });
-  bindSearchInput(_$w);
-  loadPaginationButtons(_$w);
+
   await loadData(_$w);
   loadJobsRepeater(_$w);
   loadPrimarySearchRepeater(_$w);
   await loadFilters(_$w);
   loadSelectedValuesRepeater(_$w);
+  bindSearchInput(_$w);
+  loadPaginationButtons(_$w);
 
-  if (await window.formFactor() === "Mobile") {
-    handleFilterInMobile(_$w);
+    if (await window.formFactor() === "Mobile") {
+      handleFilterInMobile(_$w);
   }
-  
-  await handleUrlParams(_$w, urlParams);
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CLEAR_ALL_BUTTON_ID).onClick(async () => {
-    await clearAll(_$w);
-  });
+    
+    await handleUrlParams(_$w, urlParams);
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CLEAR_ALL_BUTTON_ID).onClick(async () => {
+      await clearAll(_$w);
+    });
 
 }
 
@@ -272,7 +277,6 @@ async function loadData() {
     console.error('Failed to load data:', error);
   }
 }
-
 async function loadJobsRepeater(_$w) {
   try {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).onItemReady(($item, itemData) => {
@@ -304,7 +308,7 @@ 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;
       }
@@ -366,6 +370,7 @@ async function loadJobsRepeater(_$w) {
       updateOptionsUI(_$w, field.title, field._id, query);
     }, 150);
       _$w(`#${FiltersIds[field.title]}input`).onInput(runFilter);         
+      
     }
     await refreshFacetCounts(_$w);
 

package/pages/careersPage.js

@@ -7,7 +7,7 @@ const { COLLECTIONS } = require('../backend/collectionConsts');
 const { careersMultiBoxesPageOnReady } = require('./careersMultiBoxesPage');
 const { debounce, getFilter} = require('../public/filterUtils');
 const { CAREERS_PAGE_SELECTORS, FILTER_FIELDS } = require('../public/selectors');
-  const { filterBrokenMarkers } = require('../public/utils');
+const { filterBrokenMarkers } = require('../public/utils');
   
   let currentLoadedItems =100;
   const itemsPerPage = 100;
@@ -29,10 +29,6 @@ async function careersPageOnReady(_$w,thisObject=null,queryParams=null) {
         const queryResult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
         siteconfig = queryResult.items[0];
     }
-    if(siteconfig===undefined) {
-        const queryResult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
-        siteconfig = queryResult.items[0];
-    }
 
     if(siteconfig.customFields==="true") {
         await careersMultiBoxesPageOnReady(_$w,queryParams);
@@ -225,7 +221,6 @@ async function handleBackAndForth(_$w){
         }
         else{
             queryDepartmentVar=undefined;
-            deletedParam=true;
             _$w(CAREERS_PAGE_SELECTORS.DROPDOWN_DEPARTMENT).value = '';
         }
         if(newQueryParams.location){
@@ -233,7 +228,6 @@ async function handleBackAndForth(_$w){
         }
         else{
             queryLocationVar=undefined;
-            deletedParam=true
             _$w(CAREERS_PAGE_SELECTORS.DROPDOWN_LOCATION).value = '';
         }
         if(newQueryParams.keyWord){
@@ -241,7 +235,6 @@ async function handleBackAndForth(_$w){
         }
         else{
             queryKeyWordVar=undefined;
-            deletedParam=true;
             _$w(CAREERS_PAGE_SELECTORS.SEARCH_INPUT).value = '';
         }
         if(newQueryParams.jobType){
@@ -249,7 +242,6 @@ async function handleBackAndForth(_$w){
         }
         else{
             queryJobTypeVar=undefined;
-            deletedParam=true;
             _$w(CAREERS_PAGE_SELECTORS.DROPDOWN_JOB_TYPE).value = '';
         }
         if(_$w(CAREERS_PAGE_SELECTORS.DROPDOWN_BRAND).isVisible){
@@ -258,7 +250,6 @@ async function handleBackAndForth(_$w){
         }
         else{
             queryBrandVar=undefined;
-            deletedParam=true;
             _$w(CAREERS_PAGE_SELECTORS.DROPDOWN_BRAND).value = '';
         }
     }

package/pages/homePage.js

@@ -13,8 +13,6 @@ let searchByCityFlag=false;
 let loadedCategories=false;
 async function homePageOnReady(_$w,thisObject=null) {
 
-    console.log("homePageOnReady version 1.2.20");
-
     const queryResult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
     const siteconfig = queryResult.items[0];
     if(siteconfig.categorySearch==="true") {