sr-npm 1.7.771 → 1.7.773

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -23,16 +23,20 @@ const pagination = {
 async function careersMultiBoxesPageOnReady(_$w,urlParams) {
     console.log("careersMultiBoxesPageOnReady urlParams: ", urlParams);
     await loadData(_$w);
-    await loadJobsRepeater(_$w);
-    await loadPrimarySearchRepeater(_$w);
-    await loadFilters(_$w);
-    await loadSelectedValuesRepeater(_$w);
-    await bindSearchInput(_$w);
+
+    await Promise.all([
+      loadJobsRepeater(_$w),
+      loadPrimarySearchRepeater(_$w),
+      loadFilters(_$w),
+      loadSelectedValuesRepeater(_$w),
+      bindSearchInput(_$w),
+      loadPaginationButtons(_$w)
+    ]);
+    await handleUrlParams(_$w, urlParams);
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.CLEAR_ALL_BUTTON_ID).onClick(async () => {
       await clearAll(_$w);
     });
-    await loadPaginationButtons(_$w);
-   await handleUrlParams(_$w,urlParams);
+
 }
 
 async function clearAll(_$w) {
@@ -51,6 +55,7 @@ async function clearAll(_$w) {
 
 
 async function loadPrimarySearchRepeater(_$w) {
+  try {
   _$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 || '';
     $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_POSITION_BUTTON).onClick(async () => {
@@ -69,9 +74,13 @@ async function loadPrimarySearchRepeater(_$w) {
      await handleUrlParams(_$w,{category:encodedCategory});
     });
   });
+  } catch (error) {
+    console.error('Failed to load primary search repeater:', error);
+  }
 }
 
 async function handleUrlParams(_$w,urlParams) {
+  try { 
   let applyFiltering=false;
   let keyword=false
   console.log("handleUrlParams urlParams: ", urlParams);
@@ -108,6 +117,9 @@ async function handleUrlParams(_$w,urlParams) {
         _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = jobsFirstPage;
         handlePaginationButtons(_$w);
       }
+  } catch (error) {
+    console.error('Failed to handle url params:', error);
+  }
 }
 
 async function handleParams(_$w,param,value) {
@@ -133,6 +145,7 @@ async function handleParams(_$w,param,value) {
 }
 
 async function loadPaginationButtons(_$w) {
+  try {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).onClick(async () => {
       let nextPageJobs=currentJobs.slice(pagination.pageSize*pagination.currentPage,pagination.pageSize*(pagination.currentPage+1));
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = (nextPageJobs.length+pagination.pageSize*pagination.currentPage).toString();
@@ -148,9 +161,13 @@ async function loadPaginationButtons(_$w) {
       _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = previousPageJobs;
       handlePaginationButtons(_$w);
     });
+  } catch (error) {
+    console.error('Failed to load pagination buttons:', error);
+  }
 }
 
 async function loadSelectedValuesRepeater(_$w) {
+  try {
        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER).onItemReady(($item, itemData) => {
         $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.SELECTED_VALUES_REPEATER_ITEM_LABEL).text = itemData.label || '';
         // Deselect this value from both the selected map and the multibox
@@ -177,16 +194,19 @@ async function loadSelectedValuesRepeater(_$w) {
           });
     });
     await updateSelectedValuesRepeater(_$w);
+  } catch (error) {
+    console.error('Failed to load selected values repeater:', error);
+  }
 }
 
