sr-npm 1.7.666 → 1.7.668

package/backend/careersMultiBoxesPageIds.js

@@ -3,6 +3,8 @@ const CAREERS_MULTI_BOXES_PAGE_CONSTS={
     JOBS_REPEATER: '#jobsReapter',
     JOBS_REPEATER_ITEM_TITLE: '#jobTitle',
     JOBS_REPEATER_ITEM_LOCATION: '#locationLabel',
+    JOBS_REPEATER_ITEM_EMPLOYMENT_TYPE: '#employmentTypeLabel',
+    TotalJobsCountText: '#totalJobsCountText',
     FILTER_LABEL: '#FilterTextInput',
     FILTER_CHECKBOX_CONTAINER: '#FilterCheckBoxContainer',
     FILTER_REPEATER_ITEM_CHECKBOX: '#filterCheckBox',

package/backend/collectionConsts.js

@@ -28,6 +28,7 @@ const JOBS_COLLECTION_FIELDS = {
   BRAND: 'brand',
   BRAND_REF: 'brandRef',
   MULTI_REF_JOBS_CUSTOM_VALUES: 'multiRefJobsCustomValues',
+  EMPLOYMENT_TYPE: 'employmentType',
 }
 const AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION_FIELDS = {
   TITLE: 'title',
@@ -87,7 +88,8 @@ 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: 'image', type: 'IMAGE' },
+        {key: 'image', type: 'IMAGE' },
+        {key:'employmentType', type: 'TEXT'},
     ],  
     TEMPLATE_TYPE: [
       {key:'templateType', type: 'TEXT'},

package/backend/data.js

@@ -7,7 +7,7 @@ const { getAllPositions } = require('./queries');
 const { retrieveSecretVal, getTokenFromCMS } = require('./secretsData');
 
 
-//let jobToCustomValues = {}
+
 let customValuesToJobs = {}
 let locationToJobs = {}
 let siteconfig;
@@ -73,7 +73,6 @@ function getEmploymentType(position,customFieldsValues) {
     customFieldsValues["employmentType"] = {};
   }
   customFieldsValues["employmentType"][position.typeOfEmployment.id] = position.typeOfEmployment.label;
-  //jobToCustomValues[position.id] ? jobToCustomValues[position.id].push(position.typeOfEmployment.id) : jobToCustomValues[position.id]=[position.typeOfEmployment.id]
   customValuesToJobs[position.typeOfEmployment.id] ? customValuesToJobs[position.typeOfEmployment.id].push(position.id) : customValuesToJobs[position.typeOfEmployment.id]=[position.id]
 }
 
@@ -92,7 +91,6 @@ function getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,custom
     }
     customFieldsValues[fieldId][valueId] = valueLabel;
 
-    //jobToCustomValues[position.id] ? jobToCustomValues[position.id].push(valueId) : jobToCustomValues[position.id]=[valueId]
     customValuesToJobs[valueId] ? customValuesToJobs[valueId].push(position.id) : customValuesToJobs[valueId]=[position.id]
   }
 }
@@ -127,6 +125,7 @@ async function saveJobsDataToCMS() {
       language: position.language?.label || '',
       brand: getBrand(position.customField),
       jobDescription: null, // Will be filled later
+      employmentType: position.typeOfEmployment.label
     };
 
     getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,customFieldsValues);
@@ -218,6 +217,8 @@ async function saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS() {
     if (siteconfig.customFields==="true") {
       let customValues=await getAllCustomValues();
       console.log("inserting jobs references to custom values collection");
+      console.log("customValues: ",customValues)
+      console.log("customValues.items: ",customValues.items)
       for (const value of customValues.items) {
         await insertJobsReference(value._id);
       }

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -25,9 +25,49 @@ async function careersMultiBoxesPageOnReady(_$w) {
     }
     
     await  loadJobs(_$w);
-    await loadFilters(_$w);
+  //  await loadFilters(_$w);
     //selected values repeater on item ready
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER).onItemReady(($item, itemData) => {
+    //await loadSelectedValuesRepeater(_$w);
+    // _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER).onItemReady(($item, itemData) => {
+    //     $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER_ITEM_LABEL).text = itemData.label || '';
+    
+    //     // Deselect this value from both the selected map and the multibox
+    //       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.DESELECT_BUTTON_ID).onClick(async () => {
+            
+    //         const fieldId = itemData.fieldId;
+    //         const valueId = itemData.valueId;
+    //         dontUpdateThisCheckBox=fieldId;
+    //         if (!fieldId || !valueId) return;
+    
+    //         const existing = selectedByField.get(fieldId) || [];
+    //         const updated = existing.filter(v => v !== valueId);
+    //         if (updated.length) {
+    //           selectedByField.set(fieldId, updated);
+    //         } else {
+    //           selectedByField.delete(fieldId);
+    //         }
+    
+    //         // Update the checkbox group UI inside the corresponding filter item
+    //         _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.FILTER_REPEATER).forEachItem(($filterItem, filterItemData) => {
+    //           if (filterItemData._id === fieldId) {
+    //             const currentVals = $filterItem(CAREERS_MULTI_BOXES_PAGE_CONSTS.FILTER_REPEATER_ITEM_CHECKBOX).value || [];
+    //             const nextVals = currentVals.filter(v => v !== valueId);
+    //             $filterItem(CAREERS_MULTI_BOXES_PAGE_CONSTS.FILTER_REPEATER_ITEM_CHECKBOX).value = nextVals;
+    //           }
+    //         });
+    
+    //         await applyJobFilters(_$w,fieldId);
+    //         await refreshFacetCounts(_$w);
+    //         await updateSelectedValuesRepeater(_$w);
+    //         updateTotalJobsCountText(_$w);
+    //       });
+    // });
+    // await updateSelectedValuesRepeater(_$w);
+   
+}
+
+async function loadSelectedValuesRepeater(_$w) {
+       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER).onItemReady(($item, itemData) => {
         $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER_ITEM_LABEL).text = itemData.label || '';
     
         // Deselect this value from both the selected map and the multibox
@@ -62,20 +102,21 @@ async function careersMultiBoxesPageOnReady(_$w) {
           });
     });
     await updateSelectedValuesRepeater(_$w);
-   
 }
 
 async function loadJobs(_$w) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).onItemReady(($item, itemData) => {
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_TITLE).text = itemData.title || '';
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_LOCATION).text=itemData.location.fullLocation
+      $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_EMPLOYMENT_TYPE).text=itemData.employmentType
     });
+    console.log("alljobs: ",alljobs)
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = alljobs;
     updateTotalJobsCountText(_$w);
   }
 
   function updateTotalJobsCountText(_$w) {
-    _$w('#totalJobsCountText').text = `${currentJobs.length} Jobs`;
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.TotalJobsCountText).text = `${currentJobs.length} Jobs`;
     
   }
 
@@ -237,19 +278,8 @@ async function loadJobs(_$w) {
     let tempFilteredJobs=[];
     let finalFilteredJobs=alljobs;
     let addedJobsIds=[]
-    // if(filterByField!="Location") {
-    //   filterByField=JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES;
-    // }
-    // else{
-    //     filterByField=JOBS_COLLECTION_FIELDS.CITY_TEXT;
-    // }
-    console.log("filterByField: ",filterByField)
-  
-    console.log("selectedByField: ",selectedByField)
     // AND across categories, OR within each category
     for (const [key, values] of selectedByField.entries()) {
-        console.log("key: ",key)
-        console.log("values: ",values)
         for(job of finalFilteredJobs) {
             if(key==="Location"){
                 //if it is location then we check if selecred values (which is an array) have job city text