From 88d2486ab2ff0d792ce1ef8120af31ea87e8e29a Mon Sep 17 00:00:00 2001
From: qwerty287 <80460567+qwerty287@users.noreply.github.com>
Date: Tue, 21 Mar 2023 17:31:24 +0100
Subject: [PATCH] Various UI improvements (#1663)

https://github.com/woodpecker-ci/woodpecker/issues/1314#issuecomment-1475128683

https://github.com/woodpecker-ci/woodpecker/issues/1314#issuecomment-1477858832
(2.)

and the last two tasks from
https://github.com/woodpecker-ci/woodpecker/issues/1314#issue-1418804461

---------

Co-authored-by: Anbraten <anton@ju60.de>
---
 web/src/assets/locales/en.json                |  4 ++++
 .../admin/settings/AdminQueueTab.vue          |  9 +++-----
 .../repo/pipeline/PipelineStepList.vue        |  2 +-
 .../components/repo/settings/ActionsTab.vue   | 22 +++++++++++++++++++
 web/src/views/repo/pipeline/Pipeline.vue      |  4 ++--
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/web/src/assets/locales/en.json b/web/src/assets/locales/en.json
index c4e7a383e..b610d7b21 100644
--- a/web/src/assets/locales/en.json
+++ b/web/src/assets/locales/en.json
@@ -213,6 +213,10 @@
                     "disable": "Disable repository",
                     "success": "Repository disabled"
                 },
+                "enable": {
+                  "enable": "Enable repository",
+                  "success": "Repository enabled"
+                },
                 "delete": {
                     "delete": "Delete repository",
                     "confirm": "All data will be lost after this action!!!\n\nDo you really want to proceed?",
diff --git a/web/src/components/admin/settings/AdminQueueTab.vue b/web/src/components/admin/settings/AdminQueueTab.vue
index 70c6636a6..b38e849cd 100644
--- a/web/src/components/admin/settings/AdminQueueTab.vue
+++ b/web/src/components/admin/settings/AdminQueueTab.vue
@@ -65,12 +65,9 @@
           <span class="ml-2">{{ task.id }}</span>
           <span class="flex ml-auto gap-2">
             <Badge v-if="task.agent_id !== 0" :label="$t('admin.settings.queue.agent')" :value="task.agent_id" />
-            <Badge
-              v-for="(value, label) in task.labels"
-              :key="label"
-              :label="label.toString()"
-              :value="value || '???'"
-            />
+            <template v-for="(value, label) in task.labels">
+              <Badge v-if="value" :key="label" :label="label.toString()" :value="value" />
+            </template>
             <Badge
               v-if="task.dependencies"
               :label="$t('admin.settings.queue.waiting_for')"
diff --git a/web/src/components/repo/pipeline/PipelineStepList.vue b/web/src/components/repo/pipeline/PipelineStepList.vue
index 8a8d424aa..dbdb2b30c 100644
--- a/web/src/components/repo/pipeline/PipelineStepList.vue
+++ b/web/src/components/repo/pipeline/PipelineStepList.vue
@@ -43,7 +43,7 @@
     </div>
 
     <div class="flex-grow min-h-0 w-full relative">
-      <div class="absolute top-0 left-0 -right-3 h-full flex flex-col overflow-y-scroll gap-y-2">
+      <div class="absolute top-0 left-0 right-0 h-full flex flex-col overflow-y-scroll gap-y-2">
         <div
           v-for="workflow in pipeline.steps"
           :key="workflow.id"
diff --git a/web/src/components/repo/settings/ActionsTab.vue b/web/src/components/repo/settings/ActionsTab.vue
index 78510feef..a34aada8a 100644
--- a/web/src/components/repo/settings/ActionsTab.vue
+++ b/web/src/components/repo/settings/ActionsTab.vue
@@ -15,6 +15,7 @@
       />
 
       <Button
+        v-if="isActive"
         class="mr-auto mt-4"
         color="blue"
         start-icon="turn-off"
@@ -22,6 +23,15 @@
         :text="$t('repo.settings.actions.disable.disable')"
         @click="deactivateRepo"
       />
+      <Button
+        v-else
+        class="mr-auto mt-4"
+        color="blue"
+        start-icon="turn-off"
+        :is-loading="isActivatingRepo"
+        :text="$t('repo.settings.actions.enable.enable')"
+        @click="activateRepo"
+      />
 
       <Button
         class="mr-auto mt-4"
@@ -85,6 +95,15 @@ export default defineComponent({
       await router.replace({ name: 'repos' });
     });
 
+    const { doSubmit: activateRepo, isLoading: isActivatingRepo } = useAsyncAction(async () => {
+      if (!repo) {
+        throw new Error('Unexpected: Repo should be set');
+      }
+
+      await apiClient.activateRepo(repo.value.owner, repo.value.name);
+      notifications.notify({ title: i18n.t('repo.settings.actions.enable.success'), type: 'success' });
+    });
+
     const { doSubmit: deactivateRepo, isLoading: isDeactivatingRepo } = useAsyncAction(async () => {
       if (!repo) {
         throw new Error('Unexpected: Repo should be set');
@@ -96,12 +115,15 @@ export default defineComponent({
     });
 
     return {
+      isActive: repo?.value.active,
       isRepairingRepo,
       isDeletingRepo,
       isDeactivatingRepo,
+      isActivatingRepo,
       deleteRepo,
       repairRepo,
       deactivateRepo,
+      activateRepo,
     };
   },
 });
diff --git a/web/src/views/repo/pipeline/Pipeline.vue b/web/src/views/repo/pipeline/Pipeline.vue
index 18c8f4a4e..9149a3166 100644
--- a/web/src/views/repo/pipeline/Pipeline.vue
+++ b/web/src/views/repo/pipeline/Pipeline.vue
@@ -17,7 +17,7 @@
         <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-color mb-4" />
           <p class="text-xl text-color mb-4">{{ $t('repo.pipeline.protected.awaits') }}</p>
-          <div v-if="repoPermissions.push" class="flex mt-2 space-x-4">
+          <div v-if="repoPermissions.push" class="flex space-x-4">
             <Button
               color="green"
               :text="$t('repo.pipeline.protected.approve')"
@@ -34,7 +34,7 @@
         </div>
 
         <div v-else-if="pipeline.status === 'declined'" class="flex flex-col flex-grow justify-center items-center">
-          <Icon name="status-blocked" class="w-32 h-32 text-color" />
+          <Icon name="status-blocked" class="w-16 h-16 text-color mb-4" />
           <p class="text-xl text-color">{{ $t('repo.pipeline.protected.declined') }}</p>
         </div>