sr-npm 1.2.44 → 1.2.46

package/backend/careersMultiBoxesPageIds.js

@@ -1,4 +1,5 @@
 const CAREERS_MULTI_BOXES_PAGE_CONSTS={
+    JOBS_DATASET: '#jobsDataset',
     FILTER_REPEATER: '#filterReapter',
     JOBS_REPEATER: '#jobsReapter',
     JOBS_REPEATER_ITEM_TITLE: '#jobTitle',

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -5,7 +5,18 @@ const { window } = require('@wix/site-window');
 const { queryParams,onChange} = require('wix-location-frontend');
 const { location } = require("@wix/site-location");
 const {CAREERS_MULTI_BOXES_PAGE_CONSTS,FiltersIds,fieldTitlesInCMS,possibleUrlParams} = require('../backend/careersMultiBoxesPageIds');
-const { groupValuesByField, debounce, getAllRecords, getFieldById, getFieldByTitle,getCorrectOption,getOptionIndexFromCheckBox,loadPrimarySearchRepeater,bindPrimarySearch,primarySearch } = require('./pagesUtils');
+const { groupValuesByField, 
+        debounce, 
+        getAllRecords, 
+        getFieldById, 
+        getFieldByTitle,
+        getCorrectOption,
+        getOptionIndexFromCheckBox,
+        loadPrimarySearchRepeater,
+        bindPrimarySearch,
+        primarySearch,
+        getAllDatasetItems 
+      } = require('./pagesUtils');
 
 
 let dontUpdateThisCheckBox;
@@ -134,21 +145,9 @@ async function handleUrlParams(_$w,urlParams,handleBackAndForth=false) {
   if(urlParams.keyword) {
     applyFiltering = await primarySearch(_$w, decodeURIComponent(urlParams.keyword));
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value = decodeURIComponent(urlParams.keyword);
-    let items = [];
-    let data;
-    _$w("#jobsDataset").onReady(async () => {
-      try {
-        data = await _$w("#jobsDataset").getItems(0, 1000);
-      } catch (error) {
-        console.error('Failed to get items:', error);
-      }
-      items.push(...data.items);
 
-      while (_$w("#jobsDataset").hasNextPage()) {
-        const nextItems = await _$w("#jobsDataset").nextPage();
-        items.push(...nextItems);
-      }
-    });
+    const items = await getAllDatasetItems(_$w, CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_DATASET);
+
     currentJobs = items;   
     keywordAllJobs = items;
   }

package/pages/pagesUtils.js

@@ -16,248 +16,261 @@ function groupValuesByField(values, refKey) {
       });
     }
     return map;
-  }
+}
 
