Variables: Add natural sort from core grafana to query variables #459
Conversation
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
torkelo
reviewed
Nov 14, 2023
Comment on lines
104
to
116
| } else if (sortType === 4) { | ||
| // Sort by natural sort | ||
| options.sort((a, b) => { | ||
| if (!a.text) { | ||
| return -1; | ||
| } | ||
|
|
||
| if (!b.text) { | ||
| return 1; | ||
| } | ||
|
|
||
| return a.text.localeCompare(b.text, undefined, { numeric: true }); | ||
| }); |
There was a problem hiding this comment.
const sortType = Math.ceil(sortOrder / 2);
and these if statements are pure cryptic gold, can we switch to using the enum VariableSort (and switch/case statement)? (you will have to add a //@ts-expect-error for the newly added enum that, add a TODO for that so we can find it and remove the ts-expect-error when we update the schema package in the future
There was a problem hiding this comment.
I agree with that, it's confusing , I will do the changes 😄
There was a problem hiding this comment.
@torkelo I did the refactor, but I couldn't find a way to avoid hardcoding the value of the new options. Also, there is some //ts-ignore around because options is any[]
torkelo
approved these changes
Nov 14, 2023
dprokop
approved these changes
Nov 14, 2023
|
🚀 PR was released in |
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.
In core grafana we received a community contribution to implement natural sort. grafana/grafana#78024
This PR just adds their changes and a few unit tests.