check received counter in unit test

- rename the template file
- get headline from table description

CHANGELOG.md

@@ -7,7 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
-- Dashboard: add Notes page and table for important messages
 - Dashboard: add Log-File page
 - Dashboard: add Connection page
 - add web UI to add-on

Makefile

@@ -6,7 +6,7 @@ babel:
 build:
 	$(MAKE) -C ha_addons $@ 
 
-clean:
+clean build:
 	$(MAKE) -C app $@
 	$(MAKE) -C ha_addons $@ 
 

app/requirements.txt

@@ -1,4 +1,4 @@
-    aiomqtt==2.4.0
+    aiomqtt==2.3.2
     schema==0.7.7
     aiocron==2.1
     quart==0.20

app/src/web/__init__.py

@@ -7,8 +7,6 @@ Usage:
 from quart import Quart, Blueprint
 from quart_babel import Babel
 from utils import load_modules
-from .log_handler import LogHandler
-import logging
 
 web = Blueprint('web', __name__)
 
@@ -32,8 +30,3 @@ class Web:
             locale_selector=get_locale,
             timezone_selector=get_tz,
             default_translation_directories=translation_directories)
-
-        h = LogHandler()
-        logging.getLogger().addHandler(h)
-        for name in logging.root.manager.loggerDict:
-            logging.getLogger(name).addHandler(h)

app/src/web/conn_table.py

@@ -4,7 +4,6 @@ from quart_babel import format_datetime, _
 from infos import Infos
 
 from . import web
-from .log_handler import LogHandler
 
 
 def _get_device_icon(client_mode: bool):
@@ -80,8 +79,5 @@ async def data_fetch():
     data["conn-table"] = await render_template('templ_table.html.j2',
                                                table=get_table_data())
 
-    data["notes-list"] = await render_template(
+    data["notes-list"] = await render_template('templ_notes_list.html.j2')
-        'templ_notes_list.html.j2',
-        notes=LogHandler().get_buffer(3),
-        hide_if_empty=True)
     return data

app/src/web/log_handler.py

@@ -1,24 +0,0 @@
-from logging import Handler
-from logging import LogRecord
-import logging
-from collections import deque
-
-from singleton import Singleton
-
-
-class LogHandler(Handler, metaclass=Singleton):
-    def __init__(self, capacity=64):
-        super().__init__(logging.WARNING)
-        self.capacity = capacity
-        self.buffer = deque(maxlen=capacity)
-
-    def emit(self, record: LogRecord):
-        self.buffer.append({
-            'ctime': record.created,
-            'level': record.levelno,
-            'lname': record.levelname,
-            'msg': record.getMessage()
-        })
-
-    def get_buffer(self, elms=0) -> list:
-        return list(self.buffer)[-elms:]

app/src/web/mqtt_table.py

@@ -4,7 +4,6 @@ from quart_babel import format_datetime, _
 from mqtt import Mqtt
 
 from . import web
-from .log_handler import LogHandler
 
 
 def _get_row(inv: InverterBase):
@@ -56,9 +55,4 @@ async def mqtt_fetch():
     data["mqtt-table"] = await render_template('templ_table.html.j2',
                                                table=get_table_data())
 
-    data["notes-list"] = await render_template(
-        'templ_notes_list.html.j2',
-        notes=LogHandler().get_buffer(3),
-        hide_if_empty=True)
-
     return data

app/src/web/notes_list.py

@@ -1,19 +0,0 @@
-from quart import render_template
-from quart_babel import format_datetime
-
-from . import web
-from .log_handler import LogHandler
-
-
-@web.route('/notes-fetch')
-async def notes_fetch():
-    data = {
-        "update-time": format_datetime(format="medium"),
-    }
-
-    data["notes-list"] = await render_template(
-        'templ_notes_list.html.j2',
-        notes=LogHandler().get_buffer(),
-        hide_if_empty=False)
-
-    return data

app/src/web/pages.py

