From 1765a287a2746069770ad83067cc86ed64f6dfb4 Mon Sep 17 00:00:00 2001 From: peterlau Date: Mon, 14 Mar 2022 16:26:02 -0700 Subject: [PATCH] Squashed commit of the following: Separate colors for in_progress and canceled tasks Additional columns in Task Defintions list --- ui/src/components/diagram/diagram.scss | 11 +++++++---- ui/src/pages/definitions/Task.jsx | 2 ++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ui/src/components/diagram/diagram.scss b/ui/src/components/diagram/diagram.scss index a8b7513c90..dfed898374 100644 --- a/ui/src/components/diagram/diagram.scss +++ b/ui/src/components/diagram/diagram.scss @@ -96,16 +96,19 @@ $node-text-size: 12px; &.status_COMPLETED_WITH_ERRORS { @include nodeColor(#8b5b02, #feeac5); } - &.status_IN_PROGRESS, + &.status_IN_PROGRESS { + @include nodeColor(#c2920d, #fff5da); + } &.status_SCHEDULED { @include nodeColor(#11497a, #cbe2f7); } - //&.status_CANCELED { @include nodeColor(#26194b, #ded5f8); } + &.status_CANCELED { + @include nodeColor(#26194b, #ded5f8); + } &.status_FAILED, &.status_FAILED_WITH_TERMINAL_ERROR, &.status_TIMED_OUT, - &.status_DF_PARTIAL, - &.status_CANCELED { + &.status_DF_PARTIAL { @include nodeColor(#7f050b, #f9c6c9); } &.status_SKIPPED { diff --git a/ui/src/pages/definitions/Task.jsx b/ui/src/pages/definitions/Task.jsx index 93383c00a4..12e2bcabc4 100644 --- a/ui/src/pages/definitions/Task.jsx +++ b/ui/src/pages/definitions/Task.jsx @@ -41,6 +41,8 @@ const columns = [ sortable: false, searchable: false, }, + { name: "concurrentExecLimit" }, + { name: "pollTimeoutSeconds" }, ]; export default function TaskDefinitions() {