From e1c6a2b7bccea6cc6a8b387bbc266a1ba4e7789f Mon Sep 17 00:00:00 2001 From: Scott Fasone Date: Wed, 5 Jun 2024 14:34:15 -0400 Subject: [PATCH] feat(frontend): changed default attribute value to time series, then fallback to given attribute value --- frontend/lib/equipment/utils.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/lib/equipment/utils.ts b/frontend/lib/equipment/utils.ts index 71a0ea2..a55f7ee 100644 --- a/frontend/lib/equipment/utils.ts +++ b/frontend/lib/equipment/utils.ts @@ -56,11 +56,13 @@ function parseTimeSeriesValue(attribute: AttributeOverviewFragment, ts: TimeSeri } } function parseAttribute(attribute: AttributeOverviewFragment): IAttribute { - let value = parseAttributeValue(attribute); - if((value === null || value === undefined) && attribute.getTimeSeries?.[0]) { + let value: AttributeValue | undefined = undefined; + if(attribute.getTimeSeries?.[0]) { value = parseTimeSeriesValue(attribute, attribute.getTimeSeries[0]); } - + if(value === undefined || value === null) { + value = parseAttributeValue(attribute); + } return { id: attribute.id,