fix(explore): Restore missing dataset states #22693
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
Codecov Report
@@ Coverage Diff @@
## master #22693 +/- ##
==========================================
- Coverage 67.10% 67.08% -0.02%
==========================================
Files 1869 1869
Lines 71580 71551 -29
Branches 7806 7822 +16
==========================================
- Hits 48031 48001 -30
- Misses 21521 21523 +2
+ Partials 2028 2027 -1
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
eschutho
reviewed
Jan 12, 2023
| @@ -267,11 +267,12 @@ class DatasourceControl extends React.PureComponent { | |||
| showSaveDatasetModal, | |||
| } = this.state; | |||
| const { datasource, onChange, theme } = this.props; | |||
| const isMissingDatasource = datasource?.id == null; | |||
| const isMissingDatasource = !datasource || datasource.id === 0; | |||
There was a problem hiding this comment.
Would this also work?
Suggested change
| const isMissingDatasource = !datasource || datasource.id === 0; | |
| const isMissingDatasource = !!datasource?.id |
There was a problem hiding this comment.
That's cleaner, thanks! This now also covers the original null case in case it's still used somewhere I couldn't find, which is probably good.
There was a problem hiding this comment.
Actually sorry, !!datasource?.id doesn't work but !datasource?.id works. Is that what you meant?
eschutho
approved these changes
Jan 13, 2023
|
@eschutho thanks, feel free to merge! |
mistercrunch
added
🏷️ bot
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.
SUMMARY
This PR fixes Explore's dataset control so it correctly displays the intended UI when the chart's dataset doesn't exist or Explore has been opened without a specified chart or dataset.
Prior to moving Explore into the SPA,
DatasourceControl(the dataset picker in the upper left) would check for a dataset ID ofnullto determine if the current chart's dataset existed. As part of moving Explore into the SPA, the initial Explore state in Redux was set to this object, which has the dataset ID set to0. When a user opens Explore for a chart whose dataset does not exist, or when Explore is opened without a specified chart (this happens for new charts) and also without a dataset specified (this should only happen by accident), the initial Explore state's dataset object is not overwritten. BecauseDatasourceControlis checking for an ID ofnull, it doesn't correctly identify these cases as empty dataset situations, and shows options that should only be present in situations when there is a dataset and don't work correctly when no dataset is present.This PR:
BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF
Chart with missing dataset, before:
Chart with missing dataset, after:
No chart with no dataset specified (e.g. from visiting
/explorewith no query string), before:No chart with no dataset specified, after:
TESTING INSTRUCTIONS
DatasourceControland that the only menu option in theDatasourceControlthree-dots menu is "Swap dataset"./exploreand confirm that the correct message (missing URL params) appears underDatasourceControland that the only menu option in theDatasourceControlthree-dots menu is "Swap dataset".ADDITIONAL INFORMATION