sr-npm 1.7.724 → 1.7.726

package/package.json

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

package/pages/careersMultiBoxesPage.js

@@ -1,6 +1,6 @@
 const { COLLECTIONS,CUSTOM_VALUES_COLLECTION_FIELDS,JOBS_COLLECTION_FIELDS } = require('../backend/collectionConsts');
+const { queryParams } = require('wix-location-frontend');
 const {CAREERS_MULTI_BOXES_PAGE_CONSTS,FiltersIds,fieldTitlesInCMS} = require('../backend/careersMultiBoxesPageIds');
-const { query,queryParams,onChange} = require("wix-location-frontend");
 const { groupValuesByField, debounce, getAllRecords, getFieldById, getFieldByTitle,getCorrectOption,getOptionIndexFromCheckBox } = require('./pagesUtils');
 
 let dontUpdateThisCheckBox;
@@ -51,6 +51,26 @@ async function handleUrlParams(_$w,urlParams) {
     if(applyFiltering) {
       await updateJobsAndNumbersAndFilters(_$w);
     }
+    if(urlParams.page) {
+      console.log("urlParams.page: ", urlParams.page);
+      if(Number.isNaN(Number(urlParams.page)) || Number(urlParams.page)<=1 || Number(urlParams.page)>Math.ceil(currentJobs.length/pagination.pageSize)) {
+        console.log("page number is invalid, removing page from url");
+        queryParams.remove(["page"]);
+        return;
+      }
+      
+        console.log("(Number(urlParams.page)*pagination.pageSize).toString();  ", (Number(urlParams.page)*pagination.pageSize).toString());
+        let paginationCurrentText=Number(urlParams.page)*pagination.pageSize
+        if(Number(urlParams.page)==Math.ceil(currentJobs.length/pagination.pageSize)) {
+          console.log("last page, subtracting the remaining jobs from the pagination current text");
+          paginationCurrentText=paginationCurrentText-(currentJobs.length%pagination.pageSize);          
+        }
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = paginationCurrentText.toString();
+        pagination.currentPage=Number(urlParams.page);
+        const jobsFirstPage=currentJobs.slice(pagination.pageSize*(pagination.currentPage),pagination.pageSize*pagination.currentPage);
+        _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = jobsFirstPage;
+        handlePaginationButtons(_$w);
+      }
 }
 
 async function handleParams(_$w,param,value) {
@@ -314,14 +334,26 @@ async function loadJobsRepeater(_$w) {
 
 function handlePaginationButtons(_$w,secondarySearch=false)
 {
+  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(secondarySearch) {
-    pagination.currentPage===Math.ceil(secondarySearchJobs.length/pagination.pageSize)? _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).disable():_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).enable();
+    pagination.currentPage>=Math.ceil(secondarySearchJobs.length/pagination.pageSize)? _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).disable():_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.PAGE_BUTTON_NEXT).enable();
   }
   else {
-  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();
+  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();
   }
 }
+
+function handlePageUrlParam() {
+  if(pagination.currentPage==1)
+  {
+      queryParams.remove(["page"]);
+  }
+  else{
+    queryParams.add({ page: pagination.currentPage });
+  }
+  
+}
 async function refreshFacetCounts(_$w,clearAll=false) {   
     const fieldIds = Array.from(optionsByFieldId.keys());
     const currentJobsIds=currentJobs.map(job=>job._id);
@@ -365,26 +397,21 @@ function primarySearch(_$w,query) {
   console.log("primary search query: ", query);
 }
 function secondarySearch(_$w,query) {
-  console.log("secondary search query: ", query);
   if(query.length===0) {
     secondarySearchJobs=currentJobs;
   }
   else {
     secondarySearchJobs=currentJobs.filter(job=>job.title.toLowerCase().includes(query));
   }
-      console.log("current jobs length: ", currentJobs.length);
-      console.log("current jobs: ", currentJobs);
  
     const jobsFirstPage=secondarySearchJobs.slice(0,pagination.pageSize);
-    console.log("jobs first page: ", jobsFirstPage);
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data = jobsFirstPage;
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText).text = jobsFirstPage.length.toString();
     _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationTotalCountText).text = secondarySearchJobs.length.toString();
     pagination.currentPage=1;
     handlePaginationButtons(_$w,true);
     updateTotalJobsCountText(_$w,true);
