sr-npm 1.2.62 → 1.2.64

package/package.json

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

package/public/primarySearchUtils.js

@@ -8,12 +8,10 @@ async function handlePrimarySearch(_$w, allvaluesobjects) {
     // wait for the jobs dataset to be ready
     await _$w("#jobsDataset").onReadyAsync();
 
-    loadPrimarySearchRepeater(_$w);
     await bindPrimarySearch(_$w, allvaluesobjects);
 }
 
-function loadPrimarySearchRepeater(_$w) {
-  // handle category state
+function handleCategoryResultsRepeater(_$w) {
   _$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 || '';
   }); 
@@ -30,63 +28,77 @@ function loadPrimarySearchRepeater(_$w) {
   
 }
 
+function getSearchQuery(_$w) {
+  return _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
+}
+
 async function bindPrimarySearch(_$w, allvaluesobjects) {
-    const handleSearchInput = async () => { 
-      const query = _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value?.toLowerCase().trim() || '';
-      await queryPrimarySearchResults(_$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(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 queryPrimarySearchResults(_$w, query);
-      }
-      else {
-        await loadCategoriesListPrimarySearch(_$w,allvaluesobjects);
-      }
-    });
-    
+
+    handleCategoryResultsRepeater(_$w);
+    await handleSearchInput(_$w, allvaluesobjects);
+
+    // on mouse out collapse the results container
     _$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}`);
-        }
-      }
-    });
-    
+    // handle the click on the search button
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_BUTTON).onClick(async () => {
-      if(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value.trim()==='') {
+      if(getSearchQuery(_$w) === '') {
         const baseUrl = await location.baseUrl();
         location.to(`${baseUrl}/search`);
       }
       else {
-        let encodedKeyWord=encodeURIComponent(_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value);
+        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 handleSearchInput(_$w, allvaluesobjects) {
+
+    const handleSearchInput = async () => { 
+        await queryPrimarySearchResults(_$w, getSearchQuery(_$w));
+      } 
+
+    // handle the input on the search input
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onInput(async () => { 
+        await debounce(() => handleSearchInput(), 300);
+      });
+    
+    // handle the click on the search input
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onClick(async () => {
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).expand();
+
+        const searchQuery = getSearchQuery(_$w);
+        if(searchQuery !== '') {
+            await queryPrimarySearchResults(_$w, searchQuery);
+        }
+        else {
+            await loadCategoriesListPrimarySearch(_$w,allvaluesobjects);
+        }
+    });
+
+    // handle the key press on the search input
+    _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).onKeyPress(async (event) => {
+        if( event.key === 'Enter') {
+            if(getSearchQuery(_$w) === '') {
+            // _$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}`);
+            }
+        }
+    });
+
+}
+
 async function loadCategoriesListPrimarySearch(_$w, allvaluesobjects) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");
     
@@ -138,7 +150,6 @@ return count > 0;
 }
 
 module.exports = {
-  loadPrimarySearchRepeater,
   bindPrimarySearch,
   queryPrimarySearchResults,
   handlePrimarySearch,