sr-npm 1.7.65 → 1.7.67

package/backend/fetchPositionsFromSRAPI.js

@@ -1,6 +1,7 @@
 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
@@ -34,7 +35,7 @@ async function fetchPositionsFromSRAPI() {
   let allPositions = [];
   let totalFound = 0;
   let nextPageId = null; // Start with no page ID for the first request
-  let pageCount = 0;
+  let page = 0;
   const MAX_PAGES = 30 // Safety limit to prevent infinite loops
   const token = await getSmartTokenFromCMS();
 
@@ -42,45 +43,44 @@ async function fetchPositionsFromSRAPI() {
 
   do {
     try {
-      pageCount++;
-      
+      page++;
+
       // Build the API path - first request has no page parameter, subsequent use nextPageId
       let apiPath = '/jobs?limit=50';
       if (nextPageId) {
         apiPath += `&nextPageId=${nextPageId}`;
       }
       
-      console.log(`Fetching page ${pageCount} with path: ${apiPath}`);
+      console.log(`Fetching page ${page} with path: ${apiPath}`);
       const response = await makeSmartRecruitersRequest(apiPath,token);
       
       // Add positions from this page to our collection
       if (response.content && Array.isArray(response.content)) {
         allPositions = allPositions.concat(response.content);
-        console.log(`Page ${pageCount}: Found ${response.content.length} positions`);
+        console.log(`Page ${page}: Found ${response.content.length} positions`);
       }
-      
+
       // Update total count from first response
-      if (pageCount === 1) {
+      if (page === 1) {
         totalFound = response.totalFound || 0;
         console.log(`Total positions available: ${totalFound}`);
       }
-      
+
       // Get the nextPageId for the next iteration
-      nextPageId = response.nextPageId && response.nextPageId !== "" ? response.nextPageId : null;
-      
+      nextPageId = response.nextPageId && response.nextPageId !== '' ? response.nextPageId : null;
+
       if (nextPageId) {
         console.log(`Next page ID: ${nextPageId}`);
       } else {
         console.log('No more pages to fetch');
       }
-      
     } catch (error) {
-      console.error(`Error fetching page ${pageCount}:`, error);
+      console.error(`Error fetching page ${page}:`, error);
       throw error;
     }
-    
+
     // Safety check to prevent infinite loops
-    if (pageCount >= MAX_PAGES) {
+    if (page >= MAX_PAGES) {
       console.warn(`Reached maximum page limit of ${MAX_PAGES}. Stopping pagination.`);
       break;
     }
@@ -89,12 +89,12 @@ async function fetchPositionsFromSRAPI() {
   console.log(`Finished fetching all pages. Total positions collected: ${allPositions.length}`);
 
   // Return response in the same format as before, but with all positions
-  const result =  {
+  const result = {
     totalFound: totalFound,
     offset: 0,
     limit: allPositions.length,
-    nextPageId: "", // Always empty since we've fetched everything
-    content: allPositions
+    nextPageId: '', // Always empty since we've fetched everything
+    content: allPositions,
   };
 
   const amountOfUniqueJobs = new Set(allPositions.map(job => job.id)).size;
@@ -108,8 +108,7 @@ async function fetchPositionsFromSRAPI() {
 }
 
 async function fetchJobDescription(jobId) {
-  const token = await getSmartTokenFromCMS();
-  return await makeSmartRecruitersRequest(`/jobs/${jobId}`,token);
+  return await makeSmartRecruitersRequest(`/jobs/${jobId}`);
 }
 
 async function getSmartTokenFromCMS() {
@@ -117,12 +116,12 @@ async function getSmartTokenFromCMS() {
   if (result.items.length > 0) {
       return result.items[0].token; // This is your string token
   } else {
-      return null; // No token found
+      throw new Error('[getSmartTokenFromCMS], No token found');
   }
 }
 
 
 module.exports = {
-    fetchPositionsFromSRAPI,
-    fetchJobDescription,
+  fetchPositionsFromSRAPI,
+  fetchJobDescription,
 };

package/backend/index.js

@@ -1,7 +1,6 @@
 module.exports = {
-    ...require('./utils'),
-    ...require('./queries'),
-    ...require('./fetchPositionsFromSRAPI'),
-    ...require('./consts'),
-  };
-  
+  ...require('./utils'),
+  ...require('./queries'),
+  ...require('./fetchPositionsFromSRAPI'),
+  ...require('./consts'),
+};

package/backend/queries.js

@@ -1,19 +1,22 @@
-const { COLLECTIONS } = require('./collectionConsts');
-const { items } = require('@wix/data');
-
+const { items: wixData } = require('@wix/data');
 
 async function getAllPositions() {
-    return await items.query(COLLECTIONS.JOBS).find().items;
-    
+  return wixData
+    .query('Jobs1')
+    .limit(1000)
+    .find()
+    .then(result => result.items);
 }
 
 async function getPositionsByField(field, value) {
-    return await items.query(COLLECTIONS.JOBS).where(field, value).find().items;
-    
+  return wixData
+    .query('Jobs1')
+    .eq(field, value)
+    .find()
+    .then(result => result.items);
 }
 
-
 module.exports = {
-    getAllPositions,
-    getPositionsByField,
-};
+  getAllPositions,
+  getPositionsByField,
+};

package/backend/utils.js

@@ -1,11 +1,70 @@
 async function chunkedBulkOperation({ items, chunkSize, processChunk }) {
-    for (let i = 0; i < items.length; i += chunkSize) {
-        const chunk = items.slice(i, i + chunkSize);
-        await processChunk(chunk, Math.floor(i / chunkSize) + 1);
+  for (let i = 0; i < items.length; i += chunkSize) {
+    const chunk = items.slice(i, i + chunkSize);
+    await processChunk(chunk, Math.floor(i / chunkSize) + 1);
+  }
+}
+
+async function delay(ms) {
+  await new Promise(resolve => setTimeout(resolve, ms));
+}
+
+function countJobsPerGivenField(jobs, field,jobsPerField) {
+  for (const job of jobs) {
+    if (!job[field]) {
+      throw new Error(`Job ${job._id} has no ${field} field`);
+    }
+    jobsPerField[job[field]] = (jobsPerField[job[field]] || 0) + 1;
+  }
+}
+
+function fillCityLocationAndLocationAddress(jobs, cityLocations,citylocationAddress) {
+  for (const job of jobs) {
+    if (!cityLocations[job.cityText] && !citylocationAddress[job.cityText]) {
+      cityLocations[job.cityText] = job.location;
+      citylocationAddress[job.cityText] = job.locationAddress;
     }
+  }
 }
 
+function prepareToSaveArray(jobsPerField, cityLocations, field,citylocationAddress) {
+  if (field === 'cityText') {
+    return Object.entries(jobsPerField).map(([value, amount]) => {
+      const loc = cityLocations[value] || {};
+      const locAddress = citylocationAddress[value] || {};
+      value = normalizeCityName(value);
+      return {
+        title: value,
+        _id: value.replace(/\s+/g, ''),
+        count: amount,
+        locationAddress: locAddress,
+        country: loc.country,
+        city: loc.city,
+    };
+    });
+  } else {
+    return Object.entries(jobsPerField).map(([value, amount]) => ({
+      title: value,
+      _id: value.replace(/\s+/g, ''),
+      count: amount,
+    }));
+  }
+}
+
+function normalizeCityName(city) {
+  if (!city) return city;
+  // Remove accents/diacritics, trim whitespace
+  return city
+    .normalize('NFD')
+    .replace(/\p{Diacritic}/gu, '')
+    .trim();
+}
 
 module.exports = {
-    chunkedBulkOperation,
-};
+  chunkedBulkOperation,
+  delay,
+  countJobsPerGivenField,
+  fillCityLocationAndLocationAddress,
+  prepareToSaveArray,
+  normalizeCityName,
+};

package/index.js

@@ -1,6 +1,5 @@
 module.exports = {
-    ...require('./public'),
-    ...require('./pages'),
-    ...require('./backend'),
-  };
-  
+  ...require('./public'),
+  ...require('./pages'),
+  ...require('./backend'),
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.7.65",
+  "version": "1.7.67",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -17,9 +17,12 @@
   },
   "homepage": "https://github.com/psdevteamenterprise/sr-npm#readme",
   "dependencies": {
-    "@hisense-staging/velo-npm": "1.7.251",
+    "@hisense-staging/velo-npm": "3.0.19",
     "@wix/data": "^1.0.211",
     "@wix/essentials": "^0.1.24",
-    "@wix/secrets": "1.0.53"
+    "@wix/secrets": "^1.0.53"
+  },
+  "devDependencies": {
+    "prettier": "^3.6.2"
   }
 }

package/pages/homePage.js

@@ -0,0 +1,108 @@
+const {
+    debounce,
+    getFilter,
+  } = require('../public/filterUtils');
+const { location } = require('@wix/site-location');
+
+async function homePageOnReady(_$w) {
+    console.log('homePageOnReady inisde SR-NPM');
+    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, 400);
+
+    _$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');
+    });
+}
+
+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/pages/index.js

@@ -0,0 +1,5 @@
+module.exports = {
+    ...require('./positionPage'),
+    ...require('./homePage'),
+  };
+  

package/pages/positionPage.js

@@ -0,0 +1,35 @@
+const {
+    htmlToText,
+  } = require('../public/utils');
+
+  async function positionPageOnReady(_$w) {
+
+    console.log('positionPageOnReady inisde SR-NPM');
+    await bind(_$w);
+  }
+
+  async function bind(_$w) {
+    _$w('#datasetJobsItem').onReady(async () => {
+
+        const item = await _$w('#datasetJobsItem').getCurrentItem();
+
+        _$w('#companyDescriptionText').text = htmlToText(item.jobDescription.companyDescription.text);        
+        _$w('#responsibilitiesText').text = htmlToText(item.jobDescription.jobDescription.text);
+        _$w('#qualificationsText').text = htmlToText(item.jobDescription.qualifications.text);
+        _$w('#relatedJobsTitleText').text = `More ${item.department} Positions`;
+    });
+
+    _$w('#relatedJobsDataset').onReady(async () => {
+        const count = await _$w('#relatedJobsDataset').getTotalCount();
+       if(!count){
+            _$w('#relatedJobsSection').collapse();
+       }
+    });
+}
+
+  
+  
+  module.exports = {
+    positionPageOnReady,
+  };
+  

package/public/filterUtils.js

@@ -0,0 +1,36 @@
+const { items:wixData } = require('@wix/data');
+
+export 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;
+}
+
+export function debounce(fn, delay = 400) {
+    let timeout;
+    return function (...args) {
+        clearTimeout(timeout);
+        timeout = setTimeout(() => fn.apply(this, args), delay);
+    };
+}
+
+module.exports = {
+    getFilter,
+    debounce
+  };

package/public/index.js

@@ -0,0 +1,5 @@
+module.exports = {
+    ...require('./utils'),
+    ...require('./filterUtils'),
+  };
+  

package/public/utils.js

@@ -0,0 +1,28 @@
+
+
+function htmlToText(html) {
+  if (!html) return '';
+
+  // Remove HTML tags and decode entities
+  let text = html
+      .replace(/<br\s*\/?>/gi, '\n')
+      .replace(/<\/?(p|div|h[1-6])\s*\/?>/gi, '\n')
+      .replace(/<li[^>]*>/gi, '• ')
+      .replace(/<\/li>/gi, '\n')
+      .replace(/<[^>]*>/g, '')
+      .replace(/&amp;/g, '&')
+      .replace(/&lt;/g, '<')
+      .replace(/&gt;/g, '>')
+      .replace(/&quot;/g, '"')
+      .replace(/&#39;/g, "'")
+      .replace(/&nbsp;/g, ' ');
+
+  console.log(text);
+  // Clean up whitespace
+  return text.replace(/\n\s*\n+/g, '\n\n').replace(/[ \t]+\n/g, '\n').trim();
+}
+
+
+  module.exports = {
+    htmlToText
+  };