[annotation] Only allow override whole time_range #6286
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 #6286 +/- ##
==========================================
+ Coverage 77.01% 77.03% +0.01%
==========================================
Files 64 64
Lines 9508 9505 -3
==========================================
- Hits 7323 7322 -1
+ Misses 2185 2183 -2
Continue to review full report at Codecov.
|
graceguo-supercat
force-pushed
the
gg-OnlyAllowOverrideTimeRange
branch
from
369364b to
6f277c4
Compare
graceguo-supercat
force-pushed
the
gg-OnlyAllowOverrideTimeRange
branch
from
6f277c4 to
430f937
Compare
| if (fd.time_range) { | ||
| [fd.since, fd.until] = fd.time_range.split(TIME_RANGE_SEPARATOR); | ||
| const overridesKeys = Object.keys(annotation.overrides); | ||
| if (overridesKeys.includes('since') || overridesKeys.includes('until')) { |
There was a problem hiding this comment.
this line is to backward compatible with old override options: since or until. now we only allow override whole time_range, so either since or until will be treated as override whole time_range.
| @@ -97,6 +97,14 @@ export default class AnnotationLayer extends React.PureComponent { | |||
| timeColumn, | |||
| intervalEndColumn, | |||
| } = props; | |||
|
|
|||
| const overridesKeys = Object.keys(overrides); | |||
There was a problem hiding this comment.
render checkbox UI. try to be backward compatible when user select override since or override until before.
|
@betodealmeida please 👀 ^ |
betodealmeida
approved these changes
Nov 7, 2018
graceguo-supercat
pushed a commit
to graceguo-supercat/superset
that referenced
this pull request
Nov 8, 2018
(cherry picked from commit ede5c71) (cherry picked from commit ad83b06)
bipinsoniguavus
pushed a commit
to ThalesGroup/incubator-superset
that referenced
this pull request
Dec 26, 2018
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.
This PR is related with #6251.
Before
time_rangewe usedsince,untilparameters. And in annotation layer UI we allow user to override since, or until, or both. But after we introducedtime_range, it offers many framed time range string likeLast day,Last 3 monthetc. in #6251, i tried to merge old since until into time_range, but today we found there are so many cases that no simple solution to cover all. So @michellethomas and me are thinking about simplify the override feature in annotation layer: instead of allow since or until or both, now we only allow override time_range as a whole.in airbnb we don't have many cases where user want to override only since or until. if @fabianmenges feel this solution is not good enough, we can think about more possible solutions.
@fabianmenges @betodealmeida @mistercrunch @michellethomas