sr-npm 1.7.887 → 1.7.888

package/backend/careersMultiBoxesPageIds.js

@@ -36,6 +36,7 @@ const CATEGORY_CUSTOM_FIELD_ID_IN_CMS='5cd8c873c9e77c0008aa7d23';
 const fieldTitlesInCMS={
     "brand": "Brands",
     category: "Category",
+    visibility: "Visibility",
 }
 
 const FiltersIds={
@@ -46,6 +47,7 @@ const FiltersIds={
     "Employment Type": 'employmentType',
    "Contract Type": 'contractType',
    Brands: 'Brands',
+   Visibility: 'Visibility',
 }
 
 

package/backend/collectionConsts.js

@@ -41,7 +41,7 @@ const CUSTOM_VALUES_COLLECTION_FIELDS = {
   TITLE: 'title',
   CUSTOM_FIELD: 'customField',
   MULTI_REF_JOBS_CUSTOM_VALUES: 'multiRefJobsCustomValues',
-  count: 'count',
+  TOTAL_JOBS: 'totalJobs',
   JOB_IDS: 'jobIds',
 }
 const CUSTOM_FIELDS_COLLECTION_FIELDS = {
@@ -112,7 +112,7 @@ const COLLECTIONS_FIELDS = {
     CUSTOM_VALUES: [
       {key:'title', type: 'TEXT'},
       {key:'customField', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.CUSTOM_FIELDS } } },
-      {key:'count', type: 'NUMBER'},
+      {key:'totalJobs', type: 'NUMBER'},
       {key:'multiRefJobsCustomValues', type: 'MULTI_REFERENCE', typeMetadata: { multiReference: { referencedCollectionId: COLLECTIONS.JOBS,referencingFieldKey:CUSTOM_VALUES_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES,referencingDisplayName:CUSTOM_VALUES_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES } } },
       {key:'jobIds', type: 'ARRAY'},
     ],

package/backend/consts.js

@@ -107,8 +107,11 @@ const supportTeamsPageIds={
         "Commercial":"CommercialSales",// this field doesnt exists in the database
     }
 }
