From 49f95edf007423f50ea3ace1a260b34d4e20cd29 Mon Sep 17 00:00:00 2001 From: Anbraten Date: Fri, 3 Nov 2023 14:42:59 +0100 Subject: [PATCH] Fix step selection (#2719) Just reverted those lines from #1572 --- web/src/views/repo/pipeline/Pipeline.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/web/src/views/repo/pipeline/Pipeline.vue b/web/src/views/repo/pipeline/Pipeline.vue index ab9372f25..f5d643889 100644 --- a/web/src/views/repo/pipeline/Pipeline.vue +++ b/web/src/views/repo/pipeline/Pipeline.vue @@ -94,7 +94,7 @@ import { useAsyncAction } from '~/compositions/useAsyncAction'; import useConfig from '~/compositions/useConfig'; import useNotifications from '~/compositions/useNotifications'; import usePipeline from '~/compositions/usePipeline'; -import { Pipeline, Repo, RepoPermissions } from '~/lib/api/types'; +import { Pipeline, PipelineStep, Repo, RepoPermissions } from '~/lib/api/types'; import { findStep } from '~/utils/helpers'; const props = defineProps<{ @@ -122,7 +122,10 @@ const selectedStepId = computed({ get() { if (stepId.value !== '' && stepId.value !== null && stepId.value !== undefined) { const id = parseInt(stepId.value, 10); - const step = pipeline.value?.workflows?.find((p) => p.children?.find((c) => c.pid === id)); + const step = pipeline.value?.workflows?.reduce( + (prev, p) => prev || p.children?.find((c) => c.pid === id), + undefined as PipelineStep | undefined, + ); if (step) { return step.pid; }