feat: add link to running job

AOSC-Dev · Mar 13, 2024 · d3e2095 · d3e2095
1 parent c4f98f6
commit d3e2095
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 32 deletions.
diff --git a/frontend/src/pages/index.vue b/frontend/src/pages/index.vue
@@ -18,11 +18,11 @@
           </v-card-item>
           <v-card-text>
             Total: {{status.total_job_count}}
-            <p></p>
+            <br/>
             Pending: {{status.pending_job_count}}
-            <p></p>
+            <br/>
             Running: {{status.running_job_count}}
-            <p></p>
+            <br/>
             Finished: {{status.finished_job_count}}
           </v-card-text>
         </v-card>
@@ -34,13 +34,13 @@
           </v-card-item>
           <v-card-text>
             Total: {{status.total_worker_count}}
-            <p></p>
+            <br/>
             Live: {{status.live_worker_count}}
-            <p></p>
+            <br/>
             Total Logical Cores: {{status.total_logical_cores}}
-            <p></p>
+            <br/>
             Total Memory: {{status.total_memory_bytes && prettyBytes(Number(status.total_memory_bytes))}}
-            <p></p>
+            <br/>
           </v-card-text>
         </v-card>
       </v-col>
@@ -53,17 +53,17 @@
           </v-card-item>
           <v-card-text>
             Total Workers: {{status.by_arch && status.by_arch[arch].total_worker_count}}
-            <p></p>
+            <br/>
             Live Workers: {{status.by_arch && status.by_arch[arch].live_worker_count}}
-            <p></p>
+            <br/>
             Total Logical Cores: {{status.by_arch && status.by_arch[arch].total_logical_cores}}
-            <p></p>
+            <br/>
             Total Memory: {{status.by_arch && prettyBytes(Number(status.by_arch[arch].total_memory_bytes))}}
-            <p></p>
+            <br/>
             Total Jobs: {{status.by_arch && status.by_arch[arch].total_job_count}}
-            <p></p>
+            <br/>
             Pending Jobs: {{status.by_arch && status.by_arch[arch].pending_job_count}}
-            <p></p>
+            <br/>
             Running Jobs: {{status.by_arch && status.by_arch[arch].running_job_count}}
           </v-card-text>
         </v-card>

diff --git a/frontend/src/pages/jobs/[id].vue b/frontend/src/pages/jobs/[id].vue
@@ -7,27 +7,27 @@
       </v-card-item>
       <v-card-text>
         Creation time: {{ job.creation_time }}
-        <p></p>
+        <br/>
         Finish time: {{ job.finish_time }}
-        <p></p>
+        <br/>
         Time elapsed: {{ job.elapsed_secs }}
-        <p></p>
+        <br/>
         Git commit: {{ job.git_sha }}
-        <p></p>
+        <br/>
         Git branch: {{ job.git_branch }}
-        <p></p>
+        <br/>
         Architecture: {{ job.arch }}
-        <p></p>
+        <br/>
         Package(s) to build: {{ job.packages }}
-        <p></p>
+        <br/>
         Package(s) successfully built: {{ job.successful_packages }}
-        <p></p>
+        <br/>
         Package(s) failed to build: {{ job.failed_package }}
-        <p></p>
+        <br/>
         Package(s) not built due to previous build failure: {{ job.skipped_packages }}
-        <p></p>
+        <br/>
         Log: {{ job.log_url }}
-        <p></p>
+        <br/>
         Status: {{ job.status }}
       </v-card-text>
     </v-card>

diff --git a/frontend/src/pages/workers/[id].vue b/frontend/src/pages/workers/[id].vue
@@ -7,17 +7,20 @@
       </v-card-item>
       <v-card-text>
         Architecture: {{ worker.arch }}
-        <p></p>
+        <br/>
         Git commit: {{ worker.git_commit }}
-        <p></p>
-        Memory size: {{ prettyBytes(worker.memory_bytes) }}
-        <p></p>
+        <br/>
+        Memory size: {{ worker.memory_bytes !== undefined && prettyBytes(worker.memory_bytes) }}
+        <br/>
         Logical cores: {{ worker.logical_cores }}
-        <p></p>
+        <br/>
         Last heartbeat time: {{ worker.last_heartbeat_time }}
-        <p></p>
-        Running job id: {{ worker.running_job_id }}
-        <p></p>
+        <br/>
+        Running job id: 
+        <router-link v-if="worker.running_job_id !== undefined" :to="{ path: `/workers/${worker.running_job_id}`, params: { id: worker.running_job_id } }">
+          {{ worker.running_job_id }}
+        </router-link>
+        <br/>
         Built job count: {{ worker.built_job_count }}
       </v-card-text>
     </v-card>