From 93b74dc9281553d7e44d189a1e73880a6a7f38fc Mon Sep 17 00:00:00 2001 From: qwerty287 Date: Sat, 30 Dec 2023 12:09:11 +0100 Subject: [PATCH 1/2] Indicate if step is service --- .../components/repo/pipeline/PipelineStatusIcon.vue | 3 ++- .../components/repo/pipeline/PipelineStepList.vue | 4 ++-- web/src/components/repo/pipeline/pipeline-status.ts | 13 ------------- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/web/src/components/repo/pipeline/PipelineStatusIcon.vue b/web/src/components/repo/pipeline/PipelineStatusIcon.vue index f80ef78d96..95f5a3d4d7 100644 --- a/web/src/components/repo/pipeline/PipelineStatusIcon.vue +++ b/web/src/components/repo/pipeline/PipelineStatusIcon.vue @@ -4,7 +4,7 @@ :title="$t('repo.pipeline.status.status', { status: $t(`repo.pipeline.status.${status}`) })" > - + {{ step.name }} @@ -128,7 +128,7 @@ import Icon from '~/components/atomic/Icon.vue'; import PipelineStatusIcon from '~/components/repo/pipeline/PipelineStatusIcon.vue'; import PipelineStepDuration from '~/components/repo/pipeline/PipelineStepDuration.vue'; import usePipeline from '~/compositions/usePipeline'; -import { Pipeline, PipelineStep } from '~/lib/api/types'; +import { Pipeline, PipelineStep, StepType } from '~/lib/api/types'; const props = defineProps<{ pipeline: Pipeline; diff --git a/web/src/components/repo/pipeline/pipeline-status.ts b/web/src/components/repo/pipeline/pipeline-status.ts index 5b444e115a..34e54d920a 100644 --- a/web/src/components/repo/pipeline/pipeline-status.ts +++ b/web/src/components/repo/pipeline/pipeline-status.ts @@ -12,16 +12,3 @@ export const pipelineStatusColors: Record = { - blocked: '', - declined: '', - error: '', - failure: '', - killed: '', - pending: '', - skipped: '', - running: 'animate-spin animate-slow', - started: 'animate-spin animate-slow', - success: '', -}; From 32855db42b36340b6e23f8aef5cc8e07885c017e Mon Sep 17 00:00:00 2001 From: qwerty287 Date: Sat, 30 Dec 2023 12:15:39 +0100 Subject: [PATCH 2/2] fix tc --- web/src/components/repo/pipeline/PipelineStatusIcon.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/components/repo/pipeline/PipelineStatusIcon.vue b/web/src/components/repo/pipeline/PipelineStatusIcon.vue index 95f5a3d4d7..3df9d224d3 100644 --- a/web/src/components/repo/pipeline/PipelineStatusIcon.vue +++ b/web/src/components/repo/pipeline/PipelineStatusIcon.vue @@ -24,6 +24,6 @@ import { pipelineStatusColors } from './pipeline-status'; defineProps<{ status: PipelineStatus; - service: boolean; + service?: boolean; }>();