-
Notifications
You must be signed in to change notification settings - Fork 355
fix: Correctly disable previous period query #1528
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| "@hyperdx/app": patch | ||
| --- | ||
|
|
||
| fix: Correctly disable previous period query |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
packages/app/src/components/__tests__/DBTimeChart.test.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| import React from 'react'; | ||
|
|
||
| import api from '@/api'; | ||
| import { useQueriedChartConfig } from '@/hooks/useChartConfig'; | ||
| import { useSource } from '@/source'; | ||
|
|
||
| import { DBTimeChart } from '../DBTimeChart'; | ||
|
|
||
| // Mock dependencies | ||
| jest.mock('@/hooks/useChartConfig', () => ({ | ||
| useQueriedChartConfig: jest.fn(), | ||
| })); | ||
|
|
||
| jest.mock('@/api', () => ({ | ||
| __esModule: true, | ||
| default: { | ||
| useMe: jest.fn(), | ||
| }, | ||
| })); | ||
|
|
||
| jest.mock('@/source', () => ({ | ||
| useSource: jest.fn(), | ||
| })); | ||
|
|
||
| describe('DBTimeChart', () => { | ||
| const mockUseQueriedChartConfig = useQueriedChartConfig as jest.Mock; | ||
| const mockUseMe = api.useMe as jest.Mock; | ||
| const mockUseSource = useSource as jest.Mock; | ||
|
|
||
| const baseTestConfig = { | ||
| dateRange: [new Date('2024-01-01'), new Date('2024-01-02')] as [Date, Date], | ||
| from: { databaseName: 'test', tableName: 'test' }, | ||
| timestampValueExpression: 'timestamp', | ||
| connection: 'test-connection', | ||
| select: 'value', | ||
| where: '', | ||
| }; | ||
|
|
||
| beforeEach(() => { | ||
| jest.clearAllMocks(); | ||
|
|
||
| mockUseMe.mockReturnValue({ | ||
| data: { team: { parallelizeWhenPossible: false } }, | ||
| isLoading: false, | ||
| }); | ||
|
|
||
| mockUseSource.mockReturnValue({ | ||
| data: undefined, | ||
| isLoading: false, | ||
| }); | ||
|
|
||
| mockUseQueriedChartConfig.mockReturnValue({ | ||
| data: { | ||
| data: [{ timestamp: 1704067200, value: 100 }], | ||
| meta: [], | ||
| rows: 1, | ||
| isComplete: true, | ||
| }, | ||
| isLoading: false, | ||
| isError: false, | ||
| isSuccess: true, | ||
| isPlaceholderData: false, | ||
| }); | ||
| }); | ||
|
|
||
| it('passes enabled: false to useQueriedChartConfig for previous period when compareToPreviousPeriod is undefined', () => { | ||
| const config = { | ||
| ...baseTestConfig, | ||
| compareToPreviousPeriod: undefined, | ||
| }; | ||
|
|
||
| renderWithMantine(<DBTimeChart config={config} />); | ||
|
|
||
| // Get the second call (previous period query) | ||
| const [, secondCallOptions] = mockUseQueriedChartConfig.mock.calls[1]; | ||
|
|
||
| // Verify that enabled is false for the previous period query | ||
| expect(secondCallOptions.enabled).toBe(false); | ||
| }); | ||
|
|
||
| it('passes enabled: true to useQueriedChartConfig for previous period when compareToPreviousPeriod is true', () => { | ||
| const config = { | ||
| ...baseTestConfig, | ||
| compareToPreviousPeriod: true, | ||
| }; | ||
|
|
||
| renderWithMantine(<DBTimeChart config={config} />); | ||
|
|
||
| // Get the second call (previous period query) | ||
| const [, secondCallOptions] = mockUseQueriedChartConfig.mock.calls[1]; | ||
|
|
||
| // Verify that enabled is true for the previous period query | ||
| expect(secondCallOptions.enabled).toBe(true); | ||
| }); | ||
|
|
||
| it('passes enabled: false to useQueriedChartConfig for previous period when compareToPreviousPeriod is false', () => { | ||
| const config = { | ||
| ...baseTestConfig, | ||
| compareToPreviousPeriod: false, | ||
| }; | ||
|
|
||
| renderWithMantine(<DBTimeChart config={config} />); | ||
|
|
||
| // Get the second call (previous period query) | ||
| const [, secondCallOptions] = mockUseQueriedChartConfig.mock.calls[1]; | ||
|
|
||
| // Verify that enabled is false for the previous period query | ||
| expect(secondCallOptions.enabled).toBe(false); | ||
| }); | ||
|
|
||
| it('respects the enabled prop when determining if previous period query should run', () => { | ||
| const config = { | ||
| ...baseTestConfig, | ||
| compareToPreviousPeriod: true, | ||
| }; | ||
|
|
||
| // Render with enabled=false | ||
| renderWithMantine(<DBTimeChart config={config} enabled={false} />); | ||
|
|
||
| // Get the second call (previous period query) | ||
| const [, secondCallOptions] = mockUseQueriedChartConfig.mock.calls[1]; | ||
|
|
||
| // Verify that enabled is false even when compareToPreviousPeriod is true | ||
| // because the enabled prop is false | ||
| expect(secondCallOptions.enabled).toBe(false); | ||
| }); | ||
| }); |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would love a quick test added if possible. Okay to punt it if it takes longer than 5m
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea, added!