From 33e4fbc54477c6d4afb43b9823b0d9e79d5f1155 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus-tarpit+git@unterwaditzer.net>
Date: Wed, 20 Aug 2025 23:26:19 +0200
Subject: [PATCH] Fix wrong analyzer name in AnalysisTable

Each event index corresponds to an index in analyzers. But some events
may be null. We're skipping those events without incrementing the index,
leading to wrong analyzer names.
---
 .../src/lib/components/AnalysisTable.svelte   | 52 +++++++++++--------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/daemon/web/src/lib/components/AnalysisTable.svelte b/daemon/web/src/lib/components/AnalysisTable.svelte
index c15d7b9..f5f6e01 100644
--- a/daemon/web/src/lib/components/AnalysisTable.svelte
+++ b/daemon/web/src/lib/components/AnalysisTable.svelte
@@ -47,29 +47,35 @@
                     {#each report.rows as row}
                         {#if row.type === AnalysisRowType.Analysis}
                             {@const parsed_date = new Date(row.packet_timestamp)}
-                            {#each row.events.filter((e) => e !== null) as event, i}
-                                {@const analyzer = analyzers[i]}
-                                <tr class="even:bg-gray-200 odd:bg-white">
-                                    {#if event.type === EventType.Warning}
-                                        {@const severity = ['Low', 'Medium', 'High'][
-                                            event.severity
-                                        ]}
-                                        {@const severity_class = [
-                                            'bg-red-200',
-                                            'bg-red-400',
-                                            'bg-red-600',
-                                        ][event.severity]}
-                                        <td class="p-2">{date_formatter.format(parsed_date)}</td>
-                                        <td class="p-2">{analyzer.name} v{analyzer.version}</td>
-                                        <td class="p-2">{event.message}</td>
-                                        <td class="p-2 {severity_class} text-center">{severity}</td>
-                                    {:else if event.type === EventType.Informational}
-                                        <td class="p-2">{date_formatter.format(parsed_date)}</td>
-                                        <td class="p-2">{analyzer.name} v{analyzer.version}</td>
-                                        <td class="p-2">{event.message}</td>
-                                        <td class="p-2">Info</td>
-                                    {/if}
-                                </tr>
+                            {#each row.events as event, analyzerIndex}
+                                {#if event !== null}
+                                    {@const analyzer = analyzers[analyzerIndex]}
+                                    <tr class="even:bg-gray-200 odd:bg-white">
+                                        {#if event.type === EventType.Warning}
+                                            {@const severity = ['Low', 'Medium', 'High'][
+                                                event.severity
+                                            ]}
+                                            {@const severity_class = [
+                                                'bg-red-200',
+                                                'bg-red-400',
+                                                'bg-red-600',
+                                            ][event.severity]}
+                                            <td class="p-2">{date_formatter.format(parsed_date)}</td
+                                            >
+                                            <td class="p-2">{analyzer.name} v{analyzer.version}</td>
+                                            <td class="p-2">{event.message}</td>
+                                            <td class="p-2 {severity_class} text-center"
+                                                >{severity}</td
+                                            >
+                                        {:else if event.type === EventType.Informational}
+                                            <td class="p-2">{date_formatter.format(parsed_date)}</td
+                                            >
+                                            <td class="p-2">{analyzer.name} v{analyzer.version}</td>
+                                            <td class="p-2">{event.message}</td>
+                                            <td class="p-2">Info</td>
+                                        {/if}
+                                    </tr>
+                                {/if}
                             {/each}
                         {/if}
                     {/each}