-    console.log("_$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data : ", _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data);
-    return _$w(CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER).data
+    return secondarySearchJobs;
 }
   function bindSearchInput(_$w) {
     const primarySearchDebounced = debounce(() => {
@@ -400,5 +427,6 @@ function secondarySearch(_$w,query) {
   }
 
 module.exports = {
-    careersMultiBoxesPageOnReady
+    careersMultiBoxesPageOnReady,
+    secondarySearch
 };

package/tests/mockJobBuilder.js

@@ -0,0 +1,182 @@
+class MockJobBuilder {
+  constructor() {
+    this.reset();
+  }
+
+  reset() {
+    this.jobData = {
+      id: this.generateId(),
+      title: "Software Engineer",
+      uuid: this.generateUuid(),
+      refNumber: this.generateRefNumber(),
+      company: {
+        identifier: "TheWarehouseGroup1",
+        name: "The Warehouse Group"
+      },
+      location: {
+        city: "Auckland",
+        region: "Auckland Region",
+        country: "nz",
+        address: "123 Queen Street",
+        postalCode: "1010",
+        remote: false,
+        latitude: "-36.8484597",
+        longitude: "174.7633315",
+        fullLocation: "Auckland, Auckland Region, New Zealand"
+      },
+      employmentType: "Full-time",
+      customField: [
+        {
+          fieldId: "5cd160b26b2f07000673dc00",
+          fieldLabel: "Brands",
+          valueId: "2b6526b2-ed37-426c-8592-1c580f462334",
+          valueLabel: "The Warehouse"
+        }
+      ]
+    };
+    return this;
+  }
+
+  generateId() {
+    return `74400009${Math.floor(1000000 + Math.random() * 9000000)}`;
+  }
+
+  generateUuid() {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+      const r = Math.random() * 16 | 0;
+      const v = c === 'x' ? r : (r & 0x3 | 0x8);
+      return v.toString(16);
+    });
+  }
+
+  generateRefNumber() {
+    return `REF${Math.floor(10000 + Math.random() * 90000)}G`;
+  }
+
+  withId(id) {
+    this.jobData.id = id;
+    return this;
+  }
+
+  withTitle(title) {
+    this.jobData.title = title;
+    return this;
+  }
+
+  withUuid(uuid) {
+    this.jobData.uuid = uuid;
+    return this;
+  }
+
+  withRefNumber(refNumber) {
+    this.jobData.refNumber = refNumber;
+    return this;
+  }
+
+  withCompany(identifier, name) {
+    this.jobData.company = {
+      identifier: identifier || this.jobData.company.identifier,
+      name: name || this.jobData.company.name
+    };
+    return this;
+  }
+
+  withLocation(locationData) {
+    this.jobData.location = {
+      ...this.jobData.location,
+      ...locationData
+    };
+    return this;
+  }
+
+  withCity(city, region = null, fullLocation = null) {
+    this.jobData.location.city = city;
+    if (region) this.jobData.location.region = region;
+    if (fullLocation) {
+      this.jobData.location.fullLocation = fullLocation;
+    } else {
+      this.jobData.location.fullLocation = `${city}, ${this.jobData.location.region}, New Zealand`;
+    }
+    return this;
+  }
+
+  withEmploymentType(employmentType) {
+    this.jobData.employmentType = employmentType;
+    return this;
+  }
+
+  withCustomField(fieldId, fieldLabel, valueId, valueLabel) {
+    this.jobData.customField.push({
+      fieldId,
+      fieldLabel,
+      valueId,
+      valueLabel
+    });
+    return this;
+  }
+
+  withCustomFields(fields) {
+    this.jobData.customField = fields;
+    return this;
+  }
+
+  asRemote() {
+    this.jobData.location.remote = true;
+    return this;
+  }
+
+  asOnsite() {
+    this.jobData.location.remote = false;
+    return this;
+  }
+
+  build() {
+    const result = { ...this.jobData };
+    this.reset();
+    return result;
+  }
+
+  static createDefault() {
+    return new MockJobBuilder().build();
+  }
+
+  static createSeniorEngineer() {
+    return new MockJobBuilder()
+      .withTitle("Senior Software Engineer")
+      .withCity("Dunedin", "Otago Region")
+      .withEmploymentType("Full-time")
+      .build();
+  }
+
+  static createBackendDeveloper() {
+    return new MockJobBuilder()
+      .withTitle("Backend Developer")
+      .withCity("Auckland", "Auckland Region")
+      .withEmploymentType("Part-time")
+      .build();
+  }
+
+  static createProductManager() {
+    return new MockJobBuilder()
+      .withTitle("Product Manager")
+      .withCity("Wellington", "Wellington Region")
+      .withEmploymentType("Full-time")
+      .asRemote()
+      .build();
+  }
+
+  static createMultiple(count, customizer = null) {
+    const jobs = [];
+    for (let i = 0; i < count; i++) {
+      const builder = new MockJobBuilder();
+      if (customizer) {
+        customizer(builder, i);
+      }
+      jobs.push(builder.build());
+    }
+    return jobs;
+  }
+}
+
+module.exports = MockJobBuilder;
+

package/tests/multiSearchBoxCareers.spec.js

@@ -1,24 +1,100 @@
-const { executeApiRequest } = require('tests-utils');
-const { clearCollections } = require('./testsUtils');
-const { TEMPLATE_TYPE } = require('./consts');
-
-beforeAll(async () => {
-    clearCollections();
-});
-
-
-it.each([
-    { templateName: 'Internal', templateType: TEMPLATE_TYPE.INTERNAL },
-    { templateName: 'External', templateType: TEMPLATE_TYPE.EXTERNAL },
-])('should successfully mark template as $templateName', async ({ templateName,templateType }) => {
-    const requestBody = `markTemplateAs${templateName}();`;
-    const response = await executeApiRequest(requestBody);
-    expect(response.status).toBe(200);
-    expect(response.data).toBeDefined();
-    expect(response.data.result.templateType).toBe(templateType);
+const rewire = require('rewire');
+const MockJobBuilder = require('./mockJobBuilder');
+const { CAREERS_MULTI_BOXES_PAGE_CONSTS } = require('../backend/careersMultiBoxesPageIds');
+
+const careersMultiBoxesPage = rewire('../pages/careersMultiBoxesPage');
+const secondarySearch = careersMultiBoxesPage.__get__('secondarySearch');
+
+
+
+describe('secondarySearch function tests', () => {
+  let mockW;
+  let mockJobsRepeater;
+  let mockPaginationCurrentText;
+  let mockPaginationTotalCountText;
+  let mockPageButtonNext;
+  let mockPageButtonPrevious;
+  let mockTotalJobsCountText;
+
+  beforeEach(() => {
+    mockJobsRepeater = { data: null };
+    mockPaginationCurrentText = { text: '' };
+    mockPaginationTotalCountText = { text: '' };
+    mockPageButtonNext = { 
+      enable: jest.fn(), 
+      disable: jest.fn() 
+    };
+    mockPageButtonPrevious = { 
+      enable: jest.fn(), 
+      disable: jest.fn() 
+    };
+    mockTotalJobsCountText = { text: '' };
+
+    mockW = jest.fn((selector) => {
+      const mocks = {
+        [CAREERS_MULTI_BOXES_PAGE_CONSTS.JOBS_REPEATER]: mockJobsRepeater,
+        [CAREERS_MULTI_BOXES_PAGE_CONSTS.paginationCurrentText]: mockPaginationCurrentText,
+        [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
+      };
+      return mocks[selector] || {
+        data: null,
+        text: '',
+        value: '',
+        onClick: jest.fn(),
+        onChange: jest.fn(),
+        onInput: jest.fn(),
+        enable: jest.fn(),
+        disable: jest.fn()
+      };
+    });
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+    careersMultiBoxesPage.__set__('currentJobs', []);
   });
 
+  it('should return count > 0 when searching for existing job title', () => {
+    
+    
+    let mockJobs = MockJobBuilder.createMultiple(11, (builder, index) => {
+      builder.withTitle(`Product Manager ${index}`);
+    });
+
+    mockJobs.push(new MockJobBuilder().withTitle('Backend Engineer').build());
+    mockJobs.push(new MockJobBuilder().withTitle('Frontend Engineer').build());
 
+    careersMultiBoxesPage.__set__('currentJobs', mockJobs);
 
+    const result = secondarySearch(mockW, 'product');
 
+    expect(result.length).toBe(11);
+    expect(mockTotalJobsCountText.text).toContain('11 Jobs');
+    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', () => {
+    let mockJobs = MockJobBuilder.createMultiple(11, (builder, index) => {
+      builder.withTitle(`random job ${index}`);
+    });
+    careersMultiBoxesPage.__set__('currentJobs', mockJobs);
+
+    const result = 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();
+
+  });
+
+  });