Browser: Fix panel rendered waiting condition #472
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
juanicabanas
reviewed
Oct 5, 2023
| @@ -351,8 +351,8 @@ export class Browser { | |||
| return totalPanelsRendered >= panelCount; | |||
| } | |||
|
|
|||
| const panelCount = document.querySelectorAll('.panel').length || document.querySelectorAll('.panel-container').length; | |||
| return (window as any).panelsRendered >= panelCount || (window as any).panelsRendered === undefined; | |||
| const panelCount = document.querySelectorAll('.panel-solo').length || document.querySelectorAll('[class$=\'panel-container\']').length; | |||
There was a problem hiding this comment.
why did it change? Does it work right now?
There was a problem hiding this comment.
I think it changes a while ago in Grafana but we didn't notice because it was 0 and panelsRendered is undefined until the panel is rendered. So for one panel (what we always render because the condition for full page is different), we checked undefined >= 0 for a while (which is false) and when the panel is rendered, we checked 0 >= 0 (which is true) so it returned.
I don't think we actually need this and we could set it to 1 but I would need to think more about it before making this more bigger change (and it would be nice to have a test suite as well for this kind of things).
juanicabanas
approved these changes
Oct 5, 2023
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.
Fix the following things in the panel rendered waiting condition:
panelCountwas always 0, now it should be the right count for valid panels and 0 for invalid panels (e.g. panel not found error)panelsRenderedis always undefined at first and is set when the panel is rendered so checking if it's undefined make the waiting condition pass on the first check and we actually don't wait for the panel to be rendered