From 234ec2eef7dbfa520a28ecff21a86004762c0aae Mon Sep 17 00:00:00 2001 From: qwerty287 <80460567+qwerty287@users.noreply.github.com> Date: Sat, 30 Dec 2023 12:28:11 +0100 Subject: [PATCH] Indicate if step is service (#3078) closes https://github.com/woodpecker-ci/woodpecker/issues/269 Icons in step list: ![Screenshot 2023-12-30 at 12-05-48 Woodpecker](https://github.com/woodpecker-ci/woodpecker/assets/80460567/5f682cc6-8dad-4edb-ab15-b8ae93078c7c) ![Screenshot 2023-12-30 at 12-06-06 Woodpecker](https://github.com/woodpecker-ci/woodpecker/assets/80460567/67782571-438e-4937-a7c6-ab2b378aa0c7) ![Screenshot 2023-12-30 at 12-07-49 Woodpecker](https://github.com/woodpecker-ci/woodpecker/assets/80460567/b3841e10-ac85-4c2b-a46b-663c2db8f59e) --- .../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..3df9d224d3 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: '', -};