-  const debounce = (fn, ms = 150) => {
-    let t;
-    return (...args) => {
-      clearTimeout(t);
-      t = setTimeout(() => fn(...args), ms);
-    };
+const debounce = (fn, ms = 150) => {
+  let t;
+  return (...args) => {
+    clearTimeout(t);
+    t = setTimeout(() => fn(...args), ms);
   };
+};
 
-  async function getAllRecords(collectionId) {
-    const q = wixData.query(collectionId).include(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES)
-  
-  
-    const items = [];
-    let res = await q.limit(1000).find();
-    items.push(...res.items);
-  
-    while (res.hasNext()) {
-      res = await res.next();
-      items.push(...res.items);
-    }
-    return items;
+async function getAllDatasetItems(_$w, datasetSelector) {
+  await _$w(datasetSelector).onReadyAsync();
+
+  let items = [];
+  let data = await _$w(datasetSelector).getItems(0, 1000);
+  items.push(...data.items);
+
+  while (_$w(datasetSelector).hasNextPage()) {
+    const nextItems = await _$w(datasetSelector).nextPage();
+    items.push(...nextItems);
   }
 
-  async function getAllRecordsWithoutMultiRef(collectionId) {
-    const q = wixData.query(collectionId)
-  
-  
-    const items = [];
-    let res = await q.limit(1000).find();
+  return items;
+}
+
+async function getAllRecords(collectionId) {
+  const q = wixData.query(collectionId).include(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES)
+
+
+  const items = [];
+  let res = await q.limit(1000).find();
+  items.push(...res.items);
+
+  while (res.hasNext()) {
+    res = await res.next();
     items.push(...res.items);
-  
-    while (res.hasNext()) {
-      res = await res.next();
-      items.push(...res.items);
-    }
-    return items;
   }
+  return items;
+}
 
-  function getFieldById(fieldId,allFields) {
-    return allFields.find(field=>field._id===fieldId);
-  }
+async function getAllRecordsWithoutMultiRef(collectionId) {
+  const q = wixData.query(collectionId)
 
-  function getFieldByTitle(title,allFields) {
-    return allFields.find(field=>field.title===title);
+
+  const items = [];
+  let res = await q.limit(1000).find();
+  items.push(...res.items);
+
+  while (res.hasNext()) {
+    res = await res.next();
+    items.push(...res.items);
   }
+  return items;
+}
 
-  function getCorrectOption(value,options,param) {
-    const standardizedValue = normalizeString(value.toLowerCase())
-    if(param==="employmenttype") //employmenttype have a problematic value
-    {
-      return options.find(option=>normalizeString(option.value.toLowerCase())===standardizedValue);
-    }
-    return options.find(option=>normalizeString(option.label.toLowerCase())===standardizedValue);
+function getFieldById(fieldId,allFields) {
+  return allFields.find(field=>field._id===fieldId);
+}
+
+function getFieldByTitle(title,allFields) {
+  return allFields.find(field=>field.title===title);
+}
+
+function getCorrectOption(value,options,param) {
+  const standardizedValue = normalizeString(value.toLowerCase())
+  if(param==="employmenttype") //employmenttype have a problematic value
+  {
+    return options.find(option=>normalizeString(option.value.toLowerCase())===standardizedValue);
   }
+  return options.find(option=>normalizeString(option.label.toLowerCase())===standardizedValue);
+}
 
-  function getOptionIndexFromCheckBox(options,value) {
-    const normalizedValue=normalizeString(value.toLowerCase());
-    for(let index=0;index<options.length;index++) {
-      if(normalizeString(options[index].value.toLowerCase())===normalizedValue) {
-        return index;
-      }
+function getOptionIndexFromCheckBox(options,value) {
+  const normalizedValue=normalizeString(value.toLowerCase());
+  for(let index=0;index<options.length;index++) {
+    if(normalizeString(options[index].value.toLowerCase())===normalizedValue) {
+      return index;
     }
   }
+}
 
 function loadPrimarySearchRepeater(_$w) {
-  
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER_ITEM).onClick((event) => {
-    const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
-    const clickedItemData = data.find(
-      (item) => item._id === event.context.itemId,
-      
-    );
+
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER_ITEM).onClick((event) => {
+  const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
+  const clickedItemData = data.find(
+    (item) => item._id === event.context.itemId,
     
-    // 'link-jobs-title' or 'link-copy-of-jobs-title'
-    const linkKey = Object.keys(clickedItemData).find(
-      key => key.startsWith('link') && key.includes('jobs') && key.includes('title')
-    );
-    if (linkKey && clickedItemData[linkKey] ) {
-      if(clickedItemData[linkKey].includes("copy-of-jobs")) {
-        clickedItemData[linkKey]=clickedItemData[linkKey].replace("copy-of-jobs","jobs")
-      }
-      location.to(clickedItemData[linkKey]);
+  );
+  
+  // 'link-jobs-title' or 'link-copy-of-jobs-title'
+  const linkKey = Object.keys(clickedItemData).find(
+    key => key.startsWith('link') && key.includes('jobs') && key.includes('title')
+  );
+  if (linkKey && clickedItemData[linkKey] ) {
+    if(clickedItemData[linkKey].includes("copy-of-jobs")) {
+      clickedItemData[linkKey]=clickedItemData[linkKey].replace("copy-of-jobs","jobs")
     }
+    location.to(clickedItemData[linkKey]);
+  }
 
-  });
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
-    $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_CATEGORY_BUTTON).label = itemData.title || '';
-  }); 
-
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER_ITEM).onClick(async (event) => {
-    const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data;
-    const clickedItemData = data.find(
-      (item) => item._id === event.context.itemId,
-    );
-    const baseUrl = await location.baseUrl();
-      const encodedCategory=encodeURIComponent(clickedItemData._id);
-      location.to(`${baseUrl}/search?category=${encodedCategory}`);
-  });
+});
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
+  $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_CATEGORY_BUTTON).label = itemData.title || '';
+}); 
+
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER_ITEM).onClick(async (event) => {
+  const data = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data;
+  const clickedItemData = data.find(
+    (item) => item._id === event.context.itemId,
+  );
+  const baseUrl = await location.baseUrl();
+    const encodedCategory=encodeURIComponent(clickedItemData._id);
+    location.to(`${baseUrl}/search?category=${encodedCategory}`);
+});
 
 }
 
 function bindPrimarySearch(_$w, allvaluesobjects) {
 
-  const handleSearchInput = async () => { 
-    const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
-    await primarySearch(_$w, query);
-  } 
+const handleSearchInput = async () => { 
+  const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
+  await primarySearch(_$w, query);
+} 
 
-  const primarySearchDebounced = debounce(() => handleSearchInput(), 400);
+const primarySearchDebounced = debounce(() => handleSearchInput(), 400);
 
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => { 
-    await primarySearchDebounced();
-  });
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => { 
+  await primarySearchDebounced();
+});
 
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
 
