sr-npm 3.1.2 → 3.1.4

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 = {}
@@ -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": "3.1.2",
+  "version": "3.1.4",
   "description": "",
   "main": "index.js",
   "scripts": {

package/pages/homePage.js

@@ -15,13 +15,16 @@ async function homePageOnReady(_$w,thisObject=null) {
 
     const queryResult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
     const siteconfig = queryResult.items[0];
-    if(siteconfig.categorySearch==="true") {
+    if(siteconfig.twg) {
         const allJobs=await getAllRecords(COLLECTIONS.JOBS);
         const allvaluesobjects=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
         bindPrimarySearch(_$w,allvaluesobjects,allJobs);
         loadPrimarySearchRepeater(_$w)
+        console.log("siteconfig.twg: ",siteconfig.twg);
+        if(siteconfig.twg==="external") {
         bindTeamRepeater(_$w)
         bindViewAllButton(_$w)
+        }
     }
     else{
 

package/pages/pagesUtils.js

@@ -93,9 +93,17 @@ function loadPrimarySearchRepeater(_$w) {
       (item) => item._id === event.context.itemId,
       
     );
-    console.log("clickedItemData: ",clickedItemData);
-    console.log("clickedItemData['link-jobs-title']: ",clickedItemData["link-jobs-title"]);
-    location.to(clickedItemData["link-jobs-title"]);
+    // '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")
+      }
+      location.to(clickedItemData[linkKey]);
+    }
+
   });
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
     $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_CATEGORY_BUTTON).label = itemData.title || '';

package/pages/positionPage.js

@@ -13,7 +13,7 @@ const {
 
 
   async function positionPageOnReady(_$w) {
-
+    console.log("positionPageOnReady called");
     await bind(_$w);
     
     
@@ -32,6 +32,7 @@ async function getCategoryValue(customValues) {
 
 
   async function bind(_$w) {
+    console.log("bind called");
     _$w('#datasetJobsItem').onReady(async () => {
 
         const item = await _$w('#datasetJobsItem').getCurrentItem();