8693wugha: disable removing running / pending reports. Fix report rem…

…oval on screen
CogStack · Mar 29, 2024 · 16c52fe · 16c52fe
1 parent 3318cf0
commit 16c52fe
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/webapp/api/api/views.py b/webapp/api/api/views.py
@@ -698,7 +698,7 @@ def remove_metrics_job(request, report_id: int):
             pass
         task.delete()
         logger.info('Completed metrics job deleted - report ID: %s', report_id)
-        return Response(200, 'task / report deleted')
+        return Response('task / report deleted', 200)
 
 
 @api_view(http_method_names=['GET', 'PUT'])

diff --git a/webapp/frontend/src/views/MetricsHome.vue b/webapp/frontend/src/views/MetricsHome.vue
@@ -24,7 +24,8 @@
         </span>
       </template>
       <template #cell(cleanup)="data">
-        <button class="btn btn-outline-danger" @click="confDeleteReportModal = data.item">
+        <button class="btn btn-outline-danger" @click="confDeleteReportModal = data.item"
+                :disabled="data.item.status === 'pending' || data.item.status === 'running'">
           <font-awesome-icon icon="times"></font-awesome-icon>
         </button>
       </template>
@@ -130,7 +131,10 @@ export default {
             <router-link :to="{ name: 'train-annotations', params: { projectId: '${i}' }}">${this.projects[i].name}</router-link>
           </div>`
         } else {
-          outEl += `<div>${i}</div>`
+          outEl += `
+            <div>
+              ${i} <font-awesome-icon icon="spinner" spin></font-awesome-icon>
+            </div>`
         }
       })
       return `<div>${outEl}</div>`