-async function loadData(_$w) {
+async function loadData() {
+  try {
     if(alljobs.length===0) {
         alljobs=await getAllRecords(COLLECTIONS.JOBS);
         currentJobs=alljobs;
       }
     if(Object.keys(valueToJobs).length === 0){
         allvaluesobjects=await getAllRecords(COLLECTIONS.CUSTOM_VALUES);
-        console.log("allvaluesobjects: ", allvaluesobjects);
         for (const value of allvaluesobjects) {
             valueToJobs[value._id]= value.jobIds;
         }
@@ -195,8 +215,12 @@ async function loadData(_$w) {
         allfields=await getAllRecords(COLLECTIONS.CUSTOM_FIELDS);
         allfields.push({_id:"Location",title:"Location"}); 
     }
+  } catch (error) {
+    console.error('Failed to load data:', error);
+  }
 }
 async function loadJobsRepeater(_$w) {
+  try {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).onItemReady(($item, itemData) => {
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_TITLE).text = itemData.title;
       $item(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER_ITEM_TITLE).onClick(async () => {
@@ -213,7 +237,10 @@ async function loadJobsRepeater(_$w) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = currentJobs.length.toString();
     updateTotalJobsCountText(_$w);
     handlePaginationButtons(_$w);
+  } catch (error) {
+    console.error('Failed to load jobs repeater:', error);
   }
+}
 
   function updateTotalJobsCountText(_$w) {
     secondarySearchIsFilled? _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.TotalJobsCountText).text = `${currentSecondarySearchJobs.length} Jobs`:
@@ -341,30 +368,30 @@ async function loadJobsRepeater(_$w) {
     if(keyword) {
       finalFilteredJobs=currentJobs
     }
-    let addedJobsIds=[]
+    let addedJobsIds=new Set();
     // AND across categories, OR within each category
     for (const [key, values] of selectedByField.entries()) {
         for(const job of finalFilteredJobs) {
             if(key==="Location"){
                 //if it is location then we check if selecred values (which is an array) have job city text
                 if(values.includes(job[JOBS_COLLECTION_FIELDS.CITY_TEXT])) {
-                    if(!addedJobsIds.includes(job._id)) {
+                    if(!addedJobsIds.has(job._id)) {
                         tempFilteredJobs.push(job);
-                        addedJobsIds.push(job._id);
+                        addedJobsIds.add(job._id);
                     }
                 }
             }
             else{
             //if it is not location then we check if selecred values (which is an array) have one of the job values (whcih is also an array)
             if(job[JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES].some(value=>values.includes(value._id))) {
-                if(!addedJobsIds.includes(job._id)) {
+                if(!addedJobsIds.has(job._id)) {
                     tempFilteredJobs.push(job);
-                    addedJobsIds.push(job._id);
+                    addedJobsIds.add(job._id);
                 }
             }
         }
         }
-        addedJobsIds=[]
+        addedJobsIds.clear();
         finalFilteredJobs=tempFilteredJobs;
         tempFilteredJobs=[];
     }
@@ -387,11 +414,20 @@ async function loadJobsRepeater(_$w) {
 function handlePaginationButtons(_$w)
 {
   handlePageUrlParam();
+
   pagination.currentPage===1? _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS).disable():_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS).enable();
   if(secondarySearchIsFilled) {
+    if(currentSecondarySearchJobs.length===0) {
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).disable();
+      return;
+    }
     pagination.currentPage>=Math.ceil(currentSecondarySearchJobs.length/pagination.pageSize)? _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).disable():_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).enable();
   }
   else {
+    if(currentJobs.length===0) {
+      _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).disable();
+      return;
+    }
   pagination.currentPage>=Math.ceil(currentJobs.length/pagination.pageSize)? _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).disable():_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).enable();
   }
 }
@@ -498,6 +534,7 @@ async function secondarySearch(_$w,query) {
     return allsecondarySearchJobs;
 }
   async function bindSearchInput(_$w) {
+    try {
     const primarySearchDebounced = debounce(async () => {
       const query = (_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_INPUT).value || '').toLowerCase().trim();
       await primarySearch(_$w, query);
@@ -556,7 +593,10 @@ async function secondarySearch(_$w,query) {
         _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.RESULTS_CONTAINER).collapse();
       }
     });
+  } catch (error) {
+    console.error('Failed to bind search input:', error);
   }
+}
 
   async function loadCategoriesListPrimarySearch(_$w) {
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX).changeState("categoryResults");

package/pages/pagesUtils.js

