ui: simplify progresses more with getProgressLogWithInfo

Author: Snyssfx

ui/src/MainPage.vue

@@ -29,7 +29,7 @@ import { getAlignmentChartSettings } from './charts/alignmentChartSettings';
 import { getChainsChartSettings } from './charts/chainsChartSettings';
 import { PlAgChartStackedBarCell, createAgGridColDef } from '@platforma-sdk/ui-vue';
 import { parseProgressString } from './parseProgress';
-import { ProgressLogWithInfo } from '@platforma-sdk/model';
+import type { ProgressLogWithInfo } from '@platforma-sdk/model';
 
 const app = useApp();
 
@@ -100,7 +100,7 @@ const columnDefs: ColDef<MiXCRResult>[] = [
     field: 'progress',
     headerName: 'Progress',
     progress(cellData) {
-      const parsed = parseProgressString(cellData.value?.progressLine);
+      const parsed = parseProgressString(cellData.value?.progressLine, cellData.value?.live);
 
       if (parsed.stage === 'Queued') {
         return {

ui/src/app.ts

@@ -8,7 +8,7 @@ export const sdkPlugin = defineApp(platforma, (app) => {
       const qc = app.model.outputs.qc;
       const progresses = app.model.outputs.progress?.data;
       if (!progresses || !qc) return undefined;
-      const done = progresses.map(p => p.value?.live == false)
+      const done = progresses.filter((p) => p.value?.live === false);
 
       const result = done.length / qc.data.length;
 

ui/src/parseProgress.ts

@@ -1,4 +1,4 @@
-import { ProgressPattern } from '@platforma-open/milaboratories.mixcr-clonotyping.model';
+import { ProgressPattern, ProgressPrefix } from '@platforma-open/milaboratories.mixcr-clonotyping.model';
 
 type ParsedProgress = {
   raw?: string;
@@ -17,8 +17,10 @@ type ParsedProgress = {
 // 'Exporting clones: 11.1%'
 // 'Queued'
 // 'Done'
-export function parseProgressString(progressString: string | undefined | null): ParsedProgress {
-  const raw = progressString ?? 'Unknown';
+export function parseProgressString(progressString: string | undefined | null, live: boolean | undefined): ParsedProgress {
+  let raw = (progressString ?? 'Not started').replace(ProgressPrefix, '');
+  if (live === false)
+    raw = 'Done';
 
   const res: ParsedProgress = {
     raw,

ui/src/results.ts

@@ -3,7 +3,6 @@ import type {
 import {
   AlignReport,
   AssembleReport,
-  ProgressPrefix,
   Qc,
 } from '@platforma-open/milaboratories.mixcr-clonotyping.model';
 import type { AnyLogHandle, ProgressLogWithInfo } from '@platforma-sdk/model';
@@ -107,21 +106,8 @@ export const MiXCRResultsFull = computed<MiXCRResult[] | undefined>(() => {
   // adding progress information
   for (const p of progress.data) {
     const sampleId = p.key[0] as string;
-    if (resultMap.get(sampleId))
-      if (p?.value) {
-        const progress: ProgressLogWithInfo = {
-          progressLine: 'Not started',
-          live: true,
-        };
-        if ((p.value?.progressLine?.length ?? 0) > 0) {
-          progress.progressLine = p.value.progressLine?.replace(ProgressPrefix, '');
-        }
-        if (p.value?.live == false) {
-          progress.progressLine = 'Done';
-        }
-
-        resultMap.get(sampleId)!.progress = progress;
-      }
+    if (resultMap.get(sampleId) && p?.value)
+      resultMap.get(sampleId)!.progress = p.value;
   }
 
   return [...resultMap.values()];