sr-npm 1.2.57 → 1.2.59

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -20,7 +20,7 @@ const { groupValuesByField,
         getOptionIndexFromCheckBox,
         getAllDatasetItems 
       } = require('./pagesUtils');
-const { loadPrimarySearchRepeater, bindPrimarySearch, primarySearch } = require('../public/primarySearchUtil');
+const { handlePrimarySearch, queryPrimarySearchResults } = require('../public/primarySearchUtils');
 
 
 let dontUpdateThisCheckBox;
@@ -50,7 +50,7 @@ async function careersMultiBoxesPageOnReady(_$w,urlParams) {
 
   await loadData(_$w);
   await loadJobsRepeater(_$w); // if we remove the await here the job list will be flaky , it doesn't fill it properly
-  loadPrimarySearchRepeater(_$w);
+  handlePrimarySearch(_$w, allvaluesobjects);
   await loadFilters(_$w);
   loadSelectedValuesRepeater(_$w);
   bindSearchInput(_$w);
@@ -147,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 queryPrimarySearchResults(_$w, decodeURIComponent(urlParams.keyword));
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value = decodeURIComponent(urlParams.keyword);
 
     const items = await getAllDatasetItems(_$w, CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_DATASET);
@@ -641,8 +641,6 @@ async function secondarySearch(_$w,query) {
 }
   function bindSearchInput(_$w) {
     try {
-      bindPrimarySearch(_$w, allvaluesobjects);
-
       const secondarySearchDebounced = debounce(async () => {
       const query = (_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).value || '').toLowerCase().trim();
       await secondarySearch(_$w, query);

package/pages/homePage.js

@@ -5,7 +5,7 @@ const { location } = require('@wix/site-location');
 const {wixData} = require('wix-data');
 const { COLLECTIONS } = require('../backend/collectionConsts');
 const { getAllRecords } = require('./pagesUtils');
-const { bindPrimarySearch, loadPrimarySearchRepeater } = require('../public/primarySearchUtil');
+const { handlePrimarySearch } = require('../public/primarySearchUtils');
 
 let thisObjectVar;
 let searchByCityFlag=false;
@@ -18,8 +18,7 @@ async function homePageOnReady(_$w,thisObject = null) {
 
     if(siteconfig.twg) {
         const allvaluesobjects  = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
-        bindPrimarySearch(_$w, allvaluesobjects);
-        loadPrimarySearchRepeater(_$w)
+        handlePrimarySearch(_$w, allvaluesobjects);
         console.log("siteconfig.twg: ",siteconfig.twg);
 
         if(siteconfig.twg === "external") {

package/public/primarySearchUtils.js

@@ -1,7 +1,13 @@
-const { CAREERS_MULTI_BOXES_PAGE_CONSTS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS, TWG_JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
 const { location } = require("@wix/site-location");
+
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS, TWG_JOBS_COLLECTION_FIELDS } = require('../backend/careersMultiBoxesPageIds');
 const { getFilter } = require('../public/filterUtils');
-const { debounce } = require('./utils');
+const { debounce } = require('../pages/pagesUtils');
+
+async function handlePrimarySearch(_$w, allvaluesobjects) {
+    loadPrimarySearchRepeater(_$w);
+    bindPrimarySearch(_$w, allvaluesobjects);
+}
 
 function loadPrimarySearchRepeater(_$w) {
     
@@ -43,7 +49,7 @@ 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);
+      await queryPrimarySearchResults(_$w, query);
     } 
     
     const primarySearchDebounced = debounce(() => handleSearchInput(), 400);
@@ -57,7 +63,7 @@ function bindPrimarySearch(_$w, allvaluesobjects) {
     
       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);
+        await queryPrimarySearchResults(_$w, query);
       }
       else {
         await loadCategoriesListPrimarySearch(_$w,allvaluesobjects);
@@ -109,7 +115,7 @@ async function loadCategoriesListPrimarySearch(_$w, allvaluesobjects) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
     }
     
-async function primarySearch(_$w, query) {
+async function queryPrimarySearchResults(_$w, query) {
     if(query === undefined || query === '') {
         _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
         return false;
@@ -150,5 +156,6 @@ return count > 0;
 module.exports = {
   loadPrimarySearchRepeater,
   bindPrimarySearch,
-  primarySearch,
+  queryPrimarySearchResults,
+  handlePrimarySearch,
 }