From 6c91831baafbf57ca90818818971ec4873990f37 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sun, 24 Jan 2016 23:45:06 -0800 Subject: [PATCH] Hide groups when they are views or auto defined --- .../components/frontend/www_static/home-assistant-polymer | 2 +- homeassistant/components/group.py | 4 ++++ tests/components/test_group.py | 7 ++++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/homeassistant/components/frontend/www_static/home-assistant-polymer b/homeassistant/components/frontend/www_static/home-assistant-polymer index 83ac27db0f7..c3337e89327 160000 --- a/homeassistant/components/frontend/www_static/home-assistant-polymer +++ b/homeassistant/components/frontend/www_static/home-assistant-polymer @@ -1 +1 @@ -Subproject commit 83ac27db0f7e4a9ae2499130be13940d7b5a030f +Subproject commit c3337e893277ce677ba4eea3ac4646d66ee3522b diff --git a/homeassistant/components/group.py b/homeassistant/components/group.py index 1b0a40b1355..673d4fe6d7e 100644 --- a/homeassistant/components/group.py +++ b/homeassistant/components/group.py @@ -167,6 +167,10 @@ class Group(Entity): def icon(self): return self._icon + @property + def hidden(self): + return not self._user_defined or self._view + @property def state_attributes(self): data = { diff --git a/tests/components/test_group.py b/tests/components/test_group.py index 4f43040e815..cf04e5f406d 100644 --- a/tests/components/test_group.py +++ b/tests/components/test_group.py @@ -10,7 +10,7 @@ import logging import homeassistant.core as ha from homeassistant.const import ( - STATE_ON, STATE_OFF, STATE_HOME, STATE_UNKNOWN, ATTR_ICON) + STATE_ON, STATE_OFF, STATE_HOME, STATE_UNKNOWN, ATTR_ICON, ATTR_HIDDEN) import homeassistant.components.group as group @@ -217,8 +217,8 @@ class TestComponentsGroup(unittest.TestCase): self.assertIsNone(group_state.attributes.get(group.ATTR_AUTO)) self.assertEqual('mdi:work', group_state.attributes.get(ATTR_ICON)) - self.assertEqual(True, - group_state.attributes.get(group.ATTR_VIEW)) + self.assertTrue(group_state.attributes.get(group.ATTR_VIEW)) + self.assertTrue(group_state.attributes.get(ATTR_HIDDEN)) group_state = self.hass.states.get( group.ENTITY_ID_FORMAT.format('test_group')) @@ -228,6 +228,7 @@ class TestComponentsGroup(unittest.TestCase): self.assertIsNone(group_state.attributes.get(group.ATTR_AUTO)) self.assertIsNone(group_state.attributes.get(ATTR_ICON)) self.assertIsNone(group_state.attributes.get(group.ATTR_VIEW)) + self.assertIsNone(group_state.attributes.get(ATTR_HIDDEN)) def test_groups_get_unique_names(self): """ Two groups with same name should both have a unique entity id. """