Home Information - Your home, your data, organized.
Python
Working on editing UI for EventDefinitions. WIP
Anthony Cassandra352facf5124b
diff --git a/src/hi/apps/common/forms.py b/src/hi/apps/common/forms.pynew file mode 100644index 00000000..548fb0e0--- /dev/null+++ b/src/hi/apps/common/forms.py@@ -0,0 +1,45 @@+from dataclasses import dataclass++from django.forms import BaseInlineFormSet+++@dataclass+class FormsetStats:+ total_forms : int = 0+ deleted_forms : int = 0+ bound_forms : int = 0+ valid_forms : int = 0+ error_forms : int = 0+ changed_forms : int = 0+ extra_forms : int = 0+++class CustomBaseFormSet( BaseInlineFormSet ):++ def get_formset_stats(self) -> FormsetStats:+ formset_stats = FormsetStats()+ formset_stats.extra_forms = self.extra++ for form in self.forms:+ formset_stats.total_forms += 1++ if form.cleaned_data.get( 'DELETE', False ):+ formset_stats.deleted_forms += 1+ elif form.has_changed():+ formset_stats.changed_forms += 1++ if bool( self.instance.pk ):+ formset_stats.bound_forms += 1+ if form.errors:+ formset_stats.error_forms += 1+ else:+ formset_stats.valid_forms += 1+ continue+ return formset_stats++ @property+ def has_at_least_one(self):+ return bool(+ (( self.total_forms - self.extra_forms - self.deleted_forms ) > 0 )+ or ( self.changed_forms > 0 )+ )diff --git a/src/hi/apps/config/enums.py b/src/hi/apps/config/enums.pyindex c363e16a..4dcb8791 100644--- a/src/hi/apps/config/enums.py+++ b/src/hi/apps/config/enums.py@@ -1,10 +1,6 @@-from typing import Dict-from hi.apps.attribute.enums import AttributeValueTypefrom hi.apps.common.enums import LabeledEnum-from hi.constants import TIMEZONE_NAME_LIST-class ConfigPageType(LabeledEnum):"""@@ -21,8 +17,9 @@ class ConfigPageType(LabeledEnum):self.url_name = url_namereturn- SETTINGS = ('Settings' , '' , 'config_settings' )- INTEGRATIONS = ('Integrations' , '' , 'integrations_home' )+ SETTINGS = ('Settings' , '' , 'config_settings' )+ EVENTS = ('Events' , '' , 'event_definitions' )+ INTEGRATIONS = ('Integrations' , '' , 'integrations_home' )def default(self):return ConfigPageType.SETTINGSdiff --git a/src/hi/apps/config/views.py b/src/hi/apps/config/views.pyindex b172ad73..d32a4e3f 100644--- a/src/hi/apps/config/views.py+++ b/src/hi/apps/config/views.py@@ -1,6 +1,5 @@from django.db import transactionfrom django.shortcuts import render-from django.views.generic import Viewimport hi.apps.common.antinode as antinodediff --git a/src/hi/apps/event/edit/__init__.py b/src/hi/apps/event/edit/__init__.pynew file mode 100644index 00000000..e69de29bdiff --git a/src/hi/apps/event/edit/urls.py b/src/hi/apps/event/edit/urls.pynew file mode 100644index 00000000..90ec3448--- /dev/null+++ b/src/hi/apps/event/edit/urls.py@@ -0,0 +1,20 @@+from django.urls import re_path++from . import views+++urlpatterns = [++ re_path( r'^definition/add$',+ views.EventDefinitionAddView.as_view(),+ name='event_definition_add'),++ re_path( r'^definition/edit/(?P<id>\d+)$',+ views.EventDefinitionEditView.as_view(),+ name='event_definition_edit'),++ re_path( r'^definition/delete/(?P<id>\d+)$',+ views.EventDefinitionDeleteView.as_view(),+ name='event_definition_delete'),++]diff --git a/src/hi/apps/event/edit/views.py b/src/hi/apps/event/edit/views.pynew file mode 100644index 00000000..0374b583--- /dev/null+++ b/src/hi/apps/event/edit/views.py@@ -0,0 +1,163 @@+from django.db import transaction+from django.urls import reverse++from hi.apps.event.view_mixin import EventViewMixin+import hi.apps.event.forms as forms++from hi.hi_async_view import HiModalView+++class EventDefinitionEditView( HiModalView, EventViewMixin ):++ def get_template_name( self ) -> str:+ return 'event/edit/modals/event_definition_edit.html'++ def get( self, request, *args, **kwargs ):+ event_definition = self.get_event_definition( request, *args, **kwargs )++ event_definition_form = forms.EventDefinitionForm(+ instance = event_definition,+ )+ event_clause_formset = forms.EventClauseFormSet(+ instance = event_definition,+ prefix = self.EVENT_CLAUSE_FORMSET_PREFIX,+ )+ alarm_action_formset = forms.AlarmActionFormSet(+ instance = event_definition,+ prefix = self.ALARM_ACTION_FORMSET_PREFIX,+ )+ control_action_formset = forms.ControlActionFormSet(+ instance = event_definition,+ prefix = self.CONTROL_ACTION_FORMSET_PREFIX,+ )++ context = {+ 'event_definition': event_definition,+ 'event_definition_form': event_definition_form,+ 'event_clause_formset': event_clause_formset,+ 'alarm_action_formset': alarm_action_formset,+ 'control_action_formset': control_action_formset,+ }+ return self.modal_response( request, context )++ def post( self, request, *args, **kwargs ):+ event_definition = self.get_event_definition( request, *args, **kwargs )++ event_definition_form = forms.EventDefinitionForm(+ request.POST,+ instance = event_definition,+ )+ event_clause_formset = forms.EventClauseFormSet(+ request.POST,+ request.FILES,+ instance = event_definition,+ prefix = self.EVENT_CLAUSE_FORMSET_PREFIX,+ )+ alarm_action_formset = forms.AlarmActionFormSet(+ request.POST,+ request.FILES,+ instance = event_definition,+ prefix = self.ALARM_ACTION_FORMSET_PREFIX,+ )+ control_action_formset = forms.ControlActionFormSet(+ request.POST,+ request.FILES,+ instance = event_definition,+ prefix = self.CONTROL_ACTION_FORMSET_PREFIX,+ )++ def error_response():+ context = {+ 'event_definition_form': event_definition_form,+ 'event_clause_formset': event_clause_formset,+ 'alarm_action_formset': alarm_action_formset,+ 'control_action_formset': control_action_formset,+ }+ return self.modal_response( request, context )++ if ( not event_definition_form.is_valid()+ or not event_clause_formset.is_valid()+ or not alarm_action_formset.is_valid()+ or not control_action_formset.is_valid() ):+ return error_response()++ event_clause_formset_stats = event_clause_formset.get_formset_stats()+ alarm_action_formset_stats = alarm_action_formset.get_formset_stats()+ control_action_formset_stats = control_action_formset.get_formset_stats()+++++++ #print( f'\n\nEventClause : {event_clause_formset_stats}' )+ #print( f'AlarmAction : {alarm_action_formset_stats}' )+ #print( f'ControlAction : {control_action_formset_stats}\n\n' )+ #redirect_url = reverse( 'event_definitions' )+ #return self.redirect_response( request = request,+ # redirect_url = redirect_url )+++++++ all_forms_valid = True+ if not event_clause_formset_stats.has_at_least_one:+ all_forms_valid = False+ event_definition_form.add_error(+ None, 'Must have at least one event clause.'+ )++ if ( not alarm_action_formset_stats.has_at_least_one+ and not control_action_formset_stats.has_at_least_one ):+ all_forms_valid = False+ event_definition_form.add_error(+ None, 'Must have either alarm of control action.'+ )++ if not all_forms_valid:+ return error_response()++ with transaction.atomic():+ event_definition = event_definition_form.save()++ # Need to force the instance so forms can save with foreign key+ event_clause_formset.instance = event_definition+ alarm_action_formset.instance = event_definition+ control_action_formset.instance = event_definition++ event_clause_formset.save()+ alarm_action_formset.save()+ control_action_formset.save()++ redirect_url = reverse( 'event_definitions' )+ return self.redirect_response( request = request,+ redirect_url = redirect_url )+++class EventDefinitionAddView( EventDefinitionEditView ):++ def get_template_name( self ) -> str:+ return 'event/edit/modals/event_definition_add.html'++ def get_event_definition( self, request, *args, **kwargs ) -> str:+ return None+++class EventDefinitionDeleteView( HiModalView, EventViewMixin ):++ def get_template_name( self ) -> str:+ return 'event/edit/modals/event_definition_delete.html'++ def get( self, request, *args, **kwargs ):+ event_definition = self.get_event_definition( request, *args, **kwargs )+ context = {+ 'event_definition': event_definition,+ }+ return self.modal_response( request, context )++ def post( self, request, *args, **kwargs ):+ event_definition = self.get_event_definition( request, *args, **kwargs )+ event_definition.delete()+ return zzzdiff --git a/src/hi/apps/event/event_manager.py b/src/hi/apps/event/event_manager.pyindex 9d64c143..d9dcb1f8 100644--- a/src/hi/apps/event/event_manager.py+++ b/src/hi/apps/event/event_manager.py@@ -39,12 +39,12 @@ class EventManager(Singleton):returndef reload(self):- self._event_definitions = EventDefinition.objects.prefetch_related(+ self._event_definitions = list( EventDefinition.objects.prefetch_related('clauses','clauses__entity_state','alarm_actions','control_actions',- ).filter( enabled = True )+ ).filter( enabled = True ))returnasync def add_entity_state_transitions( self,diff --git a/src/hi/apps/event/forms.py b/src/hi/apps/event/forms.pynew file mode 100644index 00000000..ccdac233--- /dev/null+++ b/src/hi/apps/event/forms.py@@ -0,0 +1,84 @@+from django import forms++from hi.apps.common.forms import CustomBaseFormSet++from . import models+++class EventDefinitionForm( forms.ModelForm ):++ class Meta:+ model = models.EventDefinition+ fields = (+ 'name',+ 'event_window_secs',+ 'dedupe_window_secs',+ 'enabled',+ )+++class EventClauseForm( forms.ModelForm ):++ class Meta:+ model = models.EventClause+ fields = (+ 'entity_state',+ 'value',+ )+++class AlarmActionForm( forms.ModelForm ):++ class Meta:+ model = models.AlarmAction+ fields = (+ 'security_posture_str',+ 'alarm_level_str',+ 'alarm_lifetime_secs',+ )+++class ControlActionForm( forms.ModelForm ):++ class Meta:+ model = models.ControlAction+ fields = (+ 'controller',+ 'value',+ )+++EventClauseFormSet = forms.inlineformset_factory(+ models.EventDefinition,+ models.EventClause,+ form = EventClauseForm,+ extra = 1,+ max_num = 100,+ absolute_max = 100,+ can_delete = True,+ formset = CustomBaseFormSet,+)+++AlarmActionFormSet = forms.inlineformset_factory(+ models.EventDefinition,+ models.AlarmAction,+ form = AlarmActionForm,+ extra = 1,+ max_num = 100,+ absolute_max = 100,+ can_delete = True,+ formset = CustomBaseFormSet,+)+++ControlActionFormSet = forms.inlineformset_factory(+ models.EventDefinition,+ models.ControlAction,+ form = ControlActionForm,+ extra = 1,+ max_num = 100,+ absolute_max = 100,+ can_delete = True,+ formset = CustomBaseFormSet,+)diff --git a/src/hi/apps/event/migrations/0005_alarmaction_created_datetime_and_more.py b/src/hi/apps/event/migrations/0005_alarmaction_created_datetime_and_more.pynew file mode 100644index 00000000..2c0abaa4--- /dev/null+++ b/src/hi/apps/event/migrations/0005_alarmaction_created_datetime_and_more.py@@ -0,0 +1,34 @@+# Generated by Django 4.2.15 on 2024-12-06 01:55++from django.db import migrations, models+import django.utils.timezone+++class Migration(migrations.Migration):++ dependencies = [+ ("event", "0004_eventdefinition_dedupe_window_secs"),+ ]++ operations = [+ migrations.AddField(+ model_name="alarmaction",+ name="created_datetime",+ field=models.DateTimeField(+ auto_now_add=True,+ default=django.utils.timezone.now,+ verbose_name="Created",+ ),+ preserve_default=False,+ ),+ migrations.AddField(+ model_name="alarmaction",+ name="updated_datetime",+ field=models.DateTimeField(auto_now=True, verbose_name="Updated"),+ ),+ migrations.AddField(+ model_name="controlaction",+ name="updated_datetime",+ field=models.DateTimeField(auto_now=True, verbose_name="Updated"),+ ),+ ]diff --git a/src/hi/apps/event/models.py b/src/hi/apps/event/models.pyindex 4a3678e9..2dd26e16 100644--- a/src/hi/apps/event/models.py+++ b/src/hi/apps/event/models.py@@ -108,6 +108,17 @@ class AlarmAction( models.Model ):alarm_lifetime_secs = models.PositiveIntegerField('Lifetime Secs',)++ created_datetime = models.DateTimeField(+ 'Created',+ auto_now_add = True,+ blank = True,+ )+ updated_datetime = models.DateTimeField(+ 'Updated',+ auto_now = True,+ blank = True,+ )class Meta:verbose_name = 'Alarm Actions'@@ -155,6 +166,11 @@ class ControlAction( models.Model ):auto_now_add = True,blank = True,)+ updated_datetime = models.DateTimeField(+ 'Updated',+ auto_now = True,+ blank = True,+ )class Meta:verbose_name = 'Control Action'diff --git a/src/hi/apps/event/templates/event/edit/modals/event_definition_add.html b/src/hi/apps/event/templates/event/edit/modals/event_definition_add.htmlnew file mode 100644index 00000000..213053ce--- /dev/null+++ b/src/hi/apps/event/templates/event/edit/modals/event_definition_add.html@@ -0,0 +1,29 @@+{% extends "modals/action_with_cancel.html" %}++{% block preamble %}+<form action="{% url 'event_definition_add' %}"+ method="post" enctype="multipart/form-data"+ class="form" data-async="modal">+ {% csrf_token %}+{% endblock %}++{% block title_text %}+New Event Definition+{% endblock %}++{% block body %}+<div>+{% include "event/edit/panes/event_definition_form.html" %}+</div>+{% endblock %}++{% block action_right %}+<button id="hi-add-event-definition-button" type="submit" class="btn btn-lg btn-success"+ name="action" value="add">+ ADD+</button>+{% endblock %}++{% block postamble %}+</form>+{% endblock %}diff --git a/src/hi/apps/event/templates/event/edit/modals/event_definition_delete.html b/src/hi/apps/event/templates/event/edit/modals/event_definition_delete.htmlnew file mode 100644index 00000000..44da6231--- /dev/null+++ b/src/hi/apps/event/templates/event/edit/modals/event_definition_delete.html@@ -0,0 +1,29 @@+{% extends "modals/action_with_cancel.html" %}++{% block preamble %}+<form action="{% url 'event_definition_delete' id=event_definition.id %}"+ method="post" enctype="multipart/form-data"+ class="form" data-async="modal">+ {% csrf_token %}+{% endblock %}++{% block title_text %}+Delete Event Definition?+{% endblock %}++{% block body %}+<div>+ZZZ+</div>+{% endblock %}++{% block action_right %}+<button id="hi-delete-event-definition-button" type="submit" class="btn btn-lg btn-danger"+ name="action" value="delete">+ DELETE+</button>+{% endblock %}++{% block postamble %}+</form>+{% endblock %}diff --git a/src/hi/apps/event/templates/event/edit/modals/event_definition_edit.html b/src/hi/apps/event/templates/event/edit/modals/event_definition_edit.htmlnew file mode 100644index 00000000..447f0d74--- /dev/null+++ b/src/hi/apps/event/templates/event/edit/modals/event_definition_edit.html@@ -0,0 +1,29 @@+{% extends "modals/action_with_cancel.html" %}++{% block preamble %}+<form action="{% url 'event_definition_edit' id=event_definition.id %}"+ method="post" enctype="multipart/form-data"+ class="form" data-async="modal">+ {% csrf_token %}+{% endblock %}++{% block title_text %}+Edit Event Definition+{% endblock %}++{% block body %}+<div>+{% include "event/edit/panes/event_definition_form.html" %}+</div>+{% endblock %}++{% block action_right %}+<button id="hi-edit-event-definition-button" type="submit" class="btn btn-lg btn-success"+ name="action" value="edit">+ UPDATE+</button>+{% endblock %}++{% block postamble %}+</form>+{% endblock %}diff --git a/src/hi/apps/event/templates/event/edit/panes/alarm_action_form.html b/src/hi/apps/event/templates/event/edit/panes/alarm_action_form.htmlnew file mode 100644index 00000000..4532d4d7--- /dev/null+++ b/src/hi/apps/event/templates/event/edit/panes/alarm_action_form.html@@ -0,0 +1,32 @@+{% for hidden in alarm_action_form.hidden_fields %}+{{ hidden }}+{% endfor %}++{% if alarm_action_form.non_field_errors %}+<div class="non-field-errors">+ {% for err in alarm_action_form.non_field_errors %}+ <p class="form-error text-danger">ERROR: {{ err }}</p>+ {% endfor %}+</div>+{% endif %}++<div>+ {{ alarm_action_form.security_posture_str.label }}+ {{ alarm_action_form.security_posture_str }}+ {{ alarm_action_form.security_posture_str.errors }}+</div>+<div>+ {{ alarm_action_form.alarm_level_str.label }}+ {{ alarm_action_form.alarm_level_str }}+ {{ alarm_action_form.alarm_level_str.errors }}+</div>+<div>+ {{ alarm_action_form.alarm_lifetime_secs.label }}+ {{ alarm_action_form.alarm_lifetime_secs }}+ {{ alarm_action_form.alarm_lifetime_secs.errors }}+</div>+{% if alarm_action_form.instance.pk %}+<div>+ {{ alarm_action_form.DELETE }} Delete+</div>+{% endif %}diff --git a/src/hi/apps/event/templates/event/edit/panes/control_action_form.html b/src/hi/apps/event/templates/event/edit/panes/control_action_form.htmlnew file mode 100644index 00000000..a74388cf--- /dev/null+++ b/src/hi/apps/event/templates/event/edit/panes/control_action_form.html@@ -0,0 +1,27 @@+{% for hidden in control_action_form.hidden_fields %}+{{ hidden }}+{% endfor %}++{% if control_action_form.non_field_errors %}+<div class="non-field-errors">+ {% for err in control_action_form.non_field_errors %}+ <p class="form-error text-danger">ERROR: {{ err }}</p>+ {% endfor %}+</div>+{% endif %}++<div>+ {{ control_action_form.controller.label }}+ {{ control_action_form.controller }}+ {{ control_action_form.controller.errors }}+</div>+<div>+ {{ control_action_form.value.label }}+ {{ control_action_form.value }}+ {{ control_action_form.value.errors }}+</div>+{% if control_action_form.instance.pk %}+<div>+ {{ control_action_form.DELETE }} Delete+</div>+{% endif %}diff --git a/src/hi/apps/event/templates/event/edit/panes/event_clause_form.html b/src/hi/apps/event/templates/event/edit/panes/event_clause_form.htmlnew file mode 100644index 00000000..f489215b--- /dev/null+++ b/src/hi/apps/event/templates/event/edit/panes/event_clause_form.html@@ -0,0 +1,27 @@+{% for hidden in event_clause_form.hidden_fields %}+{{ hidden }}+{% endfor %}++{% if event_clause_form.non_field_errors %}+<div class="non-field-errors">+ {% for err in event_clause_form.non_field_errors %}+ <p class="form-error text-danger">ERROR: {{ err }}</p>+ {% endfor %}+</div>+{% endif %}++<div>+ {{ event_clause_form.entity_state.label }}+ {{ event_clause_form.entity_state }}+ {{ event_clause_form.entity_state.errors }}+</div>+<div>+ {{ event_clause_form.value.label }}+ {{ event_clause_form.value }}+ {{ event_clause_form.value.errors }}+</div>+{% if event_clause_form.instance.pk %}+<div>+ {{ event_clause_form.DELETE }} Delete+</div>+{% endif %}diff --git a/src/hi/apps/event/templates/event/edit/panes/event_definition_form.html b/src/hi/apps/event/templates/event/edit/panes/event_definition_form.htmlnew file mode 100644index 00000000..11d9e1bf--- /dev/null+++ b/src/hi/apps/event/templates/event/edit/panes/event_definition_form.html@@ -0,0 +1,58 @@+{% for hidden in event_definition_form.hidden_fields %}+{{ hidden }}+{% endfor %}++{% if event_definition_form.non_field_errors %}+<div class="non-field-errors">+ {% for err in event_definition_form.non_field_errors %}+ <p class="form-error text-danger">ERROR: {{ err }}</p>+ {% endfor %}+</div>+{% endif %}++<div>+ {{ event_definition_form.name.label }}+ {{ event_definition_form.name }}+ {{ event_definition_form.name.errors }}+</div>++<div>+ {{ event_definition_form.event_window_secs.label }}+ {{ event_definition_form.event_window_secs }}+ {{ event_definition_form.event_window_secs.errors }}+</div>++<div>+ {{ event_definition_form.dedupe_window_secs.label }}+ {{ event_definition_form.dedupe_window_secs }}+ {{ event_definition_form.dedupe_window_secs.errors }}+</div>++<div>+ {{ event_definition_form.enabled.label }}+ {{ event_definition_form.enabled }}+ {{ event_definition_form.enabled.errors }}+</div>++<div>+ <div class="h5">Clauses</div>+ {{ event_clause_formset.management_form }}+ {% for event_clause_form in event_clause_formset %}+ {% include "event/edit/panes/event_clause_form.html" %}+ {% endfor %}+</div>+<div>+ <div class="h5">Alarm Actions</div>+ {{ alarm_action_formset.management_form }}+ {% for alarm_action_form in alarm_action_formset %}+ {% include "event/edit/panes/alarm_action_form.html" %}+ {% endfor %}+</div>+<div>+ <div class="h5">Control Actions</div>+ {{ control_action_formset.management_form }}+ {% for control_action_form in control_action_formset %}+ {% include "event/edit/panes/control_action_form.html" %}+ {% endfor %}+</div>+diff --git a/src/hi/apps/event/templates/event/panes/event_definitions.html b/src/hi/apps/event/templates/event/panes/event_definitions.htmlnew file mode 100644index 00000000..d02ebbee--- /dev/null+++ b/src/hi/apps/event/templates/event/panes/event_definitions.html@@ -0,0 +1,57 @@+{% extends "config/pages/config_base.html" %}++{% block config_content %}+<div class="container-fluid">+ <div class="h3">Event Definitions</div>++ <div>+ <a role="button" class="btn btn-info btn-control"+ href="{% url 'event_definition_add' %}"+ data-async="modal" >+ ADD NEW+ </a>+ </div>++ <div class="row">+ <div class="col-1 font-weight-bold"></div>+ <div class="col-3 font-weight-bold">Name</div>+ <div class="col-2 font-weight-bold">Actions</div>+ <div class="col-1 font-weight-bold">Enabled?</div>+ <div class="col-1 font-weight-bold"></div>+ </div>++ {% for event_definition in event_definition_list %}+ <div class="row">+ <div class="col-1">+ <a role="button" class="btn btn-info"+ href="{% url 'event_definition_edit' id=event_definition.id %}"+ data-async="modal" >+ EDIT+ </a>+ </div>+ <div class="col-3">+ <a href="{% url 'event_definition_edit' id=event_definition.id %}"+ data-async="modal" >+ {{ event_definition.name }}+ </a>+ </div>+ <div class="col-2">+ {% if event_definition.control_actions.all|length > 0 %}Control{%endif %}+ {% if event_definition.alarm_actions.all|length > 0 %}Alarm{%endif %}+ </div>+ <div class="col-1">+ {{ event_definition.enabled }}+ </div>+ <div class="col-1">+ <a role="button" class="btn btn-danger"+ href="{% url 'event_definition_delete' id=event_definition.id %}"+ data-async="modal" >+ X+ </a>+ </div>+ </div>+ {% empty %}+ <div class="col-12 alert alert-info" >No event definitions.</div>+ {% endfor %}+</div>+{% endblock %}diff --git a/src/hi/apps/event/urls.py b/src/hi/apps/event/urls.pynew file mode 100644index 00000000..f647a4ad--- /dev/null+++ b/src/hi/apps/event/urls.py@@ -0,0 +1,14 @@+from django.urls import include, re_path++from . import views+++urlpatterns = [++ re_path( r'^definitions$',+ views.EventDefinitionsView.as_view(),+ name='event_definitions'),++ re_path( r'^edit/', include('hi.apps.event.edit.urls' )),++]diff --git a/src/hi/apps/event/view_mixin.py b/src/hi/apps/event/view_mixin.pynew file mode 100644index 00000000..8ce14092--- /dev/null+++ b/src/hi/apps/event/view_mixin.py@@ -0,0 +1,29 @@+from django.core.exceptions import BadRequest+from django.http import Http404++from .models import EventDefinition+++class EventViewMixin:++ EVENT_CLAUSE_FORMSET_PREFIX = 'event-clause'+ ALARM_ACTION_FORMSET_PREFIX = 'alarm-action'+ CONTROL_ACTION_FORMSET_PREFIX = 'control-action'+++ def get_event_definition( self, request, *args, **kwargs ) -> EventDefinition:+ """ Assumes there is a required "id" in kwargs """+ try:+ event_definition_id = int( kwargs.get( 'id' ))+ except (TypeError, ValueError):+ raise BadRequest( 'Invalid event definition id.' )+ try:+ return EventDefinition.objects.prefetch_related(+ 'clauses',+ 'clauses__entity_state',+ 'alarm_actions',+ 'control_actions',+ ).get( id = event_definition_id )+ except EventDefinition.DoesNotExist:+ raise Http404( request )+diff --git a/src/hi/apps/event/views.py b/src/hi/apps/event/views.pynew file mode 100644index 00000000..4344bbfc--- /dev/null+++ b/src/hi/apps/event/views.py@@ -0,0 +1,27 @@+from hi.apps.config.enums import ConfigPageType+from hi.apps.config.views import ConfigPageView++from .models import EventDefinition+++class EventDefinitionsView( ConfigPageView ):++ @property+ def config_page_type(self) -> ConfigPageType:+ return ConfigPageType.EVENTS++ def get_main_template_name( self ) -> str:+ return 'event/panes/event_definitions.html'++ def get_template_context( self, request, *args, **kwargs ):+ event_definition_list = list(+ EventDefinition.objects.prefetch_related(+ 'clauses',+ 'clauses__entity_state',+ 'alarm_actions',+ 'control_actions',+ ).all().order_by('name')+ )+ return {+ 'event_definition_list': event_definition_list,+ }diff --git a/src/hi/urls.py b/src/hi/urls.pyindex a6ab4b78..71442b19 100644--- a/src/hi/urls.py+++ b/src/hi/urls.py@@ -36,6 +36,7 @@ urlpatterns = [re_path( r'^collection/', include('hi.apps.collection.urls' )),re_path( r'^sense/', include('hi.apps.sense.urls' )),re_path( r'^control/', include('hi.apps.control.urls' )),+ re_path( r'^event/', include('hi.apps.event.urls' )),# Custom error pagesre_path( r'^400.html$', views.bad_request_response, name='bad_request' ),