TimeRangePicker: Fix recently ranges only not showing all recent ranges #59836
Conversation
This file contains 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
joshhunt
commented
Dec 5, 2022
| @@ -246,7 +245,8 @@ function mapToHistoryOptions(ranges?: TimeRange[], timeZone?: TimeZone): TimeOpt | |||
| if (!Array.isArray(ranges) || ranges.length === 0) { | |||
| return []; | |||
| } | |||
| return ranges.slice(ranges.length - 4).map((range) => mapRangeToTimeOption(range, timeZone)); | |||
There was a problem hiding this comment.
Passing in a negative number returns the last n items from the array. When there was 3 items in the array, this math would do ranges.slice(-1) which would return only the last 1 item.
|
There's an outstanding issue where it appears the font size of the recently used time ranges has been increased (or caused by the switch to Inter), so they wrap onto two lines and the 4th item isn't shown. |
joshhunt
force-pushed
the
joshhunt/time-range-picker-history-refactor
branch
from
904c21f
to
f02958f
Compare
joshhunt
requested review from
oscarkilhed,
zoltanbedi,
ashharrison90 and
JoaoSilvaGrafana
and removed request for
a team
joshhunt
commented
Dec 8, 2022
| /> | ||
| </section> | ||
| </FocusScope> | ||
| <div> |
There was a problem hiding this comment.
I get errors in tests when FocusScope doesn't have a wrapping div, but im not entirely sure why. This workaround isn't great....
There was a problem hiding this comment.
could we swap the order of FocusScope and section? then at least we don't have an extra element 🤔
joshhunt
commented
Dec 8, 2022
| }, | ||
| ]; | ||
|
|
||
| describe('ButtonSelect', () => { |
There was a problem hiding this comment.
I wrote theses tests to make sure that FocusScope wasn't entirely broken within jest, so they just came along for the ride 😅
ashharrison90
approved these changes
Dec 9, 2022
grafanabot
pushed a commit
that referenced
this pull request
Dec 9, 2022
* Fix not all recently used time ranges showing * Refactor time picker history to store simpler json objects * Don't store duplicate items * update todo tests: * Add tests for TimePickerWithHistory * better fix for focus scope issues in test (cherry picked from commit 6280780)
joshhunt
changed the title
joshhunt
added a commit
that referenced
this pull request
Dec 9, 2022
…0085) TimeRangePicker: Fix recent ranges not showing all items (#59836) * Fix not all recently used time ranges showing * Refactor time picker history to store simpler json objects * Don't store duplicate items * update todo tests: * Add tests for TimePickerWithHistory * better fix for focus scope issues in test (cherry picked from commit 6280780) Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
GuYounes
pushed a commit
to paul-wurth/BIXpert
that referenced
this pull request
Feb 8, 2023
…afana#60085) TimeRangePicker: Fix recent ranges not showing all items (grafana#59836) * Fix not all recently used time ranges showing * Refactor time picker history to store simpler json objects * Don't store duplicate items * update todo tests: * Add tests for TimePickerWithHistory * better fix for focus scope issues in test (cherry picked from commit 6280780) Co-authored-by: Josh Hunt <joshhunt@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What is this feature?
{ to: string, from: string }objects, rather thanTimeRageitemsTimePickerWithHistory already limits the items saved to local storage to the most recent 4 items, so I don't believe there's a reason to also limit to 4 in the TimeRangeList component.
Related to / inspired by #54940
Special notes for your reviewer: