sr-npm 1.2.32 → 1.2.34

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -119,10 +119,11 @@ async function handleUrlParams(_$w,urlParams) {
   let currentApplyFilterFlag=false;
   //apply this first to determine all jobs
   if(urlParams.keyword) {
-    applyFiltering = await primarySearch(_$w, decodeURIComponent(urlParams.keyword), alljobs);
+    applyFiltering = await primarySearch(_$w, decodeURIComponent(urlParams.keyword));
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value = decodeURIComponent(urlParams.keyword);
-    currentJobs = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;   
-    keywordAllJobs = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).data;
+    const data = _$w("#jobsDataset").getItems()?.items || [];
+    currentJobs = data;   
+    keywordAllJobs = data;
   }
   
   for (const url of possibleUrlParams)
@@ -602,9 +603,9 @@ async function secondarySearch(_$w,query) {
 }
   function bindSearchInput(_$w) {
     try {
-       bindPrimarySearch(_$w, allvaluesobjects);
+      bindPrimarySearch(_$w, allvaluesobjects);
 
-    const secondarySearchDebounced = debounce(async () => {
+      const secondarySearchDebounced = debounce(async () => {
       const query = (_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SECONDARY_SEARCH_INPUT).value || '').toLowerCase().trim();
       await secondarySearch(_$w, query);
     }, 150);

package/pages/homePage.js

@@ -15,7 +15,7 @@ async function homePageOnReady(_$w,thisObject = null) {
     const siteconfig = queryResult.items[0];
 
     if(siteconfig.twg) {
-        const allvaluesobjects=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
+        const allvaluesobjects  = await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
         bindPrimarySearch(_$w, allvaluesobjects);
         loadPrimarySearchRepeater(_$w)
         console.log("siteconfig.twg: ",siteconfig.twg);

package/pages/pagesUtils.js

@@ -84,19 +84,13 @@ function groupValuesByField(values, refKey) {
 
 function loadPrimarySearchRepeater(_$w) {
   
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER).onItemReady(async ($item, itemData) => {
-    if(!itemData.title) {
-      console.log("!!!!!!!!!!!! itemData has no title: ",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,
       
     );
+    
     // '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')
@@ -127,7 +121,10 @@ function loadPrimarySearchRepeater(_$w) {
 
 function bindPrimarySearch(_$w, allvaluesobjects) {
 
-  const handleSearchInput = async () => { await primarySearch(_$w) } 
+  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);
 
@@ -135,41 +132,39 @@ function bindPrimarySearch(_$w, allvaluesobjects) {
     await primarySearchDebounced();
   });
 
-_$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()!=='') {
-    await primarySearch(_$w);
-  }
-  else {
-    await loadCategoriesListPrimarySearch(_$w,allvaluesobjects);
-  }
-});
+  _$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.RESULTS_CONTAINER).onMouseOut(async () => {
-  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
-});
+    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_INPUT).onKeyPress(async (event) => {
-  if( event.key==='Enter') {
-    console.log("primary search input key pressed");
-    console.log("_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value: ",_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
-    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`);
+  _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).onMouseOut(async () => {
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
+  });
 
-    } 
-    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_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 () => {
-    console.log("primary search button clicked");
-    console.log("_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value: ",_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
+  _$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`);
@@ -184,6 +179,7 @@ _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
 
 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) {
@@ -193,9 +189,7 @@ async function loadCategoriesListPrimarySearch(_$w,allvaluesobjects) {
   _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER).data = categoryValues;
 }
 
-async function primarySearch(_$w) {
-  const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
-
+async function primarySearch(_$w, query) {
   if(query === undefined || query === '') {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
     return false;
@@ -229,6 +223,8 @@ async function primarySearch(_$w) {
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("noResults");
     }
   }
+
+  return count > 0;
 }
 
   async function getValueFromValueId(valueId) {