sr-npm 1.7.94 → 1.7.95

package/backend/collectionConsts.js

@@ -17,6 +17,8 @@ const JOBS_COLLECTION_FIELDS = {
   DEPARTMENT_REF: 'departmentRef',
   CITY: 'city',
   CITY_TEXT: 'cityText',
+  IMAGE: 'image',
+  APPLY_LINK: 'applyLink',
 }
 const AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION_FIELDS = {
   TITLE: 'title',
@@ -53,9 +55,11 @@ const COLLECTIONS_FIELDS = {
         {key:'language', type: 'TEXT'},
         {key:'remote', type: 'BOOLEAN'},
         {key:'jobDescription', type: 'OBJECT'},  
-        {key:'cityText', type: 'TEXT'},         
-        {key:'departmentRef', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: 'AmountOfJobsPerDepartment1' } } },
-        {key:'city', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: 'cities1' } } },
+        {key:'cityText', type: 'TEXT'},
+        {key:'applyLink', type: 'URL'},         
+        {key:'departmentref', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT } } },
+        {key:'city', type: 'REFERENCE', typeMetadata: { reference: { referencedCollectionId: COLLECTIONS.CITIES } } },
+        { key: 'image', type: 'IMAGE' },
     ],  
     API_KEY: [
       {key:'token', type: 'TEXT'},

package/backend/consts.js

@@ -1,10 +1,4 @@
-const {
-  saveJobsDataToCMS,
-  saveJobsDescriptionsAndLocationToCMS,
-  aggregateJobsByFieldToCMS,
-  referenceJobsToField,
-  createApiKeyCollectionAndFillIt,
-} = require('./data');
+const {saveJobsDataToCMS,saveJobsDescriptionsAndLocationApplyUrlToCMS,aggregateJobsByFieldToCMS,referenceJobsToField,createApiKeyCollectionAndFillIt} = require('./data');
 const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend');
 const { COLLECTIONS, COLLECTIONS_FIELDS, JOBS_COLLECTION_FIELDS } = require('./collectionConsts');
 
@@ -13,7 +7,7 @@ const QUERY_MAX_LIMIT = 1000;
 const TASKS_NAMES = {
     SYNC_JOBS: 'syncJobsFromSRAPIToCMS',
     INSERT_JOBS_TO_CMS: 'insertJobsToCMS',
-    INSERT_JOBS_DESCRIPTIONS_TO_CMS: 'insertJobsDescriptionsToCMS',
+    INSERT_JOBS_DESCRIPTIONS_LOCATION_APPLY_URL_TO_CMS: 'insertJobsDescriptionsLocationApplyUrlToCMS',
     FILL_JOBS_PER_CITY_COLLECTION: 'fillJobsPerCityCollection',
     FILL_JOBS_PER_DEPARTMENT_COLLECTION: 'fillJobsPerDepartmentCollection',
     REFERENCE_JOBS_TO_LOCATIONS: 'referenceJobsToLocations',
@@ -26,115 +20,93 @@ const TASKS_NAMES = {
 
 
 const TASKS = {
-  [TASKS_NAMES.SYNC_JOBS]: {
-    name: TASKS_NAMES.SYNC_JOBS,
-    childTasks: [
-      { name: TASKS_NAMES.CREATE_JOBS_COLLECTION },
-      { name: TASKS_NAMES.CREATE_CITIES_COLLECTION },
-      { name: TASKS_NAMES.CREATE_AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION },
-      { name: TASKS_NAMES.INSERT_JOBS_TO_CMS },
-      { name: TASKS_NAMES.INSERT_JOBS_DESCRIPTIONS_TO_CMS },
-      { name: TASKS_NAMES.FILL_JOBS_PER_CITY_COLLECTION },
-      { name: TASKS_NAMES.FILL_JOBS_PER_DEPARTMENT_COLLECTION },
-      { name: TASKS_NAMES.REFERENCE_JOBS_TO_LOCATIONS },
-      { name: TASKS_NAMES.REFERENCE_JOBS_TO_DEPARTMENT },
-    ],
-    scheduleChildrenSequentially: true,
-    estimatedDurationSec: 30,
-  },
-  [TASKS_NAMES.CREATE_JOBS_COLLECTION]: {
-    name: TASKS_NAMES.CREATE_JOBS_COLLECTION,
-    getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: () => createCollectionIfMissing(COLLECTIONS.JOBS, COLLECTIONS_FIELDS.JOBS,{ insert: 'ADMIN', update: 'ADMIN', remove: 'ADMIN', read: 'ANYONE' }),
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 3,
-  },
-  [TASKS_NAMES.CREATE_CITIES_COLLECTION]: {
-    name: TASKS_NAMES.CREATE_CITIES_COLLECTION,
-    getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: () => createCollectionIfMissing(COLLECTIONS.CITIES, COLLECTIONS_FIELDS.CITIES),
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 3,
-  },
-  [TASKS_NAMES.CREATE_AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION]: {
-    name: TASKS_NAMES.CREATE_AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION,
-    getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: () =>
-      createCollectionIfMissing(
-        COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT,
-        COLLECTIONS_FIELDS.AMOUNT_OF_JOBS_PER_DEPARTMENT
-      ),
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 3,
-  },
-  [TASKS_NAMES.INSERT_JOBS_TO_CMS]: {
-    name: TASKS_NAMES.INSERT_JOBS_TO_CMS,
-    getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: saveJobsDataToCMS,
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 20,
-  },
-  [TASKS_NAMES.INSERT_JOBS_DESCRIPTIONS_TO_CMS]: {
-    name: TASKS_NAMES.INSERT_JOBS_DESCRIPTIONS_TO_CMS,
-    getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: saveJobsDescriptionsAndLocationToCMS,
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 20,
-  },
-  [TASKS_NAMES.FILL_JOBS_PER_CITY_COLLECTION]: {
-    name: TASKS_NAMES.FILL_JOBS_PER_CITY_COLLECTION,
-    getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: () =>
-      aggregateJobsByFieldToCMS({
-        field: JOBS_COLLECTION_FIELDS.CITY_TEXT,
-        collection: COLLECTIONS.CITIES,
-      }),
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 3,
-  },
-  [TASKS_NAMES.FILL_JOBS_PER_DEPARTMENT_COLLECTION]: {
-    name: TASKS_NAMES.FILL_JOBS_PER_DEPARTMENT_COLLECTION,
-    getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: () =>
-      aggregateJobsByFieldToCMS({
-        field: JOBS_COLLECTION_FIELDS.DEPARTMENT,
-        collection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT,
-      }),
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 3,
-  },
-  [TASKS_NAMES.REFERENCE_JOBS_TO_LOCATIONS]: {
-    name: TASKS_NAMES.REFERENCE_JOBS_TO_LOCATIONS,
-    getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: () =>
-      referenceJobsToField({
-        referenceField: JOBS_COLLECTION_FIELDS.CITY,
-        sourceCollection: COLLECTIONS.CITIES,
-        jobField: JOBS_COLLECTION_FIELDS.CITY_TEXT,
-      }),
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 3,
-  },
-  [TASKS_NAMES.REFERENCE_JOBS_TO_DEPARTMENT]: {
-    name: TASKS_NAMES.REFERENCE_JOBS_TO_DEPARTMENT,
-    getIdentifier: () => 'SHOULD_NEVER_SKIP',
-    process: () =>
-      referenceJobsToField({
-        referenceField: JOBS_COLLECTION_FIELDS.DEPARTMENT_REF,
-        sourceCollection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT,
-        jobField: JOBS_COLLECTION_FIELDS.DEPARTMENT,
-      }),
-    shouldSkipCheck: () => false,
-    estimatedDurationSec: 3,
-  },
-  [TASKS_NAMES.CREATE_API_KEY_COLLECTION_AND_FILL_IT]: {
-    name: TASKS_NAMES.CREATE_API_KEY_COLLECTION_AND_FILL_IT,
-    getIdentifier:()=> "SHOULD_NEVER_SKIP",
-    process:()=>createApiKeyCollectionAndFillIt(),
-    shouldSkipCheck:()=>false,
-    estimatedDurationSec:3
-  }
-};
+    [TASKS_NAMES.SYNC_JOBS]: {
+      name: TASKS_NAMES.SYNC_JOBS,
+      childTasks: [
+        { name: TASKS_NAMES.CREATE_JOBS_COLLECTION },
+        { name: TASKS_NAMES.CREATE_CITIES_COLLECTION },
+        {name:  TASKS_NAMES.CREATE_AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION},
+        { name: TASKS_NAMES.INSERT_JOBS_TO_CMS },
+        { name: TASKS_NAMES.INSERT_JOBS_DESCRIPTIONS_LOCATION_APPLY_URL_TO_CMS },
+        { name: TASKS_NAMES.FILL_JOBS_PER_CITY_COLLECTION },
+        { name: TASKS_NAMES.FILL_JOBS_PER_DEPARTMENT_COLLECTION },
+        { name: TASKS_NAMES.REFERENCE_JOBS_TO_LOCATIONS },
+        { name: TASKS_NAMES.REFERENCE_JOBS_TO_DEPARTMENT },
+      ],
+      scheduleChildrenSequentially: true,
+      estimatedDurationSec: 30,
+    },
+    [TASKS_NAMES.CREATE_JOBS_COLLECTION]: {
+      name: TASKS_NAMES.CREATE_JOBS_COLLECTION,
+      getIdentifier:()=> "SHOULD_NEVER_SKIP",
+      process:()=>createCollectionIfMissing(COLLECTIONS.JOBS, COLLECTIONS_FIELDS.JOBS,{ insert: 'ADMIN', update: 'ADMIN', remove: 'ADMIN', read: 'ANYONE' }),
+      shouldSkipCheck:()=>false,
+      estimatedDurationSec:3
+    },
+    [TASKS_NAMES.CREATE_CITIES_COLLECTION]: {
+      name: TASKS_NAMES.CREATE_CITIES_COLLECTION,
+      getIdentifier:()=> "SHOULD_NEVER_SKIP",
+      process:()=>createCollectionIfMissing(COLLECTIONS.CITIES, COLLECTIONS_FIELDS.CITIES),
+      shouldSkipCheck:()=>false,
+      estimatedDurationSec:3
+    },
+    [TASKS_NAMES.CREATE_AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION]: {
+      name: TASKS_NAMES.CREATE_AMOUNT_OF_JOBS_PER_DEPARTMENT_COLLECTION,
+      getIdentifier:()=> "SHOULD_NEVER_SKIP",
+      process:()=>createCollectionIfMissing(COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT, COLLECTIONS_FIELDS.AMOUNT_OF_JOBS_PER_DEPARTMENT),
+      shouldSkipCheck:()=>false,
+      estimatedDurationSec:3
+    },
+    [TASKS_NAMES.INSERT_JOBS_TO_CMS]: {
+      name: TASKS_NAMES.INSERT_JOBS_TO_CMS,
+      getIdentifier:()=> "SHOULD_NEVER_SKIP",
+      process:saveJobsDataToCMS,
+      shouldSkipCheck:()=>false,
+      estimatedDurationSec:20
+    },
+    [TASKS_NAMES.INSERT_JOBS_DESCRIPTIONS_LOCATION_APPLY_URL_TO_CMS]: {
+      name: TASKS_NAMES.INSERT_JOBS_DESCRIPTIONS_LOCATION_APPLY_URL_TO_CMS,
+      getIdentifier:()=> "SHOULD_NEVER_SKIP",
+      process:saveJobsDescriptionsAndLocationApplyUrlToCMS,
+      shouldSkipCheck:()=>false,
+      estimatedDurationSec:20
+    },
+    [TASKS_NAMES.FILL_JOBS_PER_CITY_COLLECTION]: {
+        name: TASKS_NAMES.FILL_JOBS_PER_CITY_COLLECTION,
+        getIdentifier:()=> "SHOULD_NEVER_SKIP",
+        process:()=>aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.CITY_TEXT, collection: COLLECTIONS.CITIES }),
+        shouldSkipCheck:()=>false,
+        estimatedDurationSec:3
+      },
+      [TASKS_NAMES.FILL_JOBS_PER_DEPARTMENT_COLLECTION]: {
+        name: TASKS_NAMES.FILL_JOBS_PER_DEPARTMENT_COLLECTION,
+        getIdentifier:()=> "SHOULD_NEVER_SKIP",
+        process:()=>aggregateJobsByFieldToCMS({ field: JOBS_COLLECTION_FIELDS.DEPARTMENT, collection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT }),
+        shouldSkipCheck:()=>false,
+        estimatedDurationSec:3
+      },
+      [TASKS_NAMES.REFERENCE_JOBS_TO_LOCATIONS]: {
+        name: TASKS_NAMES.REFERENCE_JOBS_TO_LOCATIONS,
+        getIdentifier:()=> "SHOULD_NEVER_SKIP",
+        process:()=>referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.CITY, sourceCollection: COLLECTIONS.CITIES, jobField: JOBS_COLLECTION_FIELDS.CITY_TEXT }),
+        shouldSkipCheck:()=>false,
+        estimatedDurationSec:3
+      },
+      [TASKS_NAMES.REFERENCE_JOBS_TO_DEPARTMENT]: {
+        name: TASKS_NAMES.REFERENCE_JOBS_TO_DEPARTMENT,
+        getIdentifier:()=> "SHOULD_NEVER_SKIP",
+        process:()=>referenceJobsToField({ referenceField: JOBS_COLLECTION_FIELDS.DEPARTMENT_REF, sourceCollection: COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT, jobField: JOBS_COLLECTION_FIELDS.DEPARTMENT }),
+        shouldSkipCheck:()=>false,
+        estimatedDurationSec:3
+      },
+      [TASKS_NAMES.CREATE_API_KEY_COLLECTION_AND_FILL_IT]: {
+        name: TASKS_NAMES.CREATE_API_KEY_COLLECTION_AND_FILL_IT,
+        getIdentifier:()=> "SHOULD_NEVER_SKIP",
+        process:()=>createApiKeyCollectionAndFillIt(),
+        shouldSkipCheck:()=>false,
+        estimatedDurationSec:3
+      }
+}
 
 
 

