-
-
Notifications
You must be signed in to change notification settings - Fork 176
fix(query): use native date inputs in query options #953
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
ErikBjare
merged 3 commits into
ActivityWatch:master
from
TimeToBuildBob:bob/native-date-query-options
Aug 31, 2026
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
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
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
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
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
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,64 @@ | ||
| import moment from 'moment'; | ||
| import { createPinia, setActivePinia } from 'pinia'; | ||
| import { shallowMount } from '@vue/test-utils'; | ||
| import QueryOptions from '~/components/QueryOptions.vue'; | ||
| import Search from '~/views/Search.vue'; | ||
|
|
||
| const mockEnsureLoaded = jest.fn().mockResolvedValue(undefined); | ||
|
|
||
| jest.mock('~/stores/buckets', () => ({ | ||
| useBucketsStore: () => ({ | ||
| ensureLoaded: mockEnsureLoaded, | ||
| hosts: ['laptop'], | ||
| }), | ||
| })); | ||
|
|
||
| describe('QueryOptions', () => { | ||
| beforeEach(() => { | ||
| setActivePinia(createPinia()); | ||
| mockEnsureLoaded.mockClear(); | ||
| }); | ||
|
|
||
| test('renders date range values in native date inputs', async () => { | ||
| const wrapper = shallowMount(QueryOptions, { | ||
| propsData: { | ||
| queryOptions: { | ||
| start: '2026-08-15', | ||
| stop: '2026-08-16', | ||
| }, | ||
| }, | ||
| stubs: { | ||
| 'b-form-group': { template: '<div><slot /></div>' }, | ||
| 'b-form-select': true, | ||
| 'b-form-checkbox': true, | ||
| }, | ||
| }); | ||
|
|
||
| await wrapper.vm.$nextTick(); | ||
| await wrapper.vm.$nextTick(); | ||
|
|
||
| const dateInputs = wrapper.findAll('input[type="date"]'); | ||
| expect(dateInputs).toHaveLength(2); | ||
| expect(dateInputs.at(0).element.value).toBe('2026-08-15'); | ||
| expect(dateInputs.at(1).element.value).toBe('2026-08-16'); | ||
| }); | ||
|
|
||
| test.each([Search])('initializes date ranges as YYYY-MM-DD strings', view => { | ||
| const data = view.data(); | ||
|
|
||
| expect(data.queryOptions.start).toMatch(/^\d{4}-\d{2}-\d{2}$/); | ||
| expect(data.queryOptions.stop).toMatch(/^\d{4}-\d{2}-\d{2}$/); | ||
| }); | ||
|
|
||
| test.each([Search])('keeps extended ranges compatible with date inputs', view => { | ||
| const vm = { | ||
| queryOptions: { start: moment('2026-08-15') }, | ||
| search: jest.fn(), | ||
| generate: jest.fn(), | ||
| }; | ||
|
|
||
| view.methods.extendByWeek.call(vm); | ||
|
|
||
| expect(vm.queryOptions.start).toBe('2026-08-08'); | ||
| }); | ||
| }); |
Oops, something went wrong.
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.
When Search or Category Builder opens, their Moment-valued defaults are copied directly into these native date inputs instead of being normalized to
YYYY-MM-DD, causing the Start and Stop controls to render blank rather than showing the active query range.Knowledge Base Used:
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.
Fixed in b31bca3.
mounted()now formatsstart/stoptoYYYY-MM-DDbefore the native date inputs bind, so Moment-valued defaults from Search and Category Builder show the active range instead of blank controls.