sr-npm 1.7.520 → 1.7.525

package/backend/collectionConsts.js

@@ -23,6 +23,7 @@ const JOBS_COLLECTION_FIELDS = {
   REFER_FRIEND_LINK: 'referFriendLink',
   BRAND: 'brand',
   BRAND_REF: 'brandRef',
+  CUSTOM_FIELDS:'customFields',
 }
 const AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION_FIELDS = {
   TITLE: 'title',
@@ -69,6 +70,7 @@ const COLLECTIONS_FIELDS = {
         {key:'departmentref', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT } } },
         {key:'city', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.CITIES } } },
         {key:'brandRef', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.BRANDS } } },
+        { key: 'customFields', type: 'ARRAY' },
         { key: 'image', type: 'IMAGE' },
     ],  
     TEMPLATE_TYPE: [

package/backend/data.js

@@ -56,12 +56,12 @@ function addCustomFields(basicJob, position) {
   const customFieldsArray = Array.isArray(position?.customField) ? position.customField : [];
   const customFields = {};
   for (const field of customFieldsArray) {
-    const label = field.fieldLabel;
+    const label = field.fieldLabel==="Brands" ? "brand" : field.fieldLabel
     const key = normalizeString(label);
     const value = field.valueLabel
     customFields[key] = value;
   }
-  return { ...basicJob, customFields };
+  return { ...basicJob, ...customFields,customFieldsNames:Object.keys(customFields) };
 }
 
 async function saveJobsDataToCMS() {
@@ -92,8 +92,8 @@ async function saveJobsDataToCMS() {
      // brand: getBrand(position.customField),
       jobDescription: null, // Will be filled later
     };
-    basicJob=addCustomFields(basicJob,position)
-    return basicJob;
+    
+    return addCustomFields(basicJob,position)
   });
 
   // Sort jobs by title (ascending, case-insensitive, numeric-aware)

package/backend/queries.js

@@ -18,7 +18,16 @@ async function getPositionsByField(field, value) {
     .then(result => result.items);
 }
 
+async function getCutomFieldKeys() {
+  return wixData
+    .query(COLLECTIONS.JOBS)
+    .limit(1)
+    .find()
+    .then(result => result.items.customFieldsNames);
+}
+
 module.exports = {
   getAllPositions,
   getPositionsByField,
+  getCutomFieldKeys
 };

package/package.json

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

package/pages/careersPage.js

@@ -1,4 +1,4 @@
-const { getAllPositions } = require('../backend/queries');
+const { getAllPositions,getCutomFieldKeys } = require('../backend/queries');
 const {wixData} = require('wix-data');
 const { window } = require('@wix/site-window');
 const { query,queryParams,onChange} = require("wix-location-frontend");
@@ -22,17 +22,12 @@ const {
   let queryLocationVar;
   let queryJobTypeVar;
   let queryBrandVar;
+  let queryCustomFields;
   let searchInputBlurredFirstTime=true;
   let deletedParam=false;
 async function careersPageOnReady(_$w,thisObject,queryParams) {
 console.log("queryParams: ", queryParams);
-const { page, keyWord, department, location,jobType,brand } = queryParams;
-queryPageVar=page;
-queryKeyWordVar=keyWord;
-queryDepartmentVar=department;
-queryLocationVar=location;
-queryJobTypeVar=jobType;
-queryBrandVar=brand;
+await retrieveQueryParams(queryParams);
 thisObjectVar=thisObject;
 allJobs=await getAllPositions();
 await activateAutoLoad(_$w);
@@ -44,7 +39,23 @@ await handleUrlParams(_$w);
 
 }
 
-  
+async function retrieveQueryParams(queryParams){
+const { page, keyWord, department, location,jobType,brand } = queryParams;
+queryPageVar=page;
+queryKeyWordVar=keyWord;
+queryDepartmentVar=department;
+queryLocationVar=location;
+queryJobTypeVar=jobType;
+queryBrandVar=brand;
+const customFieldKeys=await getCutomFieldKeys()
+console.log(customFieldKeys)
+for(const customFieldKey of customFieldKeys)
+{
+    queryCustomFields[customFieldKey]=queryParams[customFieldKey]
+}
+console.log("queryCustomFields",queryCustomFields)
+}
+
 function activateAutoLoad(_$w)
 {
     _$w("#jobsDataset").onReady(() => {