@adcops/autocore-react 3.3.75 → 3.3.79

package/src/components/tis/ResultHistoryTable.tsx

@@ -24,103 +24,12 @@ export interface ResultHistoryTableProps {
 }
 
 /**
- * Peel a tis.read_raw response. The wire shape may be either a per-cycle
- * envelope `{ cycle_index, cycle_fields, context, data }` or the legacy
- * flat `{ col: number[] }` blob. CSV builders only want the columnar
- * `{ col: number[] }` part.
+ * Browser download shim: turn an inline CSV (already built by the server)
+ * into a transient blob URL, click it, and clean up. The ZIP path uses a
+ * direct `<a href=download_url>` instead — the server has already written
+ * the file to /downloads/ and we just point the browser at it.
  */
-const unwrapEnvelope = (blob: any): Record<string, any[]> => {
-    if (!blob || typeof blob !== 'object') return {};
-    if ('data' in blob && blob.data && typeof blob.data === 'object'
-        && Object.values(blob.data).some(v => Array.isArray(v))) {
-        return blob.data as Record<string, any[]>;
-    }
-    return blob as Record<string, any[]>;
-};
-
-/**
- * RFC 4180 escape: quote only when the value contains comma, quote, or newline.
- */
-const escapeCsv = (v: any): string => {
-    if (v === null || v === undefined) return '';
-    const s = String(v);
-    return /[",\n\r]/.test(s) ? `"${s.replace(/"/g, '""')}"` : s;
-};
-
-/**
- * Build the canonical column order for a set of cycle blobs: `t` first
- * (canonical x-axis in every current schema), then the union of remaining
- * array-valued keys in first-seen order across cycles.
- */
-const unifyColumns = (blobs: Record<string, any[]>[]): string[] => {
-    const seen = new Set<string>();
-    const out: string[] = [];
-    for (const blob of blobs) {
-        for (const [k, v] of Object.entries(blob)) {
-            if (Array.isArray(v) && !seen.has(k)) {
-                seen.add(k);
-                out.push(k);
-            }
-        }
-    }
-    out.sort((a, b) => (a === 't' ? -1 : b === 't' ? 1 : 0));
-    return out;
-};
-
-/**
- * Concatenate one or more cycle envelopes into a single CSV. Adds a leading
- * `cycle_index` column so downstream consumers can split groups apart again.
- * Missing columns in a given cycle become empty cells.
- */
-const cyclesToCsv = (cycles: Array<{ cycleIndex: number; blob: any }>): string => {
-    if (cycles.length === 0) return '';
-    const unwrapped = cycles.map(c => ({
-        cycleIndex: c.cycleIndex,
-        blob: unwrapEnvelope(c.blob),
-    }));
-    const columns = unifyColumns(unwrapped.map(u => u.blob));
-    if (columns.length === 0) return '';
-
-    const lines: string[] = [['cycle_index', ...columns].join(',')];
-    for (const { cycleIndex, blob } of unwrapped) {
-        const nRows = columns.reduce(
-            (min, c) => Array.isArray(blob[c]) ? Math.min(min, blob[c].length) : min,
-            Infinity,
-        );
-        const finite = Number.isFinite(nRows) ? (nRows as number) : 0;
-        for (let i = 0; i < finite; i++) {
-            const row = [escapeCsv(cycleIndex)];
-            for (const c of columns) {
-                const arr = blob[c];
-                row.push(escapeCsv(Array.isArray(arr) ? arr[i] : ''));
-            }
-            lines.push(row.join(','));
-        }
-    }
-    return lines.join('\n');
-};
-
-/**
- * Single-blob CSV — kept for the filtered-data download path, which is
- * not (yet) per-cycle on the server.
- */
-const rawBlobToCsv = (blob: any): string => {
-    const unwrapped = unwrapEnvelope(blob);
-    return cyclesToCsv([{ cycleIndex: 0, blob: unwrapped }])
-        // Strip the synthetic cycle_index column for the legacy single-blob path.
-        .split('\n')
-        .map(line => {
-            const idx = line.indexOf(',');
-            return idx >= 0 ? line.slice(idx + 1) : '';
-        })
-        .join('\n');
-};
-
-/**
- * Browser download shim: turn a string into a transient blob URL, click it,
- * and clean up. Works without any extra libraries.
- */
-const downloadCsv = (filename: string, csv: string) => {
+const downloadCsvBlob = (filename: string, csv: string) => {
     const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' });
     const url  = URL.createObjectURL(blob);
     const a    = document.createElement('a');
@@ -132,8 +41,9 @@ const downloadCsv = (filename: string, csv: string) => {
     URL.revokeObjectURL(url);
 };
 
-type DownloadKind = 'raw' | 'filtered';
+type DownloadKind = 'data' | 'report';
 type InFlight = { runId: string; kind: DownloadKind };
+type ProjectDownloadKind = 'report' | 'archive';
 
 export const ResultHistoryTable: React.FC<ResultHistoryTableProps> = (props) => {
     const tis = useTis();
@@ -143,6 +53,7 @@ export const ResultHistoryTable: React.FC<ResultHistoryTableProps> = (props) =>
     const [tests, setTests] = useState<any[]>([]);
     const [loading, setLoading] = useState(false);
     const [downloading, setDownloading] = useState<InFlight | null>(null);
+    const [projectBusy, setProjectBusy] = useState<ProjectDownloadKind | null>(null);
     const { invoke } = useContext(EventEmitterContext);
 
     const loadTests = async () => {
@@ -182,93 +93,98 @@ export const ResultHistoryTable: React.FC<ResultHistoryTableProps> = (props) =>
     const handleDownload = async (rowData: any, kind: DownloadKind) => {
         const runId = rowData?.run_id;
         const rowMethodId = rowData?.method_id ?? methodId;
-        if (!runId || !rowMethodId) return;
+        if (!runId || !rowMethodId || !projectId) return;
 
-        // raw_data/ is per-cycle on disk; filtered_data/ is still a single
-        // file per test. The raw path lists cycles via tis.list_raw and
-        // concatenates them into one CSV with a leading cycle_index
-        // column. Filtered keeps its one-shot tis.read_filtered.
-        const topic  = kind === 'raw' ? 'tis.read_raw' : 'tis.read_filtered';
-        const label  = kind === 'raw' ? 'raw trace'   : 'filtered trace';
-        const suffix = kind === 'raw' ? 'raw'         : 'filtered';
+        // The server builds both CSVs end-to-end now. `Report` returns
+        // metadata + cycles + results (no traces). `Data` returns raw
+        // cycles concatenated with `filtered_`-prefixed columns paired
+        // against cycle 1.
+        const topic = kind === 'report' ? 'tis.export_test_csv'
+                                        : 'tis.export_test_data_csv';
+        const label = kind === 'report' ? 'test report' : 'test data';
 
         setDownloading({ runId, kind });
         try {
-            let csv = '';
+            const resp: any = await invoke(topic as any, MessageType.Request, {
+                project_id: projectId, method_id: rowMethodId, run_id: runId,
+            } as any);
+            if (!resp?.success) {
+                console.warn(`${topic} failed`, runId, resp?.error_message);
+                alert(`Failed to build ${label} for ${runId}` +
+                      (resp?.error_message ? `: ${resp.error_message}` : ''));
+                return;
+            }
+            const csv = typeof resp.data?.csv === 'string' ? resp.data.csv : '';
+            if (!csv) {
+                alert(`${label} for ${runId} is empty.`);
+                return;
+            }
+            // Trust the server-supplied filename — it already has the
+            // sanitized sample_id, project, method, and run components
+            // assembled with the same rules used for files on disk.
+            const filename = typeof resp.data?.filename === 'string' && resp.data.filename
+                ? resp.data.filename
+                : `${projectId}_${rowMethodId}_${runId}_${kind}.csv`;
+            downloadCsvBlob(filename, csv);
+        } catch (err) {
+            console.error(`Failed to download ${label}`, err);
+            alert(`Download failed: ${err instanceof Error ? err.message : String(err)}`);
+        } finally {
+            setDownloading(null);
+        }
+    };
 
-            if (kind === 'raw') {
-                // List every cycle on disk for this run/blob.
-                const listResp: any = await invoke(
-                    'tis.list_raw' as any, MessageType.Request, {
-                        project_id: projectId, method_id: rowMethodId, run_id: runId,
-                    } as any,
-                );
-                const cycleEntries: any[] = listResp?.data?.cycles ?? [];
-                const cycleIdxs = cycleEntries
-                    .filter(c => c?.name === 'trace' && typeof c?.cycle_index === 'number')
-                    .map(c => c.cycle_index as number)
-                    .sort((a, b) => a - b);
+    const handleProjectDownload = async (kind: ProjectDownloadKind) => {
+        if (!projectId) return;
+        const topic = kind === 'report' ? 'tis.export_project_csv'
+                                        : 'tis.export_project_zip';
+        const label = kind === 'report' ? 'project report' : 'project archive';
 
-                if (cycleIdxs.length === 0) {
-                    // Legacy run with a single un-cycled file → fall back
-                    // to a one-shot read (server resolves the legacy path).
-                    const resp: any = await invoke(topic as any, MessageType.Request, {
-                        project_id: projectId, method_id: rowMethodId,
-                        run_id: runId, name: 'trace',
-                    } as any);
-                    if (!resp?.success || !resp.data) {
-                        console.warn(`${topic} returned no data for`, runId, resp?.error_message);
-                        alert(`No ${label} available for ${runId}` +
-                              (resp?.error_message ? `: ${resp.error_message}` : ''));
-                        return;
-                    }
-                    csv = rawBlobToCsv(resp.data);
-                } else {
-                    // Fetch each cycle's envelope in parallel; concat into
-                    // one CSV with a leading cycle_index column.
-                    const fetched = await Promise.all(cycleIdxs.map(async (ci) => {
-                        const r: any = await invoke('tis.read_raw' as any, MessageType.Request, {
-                            project_id: projectId, method_id: rowMethodId,
-                            run_id: runId, name: 'trace', cycle_index: ci,
-                        } as any);
-                        return r?.success ? { cycleIndex: ci, blob: r.data } : null;
-                    }));
-                    const good = fetched.filter((x): x is { cycleIndex: number; blob: any } => x !== null);
-                    if (good.length === 0) {
-                        alert(`No ${label} cycles readable for ${runId}.`);
-                        return;
-                    }
-                    csv = cyclesToCsv(good);
+        setProjectBusy(kind);
+        try {
+            const resp: any = await invoke(topic as any, MessageType.Request, {
+                project_id: projectId,
+            } as any);
+            if (!resp?.success) {
+                console.warn(`${topic} failed`, projectId, resp?.error_message);
+                alert(`Failed to build ${label}` +
+                      (resp?.error_message ? `: ${resp.error_message}` : ''));
+                return;
+            }
+
+            if (kind === 'report') {
+                const csv = typeof resp.data?.csv === 'string' ? resp.data.csv : '';
+                if (!csv) {
+                    alert(`Project ${projectId} has no tests to report.`);
+                    return;
                 }
+                const filename = typeof resp.data?.filename === 'string' && resp.data.filename
+                    ? resp.data.filename
+                    : `${projectId}_project_report.csv`;
+                downloadCsvBlob(filename, csv);
             } else {
-                const resp: any = await invoke(topic as any, MessageType.Request, {
-                    project_id: projectId, method_id: rowMethodId,
-                    run_id: runId, name: 'trace',
-                } as any);
-                if (!resp?.success || !resp.data) {
-                    console.warn(`${topic} returned no data for`, runId, resp?.error_message);
-                    alert(`No ${label} available for ${runId}` +
-                          (resp?.error_message ? `: ${resp.error_message}` : ''));
+                // Archive lives on the server's /downloads/ endpoint — point
+                // the browser at it directly. Anchor click triggers a GET
+                // with content-disposition: attachment.
+                const url = typeof resp.data?.download_url === 'string' ? resp.data.download_url : '';
+                if (!url) {
+                    alert(`Server did not return a download URL for ${label}.`);
                     return;
                 }
-                csv = rawBlobToCsv(resp.data);
+                const a = document.createElement('a');
+                a.href = url;
+                a.download = typeof resp.data?.filename === 'string'
+                    ? resp.data.filename
+                    : `${projectId}_project_archive.zip`;
+                document.body.appendChild(a);
+                a.click();
+                a.remove();
             }
-
-            if (!csv) {
-                alert(`${label} for ${runId} is empty or has no array columns.`);
-                return;
-            }
-            // sample_id is required for every run, so it always belongs in
-            // the filename. Sanitize to match the on-disk filename rules
-            // applied server-side in tis_servelet::sanitize_for_filename.
-            const sampleId = sanitizeForFilename(sampleIdOf(rowData));
-            const sampleSeg = sampleId ? `${sampleId}_` : '';
-            downloadCsv(`${projectId}_${rowMethodId}_${sampleSeg}${runId}_${suffix}.csv`, csv);
         } catch (err) {
             console.error(`Failed to download ${label}`, err);
             alert(`Download failed: ${err instanceof Error ? err.message : String(err)}`);
         } finally {
-            setDownloading(null);
+            setProjectBusy(null);
         }
     };
 
@@ -286,25 +202,47 @@ export const ResultHistoryTable: React.FC<ResultHistoryTableProps> = (props) =>
         return '';
     };
 
-    // Mirrors tis_servelet::sanitize_for_filename on the server. Keeping
-    // the rules aligned means the SampleID segment in download names
-    // matches the on-disk raw_data/<sample_id>_<name>.json file.
-    const sanitizeForFilename = (s: string): string =>
-        s.replace(/[\/\\:*?"<>|\0\x00-\x1f]/g, '_');
-
     return (
         // Outer wrapper pins the whole component to its container's width.
         // `overflow: hidden` keeps a wide row from pushing the table past the
         // parent; DataTable's `scrollable` handles internal overflow via its
         // own scrollbars instead of blowing out layout.
         <div style={{ width: '100%', maxWidth: '100%', overflow: 'hidden', boxSizing: 'border-box' }}>
-            <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1rem' }}>
+            <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '1rem', gap: '0.5rem', flexWrap: 'wrap' }}>
                 <h3 style={{ margin: 0 }}>
                     {projectId
                         ? `Test History: ${projectId}${methodId ? ` / ${methodId}` : ''}`
                         : 'Test History (no project selected)'}
                 </h3>
-                <Button icon="pi pi-refresh" label="Refresh" onClick={loadTests} disabled={loading} />
+                <div style={{ display: 'flex', gap: '0.4rem', alignItems: 'center' }}>
+                    <Button
+                        icon={projectBusy === 'report' ? 'pi pi-spin pi-spinner' : 'pi pi-file'}
+                        label="Download Report"
+                        size="small"
+                        outlined
+                        disabled={!projectId || projectBusy !== null}
+                        onClick={() => handleProjectDownload('report')}
+                        tooltip="Download a CSV report of every test in this project"
+                        tooltipOptions={{ position: 'bottom' }}
+                    />
+                    <Button
+                        icon={projectBusy === 'archive' ? 'pi pi-spin pi-spinner' : 'pi pi-box'}
+                        label="Download Archive"
+                        size="small"
+                        outlined
+                        disabled={!projectId || projectBusy !== null}
+                        onClick={() => handleProjectDownload('archive')}
+                        tooltip="Download a ZIP of the entire project directory (all tests, raw data, configs)"
+                        tooltipOptions={{ position: 'bottom' }}
+                    />
+                    <Button
+                        icon="pi pi-refresh"
+                        label="Refresh"
+                        size="small"
+                        onClick={loadTests}
+                        disabled={loading}
+                    />
+                </div>
             </div>
 
             <DataTable
@@ -355,29 +293,29 @@ export const ResultHistoryTable: React.FC<ResultHistoryTableProps> = (props) =>
                     header="Download"
                     style={{ width: '14rem' }}
                     body={(rowData) => {
-                        const isRawBusy      = downloading?.runId === rowData.run_id && downloading?.kind === 'raw';
-                        const isFilteredBusy = downloading?.runId === rowData.run_id && downloading?.kind === 'filtered';
-                        const anyBusy        = downloading !== null;
+                        const isDataBusy   = downloading?.runId === rowData.run_id && downloading?.kind === 'data';
+                        const isReportBusy = downloading?.runId === rowData.run_id && downloading?.kind === 'report';
+                        const anyBusy      = downloading !== null;
                         return (
                             <div style={{ display: 'flex', gap: '0.4rem' }}>
                                 <Button
-                                    icon={isRawBusy ? 'pi pi-spin pi-spinner' : 'pi pi-download'}
-                                    label="Raw"
+                                    icon={isDataBusy ? 'pi pi-spin pi-spinner' : 'pi pi-download'}
+                                    label="Data"
                                     size="small"
                                     outlined
                                     disabled={anyBusy}
-                                    onClick={() => handleDownload(rowData, 'raw')}
-                                    tooltip="Download raw_data/trace.json as CSV"
+                                    onClick={() => handleDownload(rowData, 'data')}
+                                    tooltip="Download raw + filtered trace data as one CSV"
                                     tooltipOptions={{ position: 'left' }}
                                 />
                                 <Button
-                                    icon={isFilteredBusy ? 'pi pi-spin pi-spinner' : 'pi pi-download'}
-                                    label="Filtered"
+                                    icon={isReportBusy ? 'pi pi-spin pi-spinner' : 'pi pi-file'}
+                                    label="Report"
                                     size="small"
                                     outlined
                                     disabled={anyBusy}
-                                    onClick={() => handleDownload(rowData, 'filtered')}
-                                    tooltip="Download filtered_data/trace.json as CSV"
+                                    onClick={() => handleDownload(rowData, 'report')}
+                                    tooltip="Download a CSV report (metadata + cycles + results) for this test"
                                     tooltipOptions={{ position: 'left' }}
                                 />
                             </div>