sr-npm 1.7.566 → 1.7.568

package/backend/collectionConsts.js

@@ -89,7 +89,7 @@ const COLLECTIONS_FIELDS = {
       {key:'templateType', type: 'TEXT'},
     ],
     SITE_CONFIGS: [
-      {key:'urlParams', type: 'TEXT'},
+      {key:'onlyBrandKeywordUrlParams', type: 'TEXT'},
       {key:'customFields', type: 'TEXT'},
     ],
     SECRET_MANAGER_MIRROR: [

package/backend/data.js

@@ -10,6 +10,7 @@ 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;
@@ -18,6 +19,7 @@ function getBrand(customField) {
 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) {
@@ -64,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
@@ -119,8 +120,9 @@ async function saveJobsDataToCMS() {
     return basicJob;
   });
   if(siteconfig===undefined) {
-    siteconfig = await getSiteConfig();
+    await getSiteConfig();
   }
+  console.log("siteconfig is @#!#!@!@$##!@: ", siteconfig);
   if (siteconfig.customFields==="true") {
   await populateCustomFieldsCollection(customFieldsLabels);
   await populateCustomValuesCollection(customFieldsValues);

package/package.json

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

package/pages/careersPage.js

@@ -27,9 +27,10 @@ const {
 
 async function careersPageOnReady(_$w,thisObject,queryParams) {
 if(siteconfig===undefined) {
-    siteconfig = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
-    siteconfig = siteconfig.items[0];
+    const queryResult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
+    siteconfig = queryResult.items[0];
 }
+console.log("siteconfig: ", siteconfig);
 console.log("queryParams: ", queryParams);
 const { page, keyWord, department, location,jobType,brand } = queryParams;
 queryPageVar=page;
@@ -102,7 +103,7 @@ async function handleUrlParams(_$w) {
         await handleKeyWordParam(_$w,queryKeyWordVar);
     }
 
-    if (siteconfig.handleCareersUrlParams==="true") { // it is something else that is not TWG
+    if (siteconfig.onlyBrandKeywordUrlParams==="true") { // it is something else that is not TWG
         if (queryPageVar) {
             await handlePageParam(_$w);    
         }