-
-
+const LINKS={
+  myApplication:'https://www.smartrecruiters.com/app/employee-portal/68246e5512d84f4c00a19e62/job-applications',
+  myReferrals:'https://www.smartrecruiters.com/app/referrals/',
+  login:'https://www.smartrecruiters.com/web-sso/saml/${companyId}/login',
+}
 
   module.exports = {
     TASKS_NAMES,
@@ -116,4 +119,5 @@ const supportTeamsPageIds={
     TASKS,
     QUERY_MAX_LIMIT,
     supportTeamsPageIds,
+    LINKS,
 };

package/backend/data.js

@@ -4,7 +4,7 @@ const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend
 const { COLLECTIONS, COLLECTIONS_FIELDS,JOBS_COLLECTION_FIELDS,TEMPLATE_TYPE,TOKEN_NAME,CUSTOM_VALUES_COLLECTION_FIELDS } = require('./collectionConsts');
 const { chunkedBulkOperation, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeString} = require('./utils');
 const { getAllPositions } = require('./queries');
-const { retrieveSecretVal, getTokenFromCMS } = require('./secretsData');
+const { retrieveSecretVal, getTokenFromCMS ,getApiKeys} = require('./secretsData');
 
 
 
@@ -68,6 +68,16 @@ function getLocation(position,basicJob) {
   locationToJobs[basicJob.cityText] ? locationToJobs[basicJob.cityText].push(position.id) : locationToJobs[basicJob.cityText]=[position.id]
 
 }
+function getVisibility(position,customFieldsValues) {
+  if (!customFieldsValues["Visibility"]) {
+    customFieldsValues["Visibility"] = {};
+  }
+  let visibility;
+  position.visibility.toLowerCase()==="public"? visibility="external" : visibility="internal";
+  customFieldsValues["Visibility"][visibility] = visibility;
+  customValuesToJobs[visibility] ? customValuesToJobs[visibility].push(position.id) : customValuesToJobs[visibility]=[position.id]
+}
+
 function getEmploymentType(position,customFieldsValues) {
   if (!customFieldsValues["employmentType"]) {
     customFieldsValues["employmentType"] = {};
@@ -99,6 +109,8 @@ async function saveJobsDataToCMS() {
   const sourcePositions = await filterBasedOnBrand(positions);
   const customFieldsLabels = {}
   const customFieldsValues = {}
+  
+  const {companyId,templateType} = await getApiKeys();
 
   // bulk insert to jobs collection without descriptions first
   const jobsData = sourcePositions.map(position => {
@@ -126,12 +138,16 @@ async function saveJobsDataToCMS() {
       brand: getBrand(position.customField),
       jobDescription: null, // Will be filled later
       employmentType: position.typeOfEmployment.label,
-      releasedDate: position.releasedDate 
+      releasedDate: position.releasedDate
     };
 
     getCustomFieldsAndValuesFromPosition(position,customFieldsLabels,customFieldsValues);
     getEmploymentType(position,customFieldsValues);
     getLocation(position,basicJob);
+    if(templateType===TEMPLATE_TYPE.INTERNAL){
+     getVisibility(position,customFieldsValues);
+    }
+
     return basicJob;
   });
   if(siteconfig===undefined) {
@@ -183,8 +199,9 @@ async function insertJobsReference(valueId) {
 }
 
 async function populateCustomFieldsCollection(customFields) {
-  fieldstoinsert=[]
+  let fieldstoinsert=[]
   customFields["employmentType"] = "Employment Type";
+  customFields["Visibility"] = "Visibility";
   for(const ID of Object.keys(customFields)){
     fieldstoinsert.push({
       title: customFields[ID],
@@ -202,7 +219,7 @@ async function populateCustomValuesCollection(customFieldsValues) {
         _id: valueId,
         title: valuesMap[valueId],
         customField: fieldId,
-        count:customValuesToJobs[valueId].length,
+        totalJobs:customValuesToJobs[valueId].length,
         jobIds:customValuesToJobs[valueId],
       })
     }

package/backend/index.js

@@ -5,4 +5,5 @@ module.exports = {
   ...require('./consts'),
   ...require('./data'),
   ...require('./careersMultiBoxesPageIds'),
+  ...require ('./secretsData'),
 };

package/backend/secretsData.js

@@ -4,7 +4,7 @@ const { items: wixData } = require('@wix/data');
 const { COLLECTIONS,TOKEN_NAME } = require('./collectionConsts');
 
 const getSecretValue = auth.elevate(secrets.getSecretValue);
-
+const elevatedQuery = auth.elevate(wixData.query);
 
   async function retrieveSecretVal(tokenName)
   {
@@ -20,7 +20,7 @@ const getSecretValue = auth.elevate(secrets.getSecretValue);
   }
 
   async function getTokenFromCMS(tokenName) {
-    const result = await wixData.query(COLLECTIONS.SECRET_MANAGER_MIRROR).eq('tokenName',tokenName).find();
+    const result = await elevatedQuery(COLLECTIONS.SECRET_MANAGER_MIRROR).eq('tokenName',tokenName).find();
     if (result.items.length > 0) {
         return result.items[0].value; 
     } else {
@@ -28,7 +28,7 @@ const getSecretValue = auth.elevate(secrets.getSecretValue);
     }
   }
   async function getTemplateTypeFromCMS() {
-    const result = await wixData.query(COLLECTIONS.TEMPLATE_TYPE).limit(1).find();
+    const result = await elevatedQuery(COLLECTIONS.TEMPLATE_TYPE).limit(1).find();
     if (result.items.length > 0) {
         return result.items[0].templateType; 
     } else {

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -21,7 +21,6 @@ const pagination = {
   currentPage: 1,
 };
 async function careersMultiBoxesPageOnReady(_$w,urlParams) {
-    console.log("careersMultiBoxesPageOnReady urlParams: ", urlParams);
     await loadData(_$w);
 
     await Promise.all([
@@ -40,7 +39,6 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
 }
 
 async function clearAll(_$w) {
-  console.log("clear all button clicked");
   if(selectedByField.size>0 || _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).value || _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value) {
     for(const field of allfields) {
       _$w(`#${FiltersIds[field.title]}CheckBox`).selectedIndices = [];
@@ -58,10 +56,12 @@ async function handleUrlParams(_$w,urlParams) {
   try { 
   let applyFiltering=false;
   let keyword=false
-  console.log("handleUrlParams urlParams: ", urlParams);
     if(urlParams.brand) {
       applyFiltering=await handleParams(_$w,"brand",urlParams.brand)
     }
+    if(urlParams.visibility) {
+      applyFiltering=await handleParams(_$w,"visibility",urlParams.visibility)
+    }
     if(urlParams.category) {
       applyFiltering=await handleParams(_$w,"category",urlParams.category)
     }
@@ -71,7 +71,6 @@ async function handleUrlParams(_$w,urlParams) {
       keyword=true;
       if(applyFiltering)
       {
-        console.log("delete me")
         currentJobs=_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
       }
       
@@ -105,12 +104,9 @@ async function handleUrlParams(_$w,urlParams) {
 
 async function handleParams(_$w,param,value) {
   let applyFiltering=false;
-  console.log("handleParams param: ", param, " value: ", value);
        const decodedValue = decodeURIComponent(value);
-       console.log("decodedValue: ", decodedValue);
       const field=getFieldByTitle(fieldTitlesInCMS[param],allfields);
       const options=optionsByFieldId.get(field._id);
-      console.log("all options availbe for this field: ", field.title, " are ", options);
       const option=getCorrectOption(decodedValue,options);
       if(option) {
        const optionIndex=getOptionIndexFromCheckBox(_$w(`#${FiltersIds[field.title]}CheckBox`).options,option.value);
@@ -238,7 +234,6 @@ async function loadJobsRepeater(_$w) {
       // 2) Load all values once and group them by referenced field
       let valuesByFieldId = groupValuesByField(allvaluesobjects, CUSTOM_VALUES_COLLECTION_FIELDS.CUSTOM_FIELD);
       valuesByFieldId.set("Location",cities)
-
           // Build CheckboxGroup options for this field
         
       const counter={}
@@ -260,14 +255,13 @@ async function loadJobsRepeater(_$w) {
 
         optionsByFieldId.set(key, originalOptions);
         for (const val of allvaluesobjects) {
-          counter[val.title]=val.count
+          counter[val.title]=val.totalJobs
         }
 
         countsByFieldId.set(key, new Map(originalOptions.map(o => [o.value, counter[o.label]])));
         updateOptionsUI(_$w,field.title, field._id, ''); // no search query
         _$w(`#${FiltersIds[field.title]}CheckBox`).selectedIndices = []; // start empty
         _$w(`#${FiltersIds[field.title]}CheckBox`).onChange(async (ev) => {
-          console.log(`#${FiltersIds[field.title]}CheckBox.selectedIndices: `, _$w(`#${FiltersIds[field.title]}CheckBox`).selectedIndices);
           dontUpdateThisCheckBox=field._id;
         const selected = ev.target.value; // array of selected value IDs
         if (selected && selected.length) {
@@ -278,14 +272,11 @@ async function loadJobsRepeater(_$w) {
         await updateJobsAndNumbersAndFilters(_$w);
     
       });
-
       const runFilter = debounce(() => {
       const query = (_$w(`#${FiltersIds[field.title]}input`).value || '').toLowerCase().trim();
       updateOptionsUI(_$w, field.title, field._id, query);
     }, 150);
-
       _$w(`#${FiltersIds[field.title]}input`).onInput(runFilter);         
-        
       
     }
     await refreshFacetCounts(_$w);
@@ -332,7 +323,7 @@ async function loadJobsRepeater(_$w) {
     const filtered = searchQuery
       ? withCounts.filter(o => (o.label || '').toLowerCase().includes(searchQuery))
       : withCounts;
-  
+
     // Preserve currently selected values that are still visible
     let prevSelected=[]
     clearAll? prevSelected=[]:prevSelected= _$w(`#${FiltersIds[fieldTitle]}CheckBox`).value;

package/pages/careersPage.js

@@ -110,6 +110,8 @@ async function handleUrlParams(_$w) {
     if (queryBrandVar && _$w('#dropdownBrand').isVisible) { //if it is not visible, ignore it
         await handleBrandParam(_$w,queryBrandVar);
     }
+
+
         if (queryPageVar) {
             await handlePageParam(_$w);    
         }
@@ -122,6 +124,8 @@ async function handleUrlParams(_$w) {
         if (queryJobTypeVar) {
             await handleJobTypeParam(_$w,queryJobTypeVar);
         }
+
+
     await applyFilters(_$w, true); // Skip URL update since we're handling initial URL params
 }
 

package/pages/homePage.js

@@ -10,7 +10,6 @@ const { COLLECTIONS } = require('../backend/collectionConsts');
 const { bindPrimarySearch,getAllRecords,loadPrimarySearchRepeater } = require('./pagesUtils');
 let thisObjectVar;
 let searchByCityFlag=false;
-let loadedCategories=false;
 async function homePageOnReady(_$w,thisObject=null) {
 
     const queryResult = await wixData.query(COLLECTIONS.SITE_CONFIGS).find();
@@ -20,10 +19,7 @@ async function homePageOnReady(_$w,thisObject=null) {
         const allvaluesobjects=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
        await Promise.all([
             bindPrimarySearch(_$w,allvaluesobjects,allJobs),
-            loadPrimarySearchRepeater(_$w),
-            bindTeamRepeater(_$w),
-            bindViewAllButton(_$w),
-
+            loadPrimarySearchRepeater(_$w)
         ]);
     }
     else{
@@ -36,9 +32,13 @@ async function homePageOnReady(_$w,thisObject=null) {
   }
 
   function bind(_$w) {
-
-    bindTeamRepeater(_$w);
-
+    _$w('#teamRepeater').onItemReady(($item, itemData) => {
+        $item('#teamButton').label = `View ${itemData.count} Open Positions`;
+        $item('#teamButton').onClick(()=>{
+            const department = encodeURIComponent(itemData.title);
+            location.to(`/positions?department=${department}`);
+        });
+    });
 
     _$w('#citiesDataset').onReady(async () => {
         const numOfItems = await _$w('#citiesDataset').getTotalCount();
@@ -64,45 +64,6 @@ async function homePageOnReady(_$w,thisObject=null) {
     });
 }
 
-function bindTeamRepeater(_$w) {
-    _$w('#teamRepeater').onItemReady(($item, itemData) => {
-        $item('#teamButton').label = `View ${itemData.count} Open Positions`;
-        const department = encodeURIComponent(itemData.title);
-        if (itemData.customField) {
-            [$item('#teamButton'), $item('#teamButton2')].forEach(btn => {
-                btn.onClick(() => {
-                    location.to(`/search?category=${department}`);
-                });
-            });
-
-        }
-        else{
-            $item('#teamButton').onClick(()=>{
-                location.to(`/positions?department=${department}`);
-            });
-        }
-    });
-}
-
-function bindViewAllButton(_$w) {
-            
-    _$w('#viewAllCategoriesButton').onClick(()=>{
-        if(!loadedCategories) {
-            loadedCategories=true;
-            _$w('#viewAllCategoriesButton').label = "View Less";
-            _$w("#categoriesDataset").loadMore();
-        }
-        else{
-            loadedCategories=false;
-            _$w('#viewAllCategoriesButton').label = "View All";
-            _$w("#categoriesDataset").loadPage(1);
-        }
-    });
-}
-
-
-
-
 function init(_$w) {
     const debouncedInput = debounce(()=>handleSearchInput(_$w), 400,thisObjectVar);
 

package/pages/index.js

@@ -6,5 +6,6 @@ module.exports = {
     ...require('./pagesUtils'),
     ...require('./brandPage'),
     ...require('./supportTeamsPage'),
+    ...require('./masterPage'),
   };
   

package/pages/masterPage.js

@@ -0,0 +1,35 @@
+const{isElementExistOnPage} = require('psdev-utils');
+const { location } = require("@wix/site-location");
+const { LINKS } = require('../backend/consts');
+
+
+let companyIdGlobal;
+async function masterPageOnReady(_$w,getApiKeys) {
+    const {companyId,templateType} = await getApiKeys();
+    companyIdGlobal=companyId;
+    bindButton(_$w,"myApplication");    
+    bindButton(_$w,"myReferrals");
+    bindButton(_$w,"login");
+  }
+
+  function bindButton(_$w,buttonName) {
+    if(isElementExistOnPage(_$w(`#${buttonName}Button`))){
+        if(buttonName==="login"){
+            
+            _$w(`#${buttonName}Button`).onClick(()=>{
+            location.to(LINKS[buttonName].replace("${companyId}",companyIdGlobal));
+            });
+        }
+        else{   
+        _$w(`#${buttonName}Button`).onClick(()=>{
+            location.to(LINKS[buttonName]);
+        });
+    }
+    }
+    else{
+        console.log(`${buttonName} button not found`);
+    }
+  }
+module.exports = {
+    masterPageOnReady,
+  };

package/pages/pagesUtils.js

@@ -141,7 +141,7 @@ async function loadCategoriesListPrimarySearch(_$w,allvaluesobjects) {
   let categoryValues=[]
   for(const value of allvaluesobjects) {
     if(value.customField===CATEGORY_CUSTOM_FIELD_ID_IN_CMS) {
-      categoryValues.push({title:value.title+` (${value.count})` ,_id:value._id});
+      categoryValues.push({title:value.title+` (${value.totalJobs})` ,_id:value._id});
     }
   }
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
@@ -152,15 +152,21 @@ async function primarySearch(_$w,query,alljobs) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
     return false;
   }
-
   let filteredJobs=alljobs.filter(job=>job.title.toLowerCase().includes(query));
   if(filteredJobs.length>0) {
-    //currentJobs=filteredJobs;
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data = filteredJobs
     return true;
   }
   else {
+    console.log("searching by location")
+    //search by location
+     filteredJobs=alljobs.filter(job=>job.location.fullLocation.toLowerCase().includes(query));
+    if(filteredJobs.length>0) {
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data = filteredJobs
+      return true;
+    }
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
     return false;
   }

package/pages/positionPage.js

@@ -37,9 +37,10 @@ async function getCategoryValueId(customValues) {
         const item = await _$w('#datasetJobsItem').getCurrentItem();
         const multiRefField=await getPositionWithMultiRefField(item._id);
         const categoryValueId=await getCategoryValueId(multiRefField);
+
         handleReferFriendButton(_$w,item);
+
         handleApplyButton(_$w,item);
-        
 
         _$w('#companyDescriptionText').text = htmlToText(item.jobDescription.companyDescription.text);        
         _$w('#responsibilitiesText').text = htmlToText(item.jobDescription.jobDescription.text);
@@ -51,12 +52,12 @@ async function getCategoryValueId(customValues) {
         }
         if(_$w('#relatedJobsRepNoDepartment')) // when there is no department, we filter based on category
         {
-        const relatedJobs=await getRelatedJobs(categoryValueId,item._id,5);
+        const relatedJobs=await getRelatedJobs(categoryValueId,item._id);
           _$w('#relatedJobsRepNoDepartment').onItemReady(($item, itemData) => {
             $item('#relatedJobTitle').text = itemData.title;
             $item('#relatedJobLocation').text = itemData.location.fullLocation;
           });
-          _$w('#relatedJobsRepNoDepartment').data = relatedJobs;
+          _$w('#relatedJobsRepNoDepartment').data = relatedJobs
 
 
         }
@@ -82,25 +83,19 @@ async function getCategoryValueId(customValues) {
     
   function handleReferFriendButton(_$w,item) {
     if(!item.referFriendLink &&  isElementExistOnPage(_$w('#referFriendButton'))){
+      console.log("hiding referFriendButton");
       _$w('#referFriendButton').hide();
     }
   }
 
   function handleApplyButton(_$w,item) {
-    try{
     _$w('#applyButton').target="_blank";//so it can open in new tab
-      const url=appendQueryParams(item.applyLink,query);
-      _$w('#applyButton').link=url; //so it can be clicked
-    }
-    catch(error){
-      console.warn("error in handleApplyButton: , using applyLink directly", error);
-      _$w('#applyButton').target="_blank";
-      _$w('#applyButton').link=item.applyLink;
-    }
+    const url=appendQueryParams(item.applyLink,query);
+    _$w('#applyButton').link=url; //so it can be clicked
   }
 
-  async function getRelatedJobs(categoryValueId,itemId,limit=1000) {
-    const relatedJobs=await wixData.query(COLLECTIONS.JOBS).include(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES).hasSome(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES,[categoryValueId]).ne("_id",itemId).limit(limit).find();
+  async function getRelatedJobs(categoryValueId,itemId) {
+    const relatedJobs=await wixData.query(COLLECTIONS.JOBS).include(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES).hasSome(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES,[categoryValueId]).ne("_id",itemId).find();
     return relatedJobs.items;
   }
 

package/tests/multiSearchBoxCareers.spec.js

@@ -158,16 +158,15 @@ describe('primarySearch function tests', () => {
  
      await primarySearch(mockW, 'unicorn hunter',mockJobs);
      
-     
      expect(mockprimarySearchMultiBox.changeState).toHaveBeenCalledWith('noResults');
      expect(mockprimarySearcJobResult.data).toBeNull();
    });
 
    it('should fill category repeater when clicking on empty primary search input', async () => {
      const mockCategoryValues = [
-       { _id: 'cat1', title: 'Engineering', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, count: 5 },
-       { _id: 'cat2', title: 'Marketing', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, count: 3 },
-       { _id: 'cat3', title: 'Sales', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, count: 7 }
+       { _id: 'cat1', title: 'Engineering', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, totalJobs: 5 },
+       { _id: 'cat2', title: 'Marketing', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, totalJobs: 3 },
+       { _id: 'cat3', title: 'Sales', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, totalJobs: 7 }
      ];
      
      careersMultiBoxesPage.__set__('allvaluesobjects', mockCategoryValues);