Skip to content

fix: getPeriods function does not return periods in the correct order #1451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jenniferarnesen wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

fix: getPeriods function does not return periods in the correct order #1451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 92 additions & 33 deletions src/components/PeriodDimension/__tests__/fixedPeriods.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,40 +474,99 @@ describe('fixedPeriods utils', () => {
})

describe('Yearly period generator', () => {
let periods

beforeAll(() => {
const option = getFixedPeriodsOptionsById('YEARLY')

periods = option.getPeriods({
offset: 10, // 2020 - 2029
filterFuturePeriods: false,
reversePeriods: false,
})
})

it('should return the correct number of yearly periods', () => {
expect(periods.length).toEqual(10)
})

it('should return the correct object for yearly period 1', () => {
expect(periods[0]).toMatchObject({
startDate: '2020-01-01',
endDate: '2020-12-31',
iso: '2020',
id: '2020',
})
expect(periods[0].name).toEqual('2020')
})

it('should return the correct object for yearly period 10', () => {
expect(periods[9]).toMatchObject({
startDate: '2029-01-01',
endDate: '2029-12-31',
iso: '2029',
id: '2029',
const tests = [
{
config: {
offset: 10,
filterFuturePeriods: false,
reversePeriods: false,
},
expectedPeriodCount: 10,
expectedFirstYear: '2020',
expectedLastYear: '2029',
},
{
config: {
offset: 10,
filterFuturePeriods: false,
reversePeriods: true,
},
expectedPeriodCount: 10,
expectedFirstYear: '2029',
expectedLastYear: '2020',
},
{
config: {
offset: 10,
filterFuturePeriods: true,
reversePeriods: true,
},
expectedPeriodCount: 0,
},
{
config: {
offset: -5,
filterFuturePeriods: true,
reversePeriods: true,
},
expectedPeriodCount: 10,
expectedFirstYear: '2014',
expectedLastYear: '2005',
},
{
config: {
offset: -5,
filterFuturePeriods: true,
reversePeriods: false,
},
expectedPeriodCount: 10,
expectedFirstYear: '2005',
expectedLastYear: '2014',
},
{
config: {
offset: 3,
filterFuturePeriods: true,
reversePeriods: true,
},
expectedPeriodCount: 7,
expectedFirstYear: '2019',
expectedLastYear: '2013',
},
]

tests.forEach((t) => {
jest.spyOn(Date, 'now').mockImplementation(() => 1560765600000)

const testName = `Yearly period generator: offset ${t.config.offset}, filter ${t.config.filterFuturePeriods}, reverse ${t.config.reversePeriods}`

const periods = getFixedPeriodsOptionsById('YEARLY').getPeriods({
offset: t.config.offset,
filterFuturePeriods: t.config.filterFuturePeriods,
reversePeriods: t.config.reversePeriods,
})

// console.log('periods', periods)

it(testName, () => {
expect(periods.length).toEqual(t.expectedPeriodCount)
if (t.expectedPeriodCount > 0) {
expect(periods[0]).toMatchObject({
startDate: `${t.expectedFirstYear}-01-01`,
endDate: `${t.expectedFirstYear}-12-31`,
iso: `${t.expectedFirstYear}`,
id: `${t.expectedFirstYear}`,
name: t.expectedFirstYear,
})
expect(periods[periods.length - 1]).toMatchObject({
startDate: `${t.expectedLastYear}-01-01`,
endDate: `${t.expectedLastYear}-12-31`,
iso: `${t.expectedLastYear}`,
id: `${t.expectedLastYear}`,
name: t.expectedLastYear,
})
}
})
expect(periods[9].name).toEqual('2029')
})
})

Expand Down