-
Notifications
You must be signed in to change notification settings - Fork 12.5k
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
CloudMonitoring: Fix query type selection issue #87990
Merged
Merged
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
This PR must be merged before a backport PR will be created. |
2 similar comments
This PR must be merged before a backport PR will be created. |
This PR must be merged before a backport PR will be created. |
adamyeats
approved these changes
May 16, 2024
asimpson
requested changes
May 16, 2024
public/app/plugins/datasource/cloud-monitoring/components/QueryEditor.tsx
Outdated
Show resolved
Hide resolved
asimpson
approved these changes
May 17, 2024
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.
Love this cleaned up version!
grafana-delivery-bot bot
pushed a commit
that referenced
this pull request
May 17, 2024
* Use deepEqual to ensure migratedQuery is only returned when query is unchanged * Add selectors for query editors * Add more tests for query editor component * Clarifying comments * Fix how state is set * Simplify query editor loading and migration (cherry picked from commit 58d382e)
grafana-delivery-bot bot
pushed a commit
that referenced
this pull request
May 17, 2024
* Use deepEqual to ensure migratedQuery is only returned when query is unchanged * Add selectors for query editors * Add more tests for query editor component * Clarifying comments * Fix how state is set * Simplify query editor loading and migration (cherry picked from commit 58d382e)
aangelisc
added a commit
that referenced
this pull request
May 17, 2024
CloudMonitoring: Fix query type selection issue (#87990) * Use deepEqual to ensure migratedQuery is only returned when query is unchanged * Add selectors for query editors * Add more tests for query editor component * Clarifying comments * Fix how state is set * Simplify query editor loading and migration (cherry picked from commit 58d382e) Co-authored-by: Andreas Christou <[email protected]>
aangelisc
added a commit
that referenced
this pull request
May 17, 2024
CloudMonitoring: Fix query type selection issue (#87990) * Use deepEqual to ensure migratedQuery is only returned when query is unchanged * Add selectors for query editors * Add more tests for query editor component * Clarifying comments * Fix how state is set * Simplify query editor loading and migration (cherry picked from commit 58d382e) Co-authored-by: Andreas Christou <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
add to changelog
area/frontend
backport v10.4.x
backport v11.0.x
Mark PR for automatic backport to v11.0.x
datasource/GoogleCloudMonitoring
type/bug
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.
#86069 introduced a bug which would prevent the query type from being changed.
This fixes that by running a
deepEqual
check against the savedmigratedQuery
value and the new query.I've tested that the original migration fix still works and that the query is correctly maintained across re-renders.