Merge pull request #695 from brunosabot/fix/allow-data-set-to-0

fix: 0 is a valid attributes, state or last change
Clooos · Aug 10, 2024 · c4ab799 · c4ab799
2 parents d3a1cd8 + 2a66082
commit c4ab799
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/tools/global-changes.ts b/src/tools/global-changes.ts
@@ -293,13 +293,13 @@ export function changeSubButtonState(context, container = context.content, appen
         // Build the displayed state string
         let displayedState = '';
         const formattedState = state && showState ? context._hass.formatEntityState(state) : '';
-        const formattedAttribute = state && attribute && showAttribute ? context._hass.formatEntityAttributeValue(state, attributeType) ?? attribute : '';
+        const formattedAttribute = state && attribute !== '' && showAttribute ? context._hass.formatEntityAttributeValue(state, attributeType) ?? attribute : '';
         const formattedLastChanged = state && showLastChanged ? formatDateTime(state.last_changed, context._hass.locale.language) : '';
 
-        if (showName && name) displayedState += name;
-        if (formattedState) displayedState += (displayedState ? ' · ' : '') + formattedState;
-        if (formattedLastChanged) displayedState += (displayedState ? ' · ' : '') + formattedLastChanged;
-        if (formattedAttribute) displayedState += (displayedState ? ' · ' : '') + formattedAttribute;
+        if (showName && name !== '') displayedState += name;
+        if (formattedState !== '') displayedState += (displayedState ? ' · ' : '') + formattedState;
+        if (formattedLastChanged !== '') displayedState += (displayedState ? ' · ' : '') + formattedLastChanged;
+        if (formattedAttribute !== '') displayedState += (displayedState ? ' · ' : '') + formattedAttribute;
 
         displayedState = displayedState.charAt(0).toUpperCase() + displayedState.slice(1);