Skip to content

Commit 21e439a

Browse files
rerpharerpha
authored
Merge pull request #58 from ISISComputingGroup/56_show_block_sps
show block SPs if they exist
2 parents a682cb2 + f04bdc4 commit 21e439a

File tree

11 files changed

+252
-65
lines changed

11 files changed

+252
-65
lines changed

‎app/components/Block.test.tsx‎

Lines changed: 95 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ it("renders topbar unchanged", () => {
2020
};
2121
const instName = "Instrument";
2222
const { container } = render(
23-
<Block pv={aBlock} instName={instName} showHiddenBlocks={false} />,
23+
<Block
24+
pv={aBlock}
25+
instName={instName}
26+
showHiddenBlocks={false}
27+
showSetpoints={false}
28+
/>,
2429
{
2530
container: tableBody,
2631
},
@@ -31,7 +36,12 @@ it("renders topbar unchanged", () => {
3136
it("renders nothing if pv is hidden", () => {
3237
const aBlock: IfcBlock = { pvaddress: "SOME:PV", visible: false };
3338
const { container } = render(
34-
<Block pv={aBlock} instName={""} showHiddenBlocks={false} />,
39+
<Block
40+
pv={aBlock}
41+
instName={""}
42+
showHiddenBlocks={false}
43+
showSetpoints={false}
44+
/>,
3545
{
3646
container: tableBody,
3747
},
@@ -46,7 +56,12 @@ it("renders block with correct name", () => {
4656
human_readable_name: "MyBlock",
4757
};
4858
const { container } = render(
49-
<Block pv={aBlock} instName={""} showHiddenBlocks={false} />,
59+
<Block
60+
pv={aBlock}
61+
instName={""}
62+
showHiddenBlocks={false}
63+
showSetpoints={false}
64+
/>,
5065
{
5166
container: tableBody,
5267
},
@@ -65,7 +80,12 @@ it("renders block with run control that is in range as a tick", () => {
6580
runcontrol_enabled: true,
6681
};
6782
const { container } = render(
68-
<Block pv={aBlock} instName={""} showHiddenBlocks={false} />,
83+
<Block
84+
pv={aBlock}
85+
instName={""}
86+
showHiddenBlocks={false}
87+
showSetpoints={false}
88+
/>,
6989
{
7090
container: tableBody,
7191
},
@@ -85,7 +105,12 @@ it("renders block with run control that is not in range as a cross", () => {
85105
runcontrol_enabled: true,
86106
};
87107
const { container } = render(
88-
<Block pv={aBlock} instName={""} showHiddenBlocks={false} />,
108+
<Block
109+
pv={aBlock}
110+
instName={""}
111+
showHiddenBlocks={false}
112+
showSetpoints={false}
113+
/>,
89114
{
90115
container: tableBody,
91116
},
@@ -105,7 +130,12 @@ it("renders block without run control without tick or cross", () => {
105130
runcontrol_enabled: false,
106131
};
107132
const { container } = render(
108-
<Block pv={aBlock} instName={""} showHiddenBlocks={false} />,
133+
<Block
134+
pv={aBlock}
135+
instName={""}
136+
showHiddenBlocks={false}
137+
showSetpoints={false}
138+
/>,
109139
{
110140
container: tableBody,
111141
},
@@ -115,3 +145,62 @@ it("renders block without run control without tick or cross", () => {
115145
.innerHTML,
116146
).toBe("");
117147
});
148+
149+
it("renders block with SP and shows SP value", () => {
150+
const expectedValue = 123;
151+
const expectedSpValue = 124;
152+
const aBlock: IfcBlock = {
153+
pvaddress: "SOME:PV",
154+
visible: true,
155+
human_readable_name: "MyBlock",
156+
runcontrol_inrange: false,
157+
runcontrol_enabled: false,
158+
sp_value: expectedSpValue,
159+
value: expectedValue,
160+
};
161+
const { container } = render(
162+
<Block
163+
pv={aBlock}
164+
instName={""}
165+
showHiddenBlocks={false}
166+
showSetpoints={true}
167+
/>,
168+
{
169+
container: tableBody,
170+
},
171+
);
172+
expect(
173+
container.querySelector(`#${aBlock.human_readable_name}_VALUE`)!.innerHTML,
174+
).toContain(`${expectedValue} <br>(SP: ${expectedSpValue})`);
175+
});
176+
177+
it("renders block without SP and hides SP value", () => {
178+
const expectedValue = 123;
179+
const expectedSpValue = 124;
180+
const aBlock: IfcBlock = {
181+
pvaddress: "SOME:PV",
182+
visible: true,
183+
human_readable_name: "MyBlock",
184+
runcontrol_inrange: false,
185+
runcontrol_enabled: false,
186+
value: expectedValue,
187+
sp_value: expectedSpValue,
188+
};
189+
const { container } = render(
190+
<Block
191+
pv={aBlock}
192+
instName={""}
193+
showHiddenBlocks={false}
194+
showSetpoints={false}
195+
/>,
196+
{
197+
container: tableBody,
198+
},
199+
);
200+
201+
const valueLabel = container.querySelector(
202+
`#${aBlock.human_readable_name}_VALUE`,
203+
)!.innerHTML;
204+
expect(valueLabel).toContain(`${expectedValue} `);
205+
expect(valueLabel).not.toContain(`${expectedSpValue}`);
206+
});

‎app/components/Block.tsx‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ export default function Block({
99
pv,
1010
instName,
1111
showHiddenBlocks,
12+
showSetpoints,
1213
}: {
1314
pv: IfcBlock;
1415
instName: string;
1516
showHiddenBlocks: boolean;
17+
showSetpoints: boolean;
1618
}) {
1719
const [currentValue, setCurrentValue] = useState<
1820
string | number | undefined
@@ -58,13 +60,22 @@ export default function Block({
5860

5961
<td className="py-1 px-4 ">
6062
<span id={pv.human_readable_name + "_VALUE"}>
61-
{pv.value} {pv.units != null && pv.units}{" "}
62-
<a
63-
href="https://github.com/ISISComputingGroup/ibex_user_manual/wiki/Blocks#alarms"
64-
className="text-red-600"
65-
>
66-
{pv.severity != "NONE" && pv.severity}
67-
</a>{" "}
63+
{pv.value} {pv.units != null && pv.units}
64+
{showSetpoints && pv.sp_value != null ? (
65+
<>
66+
<br />
67+
{`(SP: ${pv.sp_value})`}
68+
</>
69+
) : null}
70+
{pv.severity != "NONE" ? (
71+
<a
72+
href="https://github.com/ISISComputingGroup/ibex_user_manual/wiki/Blocks#alarms"
73+
className="text-red-600"
74+
>
75+
<br />
76+
{pv.severity}
77+
</a>
78+
) : null}
6879
</span>
6980
</td>
7081
<td className="py-1 px-4 flex justify-between items-center">

‎app/components/CheckToggle.test.tsx‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import CheckToggle from "@/app/components/CheckToggle";
2+
import { fireEvent, render } from "@testing-library/react";
3+
4+
it.each([true, false])(
5+
"CheckToggle acts on checked variable on a toggle when the initial state is %s",
6+
(initialChecked) => {
7+
const onChange = jest.fn();
8+
const expectedText = "Click me to break the internet";
9+
const { container } = render(
10+
<CheckToggle
11+
checked={initialChecked}
12+
setChecked={onChange}
13+
text={expectedText}
14+
/>,
15+
);
16+
const input = container.getElementsByTagName("input")[0];
17+
expect(input.checked).toBe(initialChecked);
18+
fireEvent.click(input);
19+
expect(onChange).toHaveBeenCalledWith(!initialChecked);
20+
},
21+
);

‎app/components/CheckToggle.tsx‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import React, { Dispatch, SetStateAction } from "react";
2+
3+
export default function CheckToggle({
4+
checked,
5+
setChecked,
6+
text,
7+
}: {
8+
checked: boolean;
9+
setChecked: Dispatch<SetStateAction<boolean>>;
10+
text: string;
11+
}) {
12+
return (
13+
<div className="pt-4">
14+
<label className="inline-flex items-center cursor-pointer">
15+
<input
16+
type="checkbox"
17+
checked={checked}
18+
onChange={() => {
19+
setChecked(!checked);
20+
}}
21+
className="sr-only peer"
22+
/>
23+
<div className="relative w-11 h-6 bg-gray-200 rounded-full peer peer-focus:ring-4 peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600"></div>
24+
<span className="ms-3 text-sm font-medium text-gray-900">{text}</span>
25+
</label>
26+
</div>
27+
);
28+
}

‎app/components/Group.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ export default function Group({
88
group,
99
instName,
1010
showHiddenBlocks,
11+
showSetpoints,
1112
}: {
1213
group: IfcGroup;
1314
instName: string;
1415
showHiddenBlocks: boolean;
16+
showSetpoints: boolean;
1517
}) {
1618
if (!group) {
1719
return <h1>Loading...</h1>;
@@ -30,7 +32,7 @@ export default function Group({
3032
<table className="text-sm table-fixed">
3133
<thead>
3234
<tr className="bg-blue-gray-100 text-gray-100">
33-
<th className="py-3 px-4 text-left">Block Name</th>
35+
<th className="py-3 px-4 text-left">Block</th>
3436
<th className="py-3 px-4 text-left">Value</th>
3537
<th className="py-3 px-4 text-left">In-Range</th>
3638
</tr>
@@ -43,6 +45,7 @@ export default function Group({
4345
pv={pv}
4446
instName={instName}
4547
showHiddenBlocks={showHiddenBlocks}
48+
showSetpoints={showSetpoints}
4649
/>
4750
);
4851
})}

‎app/components/Groups.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,27 @@ export default function Groups({
77
groupsMap,
88
instName,
99
showHiddenBlocks,
10+
showSetpoints,
1011
}: {
1112
groupsMap: Array<IfcGroup>;
1213
instName: string;
1314
showHiddenBlocks: boolean;
15+
showSetpoints: boolean;
1416
}) {
1517
if (!groupsMap) {
1618
return <h1>Loading...</h1>;
1719
}
1820

1921
return (
20-
<div className="rounded-xl grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4 mt-8">
22+
<div className="rounded-xl grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 gap-4 mt-2">
2123
{groupsMap.map((group) => {
2224
return (
2325
<Group
2426
key={group.name}
2527
group={group}
2628
instName={instName}
2729
showHiddenBlocks={showHiddenBlocks}
30+
showSetpoints={showSetpoints}
2831
/>
2932
);
3033
})}

‎app/components/InstrumentPage.test.ts‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
import { ConfigOutput, IfcPVWSRequest } from "@/app/types";
1+
import { ConfigOutput, IfcBlock, IfcPVWSRequest } from "@/app/types";
22
import {
33
getGroupsWithBlocksFromConfigOutput,
44
RC_ENABLE,
55
RC_INRANGE,
6+
SP_RBV,
67
subscribeToBlockPVs,
8+
toPrecision,
79
} from "@/app/components/InstrumentPage";
810

911
test("subscribeToBlockPVs subscribes to all run control PVs", () => {
@@ -13,13 +15,44 @@ test("subscribeToBlockPVs subscribes to all run control PVs", () => {
1315
expect(mockSendJsonMessage.mock.calls.length).toBe(1);
1416
const expectedCall: IfcPVWSRequest = {
1517
type: "subscribe",
16-
pvs: [aBlock, aBlock + RC_ENABLE, aBlock + RC_INRANGE],
18+
pvs: [aBlock, aBlock + RC_ENABLE, aBlock + RC_INRANGE, aBlock + SP_RBV],
1719
};
1820
expect(JSON.stringify(mockSendJsonMessage.mock.calls[0][0])).toBe(
1921
JSON.stringify(expectedCall),
2022
);
2123
});
2224

25+
test("toPrecision does nothing to string value ", () => {
26+
const expectedValue = "untouched";
27+
const aBlock: IfcBlock = {
28+
pvaddress: "SOME:BLOCK:STR",
29+
value: expectedValue,
30+
};
31+
expect(toPrecision(aBlock, expectedValue)).toBe(expectedValue);
32+
});
33+
34+
test("toPrecision does nothing to block without pv ", () => {
35+
const expectedValue = 0.00123456;
36+
const aBlock: IfcBlock = {
37+
pvaddress: "SOME:BLOCK:STR",
38+
value: expectedValue,
39+
};
40+
expect(toPrecision(aBlock, expectedValue)).toBe(expectedValue);
41+
});
42+
43+
test("toPrecision truncates block if it has precision", () => {
44+
const originalValue = 0.00123456;
45+
const precision = 3;
46+
const aBlock: IfcBlock = {
47+
pvaddress: "SOME:BLOCK:STR",
48+
value: originalValue,
49+
precision: precision,
50+
};
51+
expect(toPrecision(aBlock, originalValue)).toBe(
52+
originalValue.toPrecision(precision),
53+
);
54+
});
55+
2356
test("getGroupsWithBlocksFromConfigOutput gets blocks from blockserver groups", () => {
2457
const blockNameToTest = "aBlock";
2558
const groupNameToTest = "aGroup";

0 commit comments

Comments
 (0)