diff --git a/src/ui/widgets/EmbeddedDisplay/bobParser.test.ts b/src/ui/widgets/EmbeddedDisplay/bobParser.test.ts index 451893da..81b5bdc7 100644 --- a/src/ui/widgets/EmbeddedDisplay/bobParser.test.ts +++ b/src/ui/widgets/EmbeddedDisplay/bobParser.test.ts @@ -107,7 +107,6 @@ describe("opi widget parser", (): void => { 62 140 50 - false `; it("parses defaults", (): void => { @@ -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 = ` diff --git a/src/ui/widgets/EmbeddedDisplay/bobParser.ts b/src/ui/widgets/EmbeddedDisplay/bobParser.ts index ebd772ff..46bc432a 100644 --- a/src/ui/widgets/EmbeddedDisplay/bobParser.ts +++ b/src/ui/widgets/EmbeddedDisplay/bobParser.ts @@ -8,7 +8,6 @@ import { opiParseRules, opiParsePvName, opiParseColor, - opiParseAlarmSensitive, opiParseString, opiParseMacros, opiParseBoolean @@ -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) => { @@ -329,7 +337,7 @@ const BOB_COMPLEX_PARSERS: ComplexParserDict = { type: bobParseType, position: bobParsePosition, border: bobParseBorder, - alarmSensitive: opiParseAlarmSensitive, + alarmSensitive: bobParseAlarmSensitive, file: bobParseFile };