Skip to content

Home Information - Your home, your data, organized.

Python

Finished config and integration view refactor.

Anthony Cassandrab36a326f9e6c
diff --git a/src/hi/constants.py b/src/hi/constants.py
index f7a95782..8b1537c1 100644
--- a/src/hi/constants.py
+++ b/src/hi/constants.py
@@ -9,9 +9,7 @@ DIVID = {
'SIDE': 'hi-side-content',
# Config
- 'INTEGRATION_TAB': 'hi-config-integration-tab',
'INTEGRATION_SETTINGS_PANE': 'hi-integration-settings',
- 'INTEGRATION_CONTENT_PANE': 'hi-integration-content',
'LOCATION_EDIT_PANE': 'hi-location-edit',
'LOCATION_VIEW_EDIT_PANE': 'hi-location-view-edit',
diff --git a/src/hi/hi_grid_view.py b/src/hi/hi_grid_view.py
index 136e7218..2de1fc88 100644
--- a/src/hi/hi_grid_view.py
+++ b/src/hi/hi_grid_view.py
@@ -44,10 +44,10 @@ class HiGridView(View):
TOP_TEMPLATE_NAME = 'panes/top_buttons.html'
BOTTOM_TEMPLATE_NAME = 'panes/bottom_buttons.html'
SIDE_DEFAULT_TEMPLATE_NAME = 'panes/side.html'
-
+
def get_main_template_name( self ) -> str:
raise NotImplementedError('Subclasses must override this method.')
-
+
def get_template_context( self, request, *args, **kwargs ) -> Dict[ str, str ]:
""" Can raise exceptions like BadRequest, Http404, etc. """
raise NotImplementedError('Subclasses must override this method.')
diff --git a/src/hi/integrations/core/integration_factory.py b/src/hi/integrations/core/integration_factory.py
index 3397699b..c6283e40 100644
--- a/src/hi/integrations/core/integration_factory.py
+++ b/src/hi/integrations/core/integration_factory.py
@@ -16,66 +16,40 @@ class IntegrationFactory( Singleton ):
self._integration_gateway_map : Dict[ str, IntegrationGateway ] = dict()
return
- def get_active_integration_data_list( self ) -> List[ IntegrationData ]:
- integration_data_list = list()
- integration_queryset = Integration.objects.filter( is_enabled = True )
- for integration in integration_queryset:
- integration_gateway = self._integration_gateway_map.get( integration.integration_id )
- if not integration_gateway:
- logger.error( f'Integration "{integration.integration_id }" in DB, but not registered.' )
- continue
- integration_metadata = integration_gateway.get_meta_data()
- integration_data = IntegrationData(
- integration_metadata = integration_metadata,
- integration = integration,
- )
- integration_data_list.apend( integration_data )
- continue
- integration_data_list.sort( key = lambda data : data.integration_metadata.label )
- return integration_data_list
-
def get_default_integration_data( self ):
- integration_data_list = self.get_active_integration_data_list()
+ integration_data_list = self.get_integration_data_list( enabled_only = True )
if not integration_data_list:
return None
return integration_data_list[0]
-
-
-
-
-
-
-
- def get_integration_gateway_list( self ):
- integration_gateway_list = list( self._integration_gateway_map.values() )
- integration_gateway_list.sort( key = lambda gateway : gateway.get_meta_data().label )
- return integration_gateway_list
-
- def get_integration_data_list( self ) -> List[ IntegrationData ]:
+ def get_integration_data_list( self, enabled_only = False ) -> List[ IntegrationData ]:
integration_data_list = list()
- for integration_gateway in self.get_integration_gateway_list():
+ if enabled_only:
+ integration_queryset = Integration.objects.filter( is_enabled = True )
+ else:
+ integration_queryset = Integration.objects.all()
+ integration_map = { x.integration_id: x for x in integration_queryset }
+
+ for integration_id, integration_gateway in self._integration_gateway_map.items():
integration_metadata = integration_gateway.get_meta_data()
- integration = self.get_integration( integration_id = integration_metadata.integration_id )
+ integration = integration_map.get( integration_id )
+ if not integration and enabled_only:
+ continue
+ elif not integration:
+ integration = Integration(
+ integration_id = integration_id,
+ is_enabled = False,
+ )
integration_data = IntegrationData(
integration_metadata = integration_metadata,
integration = integration,
)
integration_data_list.append( integration_data )
continue
+
+ integration_data_list.sort( key = lambda data : data.integration_metadata.label )
return integration_data_list
- def get_integration( self, integration_id : str ) -> Integration:
- if integration_id not in self._integration_gateway_map:
- raise KeyError( f'Unknown integration id "{integration_id}".' )
- try:
- return Integration.objects.get( integration_id = integration_id )
- except Integration.DoesNotExist:
- return Integration(
- integration_id = integration_id,
- is_enabled = False,
- )
-
def get_integration_gateway( self, integration_id : str ) -> IntegrationGateway:
if integration_id in self._integration_gateway_map:
return self._integration_gateway_map[integration_id]
diff --git a/src/hi/integrations/core/templates/core/pages/no_integrations.html b/src/hi/integrations/core/templates/core/pages/no_integrations.html
index 377c3dd9..96b5e93f 100644
--- a/src/hi/integrations/core/templates/core/pages/no_integrations.html
+++ b/src/hi/integrations/core/templates/core/pages/no_integrations.html
@@ -3,4 +3,11 @@
<div class="alert alert-warning">
There are no integrations currently registered.
</div>
+<div>
+ <a class="btn btn-info" role="button"
+ href="{% url 'integrations_manage' %}"
+ data-async="modal">
+ ADD INTEGRATIONS
+ </a>
+</div>
{% endblock %}
diff --git a/src/hi/integrations/core/views.py b/src/hi/integrations/core/views.py
index ba7c8144..27b2ca67 100644
--- a/src/hi/integrations/core/views.py
+++ b/src/hi/integrations/core/views.py
@@ -42,7 +42,7 @@ class IntegrationPageView( ConfigPageView ):
"""
def dispatch( self, request, *args, **kwargs ):
- request.integration_data_list = IntegrationFactory().get_active_integration_data_list()
+ request.integration_data_list = IntegrationFactory().get_integration_data_list( enabled_only = True )
request.current_integration_metadata = self.integration_metadata
return super().dispatch( request, *args, **kwargs )
diff --git a/src/hi/integrations/hass/templates/hass/panes/manage.html b/src/hi/integrations/hass/templates/hass/panes/manage.html
index 3ee56815..e00bf671 100644
--- a/src/hi/integrations/hass/templates/hass/panes/manage.html
+++ b/src/hi/integrations/hass/templates/hass/panes/manage.html
@@ -3,14 +3,14 @@
<div class="col-2">
<form action="{% url 'hass_sync' %}"
- method="POST" role="form" data-async="#{{ DIVID.INTEGRATION_TAB }}">
+ method="POST" role="form" data-async="true">
{% csrf_token %}
<button type="submit" class="btn btn-primary" role="button"
name="action" value="sync" >SYNC</button>
</form>
</div>
-<div id="{{ DIVID.INTEGRATION_SETTINGS_PANE }}">
+<div id="">
{% include "hass/panes/hass_settings.html" %}
</div>
{% endblock %}
diff --git a/src/hi/integrations/zoneminder/templates/zoneminder/panes/zm_manage.html b/src/hi/integrations/zoneminder/templates/zoneminder/panes/zm_manage.html
index ed489456..0deb53f9 100644
--- a/src/hi/integrations/zoneminder/templates/zoneminder/panes/zm_manage.html
+++ b/src/hi/integrations/zoneminder/templates/zoneminder/panes/zm_manage.html
@@ -3,14 +3,14 @@
<div class="col-2">
<form action="{% url 'zm_sync' %}"
- method="POST" role="form" data-async="#{{ DIVID.INTEGRATION_TAB }}">
+ method="POST" role="form" data-async="">
{% csrf_token %}
<button type="submit" class="btn btn-primary" role="button"
name="action" value="sync" >SYNC</button>
</form>
</div>
-<div id="{{ DIVID.INTEGRATION_SETTINGS_PANE }}">
+<div id="">
{% include "zoneminder/panes/zm_settings.html" %}
</div>
{% endblock %}