sr-npm 1.2.52 → 1.2.53

package/backend/careersMultiBoxesPageIds.js

@@ -35,7 +35,7 @@ const TWG_JOBS_COLLECTION_FIELDS={
     LINK_JOBS_REF_ID_SLUG: 'link-jobs-refId-slug',
 }
 
-const CATEGORY_CUSTOM_FIELD_ID_IN_CMS='5cd8c873c9e77c0008aa7d23';
+const CATEGORY_CUSTOM_FIELD_ID_IN_CMS = '5cd8c873c9e77c0008aa7d23';
 
 // used for filters - don't add anything else here
 const fieldTitlesInCMS={

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sr-npm",
-  "version": "1.2.52",
+  "version": "1.2.53",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "@eslint/js": "^9.39.0",
     "eslint": "^9.38.0",
     "globals": "^16.4.0",
-    "prettier": "^3.6.2",
+    "prettier": "^3.7.3",
     "rewire": "^9.0.1"
   }
 }

package/pages/careersMultiBoxesPage.js

@@ -18,11 +18,9 @@ const { groupValuesByField,
         getFieldByTitle,
         getCorrectOption,
         getOptionIndexFromCheckBox,
-        loadPrimarySearchRepeater,
-        bindPrimarySearch,
-        primarySearch,
         getAllDatasetItems 
 } = require('./pagesUtils');
+const { loadPrimarySearchRepeater, bindPrimarySearch, filterPrimarySearchResults } = require('../public/primarySearchUtil');
 
 
 let dontUpdateThisCheckBox;
