sr-npm 3.1.27 → 3.1.29

package/backend/careersMultiBoxesPageIds.js

@@ -46,6 +46,7 @@ const TWG_JOBS_COLLECTION_FIELDS={
 }
 
 const CATEGORY_CUSTOM_FIELD_ID_IN_CMS='5cd8c873c9e77c0008aa7d23';
+const COMPANY_SEGMENT_CUSTOM_FIELD_ID_IN_CMS='5cd8c7ebc9e77c00072d8bc7';
 
 // used for filters - don't add anything else here
 const fieldTitlesInCMS={
@@ -88,6 +89,7 @@ module.exports = {
     FiltersIds,
     fieldTitlesInCMS,   
     CATEGORY_CUSTOM_FIELD_ID_IN_CMS,
+    COMPANY_SEGMENT_CUSTOM_FIELD_ID_IN_CMS,
     possibleUrlParams,
     TWG_JOBS_COLLECTION_FIELDS,
     PRIMARY_SEARCH_STATES,

package/backend/consts.js

@@ -68,7 +68,7 @@ const TASKS = {
       getIdentifier:()=>"SHOULD_NEVER_SKIP",
       process:syncJobsFast,
       shouldSkipCheck:()=>false,
-      estimatedDurationSec:60
+      estimatedDurationSec:120
     }
 }
 

package/backend/data.js

@@ -16,6 +16,8 @@ const { chunkedBulkOperation,
 let customValuesToJobs = {}
 let locationToJobs = {}
 let siteconfig;
+let customFieldsLabels = {}
+let customFieldsValues = {}
 const EXCLUDED_CUSTOM_FIELDS = new Set(["Department","Country"]);
 
 function getBrand(customField) {
@@ -114,11 +116,9 @@ function getCustomFieldsAndValuesFromPosition(position, customFieldsLabels, cust
   }
 }
 
-async function saveJobsDataToCMS() {
+async function retrieveJobsData() {
   const positions = await fetchPositionsFromSRAPI();
   const sourcePositions = await filterBasedOnBrand(positions);
-  const customFieldsLabels = {}
-  const customFieldsValues = {}
   
   const { templateType } = await getApiKeys();
   if(siteconfig===undefined) {
@@ -164,10 +164,6 @@ async function saveJobsDataToCMS() {
       return basicJob;
   });
 
-  if (siteconfig.customFields==="true") {
-    await populateCustomFieldsCollection(customFieldsLabels,templateType);
-    await populateCustomValuesCollection(customFieldsValues);
-  }
 
   // Sort jobs by title (ascending, case-insensitive, numeric-aware)
   jobsData.sort((a, b) => {
@@ -175,35 +171,7 @@ async function saveJobsDataToCMS() {
     const titleB = b.title || '';
     return titleA.localeCompare(titleB, undefined, { sensitivity: 'base', numeric: true });
   });
-
-  const chunkSize = 1000;
-  let totalSaved = 0;
-  const totalChunks = Math.ceil(jobsData.length / chunkSize);
-
-  console.log(
-    `Processing ${jobsData.length} jobs in ${totalChunks} chunks of max ${chunkSize} items each`
-  );
-  console.log("truncating jobs collection");
-  await wixData.truncate(COLLECTIONS.JOBS);
-  await chunkedBulkOperation({
-    items: jobsData,
-    chunkSize,
-    processChunk: async (chunk, chunkNumber) => {
-      console.log(`Saving chunk ${chunkNumber}/${totalChunks}: ${chunk.length} jobs`);
-      try {
-        const result = await wixData.bulkSave(COLLECTIONS.JOBS, chunk);
-        const saved = result.inserted + result.updated || chunk.length;
-        totalSaved += saved;
-        console.log(
-          `✓ Chunk ${chunkNumber} saved successfully. Inserted: ${result.inserted}, Updated: ${result.updated}`
-        );
-      } catch (error) {
-        console.error(`✗ Error saving chunk ${chunkNumber}:`, error);
-        throw error;
-      }
-    },
-  });
-  console.log(`✓ All chunks processed. Total jobs saved: ${totalSaved}/${jobsData.length}`);
+  return jobsData;
 }
 
 async function insertJobsReference(id, valueId) {
@@ -222,6 +190,7 @@ async function populateCustomFieldsCollection(customFields,templateType) {
       _id: ID,
     })
   }
+
   await wixData.bulkSave(COLLECTIONS.CUSTOM_FIELDS, fieldstoinsert);
 }
 async function populateCustomValuesCollection(customFieldsValues) {
@@ -243,51 +212,16 @@ async function populateCustomValuesCollection(customFieldsValues) {
   await wixData.bulkSave(COLLECTIONS.CUSTOM_VALUES, valuesToinsert);
 }
 
-async function saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS() {
+async function retrieveJobsDescriptionsAndLocationApplyUrlReferences(jobsWithNoDescriptions) {
   console.log('🚀 Starting job descriptions update process for ALL jobs');
 
   try {
-    let jobsWithNoDescriptions = await getJobsWithNoDescriptions();
-
-    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, value.valueId);
-      }
-      console.log("inserted jobs references to custom values collection successfully");
-    }
   
-    let totalUpdated = 0;
-    let totalFailed = 0;
-    let totalProcessed = 0;
-
-    console.log(
-      `Total jobs in database without descriptions:  ${jobsWithNoDescriptions?.items?.length}`
-    );
-
-    if (jobsWithNoDescriptions.items.length === 0) {
-      console.log('No jobs found in database');
-      return { success: true, message: 'No jobs found' };
-    }
-
-
-    const API_CHUNK_SIZE = 80;
-    const pageChunks = Math.ceil(jobsWithNoDescriptions.items.length / API_CHUNK_SIZE);
     const richContentConverterToken = await getTokenFromCMS(TOKEN_NAME.RICH_CONTENT_CONVERTER_TOKEN);
-    await chunkedBulkOperation({
-      items: jobsWithNoDescriptions.items,
-      chunkSize: API_CHUNK_SIZE,
-      processChunk: async (chunk, chunkNumber) => {
-        console.log(`  Processing API chunk ${chunkNumber}/${pageChunks} (${chunk.length} jobs)`);
-        const chunkPromises = chunk.map(async job => {
-          try {
-            const jobDetails = await fetchJobDescription(job._id);
-            const richContentDescription=await htmlRichContentConverter(jobDetails.jobAd.sections,richContentConverterToken);
+
+    const jobsWithDescriptions=await Promise.all(jobsWithNoDescriptions.map( async job => {
+      const jobDetails =  await fetchJobDescription(job._id);
+            const richContentDescription= await htmlRichContentConverter(jobDetails.jobAd.sections,richContentConverterToken);
             const jobLocation = fetchJobLocation(jobDetails);
             const {applyLink , referFriendLink} = fetchApplyAndReferFriendLink(jobDetails);
             const updatedJob = {
@@ -297,40 +231,10 @@ async function saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS() {
               applyLink: applyLink,
               referFriendLink: referFriendLink,
             };
-            await wixData.update(COLLECTIONS.JOBS, updatedJob);
-            return { success: true, jobId: job._id, title: job.title };
-          } catch (error) {
-            console.error(`    ❌ Failed to update ${job.title} (${job._id}):`, error);
-            return { success: false, jobId: job._id, title: job.title, error: error.message };
-          }
-        });
-        const chunkResults = await Promise.all(chunkPromises);
-        const chunkSuccesses = chunkResults.filter(r => r.success).length;
-        const chunkFailures = chunkResults.filter(r => !r.success).length;
-        totalUpdated += chunkSuccesses;
-        totalFailed += chunkFailures;
-        totalProcessed += chunk.length;
-        console.log(
-          `  API chunk ${chunkNumber} completed: ${chunkSuccesses} success, ${chunkFailures} failed`
-        );
-      },
-    });
+            return updatedJob;
+    }))
+    return {success: true, updatedJobs: jobsWithDescriptions};
 
-
-
-    console.log(`\n✅ Finished updating ALL job descriptions`);
-    console.log(`📊 Final Results:`);
-    console.log(`   Total jobs processed: ${totalProcessed}`);
-    console.log(`   Total updated: ${totalUpdated}`);
-    console.log(`   Total failed: ${totalFailed}`);
-
-    return {
-      success: true,
-      totalProcessed: totalProcessed,
-      totalUpdated: totalUpdated,
-      totalFailed: totalFailed,
-      message: `Successfully updated ${totalUpdated} job descriptions out of ${totalProcessed} total jobs`,
-    };
   } catch (error) {
     console.error('❌ Error in updateJobDescriptions:', error);
     throw error;
@@ -375,14 +279,7 @@ async function getAllCustomValues() {
   return customValuesQuery;
 }
 
-async function getJobsWithNoDescriptions() {
-  let jobswithoutdescriptionsQuery = await wixData
-    .query(COLLECTIONS.JOBS)
-    .limit(1000)
-    .isEmpty('jobDescription')
-    .find();
-  return jobswithoutdescriptionsQuery;
-}
+
 
 /**
  * @param {Object} params
@@ -507,20 +404,45 @@ async function syncJobsFast() {
   try{
   console.log("Syncing jobs fast");
   await createCollections();
-  await clearCollections();
+  
   await fillSecretManagerMirror();
 
-  console.log("saving jobs data to CMS");
-  await saveJobsDataToCMS();
-  console.log("saved jobs data to CMS successfully");
+  console.log("retrieving jobs data from SR API");
+  
+  const jobsData = await retrieveJobsData();
+
+  console.log("retrieved jobs data from SR API successfully");
   
-  console.log("saving jobs descriptions and location apply url to CMS");
-  await saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS();
+  console.log("retrieving jobs descriptions and location apply url from SR API");
+
+  const status=await retrieveJobsDescriptionsAndLocationApplyUrlReferences(jobsData);
+  if(status.success){
+    
+    await clearCollections();
+    const updatedJobs=status.updatedJobs;
+    
+    if (siteconfig.customFields==="true") {
+      const { templateType } = await getApiKeys();
+      console.log("populating custom fields and values collections");
+      await populateCustomFieldsCollection(customFieldsLabels,templateType);
+      await populateCustomValuesCollection(customFieldsValues);
+      console.log("populated custom fields and values collections successfully");
+    }
+    console.log("saving jobs to CMS");
+    await saveJobsToCMS(updatedJobs);
+    console.log("saved jobs to CMS successfully");
+
+  if (siteconfig.customFields==="true") {
+    await insertJobsReferencesToCustomValuesCollection();
+  }
+  }
+  console.log("saved jobs data, descriptions and location apply url to CMS successfully");
 
-  console.log("saved jobs descriptions and location apply url to CMS successfully");
   await aggregateJobs();
   await referenceJobs();
+
   console.log("syncing jobs fast finished successfully");
+
   }
   catch (error) {
     error.message="Error syncing jobs: "+error.message;
@@ -529,7 +451,47 @@ async function syncJobsFast() {
   
 }
 
+async function saveJobsToCMS(updatedJobs) {
+
+  const chunkSize = 1000;
+  let totalSaved = 0;
+  const totalChunks = Math.ceil(updatedJobs.length / chunkSize);
 
+  console.log(
+    `Processing ${updatedJobs.length} jobs in ${totalChunks} chunks of max ${chunkSize} items each`
+  );
+  
+  await chunkedBulkOperation({
+    items: updatedJobs,
+    chunkSize,
+    processChunk: async (chunk, chunkNumber) => {
+      console.log(`Saving chunk ${chunkNumber}/${totalChunks}: ${chunk.length} jobs`);
+      try {
+        const result = await wixData.bulkSave(COLLECTIONS.JOBS, chunk);
+        const saved = result.inserted + result.updated || chunk.length;
+        totalSaved += saved;
+        console.log(
+          `✓ Chunk ${chunkNumber} saved successfully. Inserted: ${result.inserted}, Updated: ${result.updated}`
+        );
+      } catch (error) {
+        console.error(`✗ Error saving chunk ${chunkNumber}:`, error);
+        throw error;
+      }
+    },
+  });
+  console.log(`✓ All chunks processed. Total jobs saved: ${totalSaved}/${updatedJobs.length}`);
+}
+
+async function insertJobsReferencesToCustomValuesCollection() {
+  console.log("inserting jobs references to custom values collection");
+
+    let customValues = await getAllCustomValues();
+
+    for (const value of customValues.items) {
+      await insertJobsReference(value._id, value.valueId);
+    }
+    console.log("inserted jobs references to custom values collection successfully");
+}
 async function clearCollections() {
   console.log("clearing collections");
   if(siteconfig===undefined) {
@@ -538,8 +500,8 @@ async function clearCollections() {
   await Promise.all([
     wixData.truncate(COLLECTIONS.CITIES),
     wixData.truncate(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT),
-    wixData.truncate(COLLECTIONS.JOBS),
     wixData.truncate(COLLECTIONS.BRANDS),
+    wixData.truncate(COLLECTIONS.JOBS),
     siteconfig.customFields==="true" ? wixData.truncate(COLLECTIONS.CUSTOM_VALUES) : null,
     siteconfig.customFields==="true" ? wixData.truncate(COLLECTIONS.CUSTOM_FIELDS) : null,
   ]);
@@ -589,8 +551,8 @@ module.exports = {
   referenceJobs,
   aggregateJobs,
   createCollections,
-  saveJobsDataToCMS,
-  saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS,
+  saveJobsDataToCMS: retrieveJobsData,
+  saveJobsDescriptionsAndLocationApplyUrlReferencesToCMS: retrieveJobsDescriptionsAndLocationApplyUrlReferences,
   aggregateJobsByFieldToCMS,
   referenceJobsToField,
   fillSecretManagerMirror,

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -40,6 +40,7 @@ let secondarySearchIsFilled=false // whether the secondary search is filled with
 let keywordAllJobs; // all jobs that are displayed in the jobs repeater when the keyword is filled
 let ActivateURLOnchange=true; // whether to activate the url onchange
 let considerAllJobs=false; // whether to consider all jobs or not
+let collapseFilterBoxWhenWindowReduced=false; // whether to collapse the filter box when the window is reduced
 const pagination = {
   pageSize: 10,
   currentPage: 1,
@@ -64,10 +65,10 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
     });
     
     handleFilterButton(_$w);
-
     setInterval(async () => {
       const windowinfo=await window.getBoundingRect();
       if(windowinfo.window.width>1000){
+        
         handleWindowResize(_$w,true);
       }
       else{
@@ -80,6 +81,7 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
 
 async function handleWindowResize(_$w,desktop=false) {
   if(desktop){
+    collapseFilterBoxWhenWindowReduced=true;
   MOBILE_FILTER_BOX_SELECTORS.forEach(selector => {
     _$w(selector).expand();
   });
@@ -91,9 +93,15 @@ async function handleWindowResize(_$w,desktop=false) {
   _$w(CAREERS_PAGE_SELECTORS.REFINE_SEARCH_BUTTON).collapse();
 }
 else{
+  const formFactor = await window.formFactor();
+  if(formFactor==="Desktop" && collapseFilterBoxWhenWindowReduced){
+    _$w(CAREERS_PAGE_SELECTORS.FILTER_BOX).collapse();
+    collapseFilterBoxWhenWindowReduced=false;
+  }
   if(_$w(CAREERS_PAGE_SELECTORS.FILTER_ICON).collapsed && _$w(CAREERS_PAGE_SELECTORS.EXIT_BUTTON).collapsed && _$w(CAREERS_PAGE_SELECTORS.REFINE_SEARCH_BUTTON).collapsed){
     _$w(CAREERS_PAGE_SELECTORS.FILTER_ICON).expand();
   }
+  
 }
   
 }
@@ -178,6 +186,10 @@ async function handleFilterButton(_$w) {
     _$w(selector).collapse();
   });
 }
+else
+{
+  collapseFilterBoxWhenWindowReduced=true
+}
 
 }
 

package/pages/positionPage.js

@@ -5,13 +5,34 @@ const { TWG_JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPage
 const { items: wixData } = require('@wix/data');
 const { location } = require("@wix/site-location");
 const{isElementExistOnPage} = require('psdev-utils');
+const { COMPANY_SEGMENT_CUSTOM_FIELD_ID_IN_CMS } = require('../backend/careersMultiBoxesPageIds');
 const {
     appendQueryParams
   } = require('../public/utils');
   
   
+  let siteconfig;
+  let multiRefField;
   async function positionPageOnReady(_$w) {
-    console.log("positionPageOnReady called");
+    if(siteconfig===undefined) {
+     siteconfig = await wixData.query(COLLECTIONS.SITE_CONFIGS).find().then(result => result.items[0]);
+    }
+    const item = await _$w('#datasetJobsItem').getCurrentItem();
+    
+    if(siteconfig.customFields==="true") {
+      multiRefField=await getPositionWithMultiRefField(item._id);
+    
+      
+      const companysegmentValue=multiRefField.filter(field => field.customField===COMPANY_SEGMENT_CUSTOM_FIELD_ID_IN_CMS && field.title===siteconfig.showNotifyMeForCompanySegment);
+      
+      if(companysegmentValue===undefined || companysegmentValue.length===0) {
+       
+       _$w("#notifyMe").hide()
+       console.log(`companysegmentValue is ${siteconfig.showNotifyMeForCompanySegment}, hiding notifyMe`);
+      }
+ 
+ 
+      }
     await bind(_$w);
     
 
@@ -35,6 +56,8 @@ async function getCategoryValue(customValues) {
         const item = await _$w('#datasetJobsItem').getCurrentItem();
      console.log("item: ",item);
 
+
+
         handleReferFriendButton(_$w,item);
         handleApplyButton(_$w,item);
 
@@ -49,9 +72,7 @@ async function getCategoryValue(customValues) {
         if(isElementExistOnPage(_$w('#relatedJobsRepNoDepartment'))) // when there is no department, we filter based on category
         {
           
-            const multiRefField=await getPositionWithMultiRefField(item._id);
-            const categoryValue=await getCategoryValue(multiRefField);
-            
+            const categoryValue=await getCategoryValue(multiRefField);  
             if(isElementExistOnPage(_$w('#jobCategory'))) {
               _$w('#jobCategory').text = categoryValue.title;
             }