fix(mqtt): Fix unit_of_measurement for current statistics and consuma…

…bles
Hypfer · Nov 23, 2021 · 7f052dc · 7f052dc
1 parent 4c01842
commit 7f052dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/backend/lib/mqtt/capabilities/ConsumableMonitoringCapabilityMqttHandle.js b/backend/lib/mqtt/capabilities/ConsumableMonitoringCapabilityMqttHandle.js
@@ -135,7 +135,7 @@ class ConsumableMonitoringCapabilityMqttHandle extends CapabilityMqttHandle {
                             baseTopicReference: HassAnchor.getTopicReference(HassAnchor.REFERENCE.HASS_CONSUMABLE_STATE + topicId),
                             autoconf: {
                                 state_topic: HassAnchor.getTopicReference(HassAnchor.REFERENCE.HASS_CONSUMABLE_STATE + topicId),
-                                unit_of_measurement: unit === stateAttrs.ConsumableStateAttribute.UNITS.PERCENT ? "Percent" : "Minutes",
+                                unit_of_measurement: unit === stateAttrs.ConsumableStateAttribute.UNITS.PERCENT ? Unit.PERCENT : Unit.MINUTES,
                                 icon: "mdi:progress-wrench",
                                 entity_category: EntityCategory.DIAGNOSTIC
                             },

diff --git a/backend/lib/mqtt/capabilities/CurrentStatisticsCapabilityMqttHandle.js b/backend/lib/mqtt/capabilities/CurrentStatisticsCapabilityMqttHandle.js
@@ -47,6 +47,7 @@ class CurrentStatisticsCapabilityMqttHandle extends CapabilityMqttHandle {
                             topicName: "time",
                             friendlyName: "Current Statistics Time",
                             datatype: DataType.INTEGER,
+                            unit: Unit.SECONDS,
                             getter: async () => {
                                 return HassAnchor.getAnchor(HassAnchor.ANCHOR.CURRENT_STATISTICS_TIME).getValue();
                             },
@@ -63,7 +64,8 @@ class CurrentStatisticsCapabilityMqttHandle extends CapabilityMqttHandle {
                                         autoconf: {
                                             state_topic: prop.getBaseTopic(),
                                             icon: "mdi:equalizer",
-                                            entity_category: EntityCategory.DIAGNOSTIC
+                                            entity_category: EntityCategory.DIAGNOSTIC,
+                                            unit_of_measurement: Unit.SECONDS
                                         }
                                     })
                                 );
@@ -96,7 +98,8 @@ class CurrentStatisticsCapabilityMqttHandle extends CapabilityMqttHandle {
                                         autoconf: {
                                             state_topic: prop.getBaseTopic(),
                                             icon: "mdi:equalizer",
-                                            entity_category: EntityCategory.DIAGNOSTIC
+                                            entity_category: EntityCategory.DIAGNOSTIC,
+                                            unit_of_measurement: Unit.SQUARE_CENTIMETER
                                         }
                                     })
                                 );

diff --git a/backend/lib/mqtt/common/Unit.js b/backend/lib/mqtt/common/Unit.js
@@ -23,6 +23,8 @@ const Unit = Object.freeze({
     PSI: "psi",
     AMOUNT: "#",
     // Not part of the specification, but useful
+    SECONDS: "seconds",
+    MINUTES: "minutes",
     SQUARE_CENTIMETER: "cm²",
     SQUARE_METER: "m²",
     CUBE_METER: "m³",