Use same tooltip for Graph and Tree views for TaskInstances #8043
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
|
Whops, just notcied the |
They had _similar_ info, but they weren't identical and should have been. To not include the 250kb of moment-timezone in more than one Webpack output bundle I changed how that is imported/handled. There may be a better way of doing this in webpack, but I couldn't find it, and this isn't horrible.
ashb
force-pushed
the
same-tooltip-for-graph-and-tree
branch
from
29cf07d
to
c12f4c1
Compare
ashb
commented
Apr 1, 2020
Comment on lines
-24
to
-53
| const makeDateTimeHTML = (start, end) => { | ||
| return ( | ||
| `Started: ${start.format(defaultFormat)} <br> Ended: ${end.format(defaultFormat)} <br>` | ||
| ) | ||
| }; | ||
|
|
||
| export const generateTooltipDateTime = (startDate, endDate, dagTZ) => { | ||
| const tzFormat = 'z (Z)'; | ||
| const localTZ = moment.tz.guess(); | ||
| startDate = moment.utc(startDate); | ||
| endDate = moment.utc(endDate); | ||
| dagTZ = dagTZ.toUpperCase(); | ||
|
|
||
| // Generate UTC Start and End Date | ||
| let tooltipHTML = '<br><strong>UTC</strong><br>'; | ||
| tooltipHTML += makeDateTimeHTML(startDate, endDate); | ||
|
|
||
| // Generate User's Local Start and End Date | ||
| tooltipHTML += `<br><strong>Local: ${moment.tz(localTZ).format(tzFormat)}</strong><br>`; | ||
| tooltipHTML += makeDateTimeHTML(startDate.local(), endDate.local()); | ||
|
|
||
| // Generate DAG's Start and End Date | ||
| if (dagTZ !== 'UTC' && dagTZ !== localTZ) { | ||
| tooltipHTML += `<br><strong>DAG's TZ: ${moment.tz(dagTZ).format(tzFormat)}</strong><br>`; | ||
| tooltipHTML += makeDateTimeHTML(startDate.tz(dagTZ), endDate.tz(dagTZ)); | ||
| } | ||
|
|
||
| return tooltipHTML | ||
| }; | ||
|
|
There was a problem hiding this comment.
I moved these fns in to a new "task-instances.js" as they are specific to there, and not general "datetime" utils.
| @@ -16,8 +16,8 @@ | |||
| * specific language governing permissions and limitations | |||
| * under the License. | |||
| */ | |||
| import { generateTooltipDateTime, converAndFormatUTC, secondsToString } from './datetime-utils'; | |||
| import { escapeHtml } from './base'; | |||
| // global tiTooltip, taskTip | |||
There was a problem hiding this comment.
Global as it's included in another file that is sourced.
If I used a normal import webpack would include it in two files.
kaxil
approved these changes
Apr 1, 2020
BasPH
previously requested changes
Apr 1, 2020
kaxil
added a commit
that referenced
this pull request
Apr 1, 2020
They had _similar_ info, but they weren't identical and should have been. To not include the 250kb of moment-timezone in more than one Webpack output bundle I changed how that is imported/handled. There may be a better way of doing this in webpack, but I couldn't find it, and this isn't horrible. Co-Authored-By: Ash Berlin-Taylor <[email protected]>
kaxil
added a commit
that referenced
this pull request
Apr 2, 2020
They had _similar_ info, but they weren't identical and should have been. To not include the 250kb of moment-timezone in more than one Webpack output bundle I changed how that is imported/handled. There may be a better way of doing this in webpack, but I couldn't find it, and this isn't horrible. Co-Authored-By: Ash Berlin-Taylor <[email protected]>
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.
They had similar info, but they weren't identical and should have
been.
To not include the 250kb of moment-timezone in more than one Webpack
output bundle I changed how that is imported/handled. There may be a
better way of doing this in webpack, but I couldn't find it, and this
isn't horrible.
Graph TI:
Before:
After:
(i.e. unchanged)
Tree TI:
Before:
After:
Tree DagRun
Before: BROKEN ON MASTER -- no tooltip was displayed! Oops.
After:
Issue link: WILL BE INSERTED BY boring-cyborg
Make sure to mark the boxes below before creating PR: [x]
In case of fundamental code change, Airflow Improvement Proposal (AIP) is needed.
In case of a new dependency, check compliance with the ASF 3rd Party License Policy.
In case of backwards incompatible changes please leave a note in UPDATING.md.
Read the Pull Request Guidelines for more information.