package/backend/data.js

@@ -1,7 +1,7 @@
-const { items: wixData } = require('@wix/data');
+const { items: wixData, collections } = require('@wix/data');
 const { fetchPositionsFromSRAPI, fetchJobDescription } = require('./fetchPositionsFromSRAPI');
 const { createCollectionIfMissing } = require('@hisense-staging/velo-npm/backend');
-const { COLLECTIONS, COLLECTIONS_FIELDS } = require('./collectionConsts');
+const { COLLECTIONS, COLLECTIONS_FIELDS,JOBS_COLLECTION_FIELDS } = require('./collectionConsts');
 const { secrets } = require("@wix/secrets");
 const { auth } = require('@wix/essentials');
 const { chunkedBulkOperation, delay, countJobsPerGivenField, fillCityLocationAndLocationAddress ,prepareToSaveArray,normalizeCityName} = require('./utils');
@@ -58,7 +58,7 @@ async function saveJobsDataToCMS() {
     processChunk: async (chunk, chunkNumber) => {
       console.log(`Saving chunk ${chunkNumber}/${totalChunks}: ${chunk.length} jobs`);
       try {
-        const result = await wixData.bulkSave('Jobs1', chunk);
+        const result = await wixData.bulkSave(COLLECTIONS.JOBS, chunk);
         const saved = result.inserted + result.updated || chunk.length;
         totalSaved += saved;
         console.log(
@@ -74,7 +74,7 @@ async function saveJobsDataToCMS() {
   console.log(`✓ All chunks processed. Total jobs saved: ${totalSaved}/${jobsData.length}`);
 }
 
-async function saveJobsDescriptionsAndLocationToCMS() {
+async function saveJobsDescriptionsAndLocationApplyUrlToCMS() {
   console.log('🚀 Starting job descriptions update process for ALL jobs');
 
   try {
@@ -105,13 +105,16 @@ async function saveJobsDescriptionsAndLocationToCMS() {
           try {
             const jobDetails = await fetchJobDescription(job._id);
             const jobLocation = fetchJobLocation(jobDetails);
+            const applyLink = fetchApplyLink(jobDetails);
+
 
             const updatedJob = {
               ...job,
               locationAddress: jobLocation,
               jobDescription: jobDetails.jobAd.sections,
+              applyLink: applyLink,
             };
-            await wixData.update('Jobs1', updatedJob);
+            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);
@@ -188,7 +191,7 @@ async function aggregateJobsByFieldToCMS({ field, collection }) {
 
 async function getJobsWithNoDescriptions() {
   let jobswithoutdescriptionsQuery = await wixData
-    .query('Jobs1')
+    .query(COLLECTIONS.JOBS)
     .limit(1000)
     .isEmpty('jobDescription')
     .find();
@@ -197,9 +200,9 @@ async function getJobsWithNoDescriptions() {
 
 /**
  * @param {Object} params
- * @param {"city"|"departmentRef"} params.referenceField
- * @param {"cities1"|"AmountOfJobsPerDepartment1"} params.sourceCollection
- * @param {"cityText"|"department"} params.jobField
+ * @param {JOBS_COLLECTION_FIELDS.CITY|JOBS_COLLECTION_FIELDS.DEPARTMENT_REF} params.referenceField
+ * @param {COLLECTIONS.CITIES|COLLECTIONS.AMOUNT_OF_JOBS_PER_DEPARTMENT} params.sourceCollection
+ * @param {JOBS_COLLECTION_FIELDS.CITY_TEXT|JOBS_COLLECTION_FIELDS.DEPARTMENT} params.jobField
  */
 async function referenceJobsToField({ referenceField, sourceCollection, jobField }) {
   // Fetch all source items (cities or departments)
@@ -235,22 +238,22 @@ async function referenceJobsToField({ referenceField, sourceCollection, jobField
     items: jobsToUpdate,
     chunkSize,
     processChunk: async chunk => {
-      await wixData.bulkUpdate('Jobs1', chunk);
+      await wixData.bulkUpdate(COLLECTIONS.JOBS, chunk);
     },
   });
 
   return { success: true, updated: jobsToUpdate.length };
 }
 
+function fetchApplyLink(jobDetails) {
+    return jobDetails.actions.applyOnWeb.url;
+}
+
 function fetchJobLocation(jobDetails) {
-  const isZeroLocation =
-    jobDetails.location.latitude === '0.0000' && jobDetails.location.longitude === '0.0000';
-  const jobLocation = {
-    location: isZeroLocation
-      ? {}
-      : {
-          latitude: parseFloat(jobDetails.location.latitude),
-          longitude: parseFloat(jobDetails.location.longitude),
+    const jobLocation = {
+        location:  {
+            latitude: parseFloat(jobDetails.location.latitude),
+            longitude: parseFloat(jobDetails.location.longitude)
         },
     city: jobDetails.location.city,
     country: jobDetails.location.country,
@@ -300,7 +303,7 @@ async function createApiKeyCollectionAndFillIt() {
 
 module.exports = {
     saveJobsDataToCMS,
-    saveJobsDescriptionsAndLocationToCMS,
+    saveJobsDescriptionsAndLocationApplyUrlToCMS,
     aggregateJobsByFieldToCMS,
     referenceJobsToField,
     createApiKeyCollectionAndFillIt,

package/backend/fetchPositionsFromSRAPI.js

@@ -1,11 +1,10 @@
 const { fetch } = require('wix-fetch');
 const { items: wixData } = require('@wix/data');
 const { COLLECTIONS } = require('./collectionConsts');
-
 async function makeSmartRecruitersRequest(path,token) {
   // const baseUrl = 'https://api.smartrecruiters.com'; // PROD
-  const baseUrl = 'https://aoxley54.wixstudio.com/external-template/_functions'; // TEST
-    const fullUrl = `${baseUrl}${path}`;
+  const baseUrl = 'https://aoxley54.wixstudio.com/test-site/_functions'; // TEST
+  const fullUrl = `${baseUrl}${path}`;
   
     //console.log(`Making request to: ${fullUrl}`);
   try {
@@ -108,7 +107,8 @@ async function fetchPositionsFromSRAPI() {
 }
 
 async function fetchJobDescription(jobId) {
-  return await makeSmartRecruitersRequest(`/jobs/${jobId}`);
+  const token = await getSmartTokenFromCMS();
+  return await makeSmartRecruitersRequest(`/jobs/${jobId}`,token);
 }
 
 async function getSmartTokenFromCMS() {

package/backend/queries.js

@@ -1,8 +1,10 @@
+const { COLLECTIONS } = require('./collectionConsts');
 const { items: wixData } = require('@wix/data');
 
+
 async function getAllPositions() {
   return wixData
-    .query('Jobs')
+    .query(COLLECTIONS.JOBS)
     .limit(1000)
     .find()
     .then(result => result.items);
@@ -10,7 +12,7 @@ async function getAllPositions() {
 
 async function getPositionsByField(field, value) {
   return wixData
-    .query('Jobs')
+    .query(COLLECTIONS.JOBS)
     .eq(field, value)
     .find()
     .then(result => result.items);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.7.94",
+  "version": "1.7.95",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -20,9 +20,7 @@
     "@hisense-staging/velo-npm": "3.0.19",
     "@wix/data": "^1.0.211",
     "@wix/essentials": "^0.1.24",
-    "@wix/secrets": "^1.0.53",
-    "@wix/site-location": "^1.0.0",
-    "@wix/site-window": "^1.0.0"
+    "@wix/secrets": "^1.0.53"
   },
   "devDependencies": {
     "prettier": "^3.6.2"

package/pages/index.js

@@ -1,6 +1,4 @@
 module.exports = {
     ...require('./positionPage'),
-    ...require('./homePage'),
-    ...require('./careersPage'),
   };
   

package/pages/positionPage.js

@@ -3,14 +3,14 @@ const {
   } = require('../public/utils');
 
   async function positionPageOnReady(_$w) {
-
-    await bind(_$w);
+    
+    bind(_$w);
   }
 
-  async function bind(_$w) {
-    _$w('#datasetJobsItem').onReady(async () => {
+  function bind(_$w) {
+    _$w('#datasetJobsItem').onReady(() => {
 
-        const item = await _$w('#datasetJobsItem').getCurrentItem();
+        const item = _$w('#datasetJobsItem').getCurrentItem();
 
         _$w('#companyDescriptionText').text = htmlToText(item.jobDescription.companyDescription.text);        
         _$w('#responsibilitiesText').text = htmlToText(item.jobDescription.jobDescription.text);
@@ -18,8 +18,8 @@ const {
         _$w('#relatedJobsTitleText').text = `More ${item.department} Positions`;
     });
 
-    _$w('#relatedJobsDataset').onReady(async () => {
-        const count = await _$w('#relatedJobsDataset').getTotalCount();
+    _$w('#relatedJobsDataset').onReady(() => {
+        const count = _$w('#relatedJobsDataset').getTotalCount();
        if(!count){
             _$w('#relatedJobsSection').collapse();
        }

package/public/index.js

@@ -1,6 +1,4 @@
 module.exports = {
     ...require('./utils'),
-    ...require('./filterUtils'),
-    ...require('./mapUtils'),
   };
   

package/pages/careersPage.js

@@ -1,250 +0,0 @@
-const { getAllPositions } = require('../backend/queries');
-//const { items: wixData } = require('@wix/data');
-const {wixData} = require('wix-data');
-const { window } = require('@wix/site-window');
-//const { location,queryParams } = require('@wix/site-location');
-const { query,queryParams,to } = require("wix-location-frontend");
-const {
-    debounce,
-    getFilter,
-  } = require('../public/filterUtils');
-
-  let currentLoadedItems =100;
-  const itemsPerPage = 100;
-  let allJobs=[]
-  const RESET_ALL = 'RESET_ALL';
-  let pageParamSet=0;
-  let thisObjectVar;
-  let queryPageVar;
-  let queryKeyWordVar;
-
-
-async function careersPageOnReady(_$w,thisObject,queryPage,queryKeyWord) {
-queryPageVar=queryPage;
-queryKeyWordVar=queryKeyWord;
-thisObjectVar=thisObject;
-allJobs=await getAllPositions();
-await handleUrlParams(_$w);
-await activateAutoLoad(_$w);
-await bind(_$w);
-await init(_$w);
-
-}
-
-  
-function activateAutoLoad(_$w)
-{
-    _$w("#jobsDataset").onReady(() => {
-        updateCount(_$w);
-        _$w("#section2").onViewportEnter(() => {
-            if (currentLoadedItems<_$w("#jobsDataset").getTotalCount()) {
-                loadMoreJobs(_$w);  
-            }   
-            else {
-                console.log("no more jobs")
-            }        
-        });
-    });  
-}
-
-async function loadMoreJobs(_$w) {
-    //const query = await location.query();
-    let shouldLoad = false;
-    if (pageParamSet == 0) {
-        shouldLoad = true;
-    } else if (query.page % 2 == pageParamSet % 2) {
-        shouldLoad = true;
-    } else {
-        pageParamSet = Number(pageParamSet) + 1;
-    }
-    if (shouldLoad) {
-        _$w("#jobsDataset").loadMore();
-        console.log("loading more jobs");
-        currentLoadedItems = currentLoadedItems + itemsPerPage;
-        const data = _$w("#positionsRepeater").data;
-        console.log("data length is :    ", data.length);
-        setPageParamInUrl();
-    }
-}
-
-
-async function setPageParamInUrl() {
-    console.log("query is: ", query);
-    console.log("query.page is: ", query.page);
-    console.log(" is: ", Number(query.page) + 1);
-    console.log("queryPageVar is: ", queryPageVar);
-    if(queryPageVar){
-        queryParams.add({ page: Number(queryPageVar) + 1 })
-        queryPageVar=Number(queryPageVar) + 1
-    }
-    else{
-        queryParams.add({ page: 2 })
-        queryPageVar=2
-    }
-
-   
-}
-async function handleUrlParams(_$w) {
-   // const query = await location.query();
-    if (queryKeyWordVar) {
-        await handleKeyWordParam(_$w,queryKeyWordVar);
-    }
-    if (queryPageVar) {
-        await handlePageParam(_$w);
-        
-    }
-}
-
-async function handleKeyWordParam(_$w,keyWord) {
-    _$w('#searchInput').value = keyWord;
-    //const filter = await wixData.query("Jobs").contains("title", keyWord);
-    await $w("#jobsDataset").setFilter(wixData.filter().contains("title", keyWord));
-    await _$w("#jobsDataset").refresh();
-}
-
-async function handlePageParam(_$w) {
-    
-    if(allJobs.length/itemsPerPage<queryPageVar){
-        console.log(`max page is: ${allJobs.length/itemsPerPage}`)
-        queryParams.add({ page: allJobs.length/itemsPerPage }) 
-    }
-    if(queryPageVar<=1){
-        console.log("min page is  : 2")
-        pageParamSet=2;
-        queryParams.add({ page: 2 })
-    }
-    if (queryPageVar) {   
-        pageParamSet=queryPageVar;
-        //scrolls a bit to load the dataset data
-        await window.scrollTo(0, 200,{scrollAnimation:false});
-        for (let i = 2; i <= queryPageVar; i++) {
-           await _$w("#jobsDataset").loadMore();
-            currentLoadedItems=currentLoadedItems+itemsPerPage
-        }
-        // the timeout is to wait for the repeater to render, then scroll to the last item.
-            setTimeout(() => {
-            const data = _$w("#positionsRepeater").data;
-            if (data && data.length > 0) {
-                //the dataset each time it loads 100 items
-                const lastIndex = data.length - itemsPerPage;
-                _$w("#positionsRepeater").forEachItem(async ($item, itemData, index) => {
-                    if (index === lastIndex) {
-                        await $item("#positionItem").scrollTo();
-                        console.log("finishied scrolling inside handlePageParam")
-                    }
-                });
-            }
-        }, 200); 
-        }
-    
-}
-
-async function bind(_$w) {
-	await _$w('#jobsDataset').onReady(async () => {
-		await updateCount(_$w);
-		
-	});
-
-	if (await window.formFactor === "Mobile") {
-		_$w('#dropdownsContainer').collapse();
-    } 
-
-	_$w('#positionsRepeater').onItemReady(async ($item, itemData) => {
-		$item('#positionItem').onClick(() => {
-			to(`${itemData['link-jobs-title']}`);
-		});
-	});
-}
-
-function init(_$w) {
-    const debouncedSearch = debounce(()=>applyFilters(_$w), 400,thisObjectVar);
-    
-    _$w('#searchInput').onInput(debouncedSearch);
-    _$w('#dropdownDepartment, #dropdownLocation, #dropdownJobType').onChange(()=>applyFilters(_$w));
-	_$w('#resetFiltersButton, #clearSearch').onClick(()=>resetFilters(_$w));
-
-	_$w('#openFiltersButton').onClick(()=>{
-		_$w('#dropdownsContainer, #closeFiltersButton').expand();
-	});
-
-	_$w('#closeFiltersButton').onClick(()=>{
-		_$w('#dropdownsContainer, #closeFiltersButton').collapse();
-	});
-}
-
-async function applyFilters(_$w) {
-
-	const dropdownFiltersMapping = [
-		{ elementId: '#dropdownDepartment', field: 'department', value: _$w('#dropdownDepartment').value },
-		{ elementId: '#dropdownLocation', field: 'cityText', value: _$w('#dropdownLocation').value },
-		{ elementId: '#dropdownJobType', field: 'remote', value: _$w('#dropdownJobType').value},
-		{ elementId: '#searchInput', field: 'title', value: _$w('#searchInput').value }
-		];
-
-	let filters = [];
-	let value;
-	
-	dropdownFiltersMapping.forEach(filter => {
-		// Handle RESET_ALL values
-		if (filter.value === RESET_ALL) {
-			_$w(filter.elementId).value = '';
-			filter.value = '';
-		}
-
-		// build filters
-		if (filter.value && filter.value.trim() !== '') {
-      if(filter.field === 'title'){
-         queryParams.add({ keyWord: filter.value });
-      }
-			if(filter.field === 'remote') {	
-				value = filter.value === 'true';
-			} else {
-				value = filter.value;
-			}
-			filters.push({ field: filter.field, searchTerm: value });
-		}
-    else{
-        queryParams.remove(["keyWord" ]);
-    }
-	});
-	
-	const filter = await getFilter(filters, 'and');
-	
-    await _$w('#jobsDataset').setFilter(filter);
-    await _$w('#jobsDataset').refresh();
-    
-	const count = await updateCount(_$w);
-    
-    count ? _$w('#resultsMultiState').changeState('results') : _$w('#resultsMultiState').changeState('noResults');
-    
-    // Update reset button state
-	const hasActiveFilters = filters.length > 0;
-	hasActiveFilters? _$w('#resetFiltersButton').enable() : _$w('#resetFiltersButton').disable();
-}
-
-async function resetFilters(_$w) {
-	_$w('#searchInput, #dropdownDepartment, #dropdownLocation, #dropdownJobType').value = '';
-
-    await _$w('#jobsDataset').setFilter(wixData.filter());
-    await _$w('#jobsDataset').refresh();
-
-	_$w('#resultsMultiState').changeState('results');
-
-	_$w('#resetFiltersButton').disable();
-
-	await updateCount(_$w);
-}
-
-async function updateCount(_$w) {
-	const count = await _$w('#jobsDataset').getTotalCount();
-    _$w('#numOfPositionText').text = `Showing ${count} Open Positions`;
-
-	return count;
-}
-
-
-
-
-module.exports = {
-    careersPageOnReady,
-  };

package/pages/homePage.js

@@ -1,109 +0,0 @@
-const {
-    debounce,
-    getFilter,
-  } = require('../public/filterUtils');
-  const { handleOnLocationClick } = require('../public/mapUtils');
-const { location } = require('@wix/site-location');
-let thisObjectVar;
-async function homePageOnReady(_$w,thisObject) {
-    thisObjectVar=thisObject;
-    await bind(_$w);
-    await init(_$w);
-  }
-
-  function bind(_$w) {
-    _$w('#teamRepeater').onItemReady(($item, itemData) => {
-        $item('#teamButton').label = `View ${itemData.count} Open Positions`;
-    });
-
-    _$w('#citiesDataset').onReady(async () => {
-        const numOfItems = await _$w('#citiesDataset').getTotalCount();
-        const items = await _$w('#citiesDataset').getItems(0, numOfItems);
-        let baseUrl = await location.baseUrl();
-        const linkUrl = `${baseUrl}/positions`;
-
-        const markers = items.items.map(item => {
-            const location = item.locationAddress.location;
-            return {
-                location: {
-                    latitude: location.latitude,
-                    longitude: location.longitude
-                },
-                address: item.locationAddress.formatted,
-                description: `<a href=${linkUrl} target="_parent" rel="noopener noreferrer" style="color:#000000;text-decoration:underline;font-weight:bold;">View ${item.count} Open Positions</a>`
-            };
-        });
-        //@ts-ignore
-        _$w('#googleMaps').setMarkers(markers);
-    });
-}
-
-function init(_$w) {
-    const debouncedInput = debounce(()=>handleSearchInput(_$w), 400,thisObjectVar);
-
-    _$w('#searchInput').onInput(debouncedInput);
-    _$w('#searchInput').maxLength = 40;
-    
-    _$w('#searchInput').onKeyPress((event) => {
-        if (event.key === 'Enter') {
-            handleEnterPress(_$w('#searchInput').value);
-        }
-    });
-
-    _$w('#searchInput').onFocus(() => {
-        if (_$w(`#resultsContainer`).collapsed) {
-            _$w(`#resultsContainer`).expand();
-        }
-    });
-
-    _$w('#searchInput').onBlur(() => {
-        setTimeout(() => {
-            if (!_$w(`#resultsContainer`).collapsed) {
-                _$w(`#resultsContainer`).collapse();
-            }
-        }, 250);
-    });
-
-    _$w('#locationItem').onClick((event)=>{
-        handleOnLocationClick(event, '#locationsRepeater', '#googleMaps', _$w);
-    });
-}
-
-async function handleSearchInput(_$w) {
-    let searchInput;
-    let count;
-
-    searchInput = _$w('#searchInput').value;
-    const trimmedInput = searchInput.trim();
-
-    const fieldsToSearch = [
-        { field: 'title', searchTerm: trimmedInput }, 
-        { field: 'cityText', searchTerm: trimmedInput }
-    ];
-    
-    const filter = await getFilter(fieldsToSearch, 'or');
-
-    await _$w('#jobsDataset').setFilter(filter);
-    await _$w('#jobsDataset').refresh();
-
-    count = _$w('#jobsDataset').getTotalCount();
-
-    if (count > 0) {
-        _$w('#resultsContainer').expand();
-        _$w('#searchMultiStateBox').changeState('results');
-    } else {
-        _$w('#searchMultiStateBox').changeState('noResults');
-    }
-}
-
-function handleEnterPress(searchInput) {
-    const trimmedInput = searchInput.trim();
-    
-    if (trimmedInput) {
-        location.to(`/positions?keyWord=${trimmedInput}`);
-    }
-}
-
-module.exports = {
-    homePageOnReady,
-  };

package/public/filterUtils.js

@@ -1,40 +0,0 @@
-//const { items:wixData } = require('@wix/data');
-const {wixData} = require('wix-data');
-
-
-function getFilter(fieldsToSearch = [], mode = 'or') {
-    const baseFilter = wixData.filter();
-    // if no fields to search, return empty filter
-    if (fieldsToSearch.length === 0) {
-        return baseFilter;
-    }
-
-    // build filters
-    let filter;
-    fieldsToSearch.forEach(({ field, searchTerm }) => {
-        const condition = typeof searchTerm === 'boolean' 
-            ? baseFilter.eq(field, searchTerm)
-            : baseFilter.contains(field, searchTerm);
-
-        filter = filter
-            ? (mode === 'or' ? filter.or(condition) : filter.and(condition))
-            : condition;
-    });
-
-    return filter;
-}
-
-function debounce(fn, delay = 400,thisObject) {
-    let timeout;
-    return function (...args) {
-        clearTimeout(timeout);
-        console.log("thisObject is: ", thisObject);
-        console.log("args is: ", args);
-        timeout = setTimeout(() => fn.apply(thisObject, args), delay);
-    };
-}
-
-module.exports = {
-    getFilter,
-    debounce
-  };

package/public/mapUtils.js

@@ -1,16 +0,0 @@
-function handleOnLocationClick(event, repeaterId, mapId, _$w) {
-    const FOCUS_ZOOM = 13;
-    const { itemId } = event.context;
-    const itemData = _$w(repeaterId).data.find(item => item._id === itemId);
-
-    const location = itemData.locationAddress.location;
-  
-    //@ts-ignore
-    _$w(mapId).setCenter(location);
-    //@ts-ignore
-    _$w(mapId).setZoom(FOCUS_ZOOM);
-}
-
-module.exports = {
-    handleOnLocationClick
-  };