@@ -149,7 +147,7 @@ async function handleUrlParams(_$w,urlParams,handleBackAndForth=false) {
   let currentApplyFilterFlag=false;
   //apply this first to determine all jobs
   if(urlParams.keyword) {
-    applyFiltering = await primarySearch(_$w, decodeURIComponent(urlParams.keyword));
+    applyFiltering = await filterPrimarySearchResults(_$w, decodeURIComponent(urlParams.keyword));
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value = decodeURIComponent(urlParams.keyword);
 
     const items = await getAllDatasetItems(_$w, GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET); 
@@ -642,7 +640,8 @@ async function secondarySearch(_$w,query) {
     await refreshFacetCounts(_$w); 
     return allsecondarySearchJobs;
 }
-  function bindSearchInput(_$w) {
+
+function bindSearchInput(_$w) {
     try {
       bindPrimarySearch(_$w, allvaluesobjects);
 

package/pages/homePage.js

@@ -5,7 +5,8 @@ const { location } = require('@wix/site-location');
 const {wixData} = require('wix-data');
 const { COLLECTIONS } = require('../backend/collectionConsts');
 const { GLOBAL_SECTIONS_SELECTORS } = require('../public/selectors');
-const { bindPrimarySearch, getAllRecords, loadPrimarySearchRepeater } = require('./pagesUtils');
+const { getAllRecords } = require('./pagesUtils');
+const { bindPrimarySearch, loadPrimarySearchRepeater } = require('../public/primarySearchUtil');
 
 let thisObjectVar;
 let searchByCityFlag=false;

package/pages/pagesUtils.js

@@ -1,10 +1,8 @@
 const { items: wixData } = require('@wix/data');
 const { JOBS_COLLECTION_FIELDS,COLLECTIONS } = require('../backend/collectionConsts');
-const { CAREERS_MULTI_BOXES_PAGE_CONSTS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS, TWG_JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS } = require('../backend/careersMultiBoxesPageIds');
 const { GLOBAL_SECTIONS_SELECTORS} = require('../public/selectors');
-const { location } = require("@wix/site-location");
 const { normalizeString } = require('../backend/utils');
-const { getFilter } = require('../public/filterUtils');
 
 function groupValuesByField(values, refKey) {
     const map = new Map();
@@ -98,153 +96,6 @@ function getOptionIndexFromCheckBox(options,value) {
   }
 }
 
-function loadPrimarySearchRepeater(_$w) {
-  
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
-    $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_POSITION_BUTTON).label = itemData.title || '';   
-  });
-  
-  _$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,
-      
-    );
-    if(!clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] && !clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]) {
-      console.error("clickedItemData does not have link-jobs-title or link-jobs-refId-slug");
-      return;
-    }
-
-    location.to( clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE]|| clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]);
-    
-
-});
-_$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}`);
-});
-
-}
-
-async function bindPrimarySearch(_$w, allvaluesobjects) {
-  // wait for the jobs dataset to be ready
-  await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).onReadyAsync();
-
-  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);
-
-  _$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(GLOBAL_SECTIONS_SELECTORS.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(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).onMouseOut(async () => {
-    _$w(GLOBAL_SECTIONS_SELECTORS.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(GLOBAL_SECTIONS_SELECTORS.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(GLOBAL_SECTIONS_SELECTORS.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(GLOBAL_SECTIONS_SELECTORS.CATEGORY_RESULTS);
-
-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;
-}
-
-async function primarySearch(_$w, query) {
-  if(query === undefined || query === '') {
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.CATEGORY_RESULTS);
-    return false;
-  }
-
-  const searchByTitle = [{field: 'title', searchTerm: query}];
-  const searchByCity = [{field: 'location.fullLocation', searchTerm: query}];
-
-  let filter = await getFilter(searchByTitle);
-
-  await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(filter);
-  await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
-
-  let count = _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
-
-  if( count > 0 ) {
-    _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
-    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.JOB_RESULTS);
-  }
-  else {
-    filter = await getFilter(searchByCity);
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(filter);
-    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
-
-    count = _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
-    if  (count > 0) {
-      _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.JOB_RESULTS);
-    }
-    else{
-      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.NO_RESULTS);
-    }
-  }
-
-  return count > 0;
-}
-
 async function getValueFromValueId(valueId) {
 const result = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
 console.log("result: ",result);
@@ -269,9 +120,6 @@ module.exports = {
   getFieldByTitle,
   getCorrectOption,
   getOptionIndexFromCheckBox,
-  loadPrimarySearchRepeater,
-  bindPrimarySearch,
-  primarySearch,
   getLatestJobsByValue,
   getValueFromValueId,
   getAllRecordsWithoutMultiRef,

package/public/primarySearchUtil.js

@@ -0,0 +1,153 @@
+const { location } = require("@wix/site-location");
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS, TWG_JOBS_COLLECTION_FIELDS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS } = require('../backend/careersMultiBoxesPageIds');
+const { GLOBAL_SECTIONS_SELECTORS} = require('../public/selectors');
+const { getFilter } = require('../public/filterUtils');
+const { debounce } = require('../public/filterUtils');
+
+function loadPrimarySearchRepeater(_$w) {
+    
+    _$w("jobResultsRepeater").onClick((event) => {
+      const $item = _$w.at(event.context);
+      const clickedItemData = $item(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getCurrentItem();
+
+      if(!clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] && !clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]) {
+        console.error("clickedItemData does not have link-jobs-title or link-jobs-refId-slug");
+        return;
+      }
+  
+      location.to(clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_TITLE] || clickedItemData[TWG_JOBS_COLLECTION_FIELDS.LINK_JOBS_REF_ID_SLUG]);
+    });
+  
+  _$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 getPrimarySearchInputValue(_$w) {
+  return _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
+}
+
+async function bindPrimarySearch(_$w, allvaluesobjects) {
+    // wait for the jobs dataset to be ready
+    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).onReadyAsync();
+  
+    const handleSearchInput = async () => { 
+      const query = getPrimarySearchInputValue(_$w);
+      await filterPrimarySearchResults(_$w, query);
+    } 
+    
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => { 
+        await debounce(() => handleSearchInput(), 300);
+    });
+  
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
+      _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
+
+      const query = getPrimarySearchInputValue(_$w);
+      if( query !== '') {
+        await filterPrimarySearchResults(_$w, query);
+      }
+      else {
+        await loadCategoriesListPrimarySearch(_$w,allvaluesobjects);
+      }
+    });
+  
+    _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).onMouseOut(async () => {
+      _$w(GLOBAL_SECTIONS_SELECTORS.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(GLOBAL_SECTIONS_SELECTORS.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(GLOBAL_SECTIONS_SELECTORS.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 filterPrimarySearchResults(_$w, query) {
+    if(query === undefined || query === '') {
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.CATEGORY_RESULTS);
+        return false;
+    }
+
+    const searchByTitle = [{field: 'title', searchTerm: query}];
+    const searchByCity = [{field: 'location.fullLocation', searchTerm: query}];
+
+    let filter = await getFilter(searchByTitle);
+
+    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(filter);
+    await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
+
+    let count = _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
+
+    if( count > 0 ) {
+        _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.JOB_RESULTS);
+    }
+    else {
+        filter = await getFilter(searchByCity);
+        await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).setFilter(filter);
+        await _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).refresh();
+
+        count = _$w(GLOBAL_SECTIONS_SELECTORS.JOBS_DATASET).getTotalCount();
+        if  (count > 0) {
+        _$w(GLOBAL_SECTIONS_SELECTORS.RESULTS_CONTAINER).expand();
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.JOB_RESULTS);
+        }
+        else{
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.NO_RESULTS);
+        }
+    }
+
+    return count > 0;
+}
+
+async function loadCategoriesListPrimarySearch(_$w, allvaluesobjects) {
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState(GLOBAL_SECTIONS_SELECTORS.CATEGORY_RESULTS);
+  
+    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;
+}
+
+module.exports = {
+  loadPrimarySearchRepeater,
+  bindPrimarySearch,
+  filterPrimarySearchResults,
+}