sr-npm 1.7.565 → 1.7.567

package/backend/collectionConsts.js

@@ -7,6 +7,8 @@ const COLLECTIONS = {
     BRANDS: 'Brands',
     CUSTOM_VALUES:'CustomValues',
     CUSTOM_FIELDS:'CustomFields',
+    SITE_CONFIGS: 'SiteConfigs',
+
 }
 const JOBS_COLLECTION_FIELDS = {
   LOCATION: 'location',
@@ -86,6 +88,10 @@ const COLLECTIONS_FIELDS = {
     TEMPLATE_TYPE: [
       {key:'templateType', type: 'TEXT'},
     ],
+    SITE_CONFIGS: [
+      {key:'onlyBrandKeywordUrlParams', type: 'TEXT'},
+      {key:'customFields', type: 'TEXT'},
+    ],
     SECRET_MANAGER_MIRROR: [
       {key:'tokenName', type: 'TEXT'},
       {key:'value', type: 'TEXT'},

package/backend/data.js

@@ -9,11 +9,18 @@ const { retrieveSecretVal, getTokenFromCMS } = require('./secretsData');
 
 let jobToCustomValues = {}
 let customValuesToJobs = {}
+let siteconfig;
+const EXCLUDED_CUSTOM_FIELDS = new Set(["Country", "Department", "Brands"]);
 
 function getBrand(customField) {
   return customField.find(field => field.fieldLabel === 'Brands')?.valueLabel;
 }
 
+async function getSiteConfig() {
+  const queryresult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
+  siteconfig = queryresult.items[0];
+  console.log("siteconfig: ", siteconfig);
+}
 function validatePosition(position) {
   if (!position.id) {
     throw new Error('Position id is required');
@@ -59,10 +66,9 @@ function validateSingleDesiredBrand(desiredBrand) {
 function getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,customFieldsValues) {
   const customFieldsArray = Array.isArray(position?.customField) ? position.customField : [];
   for (const field of customFieldsArray) {
-    if(field.fieldLabel==="Country" || field.fieldLabel==="Department" || field.fieldLabel==="Brands") continue; //country and department are not custom fields, they are already in the job object
-    const label = field.fieldLabel
+    if(EXCLUDED_CUSTOM_FIELDS.has(field.fieldLabel)) continue; //country and department are not custom fields, they are already in the job object
     const fieldId=normalizeString(field.fieldId)
-    const fieldLabel = label;
+    const fieldLabel = field.fieldLabel;
     const valueId=normalizeString(field.valueId)
     const valueLabel = field.valueLabel
     customFieldsLabels[fieldId] = fieldLabel
@@ -113,9 +119,14 @@ async function saveJobsDataToCMS() {
     getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,customFieldsValues);
     return basicJob;
   });
-  
+  if(siteconfig===undefined) {
+    siteconfig = await getSiteConfig();
+  }
+  console.log("siteconfig is @#!#!@!@$##!@: ", siteconfig);
+  if (siteconfig.customFields==="true") {
   await populateCustomFieldsCollection(customFieldsLabels);
   await populateCustomValuesCollection(customFieldsValues);
+  }
   // Sort jobs by title (ascending, case-insensitive, numeric-aware)
   jobsData.sort((a, b) => {
     const titleA = a.title || '';
@@ -189,15 +200,15 @@ async function saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS() {
 
   try {
     let jobsWithNoDescriptions = await getJobsWithNoDescriptions();
-    let customValues=await getAllCustomValues();
-
-    console.log("inserting jobs references to custom values collection");
-    for (const value of customValues.items) {
-      await insertJobsReference(value._id);
+    if (siteconfig.customFields==="true") {
+      let customValues=await getAllCustomValues();
+      console.log("inserting jobs references to custom values collection");
+      for (const value of customValues.items) {
+        await insertJobsReference(value._id);
+      }
+      console.log("inserted jobs references to custom values collection successfully");
     }
-    console.log("inserted jobs references to custom values collection successfully");
-    
-
+  
     let totalUpdated = 0;
     let totalFailed = 0;
     let totalProcessed = 0;
@@ -235,7 +246,9 @@ async function saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS() {
               referFriendLink: referFriendLink,
             };
             await wixData.update(COLLECTIONS.JOBS, updatedJob);
+            if (siteconfig.customFields==="true") {
             await insertValuesReference(job._id);
+            }
             return { success: true, jobId: job._id, title: job.title };
           } catch (error) {
             console.error(`    ❌ Failed to update ${job.title} (${job._id}):`, error);

package/package.json

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

package/pages/careersPage.js

@@ -23,8 +23,13 @@ const {
   let queryJobTypeVar;
   let queryBrandVar;
   let searchInputBlurredFirstTime=true;
-  let deletedParam=false;
+  let siteconfig;
+
 async function careersPageOnReady(_$w,thisObject,queryParams) {
+if(siteconfig===undefined) {
+    siteconfig = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
+    siteconfig = siteconfig.items[0];
+}
 console.log("queryParams: ", queryParams);
 const { page, keyWord, department, location,jobType,brand } = queryParams;
 queryPageVar=page;
@@ -96,21 +101,24 @@ async function handleUrlParams(_$w) {
     if (queryKeyWordVar) {
         await handleKeyWordParam(_$w,queryKeyWordVar);
     }
-    if (queryPageVar) {
-        await handlePageParam(_$w);    
-    }
-    if (queryDepartmentVar) {
-        await handleDepartmentParam(_$w,queryDepartmentVar);
-    }
-    if (queryLocationVar) {
-        await handleLocationParam(_$w,queryLocationVar);
-    }
-    if (queryJobTypeVar) {
-        await handleJobTypeParam(_$w,queryJobTypeVar);
-    }
-    if (queryBrandVar && _$w('#dropdownBrand').isVisible) { //if it is not visible, ignore it
-        await handleBrandParam(_$w,queryBrandVar);
-    }
+
+    if (siteconfig.onlyBrandKeywordUrlParams==="true") { // it is something else that is not TWG
+        if (queryPageVar) {
+            await handlePageParam(_$w);    
+        }
+        if (queryDepartmentVar) {
+            await handleDepartmentParam(_$w,queryDepartmentVar);
+        }
+        if (queryLocationVar) {
+            await handleLocationParam(_$w,queryLocationVar);
+        }
+        if (queryJobTypeVar) {
+            await handleJobTypeParam(_$w,queryJobTypeVar);
+        }
+        if (queryBrandVar && _$w('#dropdownBrand').isVisible) { //if it is not visible, ignore it
+            await handleBrandParam(_$w,queryBrandVar);
+        }
+}
     await applyFilters(_$w, true); // Skip URL update since we're handling initial URL params
 }