@@ -23,7 +23,7 @@ function groupValuesByField(values, refKey) {
   };
 
   async function getAllRecords(collectionId) {
-    let q = wixData.query(collectionId).include(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES)
+    const q = wixData.query(collectionId).include(JOBS_COLLECTION_FIELDS.MULTI_REF_JOBS_CUSTOM_VALUES)
   
   
     const items = [];

package/tests/multiSearchBoxCareers.spec.js

@@ -1,9 +1,40 @@
 const rewire = require('rewire');
 const MockJobBuilder = require('./mockJobBuilder');
-const { CAREERS_MULTI_BOXES_PAGE_CONSTS } = require('../backend/careersMultiBoxesPageIds');
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS, CATEGORY_CUSTOM_FIELD_ID_IN_CMS } = require('../backend/careersMultiBoxesPageIds');
+
+// Mock Wix modules
+const mockQueryParams = {
+  add: jest.fn(),
+  remove: jest.fn()
+};
+
+const mockLocation = {
+  url: 'https://test.com',
+  path: '/test',
+  query: {}
+};
+
+// Temporarily mock require for Wix modules
+const Module = require('module');
+const originalRequire = Module.prototype.require;
+Module.prototype.require = function(id) {
+  if (id === 'wix-location-frontend') {
+    return { queryParams: mockQueryParams };
+  }
+  if (id === '@wix/site-location') {
+    return { location: mockLocation };
+  }
+  return originalRequire.apply(this, arguments);
+};
 
 const careersMultiBoxesPage = rewire('../pages/careersMultiBoxesPage');
+
+// Restore original require
+Module.prototype.require = originalRequire;
+
 const secondarySearch = careersMultiBoxesPage.__get__('secondarySearch');
+const primarySearch = careersMultiBoxesPage.__get__('primarySearch');
+const loadCategoriesListPrimarySearch = careersMultiBoxesPage.__get__('loadCategoriesListPrimarySearch');
 
 
 