-    if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()!=='') {
-      const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
-      await primarySearch(_$w, query);
-    }
-    else {
-      await loadCategoriesListPrimarySearch(_$w,allvaluesobjects);
-    }
-  });
-
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
-  });
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
-  });
-
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onKeyPress(async (event) => {
-    if( event.key === 'Enter') {
-      if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
-        // _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
-        const baseUrl = await location.baseUrl();
-        location.to(`${baseUrl}/search`);
-
-      } 
-      else {
-        let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
-        const baseUrl = await location.baseUrl();
-        location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
-      }
-    }
-  });
+  if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()!=='') {
+    const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
+    await primarySearch(_$w, query);
+  }
+  else {
+    await loadCategoriesListPrimarySearch(_$w,allvaluesobjects);
+  }
+});
 
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
+});
+
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onKeyPress(async (event) => {
+  if( event.key === 'Enter') {
     if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
+      // _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
       const baseUrl = await location.baseUrl();
       location.to(`${baseUrl}/search`);
-    }
+
+    } 
     else {
       let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
       const baseUrl = await location.baseUrl();
       location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
     }
-  });
+  }
+});
+
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
+  if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
+    const baseUrl = await location.baseUrl();
+    location.to(`${baseUrl}/search`);
+  }
+  else {
+    let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
+    const baseUrl = await location.baseUrl();
+    location.to(`${baseUrl}/search?keyword=${encodedKeyWord}`);
+  }
+});
 }
 
 async function loadCategoriesListPrimarySearch(_$w, allvaluesobjects) {
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
-  
-  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.valueId});
-    }
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
+
+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.valueId});
   }
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
+}
+_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
 }
 
 async function primarySearch(_$w, query) {
-  if(query === undefined || query === '') {
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
-    return false;
-  }
+if(query === undefined || query === '') {
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
+  return false;
+}
+
+const searchByTitle = [{field: 'title', searchTerm: query}];
+const searchByCity = [{field: 'location.fullLocation', searchTerm: query}];
+
+let filter = await getFilter(searchByTitle);
 
-  const searchByTitle = [{field: 'title', searchTerm: query}];
-  const searchByCity = [{field: 'location.fullLocation', searchTerm: query}];
+await _$w('#jobsDataset').setFilter(filter);
+await _$w('#jobsDataset').refresh();
 
-  let filter = await getFilter(searchByTitle);
+let count = _$w('#jobsDataset').getTotalCount();
 
+if( count > 0 ) {
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
+}
+else {
+  filter = await getFilter(searchByCity);
   await _$w('#jobsDataset').setFilter(filter);
   await _$w('#jobsDataset').refresh();
 
-  let count = _$w('#jobsDataset').getTotalCount();
-
-  if( count > 0 ) {
+  count = _$w('#jobsDataset').getTotalCount();
+  if  (count > 0) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
   }
-  else {
-    filter = await getFilter(searchByCity);
-    await _$w('#jobsDataset').setFilter(filter);
-    await _$w('#jobsDataset').refresh();
-  
-    count = _$w('#jobsDataset').getTotalCount();
-    if  (count > 0) {
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("jobResults");
-    }
-    else{
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
-    }
+  else{
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
   }
+}
 
-  return count > 0;
+return count > 0;
 }
 
 async function getValueFromValueId(valueId) {
-  const result = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
-  console.log("result: ",result);
-  console.log("valueId: ",valueId);
+const result = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
+console.log("result: ",result);
+console.log("valueId: ",valueId);
 
-  return result.find(value => value.valueId === valueId);
+return result.find(value => value.valueId === valueId);
 }
 
-  async function getLatestJobsByValue(Value) {
-    const jobs=Value.multiRefJobsCustomValues;
-    const latestJobs = jobs
-    .sort((a, b) => new Date(b.releasedDate) - new Date(a.releasedDate))
-    .slice(0, 5);
-    return latestJobs;
-  }
+async function getLatestJobsByValue(Value) {
+  const jobs=Value.multiRefJobsCustomValues;
+  const latestJobs = jobs
+  .sort((a, b) => new Date(b.releasedDate) - new Date(a.releasedDate))
+  .slice(0, 5);
+  return latestJobs;
+}
 
-  module.exports = {
-    groupValuesByField,
-    debounce,
-    getAllRecords,
-    getFieldById,
-    getFieldByTitle,
-    getCorrectOption,
-    getOptionIndexFromCheckBox,
-    loadPrimarySearchRepeater,
-    bindPrimarySearch,
-    primarySearch,
-    getLatestJobsByValue,
-    getValueFromValueId,
-    getAllRecordsWithoutMultiRef
+module.exports = {
+  groupValuesByField,
+  debounce,
+  getAllRecords,
+  getFieldById,
+  getFieldByTitle,
+  getCorrectOption,
+  getOptionIndexFromCheckBox,
+  loadPrimarySearchRepeater,
+  bindPrimarySearch,
+  primarySearch,
+  getLatestJobsByValue,
+  getValueFromValueId,
+  getAllRecordsWithoutMultiRef,
+  getAllDatasetItems
 }