Home Information - Your home, your data, organized.
Python
Add "Set to Default" restoration for settings (#247)
Thiago Trautwein Santos07204de46fbd
diff --git a/src/hi/apps/attribute/edit_context.py b/src/hi/apps/attribute/edit_context.pyindex e2c65831..dbb5f957 100644--- a/src/hi/apps/attribute/edit_context.py+++ b/src/hi/apps/attribute/edit_context.py@@ -68,6 +68,11 @@ class AttributePageEditContext:if self.owner:return f'-{self.owner_type}-{self.owner_id}'return f'-{self.owner_type}'++ @property+ def can_restore_default(self) -> bool:+ """ Whether attributes for this owner type support restoring to default values """+ return False@propertydef content_body_template_name(self):@@ -83,7 +88,15 @@ class AttributePageEditContext:def restore_url_name(self) -> str:""" Should be a view that uses AttributeEditViewMixin.post_restore() """return f'{self.owner_type}_attribute_restore_inline'-++ @property+ def restore_subsystem_url_name(self) -> str:+ return f'{self.owner_type}_attribute_restore_subsystem_inline'++ @property+ def restore_all_url_name(self) -> str:+ return f'{self.owner_type}_attribute_restore_all_inline'+@propertydef container_html_id(self) -> str:return f"{DIVID['ATTR_V2_CONTAINER_ID']}{self.id_suffix}"diff --git a/src/hi/apps/attribute/enums.py b/src/hi/apps/attribute/enums.pyindex 8e00740e..ca757f04 100644--- a/src/hi/apps/attribute/enums.py+++ b/src/hi/apps/attribute/enums.py@@ -48,3 +48,7 @@ class AttributeValueType(LabeledEnum):@propertydef is_boolean(self):return bool( self == AttributeValueType.BOOLEAN )++ @property+ def is_float(self):+ return bool( self == AttributeValueType.FLOAT )\ No newline at end of filediff --git a/src/hi/apps/attribute/models.py b/src/hi/apps/attribute/models.pyindex a28bfba2..a08bd75b 100644--- a/src/hi/apps/attribute/models.py+++ b/src/hi/apps/attribute/models.py@@ -111,6 +111,9 @@ class AttributeModel(models.Model):def get_upload_to(self):raise NotImplementedError('Subclasses should override this method.' )++ def get_attribute_default_value(self):+ return Nonedef __str__(self):return f'Attr: {self.name}={self.value} [{self.value_type_str}] [{self.attribute_type_str}]'diff --git a/src/hi/apps/attribute/templates/attribute/components/edit_content_body.html b/src/hi/apps/attribute/templates/attribute/components/edit_content_body.htmlindex b8f0320f..b97e5f38 100644--- a/src/hi/apps/attribute/templates/attribute/components/edit_content_body.html+++ b/src/hi/apps/attribute/templates/attribute/components/edit_content_body.html@@ -47,12 +47,14 @@ by using the AttributeItemEditContext pattern.<div class="attr-v2-action-bar-left"><button id="{{ attr_page_context.update_button_html_id }}"type="submit"- class="btn btn-outline-primary {{ DIVID.ATTR_V2_UPDATE_BTN_CLASS }}"+ class="btn btn-outline-primary d-inline-flex align-items-center {{ DIVID.ATTR_V2_UPDATE_BTN_CLASS }}"name="action"value="update">{% icon "save" size="sm" css_class="hi-icon-left" %}{{ attr_page_context.update_button_label }}</button>+ {% block additional_buttons %}+ {% endblock %}<!-- Vertically stacked message areas --><div class="attr-v2-message-stack"><div id="{{ attr_page_context.dirty_msg_html_id }}"diff --git a/src/hi/apps/attribute/templates/attribute/components/regular_attribute_card.html b/src/hi/apps/attribute/templates/attribute/components/regular_attribute_card.htmlindex a8b1039b..a4b929b5 100644--- a/src/hi/apps/attribute/templates/attribute/components/regular_attribute_card.html+++ b/src/hi/apps/attribute/templates/attribute/components/regular_attribute_card.html@@ -14,6 +14,9 @@ Individual attribute attribute card with value editing and actionsdata-value-type="{{ attribute_form.instance.value_type.name|default:'text' }}"data-is-secret="{{ attribute_form.instance.value_type.is_secret|yesno:'true,false' }}"data-can-delete="{{ attribute_form.instance.attribute_type.can_delete|yesno:'true,false' }}"+ {% if attr_item_context.can_restore_default %}+ data-default-value="{{ attribute_form.instance.get_attribute_default_value }}"+ {% endif %}{% if not attribute_form.instance.pk and not attribute_form.is_bound %}style="display: none;"{% endif %}{% if attribute_form.instance and not attribute_form.instance.is_editable %}is_editable="false"{% endif %} >@@ -82,6 +85,14 @@ Individual attribute attribute card with value editing and actionstitle="View history">{% icon "history" size="sm" %}</a>+ {% if attr_item_context.can_restore_default %}+ <button type="button"+ class="btn btn-sm btn-outline-secondary"+ title="Restore to Default Value"+ onclick="window.Hi.attr.restoreDefaultValue('{{ attribute_form.instance.pk }}');">+ {% icon "sync" size="sm" %}+ </button>+ {% endif %}{% endif %}{% if attribute_form.instance.pk and attribute_form.instance.attribute_type.can_delete %}diff --git a/src/hi/apps/attribute/templatetags/attribute_extras.py b/src/hi/apps/attribute/templatetags/attribute_extras.pyindex 2493b147..45db9723 100644--- a/src/hi/apps/attribute/templatetags/attribute_extras.py+++ b/src/hi/apps/attribute/templatetags/attribute_extras.py@@ -148,3 +148,42 @@ def attr_restore_url(attr_item_context, attribute_id, history_id):'history_id': history_id}return reverse(url_name, kwargs=params)+++def attr_restore_subsystem_url(attr_item_context):+ """+ Generate URL for attribute restore default view with correct parameter names.++ Usage in template: {% attr_restore_subsystem_url attr_item_context %}++ Args:+ attr_item_context: AttributeItemEditContext instance++ Returns:+ str: URL for restore all default view+ """+ from django.urls import reverse+ url_name = attr_item_context.restore_subsystem_url_name+ params = {+ attr_item_context.owner_id_param_name: attr_item_context.owner_id,+ }+ return reverse(url_name, kwargs=params)+++def attr_restore_all_url(attr_item_context):+ """+ Generate URL for attribute restore global default view.++ Usage in template: {% attr_restore_all_url attr_item_context %}++ Returns:+ str: URL for restore global default view+ """+ from django.urls import reverse+ url_name = attr_item_context.restore_all_url_name+ params = {+ attr_item_context.owner_id_param_name: attr_item_context.owner_id,+ }+ return reverse(url_name, kwargs=params)diff --git a/src/hi/apps/attribute/view_mixins.py b/src/hi/apps/attribute/view_mixins.pyindex d0099eb6..cccca51f 100644--- a/src/hi/apps/attribute/view_mixins.py+++ b/src/hi/apps/attribute/view_mixins.py@@ -1,6 +1,7 @@import loggingfrom typing import Any, Dict, List+from django.db import transactionfrom django.http import HttpRequest, HttpResponse@@ -14,8 +15,8 @@ logger = logging.getLogger(__name__)class AttributeEditCommonMixin:- """ Common mixins are those where we only deal with a single attribuet at a time.- Thus, it does not depend if we are using a single item or mutliple item views.+ """ Common mixins are those where we only deal with a single attribute at a time.+ Thus, it does not depend if we are using a single item or multiple item views."""ATTRIBUTE_HISTORY_VIEW_LIMIT = 50@@ -86,6 +87,19 @@ class AttributeEditCommonMixin:attribute.value = history_record.valueattribute.save() # This will create a new history record tooreturn++ def do_restore_default( self,+ attribute : AttributeModel ):+ """ Caller should catch exceptions """++ default_value = attribute.get_attribute_default_value()+ if default_value is None:+ logger.warning(f"Restore default: No default value for attribute {attribute.name}. Skipping restore.")+ return++ attribute.value = default_value+ attribute.save()+ returnclass AttributeEditViewMixin( AttributeEditCommonMixin ):@@ -238,3 +252,27 @@ class AttributeMultiEditViewMixin( AttributeEditCommonMixin ):request = request,)+ def post_restore_all_defaults(self,+ request: HttpRequest,+ attributes: List[AttributeModel],+ attr_page_context: AttributePageEditContext,+ attr_item_context_list: List[AttributeItemEditContext]) -> HttpResponse:++ form_handler = AttributeEditFormHandler()+ renderer = AttributeEditResponseRenderer()++ try:+ with transaction.atomic():+ for attribute in attributes:+ self.do_restore_default(attribute=attribute)+ except Exception as e:+ return renderer.render_restore_error_response(str(e))++ multi_edit_form_data_list = form_handler.create_multi_edit_form_data(+ attr_item_context_list=attr_item_context_list,+ )+ return renderer.render_restore_success_response_multi(+ attr_page_context=attr_page_context,+ multi_edit_form_data_list=multi_edit_form_data_list,+ request=request,+ )diff --git a/src/hi/apps/config/models.py b/src/hi/apps/config/models.pyindex 16da9d95..3389c623 100644--- a/src/hi/apps/config/models.py+++ b/src/hi/apps/config/models.py@@ -1,6 +1,7 @@from django.db import modelsfrom hi.apps.attribute.models import AttributeModel, AttributeValueHistoryModel+from hi.apps.config.setting_enums import SettingEnumclass Subsystem( models.Model ):@@ -55,7 +56,15 @@ class SubsystemAttribute( AttributeModel ):def _get_history_model_class(self):"""Return the history model class for SubsystemAttribute."""return SubsystemAttributeHistory-++ def get_attribute_default_value(self):+ """Return the default value for this attribute, or None if not found."""+ try:+ enum = SettingEnum.from_key(self.setting_key)+ return enum.definition.initial_value+ except (ValueError, ImportError, AttributeError, TypeError):+ return None+class SubsystemAttributeHistory(AttributeValueHistoryModel):"""History tracking for SubsystemAttribute changes."""diff --git a/src/hi/apps/config/setting_enums.py b/src/hi/apps/config/setting_enums.pyindex de645e53..9bb56a60 100644--- a/src/hi/apps/config/setting_enums.py+++ b/src/hi/apps/config/setting_enums.py@@ -1,3 +1,4 @@+import importlibfrom dataclasses import dataclassfrom enum import Enum@@ -26,4 +27,13 @@ class SettingEnum(Enum):@propertydef key(self):return f'{self.__class__.__module__}.{self.__class__.__qualname__}.{self.name}'-++ @classmethod+ def from_key(cls, setting_key: str) -> "SettingEnum":+ module_path, enum_class_name, member_name = setting_key.rsplit('.', 2)+ module = importlib.import_module(module_path)+ enum_cls = getattr(module, enum_class_name)+ if not issubclass(enum_cls, SettingEnum):+ raise AttributeError(f"{enum_class_name} is not a SettingEnum")+ return getattr(enum_cls, member_name)+\ No newline at end of filediff --git a/src/hi/apps/config/subsystem_attribute_edit_context.py b/src/hi/apps/config/subsystem_attribute_edit_context.pyindex d425b416..d8ec7ccd 100644--- a/src/hi/apps/config/subsystem_attribute_edit_context.py+++ b/src/hi/apps/config/subsystem_attribute_edit_context.py@@ -23,6 +23,10 @@ class SubsystemAttributePageEditContext(AttributePageEditContext):self.selected_subsystem_id = selected_subsystem_idreturn+ @property+ def can_restore_default(self):+ return True+@propertydef content_body_template_name(self):return 'config/panes/subsystem_edit_content_body.html'@@ -48,6 +52,10 @@ class SubsystemAttributeItemEditContext(AttributeItemEditContext):"""Get the Subsystem instance (typed accessor)."""return self.owner+ @property+ def can_restore_default(self):+ return True+@propertydef content_body_template_name(self):return 'config/panes/subsystem_edit_content_body.html'diff --git a/src/hi/apps/config/templates/config/modals/subsystem_attribute_restore_all_confirm_modal.html b/src/hi/apps/config/templates/config/modals/subsystem_attribute_restore_all_confirm_modal.htmlnew file mode 100644index 00000000..96356975--- /dev/null+++ b/src/hi/apps/config/templates/config/modals/subsystem_attribute_restore_all_confirm_modal.html@@ -0,0 +1,27 @@+{% extends "modals/action_with_cancel.html" %}+{% load attribute_extras %}++{% block modal_dialog_class %}hi-modal-dialog-600{% endblock %}++{% block footer_class %}{{ DIVID.ATTR_V2_CONTAINER_CLASS }}{% endblock %}++{% block header_class %}bg-secondary{% endblock %}++{% block title_text %}+Confirm Reset+{% endblock %}++{% block body %}+Are you sure you want to reset+<strong>All Settings</strong>?+This action cannot be undone.+{% endblock %}++{% block action_right %}+<a href="{% attr_restore_all_url attr_item_context %}"+ role="button"+ class="btn btn-danger {{ DIVID.ATTR_V2_RESTORE_LINK_CLASS }}"+ data-dismiss="modal">+ Reset+</a>+{% endblock %}diff --git a/src/hi/apps/config/templates/config/modals/subsystem_attribute_restore_subsystem_confirm_modal.html b/src/hi/apps/config/templates/config/modals/subsystem_attribute_restore_subsystem_confirm_modal.htmlnew file mode 100644index 00000000..7b0bc335--- /dev/null+++ b/src/hi/apps/config/templates/config/modals/subsystem_attribute_restore_subsystem_confirm_modal.html@@ -0,0 +1,27 @@+{% extends "modals/action_with_cancel.html" %}+{% load attribute_extras %}++{% block modal_dialog_class %}hi-modal-dialog-600{% endblock %}++{% block footer_class %}{{ DIVID.ATTR_V2_CONTAINER_CLASS }}{% endblock %}++{% block header_class %}bg-secondary{% endblock %}++{% block title_text %}+Confirm Reset+{% endblock %}++{% block body %}+Are you sure you want to reset+<strong>{{ subsystem.name }} Settings</strong>?+This action cannot be undone.+{% endblock %}++{% block action_right %}+<a href="{% attr_restore_subsystem_url attr_item_context %}"+ role="button"+ class="btn btn-danger {{ DIVID.ATTR_V2_RESTORE_LINK_CLASS }}"+ data-dismiss="modal">+ Reset+</a>+{% endblock %}diff --git a/src/hi/apps/config/templates/config/panes/subsystem_edit_content_body.html b/src/hi/apps/config/templates/config/panes/subsystem_edit_content_body.htmlindex 05514e43..3d1b9560 100644--- a/src/hi/apps/config/templates/config/panes/subsystem_edit_content_body.html+++ b/src/hi/apps/config/templates/config/panes/subsystem_edit_content_body.html@@ -9,6 +9,9 @@ This is what gets replaced on form submission{% block basic_info %}{% endblock %}+{% block additional_buttons %}+{% endblock %}+{% block additional_actions %}<h4 class="mb-0 text-muted {{ DIVID.ATTR_V2_FORM_DISPLAY_LABEL_CLASS }}">{% for multi_edit_form_data in multi_edit_form_data_list %}@@ -27,17 +30,17 @@ This is what gets replaced on form submission{% block files_section %}{% endblock %}-{% block left_column %}+{% block left_column %}<nav class="nav flex-column hi-vertical-nav mr-3" id="subsystemTabs" role="tablist">{% for multi_edit_form_data in multi_edit_form_data_list %}- <a class="nav-link hi-vertical-nav-link {% if selected_subsystem_id == multi_edit_form_data.owner.id|stringformat:'s' %}active{% endif %}"- id="subsystem-{{ multi_edit_form_data.owner.id }}-tab"- data-toggle="tab"+ <a class="nav-link hi-vertical-nav-link {% if selected_subsystem_id == multi_edit_form_data.owner.id|stringformat:'s' %}active{% endif %}"+ id="subsystem-{{ multi_edit_form_data.owner.id }}-tab"+ data-toggle="tab"data-subsystem-id="{{ multi_edit_form_data.owner.id }}"data-config-settings-url="{% url 'config_settings' %}"- href="#subsystem-{{ multi_edit_form_data.owner.id }}-panel"- role="tab"- aria-controls="subsystem-{{ multi_edit_form_data.owner.id }}-panel"+ href="#subsystem-{{ multi_edit_form_data.owner.id }}-panel"+ role="tab"+ aria-controls="subsystem-{{ multi_edit_form_data.owner.id }}-panel"aria-selected="{% if selected_subsystem_id == multi_edit_form_data.owner.id|stringformat:'s' %}true{% else %}false{% endif %}"onclick="window.Hi.attr.updateFormAction('{% url 'config_settings' subsystem_id=multi_edit_form_data.owner.id %}', '{{ attr_page_context.container_html_id }}', '{{ multi_edit_form_data.owner.name }} Settings')">{{ multi_edit_form_data.owner.name }}@@ -53,20 +56,19 @@ This is what gets replaced on form submission<!-- Vertical Tabbed Subsystem Interface --><div class="tab-content" id="subsystemTabContent">-{% for multi_edit_form_data in multi_edit_form_data_list %}- <div class="tab-pane fade {% if selected_subsystem_id == multi_edit_form_data.owner.id|stringformat:'s' %}show active{% endif %}"- id="subsystem-{{ multi_edit_form_data.owner.id }}-panel"- role="tabpanel"+ <div class="tab-pane fade {% if selected_subsystem_id == multi_edit_form_data.owner.id|stringformat:'s' %}show active{% endif %}"+ id="subsystem-{{ multi_edit_form_data.owner.id }}-panel"+ role="tabpanel"aria-labelledby="subsystem-{{ multi_edit_form_data.owner.id }}-tab">-+<!-- Subsystem content using existing attribute editing components --><div class="">{% if multi_edit_form_data.owner.subsystem_key == "hi.apps.audio" %}<!-- Audio Test Button - only shown for Audio subsystem --><div class="mb-3 text-right"><button type="button"- class="btn btn-outline-primary btn-xs"+ class="btn btn-outline-primary btn-xs d-inline-flex align-items-center"onclick="Hi.audio.testAudio();"title="Test audio playback">{% icon "play" size="xs" css_class="hi-icon-left" %}Test Audio@@ -74,9 +76,41 @@ This is what gets replaced on form submission</div>{% endif %}{% include "attribute/components/regular_attribute_list.html" with regular_attributes_formset=multi_edit_form_data.formset attr_item_context=multi_edit_form_data.context %}+ <div class="mt-4 pt-3 border-top text-right">+ <small class="text-muted mr-1">Problems with these settings?</small>+ <a href="{% url 'subsystem_attribute_restore_subsystem_confirm_modal' subsystem_id=multi_edit_form_data.owner.id %}"+ role="button"+ class="btn btn-link btn-sm text-danger p-0"+ style="text-decoration: none; vertical-align: baseline;"+ title="Restore Default Values for {{ multi_edit_form_data.owner.name }}"+ data-async="modal">+ Reset {{ multi_edit_form_data.owner.name }} Settings to Default+ </a>+ </div></div>-</div>{% endfor %}</div>{% endblock %}++{% block additional_sections %}+ {% if attr_page_context.can_restore_default %}+ {% for multi_edit_form_data in multi_edit_form_data_list %}+ {% if selected_subsystem_id == multi_edit_form_data.owner.id|stringformat:'s' %}+ <div class="row mt-5 mb-4">+ <div class="col-12 text-center">+ <small class="text-muted mr-1">Need to start over?</small>+ <a href="{% url 'subsystem_attribute_restore_all_confirm_modal' subsystem_id=multi_edit_form_data.owner.id %}"+ role="button"+ class="btn btn-link btn-sm text-danger p-0"+ style="text-decoration: none; vertical-align: baseline;"+ title="Restore Default Values for All Settings"+ data-async="modal">+ Reset All Settings to Default+ </a>+ </div>+ </div>+ {% endif %}+ {% endfor %}+ {% endif %}+{% endblock %}\ No newline at end of filediff --git a/src/hi/apps/config/tests/test_views.py b/src/hi/apps/config/tests/test_views.pyindex c7f6407c..5069761f 100644--- a/src/hi/apps/config/tests/test_views.py+++ b/src/hi/apps/config/tests/test_views.py@@ -4,6 +4,9 @@ from django.urls import reversefrom hi.apps.config.enums import ConfigPageTypefrom hi.apps.config.models import Subsystem, SubsystemAttribute+from hi.apps.attribute.enums import AttributeType, AttributeValueType+from hi.apps.audio.settings import AudioSetting+from hi.apps.security.settings import SecuritySettingfrom hi.enums import ViewType, ViewModefrom hi.testing.view_test_base import DualModeViewTestCase@@ -208,4 +211,137 @@ class TestConfigSettingsView(DualModeViewTestCase):other_section = content[other_section_start:other_section_end]self.assertNotIn('Hi.audio.testAudio()', other_section)+ def test_attribute_restore_ui_data_is_present(self):+ """Ensure attribute cards expose default values and restore action."""+ attribute = SubsystemAttribute.objects.create(+ subsystem=self.subsystem,+ setting_key=SecuritySetting.SECURITY_DAY_START.key,+ name='Security Day Start',+ value='10:00',+ value_type_str=str(AttributeValueType.ENUM),+ attribute_type_str=str(AttributeType.PREDEFINED),+ )++ url = reverse('config_settings', kwargs={'subsystem_id': self.subsystem.id})+ response = self.client.get(url)++ self.assertSuccessResponse(response)+ self.assertHtmlResponse(response)++ content = response.content.decode('utf-8')+ expected_default = str(SecuritySetting.SECURITY_DAY_START.definition.initial_value)++ self.assertIn(f'data-default-value="{expected_default}"', content)+ self.assertIn(f"Hi.attr.restoreDefaultValue('{attribute.id}')", content)++ def test_restore_subsystem_confirm_modal(self):+ """Subsystem reset confirmation is rendered by a server modal view."""+ url = reverse(+ 'subsystem_attribute_restore_subsystem_confirm_modal',+ kwargs={'subsystem_id': self.subsystem.id},+ )++ response = self.async_get(url)++ self.assertSuccessResponse(response)+ self.assertJsonResponse(response)++ data = response.json()+ self.assertIn('modal', data)+ self.assertIn('attr-v2-container', data['modal'])+ self.assertIn('attr-v2-restore-link', data['modal'])++ expected_restore_url = reverse(+ 'subsystem_attribute_restore_subsystem_inline',+ kwargs={'subsystem_id': self.subsystem.id},+ )+ self.assertIn(f'href="{expected_restore_url}"', data['modal'])++ def test_restore_subsystem(self):+ """Restoring defaults for a subsystem updates all its attributes."""+ attribute_day = SubsystemAttribute.objects.create(+ subsystem=self.subsystem,+ setting_key=SecuritySetting.SECURITY_DAY_START.key,+ name='Security Day Start',+ value='10:00',+ value_type_str=str(AttributeValueType.ENUM),+ attribute_type_str=str(AttributeType.PREDEFINED),+ )+ attribute_away = SubsystemAttribute.objects.create(+ subsystem=self.subsystem,+ setting_key=SecuritySetting.SECURITY_AWAY_DELAY_MINS.key,+ name='Away Delay',+ value='99',+ value_type_str=str(AttributeValueType.INTEGER),+ attribute_type_str=str(AttributeType.PREDEFINED),+ )++ url = reverse('subsystem_attribute_restore_subsystem_inline', kwargs={'subsystem_id': self.subsystem.id})+ response = self.client.get(url)++ self.assertSuccessResponse(response)++ attribute_day.refresh_from_db()+ attribute_away.refresh_from_db()++ self.assertEqual(attribute_day.value, str(SecuritySetting.SECURITY_DAY_START.definition.initial_value))+ self.assertEqual(attribute_away.value, str(SecuritySetting.SECURITY_AWAY_DELAY_MINS.definition.initial_value))++ def test_restore_all_confirm_modal(self):+ """Global reset confirmation is rendered by a server modal view."""+ url = reverse(+ 'subsystem_attribute_restore_all_confirm_modal',+ kwargs={'subsystem_id': self.subsystem.id},+ )++ response = self.async_get(url)++ self.assertSuccessResponse(response)+ self.assertJsonResponse(response)++ data = response.json()+ self.assertIn('modal', data)+ self.assertIn('attr-v2-container', data['modal'])+ self.assertIn('attr-v2-restore-link', data['modal'])++ expected_restore_url = reverse(+ 'subsystem_attribute_restore_all_inline',+ kwargs={'subsystem_id': self.subsystem.id},+ )+ self.assertIn(f'href="{expected_restore_url}"', data['modal'])++ def test_restore_all(self):+ """Restoring defaults for all subsystems updates every attribute."""+ other_subsystem = Subsystem.objects.create(+ name='Other Subsystem',+ subsystem_key='other_subsystem_key',+ )++ attribute_security = SubsystemAttribute.objects.create(+ subsystem=self.subsystem,+ setting_key=SecuritySetting.SECURITY_NIGHT_START.key,+ name='Security Night Start',+ value='01:00',+ value_type_str=str(AttributeValueType.ENUM),+ attribute_type_str=str(AttributeType.PREDEFINED),+ )+ attribute_audio = SubsystemAttribute.objects.create(+ subsystem=other_subsystem,+ setting_key=AudioSetting.CONSOLE_WARNING_AUDIO_FILE.key,+ name='Console Warning Sound',+ value='info',+ value_type_str=str(AttributeValueType.ENUM),+ attribute_type_str=str(AttributeType.PREDEFINED),+ )++ url = reverse('subsystem_attribute_restore_all_inline', kwargs={'subsystem_id': self.subsystem.id})++ response = self.client.get(url)++ self.assertSuccessResponse(response)++ attribute_security.refresh_from_db()+ attribute_audio.refresh_from_db()+ self.assertEqual(attribute_security.value, str(SecuritySetting.SECURITY_NIGHT_START.definition.initial_value))+ self.assertEqual(attribute_audio.value, str(AudioSetting.CONSOLE_WARNING_AUDIO_FILE.definition.initial_value))diff --git a/src/hi/apps/config/urls.py b/src/hi/apps/config/urls.pyindex 0022e51a..88714a5e 100644--- a/src/hi/apps/config/urls.py+++ b/src/hi/apps/config/urls.py@@ -22,4 +22,19 @@ urlpatterns = [views.SubsystemAttributeRestoreInlineView.as_view(),name='subsystem_attribute_restore_inline'),+ re_path( r'^attribute/restore/default/subsystem/confirm/(?P<subsystem_id>\d+)/$',+ views.SubsystemAttributeRestoreSubsystemConfirmModalView.as_view(),+ name='subsystem_attribute_restore_subsystem_confirm_modal' ),++ re_path( r'^attribute/restore/default/subsystem/(?P<subsystem_id>\d+)/$',+ views.SubsystemAttributeRestoreSubsystemInlineView.as_view(),+ name='subsystem_attribute_restore_subsystem_inline' ),++ re_path( r'^attribute/restore/default/all/confirm/(?P<subsystem_id>\d+)/$',+ views.SubsystemAttributeRestoreAllConfirmModalView.as_view(),+ name='subsystem_attribute_restore_all_confirm_modal' ),++ re_path( r'^attribute/restore/default/all/(?P<subsystem_id>\d+)/$',+ views.SubsystemAttributeRestoreAllInlineView.as_view(),+ name='subsystem_attribute_restore_all_inline' ),]diff --git a/src/hi/apps/config/views.py b/src/hi/apps/config/views.pyindex 36dd300b..cba29efa 100644--- a/src/hi/apps/config/views.py+++ b/src/hi/apps/config/views.py@@ -9,10 +9,11 @@ from hi.views import page_not_found_responsefrom hi.enums import ViewMode, ViewTypefrom hi.hi_grid_view import HiGridView+from hi.hi_async_view import HiModalViewfrom hi.apps.attribute.view_mixins import AttributeMultiEditViewMixinfrom .enums import ConfigPageType-from .models import SubsystemAttribute+from .models import Subsystem, SubsystemAttributefrom .settings_mixins import SubsystemAttributeMixinfrom .subsystem_attribute_edit_context import (SubsystemAttributeItemEditContext,@@ -173,3 +174,86 @@ class SubsystemAttributeRestoreInlineView( View,attr_page_context = attr_page_context,attr_item_context_list = attr_item_context_list,)+++class SubsystemAttributeRestoreSubsystemConfirmModalView( HiModalView ):++ def get_template_name( self ) -> str:+ return 'config/modals/subsystem_attribute_restore_subsystem_confirm_modal.html'++ def get( self, request, subsystem_id, *args, **kwargs ):+ try:+ subsystem = Subsystem.objects.get( pk = subsystem_id )+ except Subsystem.DoesNotExist:+ return page_not_found_response(request, "Subsystem not found.")+ attr_item_context = SubsystemAttributeItemEditContext(+ subsystem = subsystem,+ )+ context = {+ 'subsystem': subsystem,+ 'attr_item_context': attr_item_context,+ }+ return self.modal_response( request, context )+++class SubsystemAttributeRestoreSubsystemInlineView( View,+ SubsystemAttributeMixin,+ AttributeMultiEditViewMixin ):++ def get(self, request, subsystem_id, *args, **kwargs):+ attributes = SubsystemAttribute.objects.select_related('subsystem').filter(subsystem_id=subsystem_id)+ if not attributes.exists():+ return page_not_found_response(request, "No attributes found for this subsystem.")++ attr_page_context = SubsystemAttributePageEditContext(+ selected_subsystem_id=subsystem_id,+ )+ attr_item_context_list = self._create_attr_item_context_list()++ return self.post_restore_all_defaults(+ request=request,+ attributes=attributes,+ attr_page_context=attr_page_context,+ attr_item_context_list=attr_item_context_list,+ )+++class SubsystemAttributeRestoreAllConfirmModalView( HiModalView ):++ def get_template_name( self ) -> str:+ return 'config/modals/subsystem_attribute_restore_all_confirm_modal.html'++ def get( self, request, subsystem_id, *args, **kwargs ):+ try:+ subsystem = Subsystem.objects.get( pk = subsystem_id )+ except Subsystem.DoesNotExist:+ return page_not_found_response(request, "Subsystem not found.")+ attr_item_context = SubsystemAttributeItemEditContext(+ subsystem = subsystem,+ )+ context = {+ 'attr_item_context': attr_item_context,+ }+ return self.modal_response( request, context )+++class SubsystemAttributeRestoreAllInlineView( View,+ SubsystemAttributeMixin,+ AttributeMultiEditViewMixin ):++ def get(self, request, subsystem_id, *args, **kwargs):+ attributes = SubsystemAttribute.objects.select_related('subsystem').all()+ if not attributes.exists():+ return page_not_found_response(request, "No attributes found.")++ attr_page_context = SubsystemAttributePageEditContext(+ selected_subsystem_id=subsystem_id,+ )+ attr_item_context_list = self._create_attr_item_context_list()++ return self.post_restore_all_defaults(+ request=request,+ attributes=attributes,+ attr_page_context=attr_page_context,+ attr_item_context_list=attr_item_context_list,+ )diff --git a/src/hi/apps/entity/entity_attribute_edit_context.py b/src/hi/apps/entity/entity_attribute_edit_context.pyindex 98c0819b..017e19db 100644--- a/src/hi/apps/entity/entity_attribute_edit_context.py+++ b/src/hi/apps/entity/entity_attribute_edit_context.py@@ -63,6 +63,10 @@ class EntityAttributeItemEditContext(AttributeItemEditContext):prefix = self.formset_prefix,)+ @property+ def can_restore_default(self):+ return False+@propertydef content_body_template_name(self):return 'entity/panes/entity_edit_content_body.html'diff --git a/src/hi/apps/location/location_attribute_edit_context.py b/src/hi/apps/location/location_attribute_edit_context.pyindex 0d4aa7f8..e924cc7a 100644--- a/src/hi/apps/location/location_attribute_edit_context.py+++ b/src/hi/apps/location/location_attribute_edit_context.py@@ -63,6 +63,10 @@ class LocationAttributeItemEditContext( AttributeItemEditContext ):prefix = self.formset_prefix,)+ @property+ def can_restore_default(self):+ return False+@propertydef content_body_template_name(self):return 'location/panes/location_edit_content_body.html'diff --git a/src/hi/integrations/integration_attribute_edit_context.py b/src/hi/integrations/integration_attribute_edit_context.pyindex 115daa98..00f5e9ff 100644--- a/src/hi/integrations/integration_attribute_edit_context.py+++ b/src/hi/integrations/integration_attribute_edit_context.py@@ -54,6 +54,10 @@ class IntegrationAttributeItemEditContext(AttributeItemEditContext):"""Get the Integration instance (typed accessor)."""return self.owner+ @property+ def can_restore_default(self):+ return False+@propertydef content_body_template_name(self):return 'integrations/panes/integration_edit_content_body.html'diff --git a/src/hi/static/js/antinode.js b/src/hi/static/js/antinode.jsindex 20a9d019..1c9e7736 100644--- a/src/hi/static/js/antinode.js+++ b/src/hi/static/js/antinode.js@@ -1046,4 +1046,4 @@ $(document)$('#antinode-loader').hide();});-})();+})();\ No newline at end of filediff --git a/src/hi/static/js/attr.js b/src/hi/static/js/attr.jsindex 9b680408..06a789a4 100644--- a/src/hi/static/js/attr.js+++ b/src/hi/static/js/attr.js@@ -115,11 +115,15 @@toggleExpandedView: function(button) {return _toggleExpandedView(button);},-+reorderAttributeCard: function(button, direction) {return _reorderAttributeCard(button, direction);},+ restoreDefaultValue: function(attributeId) {+ return _restoreDefaultValue(attributeId);+ },+// Initializationinit: function() {_initializeAllContainers();@@ -1169,7 +1173,7 @@displayField.off('input.overflow');}}-+function _reorderAttributeCard(button, direction) {const card = button.closest(`[${Hi.DATA_ATTRIBUTE_ID_ATTR}]`);const parent = card?.parentElement;@@ -1207,6 +1211,82 @@}}}++ function _restoreDefaultValue(attributeId, containerSelector = null) {+ const scope = containerSelector ? $(containerSelector) : $(document);+ const $card = scope.find(`[${Hi.DATA_ATTRIBUTE_ID_ATTR}="${attributeId}"]`);++ if (!$card.length) return;++ const defaultValue = $card.data('default-value');+ const valueType = $card.data('value-type');++ if (defaultValue === undefined || valueType === undefined) {+ console.warn(`Missing data for attribute ${attributeId}`);+ return;+ }++ const handlers = {+ BOOLEAN : _restoreCheckbox,+ ENUM : _restoreSelect,+ TEXT : _restoreTextarea,+ FLOAT : _restoreInput,+ INTEGER : _restoreInput,+ };++ const handler = handlers[valueType];+ if (!handler) {+ console.warn(`Unsupported value_type "${valueType}"`);+ return;+ }++ handler($card, defaultValue);+ _ajax.showStatusMessage('Restored to default value', STATUS_TYPE.INFO, $card);+ }++ function _restoreCheckbox($card, defaultValue) {+ const $checkbox = $card.find('input[type="checkbox"].attr-v2-boolean-checkbox');++ if (!$checkbox.length) {+ console.error('Checkbox not found for boolean attribute');+ return;+ }++ $checkbox.prop('checked', defaultValue).trigger('change');+ }++ function _restoreTextarea($card, defaultValue) {+ const $textarea = $card.find(Hi.ATTR_V2_TEXTAREA_SELECTOR);++ if (!$textarea.length) {+ console.error('Textarea not found for text attribute');+ return;+ }++ $textarea.val(defaultValue).trigger('input');+ }++ function _restoreSelect($card, defaultValue) {+ const $select = $card.find('select[name$="-value"]');++ if (!$select.length) {+ console.error('Select not found for enum attribute');+ return;+ }++ $select.val(defaultValue).trigger('change');+ }++ function _restoreInput($card, defaultValue) {+ const $input = $card.find('input[name$="-value"]:not([type="hidden"])');++ if (!$input.length) {+ console.error('Input not found for numeric attribute');+ return;+ }++ $input.val(defaultValue).trigger('input');+ }// Sync textarea values to hidden fields before form submissionfunction _syncTextareaValuesToHiddenFields($container) {diff --git a/src/hi/static/js/main.js b/src/hi/static/js/main.jsindex 28b30cce..fc8ba769 100644--- a/src/hi/static/js/main.js+++ b/src/hi/static/js/main.js@@ -341,4 +341,4 @@}-})();+})();\ No newline at end of filediff --git a/src/hi/static/js/settings.js b/src/hi/static/js/settings.jsindex ad00ff44..0266fc51 100644--- a/src/hi/static/js/settings.js+++ b/src/hi/static/js/settings.js@@ -4,28 +4,35 @@const HiSettings = {- enableAudio: function() {- return _enableAudio( );- },- disableAudio: function() {- return _disableAudio( );- },- isAudioEnabled: function() {- return _isAudioEnabled( );- },- hasShownPermissionGuidance: function() {- return _hasShownPermissionGuidance( );- },- markPermissionGuidanceShown: function() {- return _markPermissionGuidanceShown( );- },- enableSleepMode: function() {- return _enableSleepMode( );- },- disableSleepMode: function() {- return _disableSleepMode( );- }- };+ enableAudio: function() {+ return _enableAudio();+ },++ disableAudio: function() {+ return _disableAudio();+ },++ isAudioEnabled: function() {+ return _isAudioEnabled();+ },++ hasShownPermissionGuidance: function() {+ return _hasShownPermissionGuidance();+ },++ markPermissionGuidanceShown: function() {+ return _markPermissionGuidanceShown();+ },++ enableSleepMode: function() {+ return _enableSleepMode();+ },++ disableSleepMode: function() {+ return _disableSleepMode();+ },++ };window.Hi.settings = HiSettings;@@ -43,47 +50,48 @@const PermissionGuidanceShownValue = 'true';function setConsoleSetting( name, value ) {- Hi.setCookie( name, value );+ Hi.setCookie( name, value );}function getConsoleSetting( name ) {- return Hi.getCookie( name );+ return Hi.getCookie( name );}function _enableAudio() {- setConsoleSetting( AudioStateSettingName, AudioStateEnabled );- return true;+ setConsoleSetting( AudioStateSettingName, AudioStateEnabled );+ return true;}function _disableAudio() {- setConsoleSetting( AudioStateSettingName, AudioStateDisabled );- return true;+ setConsoleSetting( AudioStateSettingName, AudioStateDisabled );+ return true;}function _isAudioEnabled() {- var audioState = getConsoleSetting( AudioStateSettingName );- if ( audioState && ( audioState == AudioStateDisabled ))- return false;- return true;+ var audioState = getConsoleSetting( AudioStateSettingName );+ if ( audioState && ( audioState == AudioStateDisabled ))+ return false;+ return true;}- function _enableSleepMode() {- let sleepOverlay = $(SleepOverlaySelector);- $(sleepOverlay).show();- $(sleepOverlay).off( 'click').on('click', Hi.settings.disableSleepMode );+ function _hasShownPermissionGuidance() {+ var guidanceShown = getConsoleSetting( PermissionGuidanceShownSettingName );+ return guidanceShown === PermissionGuidanceShownValue;}- function _disableSleepMode() {- $(SleepOverlaySelector).hide();++ function _markPermissionGuidanceShown() {+ setConsoleSetting( PermissionGuidanceShownSettingName, PermissionGuidanceShownValue );+ return true;}- function _hasShownPermissionGuidance() {- var guidanceShown = getConsoleSetting( PermissionGuidanceShownSettingName );- return guidanceShown === PermissionGuidanceShownValue;+ function _enableSleepMode() {+ let sleepOverlay = $(SleepOverlaySelector);+ $(sleepOverlay).show();+ $(sleepOverlay).off( 'click').on('click', Hi.settings.disableSleepMode );}-- function _markPermissionGuidanceShown() {- setConsoleSetting( PermissionGuidanceShownSettingName, PermissionGuidanceShownValue );- return true;++ function _disableSleepMode() {+ $(SleepOverlaySelector).hide();}-+})();\ No newline at end of file