@@ -15,6 +46,7 @@ describe('secondarySearch function tests', () => {
   let mockPageButtonNext;
   let mockPageButtonPrevious;
   let mockTotalJobsCountText;
+  let mockJobsMultiStateBox;
 
   beforeEach(() => {
     mockJobsRepeater = { data: null };
@@ -29,6 +61,7 @@ describe('secondarySearch function tests', () => {
       disable: jest.fn() 
     };
     mockTotalJobsCountText = { text: '' };
+    mockJobsMultiStateBox = { changeState: jest.fn() };
 
     mockW = jest.fn((selector) => {
       const mocks = {
@@ -37,7 +70,8 @@ describe('secondarySearch function tests', () => {
         [CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText]: mockPaginationTotalCountText,
         [CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT]: mockPageButtonNext,
         [CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_PREVIOUS]: mockPageButtonPrevious,
-        [CAREERS_MULTI_BOXES_PAGE_CONSTS.TotalJobsCountText]: mockTotalJobsCountText
+        [CAREERS_MULTI_BOXES_PAGE_CONSTS.TotalJobsCountText]: mockTotalJobsCountText,
+        [CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_MULTI_STATE_BOX]: mockJobsMultiStateBox
       };
       return mocks[selector] || {
         data: null,
@@ -47,7 +81,8 @@ describe('secondarySearch function tests', () => {
         onChange: jest.fn(),
         onInput: jest.fn(),
         enable: jest.fn(),
-        disable: jest.fn()
+        disable: jest.fn(),
+        changeState: jest.fn()
       };
     });
   });
@@ -57,7 +92,7 @@ describe('secondarySearch function tests', () => {
     careersMultiBoxesPage.__set__('currentJobs', []);
   });
 
-  it('should return count > 0 when searching for existing job title', () => {
+  it('should return count > 0 when searching for existing job title', async () => {
     
     
     let mockJobs = MockJobBuilder.createMultiple(11, (builder, index) => {
@@ -69,27 +104,26 @@ describe('secondarySearch function tests', () => {
 
     careersMultiBoxesPage.__set__('currentJobs', mockJobs);
 
-    const result = secondarySearch(mockW, 'product');
+    const result = await secondarySearch(mockW, 'product');
 
     expect(result.length).toBe(11);
-    expect(mockTotalJobsCountText.text).toContain('11 Jobs');
+    expect(mockTotalJobsCountText.text).toContain('11');
     expect(mockPaginationCurrentText.text).toBe('10');
     expect(mockPaginationTotalCountText.text).toBe('11');
     expect(mockPageButtonNext.enable).toHaveBeenCalled();
     expect(mockPageButtonPrevious.disable).toHaveBeenCalled();
   });
 
-  it('should return 0 when searching for non-existing job title', () => {
+  it('should return 0 when searching for non-existing job title', async () => {
     let mockJobs = MockJobBuilder.createMultiple(11, (builder, index) => {
       builder.withTitle(`random job ${index}`);
     });
     careersMultiBoxesPage.__set__('currentJobs', mockJobs);
 
-    const result = secondarySearch(mockW, 'unicorn hunter');
+    const result = await secondarySearch(mockW, 'unicorn hunter');
 
     expect(result.length).toBe(0);
     expect(mockTotalJobsCountText.text).toContain('0 Jobs');
-    expect(mockPaginationCurrentText.text).toBe('0');
     expect(mockPaginationTotalCountText.text).toBe('0');
     expect(mockPageButtonNext.disable).toHaveBeenCalled();
     expect(mockPageButtonPrevious.disable).toHaveBeenCalled();
@@ -98,3 +132,75 @@ describe('secondarySearch function tests', () => {
 
   });
 
+
+describe('primarySearch function tests', () => {
+  let mockW;
+  let mockprimarySearcJobResult;
+  let mockprimarySearchMultiBox;
+  let mockCategoryResultsRepeater;
+
+  beforeEach(() => {
+    mockprimarySearcJobResult = { data: null };
+    mockprimarySearchMultiBox = { changeState: jest.fn() };
+    mockCategoryResultsRepeater = { data: null };
+
+    mockW = jest.fn((selector) => {
+      const mocks = {
+        [CAREERS_MULTI_BOXES_PAGE_CONSTS.JOB_RESULTS_REPEATER]: mockprimarySearcJobResult,
+        [CAREERS_MULTI_BOXES_PAGE_CONSTS.PRIMARY_SEARCH_MULTI_BOX]: mockprimarySearchMultiBox,
+        [CAREERS_MULTI_BOXES_PAGE_CONSTS.CATEGORY_RESULTS_REPEATER]: mockCategoryResultsRepeater
+      };
+      return mocks[selector]
+    });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    careersMultiBoxesPage.__set__('currentJobs', []);
+  });
+
+  it('should show job results for existing job title', async () => {
+    let mockJobs = MockJobBuilder.createMultiple(11, (builder, index) => {
+      builder.withTitle(`Product Manager ${index}`);
+    });
+    careersMultiBoxesPage.__set__('alljobs', mockJobs);
+
+    await primarySearch(mockW, 'product');
+    
+    expect(mockprimarySearchMultiBox.changeState).toHaveBeenCalledWith('jobResults');
+    expect(mockprimarySearcJobResult.data).toHaveLength(11);
+    expect(mockprimarySearcJobResult.data).toEqual(mockJobs);
+  });
+
+   it('should show no results for non-existing job title', async () => {
+     let mockJobs = MockJobBuilder.createMultiple(11, (builder, index) => {
+       builder.withTitle(`Product Manager ${index}`);
+     });
+     careersMultiBoxesPage.__set__('alljobs', mockJobs);
+ 
+     await primarySearch(mockW, 'unicorn hunter');
+     
+     expect(mockprimarySearchMultiBox.changeState).toHaveBeenCalledWith('noResults');
+     expect(mockprimarySearcJobResult.data).toBeNull();
+   });
+
+   it('should fill category repeater when clicking on empty primary search input', async () => {
+     const mockCategoryValues = [
+       { _id: 'cat1', title: 'Engineering', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, totalJobs: 5 },
+       { _id: 'cat2', title: 'Marketing', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, totalJobs: 3 },
+       { _id: 'cat3', title: 'Sales', customField: CATEGORY_CUSTOM_FIELD_ID_IN_CMS, totalJobs: 7 }
+     ];
+     
+     careersMultiBoxesPage.__set__('allvaluesobjects', mockCategoryValues);
+
+     await loadCategoriesListPrimarySearch(mockW);
+
+     expect(mockprimarySearchMultiBox.changeState).toHaveBeenCalledWith('categoryResults');
+     expect(mockCategoryResultsRepeater.data).toHaveLength(3);
+     expect(mockCategoryResultsRepeater.data[0].title).toContain('Engineering (5)');
+     expect(mockCategoryResultsRepeater.data[1].title).toContain('Marketing (3)');
+     expect(mockCategoryResultsRepeater.data[2].title).toContain('Sales (7)');
+   });
+ 
+ });
+