@@ -18,13 +18,6 @@ async def mqtt():
         fetch_url=url_for('.mqtt_fetch'))
 
 
-@web.route('/notes')
-async def notes():
-    return await render_template(
-        'page_notes.html.j2',
-        fetch_url=url_for('.notes_fetch'))
-
-
 @web.route('/logging')
 async def logging():
     return await render_template(

app/src/web/templates/base.html.j2

@@ -57,8 +57,7 @@
         <button href="#" class="w3-bar-item w3-button w3-padding-16 w3-hide-large w3-dark-grey w3-hover-black" onclick="w3_close()" title="close menu"><i class="fa fa-remove fa-fw"></i>  Close Menu</button>
         <a href="{{ url_for('.index')}}" class="w3-bar-item w3-button w3-padding {% block menu1_class %}{% endblock %}"><i class="fa fa-network-wired fa-fw"></i>  {{_('Connections')}}</a>
         <a href="{{ url_for('.mqtt')}}" class="w3-bar-item w3-button w3-padding {% block menu2_class %}{% endblock %}"><i class="fa fa-database fa-fw"></i>  MQTT</a>
-        <a href="{{ url_for('.notes')}}" class="w3-bar-item w3-button w3-padding {% block menu3_class %}{% endblock %}"><i class="fa fa-exclamation-triangle fa-fw"></i>  {{_('Important Messages')}}</a>
+        <a href="{{ url_for('.logging')}}" class="w3-bar-item w3-button w3-padding {% block menu3_class %}{% endblock %}"><i class="fa fa-file-export fa-fw"></i>  {{_('Log Files')}}</a>
-        <a href="{{ url_for('.logging')}}" class="w3-bar-item w3-button w3-padding {% block menu4_class %}{% endblock %}"><i class="fa fa-file-export fa-fw"></i>  {{_('Log Files')}}</a>
       </div>
     </nav>
   

app/src/web/templates/page_index.html.j2

@@ -1,6 +1,6 @@
 {% extends 'base.html.j2' %}
 
-{% block title %}{{_("TSUN Proxy - Connections")}}{% endblock title %}
+{% block title %} TSUN Proxy - Connections {% endblock title%}
 {% block menu1_class %}w3-blue{% endblock %}
 {% block headline %}<i class="fa fa-network-wired"></i>  {{_('Proxy Connection Overview')}}{% endblock headline %}
 

app/src/web/templates/page_logging.html.j2

@@ -1,7 +1,7 @@
 {% extends 'base.html.j2' %}
 
-{% block title %}{{_("TSUN Proxy - Log Files")}}{% endblock title %}
+{% block title %} TSUN Proxy - Log Files {% endblock title%}
-{% block menu4_class %}w3-blue{% endblock %}
+{% block menu3_class %}w3-blue{% endblock %}
 {% block headline %}<i class="fa fa-file-export fa-fw"></i>  {{_('Log Files')}}{% endblock headline %}
 {% block content %}
   <div id="id01" class="w3-modal">

app/src/web/templates/page_mqtt.html.j2

@@ -1,6 +1,6 @@
 {% extends 'base.html.j2' %}
 
-{% block title %}{{_("TSUN Proxy - MQTT Status")}}{% endblock title %}
+{% block title %} TSUN Proxy - MQTT Status {% endblock title%}
 {% block menu2_class %}w3-blue{% endblock %}
 {% block headline %}<i class="fa fa-database"></i>  {{_('MQTT Overview')}}{% endblock headline %}
 {% block content %}
@@ -45,7 +45,6 @@
       </div>
     </div>
   </div>
-  <div id="notes-list"></div>
   <div id="mqtt-table"></div>
 {% endblock content%}
 

app/src/web/templates/page_notes.html.j2

@@ -1,10 +0,0 @@
-{% extends 'base.html.j2' %}
-
-{% block title %}{{_("TSUN Proxy - Important Messages")}}{% endblock title %}
-{% block menu3_class %}w3-blue{% endblock %}
-{% block headline %}<i class="fa fa-exclamation-triangle fa-fw"></i>  {{_('Important Messages')}}{% endblock headline %}
-{% block content %}
-  <div id="notes-list"></div>
-{% endblock content%}
-
-{% block footer %}{% endblock footer %}

app/src/web/templates/templ_notes_list.html.j2

@@ -1,23 +0,0 @@
-{% if notes|length > 0 %}
-<div class="w3-container w3-margin-bottom">
-  <h5>{{_("Warnings and error messages")}}  </h5>
-  <ul class="w3-ul w3-card-4">
-  {% for note in notes %}
-    <li class="{% if note.level is le(30) %}w3-leftbar w3-rightbar w3-pale-blue w3-border-blue{% else %}w3-leftbar w3-rightbar w3-pale-red w3-border-red{% endif %}">
-      <span class="w3-col" style="width:150px">{{note.ctime|datetimeformat(format='short')}}</span>
-      <span class="w3-col w3-hide-small" style="width:100px">{{note.lname|e}}</span>
-      <span class="w3-rest">{{note.msg|e}}</span>
-    </li>
-  {% endfor %}
-  </ul>
-</div>
-{% elif not hide_if_empty %}
-<div class="w3-container w3-margin-bottom">
-  <div class="w3-leftbar w3-rightbar w3-pale-green w3-border-green">
-    <div class="w3-container">
-        <h2>{{_("Well done!")}}</h2>
-        <p>{{_("No warnings or errors have been logged since the last proxy start.")}}</p>
-    </div>
-  </div>
-</div>
-{% endif %}

app/tests/test_web_route.py

@@ -68,13 +68,6 @@ async def test_rel_page(client):
     assert response.mimetype == 'text/html'
     web.build_relative_urls = False
 
-@pytest.mark.asyncio
-async def test_notes(client):
-    """Test the notes page route."""
-    response = await client.get('/notes')
-    assert response.status_code == 200
-    assert response.mimetype == 'text/html'
-
 @pytest.mark.asyncio
 async def test_logging(client):
     """Test the logging page route."""
@@ -192,15 +185,6 @@ async def test_mqtt_fetch(client, create_inverter):
     assert response.status_code == 200
 
 
-@pytest.mark.asyncio
-async def test_notes_fetch(client, config_conn):
-    """Test the notes-fetch route."""
-    _ = create_inverter
-
-    response = await client.get('/notes-fetch')
-    assert response.status_code == 200
-
-
 @pytest.mark.asyncio
 async def test_file_fetch(client, config_conn):
     """Test the data-fetch route."""

app/translations/de/LC_MESSAGES/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tsun-gen3-proxy 0.14.0\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2025-05-04 18:16+0200\n"
+"POT-Creation-Date: 2025-05-03 21:59+0200\n"
 "PO-Revision-Date: 2025-04-18 16:24+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -19,39 +19,39 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.17.0\n"
 
-#: src/web/conn_table.py:52 src/web/templates/base.html.j2:58
+#: src/web/conn_table.py:51 src/web/templates/base.html.j2:58
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: src/web/conn_table.py:59
+#: src/web/conn_table.py:58
 msgid "Device-IP:Port"
 msgstr "Geräte-IP:Port"
 
-#: src/web/conn_table.py:59
+#: src/web/conn_table.py:58
 msgid "Device-IP"
 msgstr "Geräte-IP"
 
-#: src/web/conn_table.py:60 src/web/mqtt_table.py:34
+#: src/web/conn_table.py:59 src/web/mqtt_table.py:33
 msgid "Serial-No"
 msgstr "Seriennummer"
 
-#: src/web/conn_table.py:61
+#: src/web/conn_table.py:60
 msgid "Cloud-IP:Port"
 msgstr "Cloud-IP:Port"
 
-#: src/web/conn_table.py:61
+#: src/web/conn_table.py:60
 msgid "Cloud-IP"
 msgstr "Cloud-IP"
 
-#: src/web/mqtt_table.py:27
+#: src/web/mqtt_table.py:26
 msgid "MQTT devices"
 msgstr "MQTT Geräte"
 
-#: src/web/mqtt_table.py:35
+#: src/web/mqtt_table.py:34
 msgid "Node-ID"
 msgstr ""
 
-#: src/web/mqtt_table.py:36
+#: src/web/mqtt_table.py:35
 msgid "HA-Area"
 msgstr ""
 
@@ -63,18 +63,10 @@ msgstr "Aktualisiert:"
 msgid "Version:"
 msgstr ""
 
-#: src/web/templates/base.html.j2:60 src/web/templates/page_notes.html.j2:5
+#: src/web/templates/base.html.j2:60 src/web/templates/page_logging.html.j2:5
-msgid "Important Messages"
-msgstr "Wichtige Hinweise"
-
-#: src/web/templates/base.html.j2:61 src/web/templates/page_logging.html.j2:5
 msgid "Log Files"
 msgstr "Log Dateien"
 
-#: src/web/templates/page_index.html.j2:3
-msgid "TSUN Proxy - Connections"
-msgstr "TSUN Proxy - Verbindungen"
-
 #: src/web/templates/page_index.html.j2:5
 msgid "Proxy Connection Overview"
 msgstr "Proxy Verbindungen"
@@ -111,10 +103,6 @@ msgstr "Emu Modus"
 msgid "Emulation sends data to cloud"
 msgstr "Emulation sendet in die Cloud"
 
-#: src/web/templates/page_logging.html.j2:3
-msgid "TSUN Proxy - Log Files"
-msgstr "TSUN Proxy - Log Dateien"
-
 #: src/web/templates/page_logging.html.j2:10
 msgid "Do you really want to delete the log file"
 msgstr "Soll die Datei wirklich gelöscht werden"
@@ -127,10 +115,6 @@ msgstr "File löschen"
 msgid "Abort"
 msgstr "Abbruch"
 
-#: src/web/templates/page_mqtt.html.j2:3
-msgid "TSUN Proxy - MQTT Status"
-msgstr ""
-
 #: src/web/templates/page_mqtt.html.j2:5
 msgid "MQTT Overview"
 msgstr "MQTT Überblick"
@@ -159,10 +143,6 @@ msgstr "Empfangene Topics"
 msgid "Number of topics received"
 msgstr "Anzahl der empfangenen Topics"
 
-#: src/web/templates/page_notes.html.j2:3
-msgid "TSUN Proxy - Important Messages"
-msgstr "TSUN Proxy - Wichtige Hinweise"
-
 #: src/web/templates/templ_log_files_list.html.j2:11
 msgid "Created"
 msgstr "Erzeugt"
@@ -179,17 +159,24 @@ msgstr "Größe"
 msgid "Download File"
 msgstr "Datei Download"
 
-#: src/web/templates/templ_notes_list.html.j2:3
+#~ msgid "MQTT Server"
-msgid "Warnings and error messages"
+#~ msgstr ""
-msgstr "Warnungen und Fehlermeldungen"
 
-#: src/web/templates/templ_notes_list.html.j2:18
+#~ msgid "MQTT User"
-msgid "Well done!"
+#~ msgstr ""
-msgstr "Gut gemacht!"
 
-#: src/web/templates/templ_notes_list.html.j2:19
+#~ msgid "MQTT Connected"
-msgid "No warnings or errors have been logged since the last proxy start."
+#~ msgstr ""
-msgstr ""
+
-"Seit dem letzten Proxystart wurden keine Warnungen oder Fehler "
+#~ msgid "Home Assistant Status"
-"protokolliert."
+#~ msgstr ""
+
+#~ msgid "MQTT Publish Count"
+#~ msgstr ""
+
+#~ msgid "MQTT Reveiced Count"
+#~ msgstr ""
+
+#~ msgid "MQTT Connect Time"
+#~ msgstr "MQTT Verbindungszeit"