Skip to content

Commit 8800d2a

Browse files
committed
Transpose the modal table. Increase the size of the thumbnail image
1 parent 56b0ed1 commit 8800d2a

2 files changed

Lines changed: 42 additions & 75 deletions

File tree

backend/frontend/src/components/ImageThumbnail.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export function ImageThumbnail({
1919
>
2020
<img
2121
src={`/api/result/${type}-thumbnail/${group}/${name}/${hardware}${timePart}`}
22-
style={{ width: 85, height: 47.8125 }}
22+
style={{ width: 170, height: 95.625 }}
2323
loading="lazy"
2424
alt={type}
2525
/>

backend/frontend/src/components/TestHistory.tsx

Lines changed: 41 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -12,62 +12,34 @@ export function TestHistory({
1212
}) {
1313
const testData = [...record.data].reverse()
1414

15-
function imageRow(type: string) {
16-
return (
17-
<Table.Tr key={type}>
18-
<Table.Td style={{ transform: 'rotate(270deg)', whiteSpace: 'nowrap', width: 20 }}>
19-
{type.charAt(0).toUpperCase() + type.slice(1)}
20-
</Table.Td>
21-
{testData.map((d: TestData) => (
22-
<Table.Td key={d.timeStamp}>
23-
<ImageThumbnail
24-
type={type}
25-
group={record.group}
26-
name={record.name}
27-
hardware={record.hardware}
28-
timestamp={d.timeStamp}
29-
/>
30-
</Table.Td>
31-
))}
32-
</Table.Tr>
33-
)
34-
}
35-
3615
return (
3716
<Box p="md" bg="dark.8">
38-
<Table horizontalSpacing="xs" verticalSpacing={4}>
39-
<Table.Tbody>
17+
<Table horizontalSpacing="xs" verticalSpacing={4} withTableBorder withColumnBorders>
18+
<Table.Thead>
4019
<Table.Tr>
41-
<Table.Td />
42-
{testData.map((d: TestData) => (
43-
<Table.Td
44-
key={d.timeStamp}
45-
style={{ ...diffStyle(d.pixelError), width: 20, height: 15, padding: 0 }}
46-
/>
47-
))}
20+
<Table.Th>Timestamp</Table.Th>
21+
<Table.Th>Error</Table.Th>
22+
<Table.Th>Commit</Table.Th>
23+
<Table.Th>Timing</Table.Th>
24+
<Table.Th>Log</Table.Th>
25+
<Table.Th>Candidate</Table.Th>
26+
<Table.Th>Reference</Table.Th>
27+
<Table.Th>Difference</Table.Th>
28+
<Table.Th />
4829
</Table.Tr>
49-
<Table.Tr>
50-
<Table.Td />
51-
{testData.map((d: TestData) => (
52-
<Table.Td key={d.timeStamp}>
30+
</Table.Thead>
31+
<Table.Tbody>
32+
{testData.map((d: TestData, i: number) => (
33+
<Table.Tr key={d.timeStamp}>
34+
<Table.Td>
5335
<Text size="xs" c="dimmed">{new Date(d.timeStamp).toUTCString()}</Text>
5436
</Table.Td>
55-
))}
56-
</Table.Tr>
57-
<Table.Tr>
58-
<Table.Td />
59-
{testData.map((d: TestData) => (
60-
<Table.Td key={d.timeStamp}>
37+
<Table.Td>
6138
<Box px={4} style={{ borderRadius: 4, display: 'inline-block', ...diffStyle(d.pixelError) }}>
6239
<Text size="sm">{diffDisplay(d.pixelError)}</Text>
6340
</Box>
6441
</Table.Td>
65-
))}
66-
</Table.Tr>
67-
<Table.Tr>
68-
<Table.Td />
69-
{testData.map((d: TestData) => (
70-
<Table.Td key={d.timeStamp}>
42+
<Table.Td>
7143
<Anchor
7244
size="xs"
7345
href={`https://github.com/OpenSpace/OpenSpace/commit/${d.commitHash}`}
@@ -76,20 +48,10 @@ export function TestHistory({
7648
{d.commitHash.substring(0, 8)}
7749
</Anchor>
7850
</Table.Td>
79-
))}
80-
</Table.Tr>
81-
<Table.Tr>
82-
<Table.Td />
83-
{testData.map((d: TestData) => (
84-
<Table.Td key={d.timeStamp}>
51+
<Table.Td>
8552
<Text size="sm">{timingDisplay(d.timing)}</Text>
8653
</Table.Td>
87-
))}
88-
</Table.Tr>
89-
<Table.Tr>
90-
<Table.Td />
91-
{testData.map((d: TestData) => (
92-
<Table.Td key={d.timeStamp}>
54+
<Table.Td>
9355
<Anchor
9456
size="xs"
9557
href={`/api/result/log/${record.group}/${record.name}/${record.hardware}/${d.timeStamp}`}
@@ -98,22 +60,27 @@ export function TestHistory({
9860
Log ({d.nErrors} errors)
9961
</Anchor>
10062
</Table.Td>
101-
))}
102-
</Table.Tr>
103-
{imageRow('candidate')}
104-
{imageRow('reference')}
105-
{imageRow('difference')}
106-
<Table.Tr>
107-
<Table.Td />
108-
<Table.Td>
109-
<Button size="xs" variant="default" onClick={() => onUpdateReference(record)}>
110-
Upgrade Candidate to Reference
111-
</Button>
112-
</Table.Td>
113-
{testData.slice(1).map((d: TestData) => (
114-
<Table.Td key={d.timeStamp} />
115-
))}
116-
</Table.Tr>
63+
<Table.Td>
64+
<ImageThumbnail type="candidate" group={record.group} name={record.name}
65+
hardware={record.hardware} timestamp={d.timeStamp} />
66+
</Table.Td>
67+
<Table.Td>
68+
<ImageThumbnail type="reference" group={record.group} name={record.name}
69+
hardware={record.hardware} timestamp={d.timeStamp} />
70+
</Table.Td>
71+
<Table.Td>
72+
<ImageThumbnail type="difference" group={record.group} name={record.name}
73+
hardware={record.hardware} timestamp={d.timeStamp} />
74+
</Table.Td>
75+
<Table.Td>
76+
{i === 0 && (
77+
<Button size="xs" variant="default" onClick={() => onUpdateReference(record)}>
78+
Upgrade Candidate to Reference
79+
</Button>
80+
)}
81+
</Table.Td>
82+
</Table.Tr>
83+
))}
11784
</Table.Tbody>
11885
</Table>
11986
</Box>

0 commit comments

Comments
 (0)