Skip to content

Fix warnings in bobParser when alarmSensitive border property is missing #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 6, 2025
Merged

Fix warnings in bobParser when alarmSensitive border property is missing #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ui/widgets/EmbeddedDisplay/bobParser.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ describe("opi widget parser", (): void => {
<y>62</y>
<width>140</width>
<height>50</height>
<border_alarm_sensitive>false</border_alarm_sensitive>
</widget>
</display>`;
it("parses defaults", (): void => {
Expand All @@ -116,6 +115,7 @@ describe("opi widget parser", (): void => {
expect(widget.precisionFromPv).toEqual(true);
expect(widget.showUnits).toEqual(true);
expect(widget.wrapWords).toEqual(true);
expect(widget.alarmSensitive).toEqual(true);
});

const readbackPrecisionUnits = `
Expand Down
12 changes: 10 additions & 2 deletions src/ui/widgets/EmbeddedDisplay/bobParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {
opiParseRules,
opiParsePvName,
opiParseColor,
opiParseAlarmSensitive,
opiParseString,
opiParseMacros,
opiParseBoolean
Expand Down Expand Up @@ -151,6 +150,15 @@ function bobParseBorder(props: any): Border {
}
}

export function bobParseAlarmSensitive(props: any): boolean {
// If property is missing the default is true
let alarmSensitive = true;
if (props.border_alarm_sensitive !== undefined) {
alarmSensitive = opiParseBoolean(props.border_alarm_sensitive);
}
return alarmSensitive;
}

function bobParseItems(jsonProp: ElementCompact): string[] {
const items: string[] = [];
jsonProp["item"].forEach((item: any) => {
Expand Down Expand Up @@ -329,7 +337,7 @@ const BOB_COMPLEX_PARSERS: ComplexParserDict = {
type: bobParseType,
position: bobParsePosition,
border: bobParseBorder,
alarmSensitive: opiParseAlarmSensitive,
alarmSensitive: bobParseAlarmSensitive,
file: bobParseFile
};

Expand Down