From 7a7f43024a226a9f08fe9872e2d90b2fb5377dd8 Mon Sep 17 00:00:00 2001
From: Denis Gukov <denguk@gmail.com>
Date: Sat, 21 Nov 2020 00:53:54 +0500
Subject: [PATCH] fix(fe): task log dialog

---
 web2/src/components/TaskLogView.vue     | 25 +++++++++--
 web2/src/views/project/TemplateView.vue | 60 ++++++++++++++++++++++---
 2 files changed, 76 insertions(+), 9 deletions(-)

diff --git a/web2/src/components/TaskLogView.vue b/web2/src/components/TaskLogView.vue
index 19cd373b..3eafdbeb 100644
--- a/web2/src/components/TaskLogView.vue
+++ b/web2/src/components/TaskLogView.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="item != null && output != null && user != null">
+  <div>
     <v-container class="pa-0 mb-2">
       <v-row no-gutters>
         <v-col>
@@ -88,15 +88,32 @@ export default {
   },
   data() {
     return {
-      item: null,
-      output: null,
-      user: null,
+      item: {},
+      output: [],
+      user: {},
     };
   },
+  watch: {
+    async itemId() {
+      this.reset();
+      await this.loadData();
+    },
+
+    async projectId() {
+      this.reset();
+      await this.loadData();
+    },
+  },
   async created() {
     await this.loadData();
   },
   methods: {
+    reset() {
+      this.item = {};
+      this.output = [];
+      this.user = {};
+    },
+
     async loadData() {
       this.item = (await axios({
         method: 'get',
diff --git a/web2/src/views/project/TemplateView.vue b/web2/src/views/project/TemplateView.vue
index 4f0f71fe..4faef51b 100644
--- a/web2/src/views/project/TemplateView.vue
+++ b/web2/src/views/project/TemplateView.vue
@@ -1,5 +1,11 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
-  <div v-if="item != null && tasks != null">
+  <div v-if="!isLoaded">
+    <v-progress-linear
+      indeterminate
+      color="primary darken-2"
+    ></v-progress-linear>
+  </div>
+  <div v-else>
     <EditDialog
       v-model="editDialog"
       save-button-text="Save"
@@ -94,7 +100,9 @@
             <v-list-item>
               <v-list-item-content>
                 <v-list-item-title>SSH Key</v-list-item-title>
-                <v-list-item-subtitle>{{ item.ssh_key_id }}</v-list-item-subtitle>
+                <v-list-item-subtitle>
+                  {{ keys.find((x) => x.id === item.ssh_key_id).name }}
+                </v-list-item-subtitle>
               </v-list-item-content>
             </v-list-item>
           </v-list>
@@ -104,21 +112,27 @@
             <v-list-item>
               <v-list-item-content>
                 <v-list-item-title>Inventory</v-list-item-title>
-                <v-list-item-subtitle>{{ item.inventory_id }}</v-list-item-subtitle>
+                <v-list-item-subtitle>
+                  {{ inventory.find((x) => x.id === item.inventory_id).name }}
+                </v-list-item-subtitle>
               </v-list-item-content>
             </v-list-item>
 
             <v-list-item>
               <v-list-item-content>
                 <v-list-item-title>Environment</v-list-item-title>
-                <v-list-item-subtitle>{{ item.environment_id }}</v-list-item-subtitle>
+                <v-list-item-subtitle>
+                  {{ environment.find((x) => x.id === item.environment_id).name }}
+                </v-list-item-subtitle>
               </v-list-item-content>
             </v-list-item>
 
             <v-list-item>
               <v-list-item-content>
                 <v-list-item-title>Repository</v-list-item-title>
-                <v-list-item-subtitle>{{ item.repository_id }}</v-list-item-subtitle>
+                <v-list-item-subtitle>
+                  {{ repositories.find((x) => x.id === item.repository_id).name }}
+                </v-list-item-subtitle>
               </v-list-item-content>
             </v-list-item>
           </v-list>
@@ -205,6 +219,10 @@ export default {
       ],
       tasks: null,
       item: null,
+      keys: null,
+      inventory: null,
+      environment: null,
+      repositories: null,
       deleteDialog: null,
       editDialog: null,
       copyDialog: null,
@@ -220,6 +238,14 @@ export default {
     isNew() {
       return this.itemId === 'new';
     },
+    isLoaded() {
+      return this.item
+        && this.tasks
+        && this.keys
+        && this.inventory
+        && this.environment
+        && this.repositories;
+    },
   },
 
   async created() {
@@ -281,6 +307,30 @@ export default {
         url: `/api/project/${this.projectId}/templates/${this.itemId}/tasks/last`,
         responseType: 'json',
       })).data;
+
+      this.inventory = (await axios({
+        method: 'get',
+        url: `/api/project/${this.projectId}/inventory`,
+        responseType: 'json',
+      })).data;
+
+      this.environment = (await axios({
+        method: 'get',
+        url: `/api/project/${this.projectId}/environment`,
+        responseType: 'json',
+      })).data;
+
+      this.keys = (await axios({
+        method: 'get',
+        url: `/api/project/${this.projectId}/keys`,
+        responseType: 'json',
+      })).data;
+
+      this.repositories = (await axios({
+        method: 'get',
+        url: `/api/project/${this.projectId}/repositories`,
+        responseType: 'json',
+      })).data;
     },
   },
 };