From 5c2f02c4a1fe1a34c86f1b4279a7d62c6d6d6265 Mon Sep 17 00:00:00 2001
From: Robert Kaussow <mail@thegeeklab.de>
Date: Sat, 9 Sep 2023 08:35:53 +0200
Subject: [PATCH] Harmonize pipeline status information and add a review link
 to the approval (#2345)

Ref:
https://github.com/woodpecker-ci/woodpecker/discussions/2162#discussioncomment-6666864

Adds a `PipelineInfo` view to harmonize pipeline status information and
add a review link to the approval view.


![image](https://github.com/woodpecker-ci/woodpecker/assets/3391958/41062b5f-0f15-4c3c-b72c-e22092804072)


![image](https://github.com/woodpecker-ci/woodpecker/assets/3391958/4cfb1bc8-8bfd-4217-bce3-c9a1378f58ee)


![image](https://github.com/woodpecker-ci/woodpecker/assets/3391958/f3b22a07-464e-4d29-85f0-de122bce1bbe)

---------

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: qwerty287 <80460567+qwerty287@users.noreply.github.com>
---
 web/components.d.ts                           |  1 +
 web/src/assets/locales/en.json                |  3 +-
 .../components/repo/pipeline/PipelineInfo.vue |  9 ++++
 web/src/views/repo/pipeline/Pipeline.vue      | 42 +++++++++++++------
 .../views/repo/pipeline/PipelineWrapper.vue   |  7 ++--
 5 files changed, 44 insertions(+), 18 deletions(-)
 create mode 100644 web/src/components/repo/pipeline/PipelineInfo.vue

diff --git a/web/components.d.ts b/web/components.d.ts
index 55c5721b6..050a8c050 100644
--- a/web/components.d.ts
+++ b/web/components.d.ts
@@ -83,6 +83,7 @@ declare module '@vue/runtime-core' {
     Panel: typeof import('./src/components/layout/Panel.vue')['default']
     PipelineFeedItem: typeof import('./src/components/pipeline-feed/PipelineFeedItem.vue')['default']
     PipelineFeedSidebar: typeof import('./src/components/pipeline-feed/PipelineFeedSidebar.vue')['default']
+    PipelineInfo: typeof import('./src/components/repo/pipeline/PipelineInfo.vue')['default']
     PipelineItem: typeof import('./src/components/repo/pipeline/PipelineItem.vue')['default']
     PipelineList: typeof import('./src/components/repo/pipeline/PipelineList.vue')['default']
     PipelineLog: typeof import('./src/components/repo/pipeline/PipelineLog.vue')['default']
diff --git a/web/src/assets/locales/en.json b/web/src/assets/locales/en.json
index 2aa2bb630..d80dd5d4a 100644
--- a/web/src/assets/locales/en.json
+++ b/web/src/assets/locales/en.json
@@ -255,7 +255,8 @@
         "log_auto_scroll_off": "Turn off automatic scrolling"
       },
       "protected": {
-        "awaits": "This pipeline is awaiting approval by some maintainer!",
+        "review": "Review changes",
+        "awaits": "This pipeline is awaiting approval by a maintainer!",
         "approve": "Approve",
         "decline": "Decline",
         "declined": "This pipeline has been declined!",
diff --git a/web/src/components/repo/pipeline/PipelineInfo.vue b/web/src/components/repo/pipeline/PipelineInfo.vue
new file mode 100644
index 000000000..f890f66ae
--- /dev/null
+++ b/web/src/components/repo/pipeline/PipelineInfo.vue
@@ -0,0 +1,9 @@
+<template>
+  <div class="w-full md:px-4 text-wp-text-100">
+    <div
+      class="flex flex-col px-4 py-8 gap-4 justify-center items-center text-center flex-shrink-0 rounded-md border bg-wp-background-100 border-wp-background-400 dark:bg-wp-background-200"
+    >
+      <slot />
+    </div>
+  </div>
+</template>
diff --git a/web/src/views/repo/pipeline/Pipeline.vue b/web/src/views/repo/pipeline/Pipeline.vue
index 0f92948d6..ae460e373 100644
--- a/web/src/views/repo/pipeline/Pipeline.vue
+++ b/web/src/views/repo/pipeline/Pipeline.vue
@@ -9,15 +9,26 @@
       />
 
       <div class="flex flex-grow relative">
-        <div v-if="error" class="flex flex-col p-4">
-          <span class="text-wp-state-error-100 font-bold text-xl mb-2">{{ $t('repo.pipeline.execution_error') }}</span>
-          <span class="text-wp-state-error-100">{{ error }}</span>
-        </div>
+        <PipelineInfo v-if="error">
+          <Icon name="status-error" class="w-16 h-16 text-wp-state-error-100" />
+          <div class="flex flex-wrap items-center justify-center gap-2 text-xl">
+            <span class="capitalize">{{ $t('repo.pipeline.execution_error') }}:</span>
+            <span>{{ error }}</span>
+          </div>
+        </PipelineInfo>
 
-        <div v-else-if="pipeline.status === 'blocked'" class="flex flex-col flex-grow justify-center items-center p-2">
-          <Icon name="status-blocked" class="w-16 h-16 text-wp-text-100 mb-4" />
-          <p class="text-xl text-wp-text-100 mb-4">{{ $t('repo.pipeline.protected.awaits') }}</p>
-          <div v-if="repoPermissions.push" class="flex space-x-4">
+        <PipelineInfo v-else-if="pipeline.status === 'blocked'">
+          <Icon name="status-blocked" class="w-16 h-16" />
+          <span class="text-xl">{{ $t('repo.pipeline.protected.awaits') }}</span>
+          <div v-if="repoPermissions.push" class="flex gap-2 flex-wrap items-center justify-center">
+            <Button
+              color="blue"
+              :start-icon="forge ?? 'repo'"
+              :text="$t('repo.pipeline.protected.review')"
+              :is-loading="isApprovingPipeline"
+              :to="pipeline.link_url"
+              :title="message"
+            />
             <Button
               color="green"
               :text="$t('repo.pipeline.protected.approve')"
@@ -31,12 +42,12 @@
               @click="declinePipeline"
             />
           </div>
-        </div>
+        </PipelineInfo>
 
-        <div v-else-if="pipeline.status === 'declined'" class="flex flex-col flex-grow justify-center items-center">
-          <Icon name="status-blocked" class="w-16 h-16 text-wp-text-100 mb-4" />
-          <p class="text-xl text-wp-text-100">{{ $t('repo.pipeline.protected.declined') }}</p>
-        </div>
+        <PipelineInfo v-else-if="pipeline.status === 'declined'">
+          <Icon name="status-blocked" class="w-16 h-16" />
+          <p class="text-xl">{{ $t('repo.pipeline.protected.declined') }}</p>
+        </PipelineInfo>
 
         <PipelineLog
           v-else-if="selectedStepId"
@@ -61,7 +72,9 @@ import PipelineLog from '~/components/repo/pipeline/PipelineLog.vue';
 import PipelineStepList from '~/components/repo/pipeline/PipelineStepList.vue';
 import useApiClient from '~/compositions/useApiClient';
 import { useAsyncAction } from '~/compositions/useAsyncAction';
+import useConfig from '~/compositions/useConfig';
 import useNotifications from '~/compositions/useNotifications';
+import usePipeline from '~/compositions/usePipeline';
 import { Pipeline, PipelineStep, Repo, RepoPermissions } from '~/lib/api/types';
 import { findStep } from '~/utils/helpers';
 
@@ -125,6 +138,9 @@ const selectedStepId = computed({
   },
 });
 
+const { forge } = useConfig();
+const { message } = usePipeline(pipeline);
+
 const selectedStep = computed(() => findStep(pipeline.value.workflows || [], selectedStepId.value || -1));
 const error = computed(() => pipeline.value?.error || selectedStep.value?.error);
 
diff --git a/web/src/views/repo/pipeline/PipelineWrapper.vue b/web/src/views/repo/pipeline/PipelineWrapper.vue
index c71629552..4b0e80201 100644
--- a/web/src/views/repo/pipeline/PipelineWrapper.vue
+++ b/web/src/views/repo/pipeline/PipelineWrapper.vue
@@ -11,8 +11,8 @@
       <template #title>{{ repo.full_name }}</template>
 
       <template #titleActions>
-        <div class="flex md:items-center flex-col gap-x-2 md:flex-row md:justify-between min-w-0">
-          <div class="flex content-start gap-x-2 py-2 md:mr-2 min-w-0">
+        <div class="flex md:items-center flex-col gap-2 md:flex-row md:justify-between min-w-0">
+          <div class="flex content-start gap-2 min-w-0">
             <PipelineStatusIcon :status="pipeline.status" class="flex flex-shrink-0" />
             <span class="flex-shrink-0 text-center">{{ $t('repo.pipeline.pipeline', { pipelineId }) }}</span>
             <span class="hidden md:inline-block">-</span>
@@ -21,7 +21,7 @@
             }}</span>
           </div>
 
-          <template v-if="repoPermissions.push">
+          <template v-if="repoPermissions.push && pipeline.status !== 'declined' && pipeline.status !== 'blocked'">
             <div class="flex content-start gap-x-2">
               <Button
                 v-if="pipeline.status === 'pending' || pipeline.status === 'running'"
@@ -31,7 +31,6 @@
                 @click="cancelPipeline"
               />
               <Button
-                v-else-if="pipeline.status !== 'blocked' && pipeline.status !== 'declined'"
                 class="flex-shrink-0"
                 :text="$t('repo.pipeline.actions.restart')"
                 :is-loading="isRestartingPipeline"