From 4ebd0657f4a50bc53480ad3dd63b76e042a37c38 Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 25 Jun 2024 10:41:36 +0200 Subject: [PATCH 1/5] include device data in export --- interface/src/project/Devices.tsx | 40 ++++++++----------------------- 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/interface/src/project/Devices.tsx b/interface/src/project/Devices.tsx index a7d6e87e2..3af36dc59 100644 --- a/interface/src/project/Devices.tsx +++ b/interface/src/project/Devices.tsx @@ -426,8 +426,9 @@ const Devices: FC = () => { document.body.removeChild(downloadLink); }; + const device = { ...{ device: coreData.devices[deviceIndex] }, ...deviceData }; downloadBlob( - new Blob([JSON.stringify(deviceData, null, 2)], { + new Blob([JSON.stringify(device, null, 2)], { type: 'text;charset:utf-8' }) ); @@ -650,7 +651,7 @@ const Devices: FC = () => { - + {LL.SHOWING() + ' ' + shown_data.length + @@ -660,61 +661,40 @@ const Devices: FC = () => { LL.ENTITIES(shown_data.length)} setShowDeviceInfo(true)}> - + {me.admin && ( - + )} - + setOnlyFav(!onlyFav)}> {onlyFav ? ( - + ) : ( - + )} - + - + From 2184fbb113565f4e32bd8a15384f287521e98ac5 Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 25 Jun 2024 10:42:05 +0200 Subject: [PATCH 2/5] experiment with cache (again) --- lib/framework/ESP8266React.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/framework/ESP8266React.cpp b/lib/framework/ESP8266React.cpp index 12036b759..1de95f1cf 100644 --- a/lib/framework/ESP8266React.cpp +++ b/lib/framework/ESP8266React.cpp @@ -39,6 +39,7 @@ ESP8266React::ESP8266React(AsyncWebServer * server, FS * fs) response->addHeader("Content-Encoding", "gzip"); // response->addHeader("Content-Encoding", "br"); // only works over HTTPS // response->addHeader("Cache-Control", "public, immutable, max-age=31536000"); + response->addHeader("Cache-Control", "must-revalidate"); // ensure that a client will check the server for a change response->addHeader("Last-Modified", last_modified); response->addHeader("ETag", hash); @@ -46,6 +47,7 @@ ESP8266React::ESP8266React(AsyncWebServer * server, FS * fs) }; server->on(uri, HTTP_GET, requestHandler); + // Serving non matching get requests with "/index.html" // OPTIONS get a straight up 200 response if (strncmp(uri, "/index.html", 11) == 0) { From 18483558d4f25247249f63b3e597d3ff2b1477e7 Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 25 Jun 2024 10:42:18 +0200 Subject: [PATCH 3/5] lowercase Entities --- interface/src/i18n/en/index.ts | 2 +- interface/src/i18n/fr/index.ts | 2 +- interface/src/i18n/it/index.ts | 2 +- interface/src/i18n/nl/index.ts | 2 +- interface/src/i18n/sk/index.ts | 2 +- interface/src/i18n/sv/index.ts | 2 +- interface/src/i18n/tr/index.ts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts index ae1e89cc5..d996e5c06 100644 --- a/interface/src/i18n/en/index.ts +++ b/interface/src/i18n/en/index.ts @@ -23,7 +23,7 @@ const en: Translation = { ONOFF: 'on/off', TYPE: 'Type', DESCRIPTION: 'Description', - ENTITIES: 'Entities', + ENTITIES: 'entities', REFRESH: 'Refresh', EXPORT: 'Export', DEVICE_DETAILS: 'Device Details', diff --git a/interface/src/i18n/fr/index.ts b/interface/src/i18n/fr/index.ts index b19b60042..0e1d46f37 100644 --- a/interface/src/i18n/fr/index.ts +++ b/interface/src/i18n/fr/index.ts @@ -23,7 +23,7 @@ const fr: Translation = { ONOFF: 'on/off', TYPE: 'Type', DESCRIPTION: 'Description', - ENTITIES: 'Entités', + ENTITIES: 'entités', REFRESH: 'Rafraîchir', EXPORT: 'Exporter', DEVICE_DETAILS: "Détails de l'appareil", diff --git a/interface/src/i18n/it/index.ts b/interface/src/i18n/it/index.ts index 90d49b765..eae77f1a2 100644 --- a/interface/src/i18n/it/index.ts +++ b/interface/src/i18n/it/index.ts @@ -23,7 +23,7 @@ const it: Translation = { ONOFF: 'on/off', TYPE: 'Tipo', DESCRIPTION: 'Descrizione', - ENTITIES: 'Entità', + ENTITIES: 'entità', REFRESH: 'Ricaricare', EXPORT: 'Esporta', DEVICE_DETAILS: 'Dettagli dispositivo', diff --git a/interface/src/i18n/nl/index.ts b/interface/src/i18n/nl/index.ts index 28e406839..6b2c1a00d 100644 --- a/interface/src/i18n/nl/index.ts +++ b/interface/src/i18n/nl/index.ts @@ -23,7 +23,7 @@ const nl: Translation = { ONOFF: 'aan/uit', TYPE: 'Type', DESCRIPTION: 'Beschrijving', - ENTITIES: 'Entiteiten', + ENTITIES: 'entiteiten', REFRESH: 'Ververs', EXPORT: 'Export', DEVICE_DETAILS: 'Device Gegevens', diff --git a/interface/src/i18n/sk/index.ts b/interface/src/i18n/sk/index.ts index bcb958dc7..43ae4ac38 100644 --- a/interface/src/i18n/sk/index.ts +++ b/interface/src/i18n/sk/index.ts @@ -23,7 +23,7 @@ const sk: Translation = { ONOFF: 'zap/vyp', TYPE: 'Typ', DESCRIPTION: 'Popis', - ENTITIES: 'Entity', + ENTITIES: 'entity', REFRESH: 'Obnoviť', EXPORT: 'Export', DEVICE_DETAILS: 'Detaily zariadenia', diff --git a/interface/src/i18n/sv/index.ts b/interface/src/i18n/sv/index.ts index 523b45b35..ca9952708 100644 --- a/interface/src/i18n/sv/index.ts +++ b/interface/src/i18n/sv/index.ts @@ -23,7 +23,7 @@ const sv: Translation = { ONOFF: 'på/av', TYPE: 'Typ', DESCRIPTION: 'Beskrivning', - ENTITIES: 'Entiteter', + ENTITIES: 'entiteter', REFRESH: 'Uppdatera', EXPORT: 'Exportera', DEVICE_DETAILS: 'Enhetsdetaljer', diff --git a/interface/src/i18n/tr/index.ts b/interface/src/i18n/tr/index.ts index 9c6e2fb79..44ab06c5d 100644 --- a/interface/src/i18n/tr/index.ts +++ b/interface/src/i18n/tr/index.ts @@ -23,7 +23,7 @@ const tr: Translation = { ONOFF: 'açık/kapalı', TYPE: 'Tür', DESCRIPTION: 'Açıklama', - ENTITIES: 'Varlıklar', + ENTITIES: 'varlıklar', REFRESH: 'Yenile', EXPORT: 'Dışarı al', DEVICE_DETAILS: 'Cihaz Ayrıntıları', From 9a63307b33c14ea6d8adfcfb8b45a7481b5a6edd Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 25 Jun 2024 10:44:44 +0200 Subject: [PATCH 4/5] updated for dev.18 --- CHANGELOG_LATEST.md | 3 ++- src/version.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index 91643bf5e..8ff39a6e1 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -5,7 +5,7 @@ ## **IMPORTANT! BREAKING CHANGES** - new device WATER shows dhw entities from MM100 and SM100 in dhw setting -- rename WWC to DHW, always create DHW nests/topics, remove ww prefix from mqtt names [#1634](https://github.com/emsesp/EMS-ESP32/issues/1634) +- renamed WWC to DHW, always create DHW nests/topics, remove ww prefix from mqtt names [#1634](https://github.com/emsesp/EMS-ESP32/issues/1634) ## Added @@ -40,3 +40,4 @@ - dynamic register dhw circuits for thermostat - removed OTA feature [#1738](https://github.com/emsesp/EMS-ESP32/issues/1738) - added shower min duration [[#1801](https://github.com/emsesp/EMS-ESP32/issues/1801)] +- Include TXT file along with the generated CSV for Device Data export/download diff --git a/src/version.h b/src/version.h index 1d59dfab5..93d63925e 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.7.0-dev.17" +#define EMSESP_APP_VERSION "3.7.0-dev.18" From edaeafd6192af32bdf9c883690a69da61c413f0a Mon Sep 17 00:00:00 2001 From: proddy Date: Tue, 25 Jun 2024 10:51:08 +0200 Subject: [PATCH 5/5] don't run sonar on pulls --- .github/workflows/sonar_check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sonar_check.yml b/.github/workflows/sonar_check.yml index 38e306ade..18dea5b40 100644 --- a/.github/workflows/sonar_check.yml +++ b/.github/workflows/sonar_check.yml @@ -5,8 +5,8 @@ on: push: branches: - dev - pull_request: - types: [opened, synchronize, reopened] + # pull_request: + # types: [opened, synchronize, reopened] jobs: build: