Skip to content

Commit 649fa74

Browse files
committed
fix alarms layout shift by colouring readback red and showing alarm when expanded
1 parent 7296d24 commit 649fa74

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

app/components/Block.tsx

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@ export default function Block({
6464
<td className="py-1 px-2 w-7/12">
6565
<span id={pv.human_readable_name + "_VALUE_ROW"}>
6666
<div className="flex justify-between">
67-
<span id={pv.human_readable_name + "_VALUE"}>
67+
<span
68+
id={pv.human_readable_name + "_VALUE"}
69+
className={pv.severity != "NONE" ? "text-red-600" : ""}
70+
>
6871
{showAdvanced && "Readback: "}
6972
{pv.value} {pv.units != null && pv.units}
7073
</span>
@@ -78,16 +81,18 @@ export default function Block({
7881
<circle cx="12" cy="12" r="12" />
7982
</svg>
8083
</div>
81-
{pv.severity != "NONE" ? (
82-
<a
83-
href="https://github.com/ISISComputingGroup/ibex_user_manual/wiki/Blocks#alarms"
84-
className="text-red-600"
85-
>
86-
Alarm: {pv.severity}
87-
</a>
88-
) : null}
84+
8985
{showAdvanced && (
9086
<div>
87+
<hr />
88+
{pv.severity != "NONE" ? (
89+
<a
90+
href="https://github.com/ISISComputingGroup/ibex_user_manual/wiki/Blocks#alarms"
91+
className="text-red-600"
92+
>
93+
Alarm: {pv.severity}
94+
</a>
95+
) : null}
9196
<hr />
9297
{pv.sp_value != null ? (
9398
<span id={pv.human_readable_name + "_SP"}>

app/components/__snapshots__/Block.test.tsx.snap

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ exports[`renders topbar unchanged 1`] = `
2424
class="flex justify-between"
2525
>
2626
<span
27+
class="text-red-600"
2728
id="undefined_VALUE"
2829
>
2930
123
@@ -44,12 +45,6 @@ exports[`renders topbar unchanged 1`] = `
4445
/>
4546
</svg>
4647
</div>
47-
<a
48-
class="text-red-600"
49-
href="https://github.com/ISISComputingGroup/ibex_user_manual/wiki/Blocks#alarms"
50-
>
51-
Alarm:
52-
</a>
5348
</span>
5449
</td>
5550
<td

0 commit comments

Comments
 (0)