fix(fastani): Move logs outside expandable rows, don't group qvr and …

…rvq.
Ecogenomics · May 6, 2022 · 21b2235 · 21b2235
1 parent 77e9f86
commit 21b2235
Show file tree

Hide file tree

Showing 3 changed files with 264 additions and 175 deletions.
diff --git a/assets/api/fastani.ts b/assets/api/fastani.ts
@@ -60,6 +60,7 @@ export interface FastAniJobResult {
 export interface FastAniResultData {
   status: RqJobStatus,
   ani: number,
+  af: number | null,
   mapped: number,
   total: number
   stdout: string | null,
@@ -70,8 +71,7 @@ export interface FastAniResultData {
 export interface FastAniResult {
   query: string,
   reference: string,
-  qvr: FastAniResultData,
-  rvq: FastAniResultData
+  data: FastAniResultData,
 }
 
 export interface FastAniConfig {

diff --git a/components/fastani/FastAniLogsModal.vue b/components/fastani/FastAniLogsModal.vue
@@ -1,8 +1,8 @@
 <template>
   <v-dialog
     v-model="dialog"
-    scrollable
     max-width="70%"
+    scrollable
   >
     <template v-slot:activator="{ on, attrs }">
       <v-btn
@@ -40,25 +40,13 @@
           </v-row>
         </div>
 
-        <div class="mt-2 pa-2 rounded bordered">
-          <v-row no-gutters>
-            <v-icon left>
-              {{ mdiScriptTextOutlineSvg }}
-            </v-icon>
-            <span class="text-h6 black--text">stdout</span>
-          </v-row>
-          <v-row class="mt-1" no-gutters>
-            <code style="white-space: pre;">{{ stdout !== null && stdout.length > 0 ? stdout : 'n/a' }}</code>
-          </v-row>
-        </div>
-
         <div class="mt-2 pa-2 rounded bordered">
           <v-row no-gutters>
             <span class="text-h6 black--text">
                    <v-icon left>
               {{ mdiScriptTextOutlineSvg }}
             </v-icon>
-              stderr</span>
+              Output</span>
           </v-row>
           <v-row class="mt-1" no-gutters>
             <code style="white-space: pre;">{{ stderr !== null && stderr.length > 0 ? stderr : 'n/a' }}</code>
@@ -87,10 +75,6 @@ import {mdiConsole, mdiHelpCircle, mdiScriptTextOutline} from "@mdi/js";
 
 export default {
   props: {
-    stdout: {
-      type: String,
-      default: null,
-    },
     stderr: {
       type: String,
       default: null,
@@ -102,7 +86,6 @@ export default {
   },
   data: () => ({
     dialog: false,
-
     mdiHelpCircleSvg: mdiHelpCircle,
     mdiConsoleSvg: mdiConsole,
     mdiScriptTextOutlineSvg: mdiScriptTextOutline,