bbovenzi commented on code in PR #27141:
URL: https://github.com/apache/airflow/pull/27141#discussion_r1000917772
##########
airflow/www/static/js/dags.js:
##########
@@ -255,78 +264,14 @@ function drawDagStatsForDag(dagId, states) {
function dagStatsHandler(error, json) {
Object.keys(json).forEach((dagId) => {
const states = json[dagId];
- drawDagStatsForDag(dagId, states);
+ drawDagAndTaskStatsForDag('dag-run', dagId, states);
});
}
-function drawTaskStatsForDag(dagId, states) {
- const g = d3.select(`svg#task-run-${dagId.replace(/\./g, '__dot__')}`)
- .attr('height', diameter + (strokeWidthHover * 2))
- .attr('width', (states.length * (diameter + circleMargin)) + circleMargin)
- .selectAll('g')
- .data(states)
- .enter()
- .append('g')
- .attr('transform', (d, i) => {
- const x = (i * (diameter + circleMargin)) + (diameter / 2 +
circleMargin);
- const y = (diameter / 2) + strokeWidthHover;
- return `translate(${x},${y})`;
- });
-
- g.append('svg:a')
- .attr('href', (d) =>
`${taskInstanceUrl}?_flt_3_dag_id=${dagId}&_flt_3_state=${d.state}`)
- .append('circle')
- .attr('id', (d) => `task-${dagId.replace(/\./g, '_')}${d.state || 'none'}`)
- .attr('class', 'has-svg-tooltip')
- .attr('stroke-width', (d) => {
- if (d.count > 0) return strokeWidth;
-
- return 1;
- })
- .attr('stroke', (d) => {
- if (d.count > 0) return STATE_COLOR[d.state];
-
- return 'gainsboro';
- })
- .attr('fill', '#fff')
- .attr('r', diameter / 2)
- .attr('title', (d) => d.state || 'none')
- .on('mouseover', function mouseOver(d) {
- if (d.count > 0) {
- d3.select(this).transition().duration(400)
- .attr('fill', '#e2e2e2')
- .style('stroke-width', strokeWidthHover);
- }
- })
- .on('mouseout', function mouseOut(d) {
- if (d.count > 0) {
- d3.select(this).transition().duration(400)
- .attr('fill', '#fff')
- .style('stroke-width', strokeWidth);
- }
- })
- .style('opacity', 0)
- .transition()
- .duration(300)
- .delay((d, i) => i * 50)
- .style('opacity', 1);
-
- d3.select('.js-loading-task-stats').remove();
-
- g.append('text')
- .attr('fill', '#51504f')
- .attr('text-anchor', 'middle')
- .attr('vertical-align', 'middle')
- .attr('font-size', 9)
- .attr('y', 3)
- .style('pointer-events', 'none')
- .text((d) => (d.count > 0 ? d.count : ''));
-}
-
function taskStatsHandler(error, json) {
Object.keys(json).forEach((dagId) => {
const states = json[dagId];
- drawTaskStatsForDag(dagId, states);
+ drawDagAndTaskStatsForDag('task-run', dagId, states);
Review Comment:
Let's make the selectors constants at the top of the file. And probably use
task instance vs run, for consistency's sake.
`const TASK_INSTANCE = 'task-instance';`
`const DAG_RUN = 'dag-run';`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
