From 00beb2a03971577c17c7ac35968137e5f8aec928 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 10 Nov 2024 00:37:14 +0100 Subject: [PATCH] updates to firmware check UI --- interface/src/app/settings/Settings.tsx | 4 +- interface/src/app/settings/Version.tsx | 55 +++++++++++++++++-------- interface/src/i18n/cz/index.ts | 1 - interface/src/i18n/de/index.ts | 1 - interface/src/i18n/en/index.ts | 1 - interface/src/i18n/fr/index.ts | 1 - interface/src/i18n/it/index.ts | 1 - interface/src/i18n/nl/index.ts | 1 - interface/src/i18n/no/index.ts | 1 - interface/src/i18n/pl/index.ts | 1 - interface/src/i18n/sk/index.ts | 1 - interface/src/i18n/sv/index.ts | 1 - interface/src/i18n/tr/index.ts | 1 - mock-api/rest_server.ts | 13 +++--- 14 files changed, 47 insertions(+), 36 deletions(-) diff --git a/interface/src/app/settings/Settings.tsx b/interface/src/app/settings/Settings.tsx index 57c902489..acf630053 100644 --- a/interface/src/app/settings/Settings.tsx +++ b/interface/src/app/settings/Settings.tsx @@ -86,8 +86,8 @@ const Settings = () => { diff --git a/interface/src/app/settings/Version.tsx b/interface/src/app/settings/Version.tsx index 4c9b904ef..d86ba43c5 100644 --- a/interface/src/app/settings/Version.tsx +++ b/interface/src/app/settings/Version.tsx @@ -60,10 +60,12 @@ const Version = () => { useEffect(() => { if (latestVersion && latestDevVersion) { - console.log("Latest versions, stable: " + latestVersion + " dev: " + latestDevVersion); - sendCheckUpgrade(latestDevVersion + "," + latestVersion).catch((error: Error) => { - console.error("Failed to check upgrade:", error); - }); + // console.log("Latest versions, stable: " + latestVersion + " dev: " + latestDevVersion); + sendCheckUpgrade(latestDevVersion + ',' + latestVersion).catch( + (error: Error) => { + toast.error('Failed to check upgrade: ' + error.message); + } + ); } }, [latestVersion, latestDevVersion]); @@ -104,7 +106,7 @@ const Version = () => { setRestarting(true); }; - useLayoutTitle(LL.EMS_ESP_VER()); + useLayoutTitle('EMS-ESP Firmware'); const internet_live = latestDevVersion !== undefined && latestVersion !== undefined; @@ -191,8 +193,18 @@ const Version = () => { Platform - Release + Release Type + {internet_live && ( + <> + + Latest Stable Release + + + Latest Development Release + + + )} @@ -213,24 +225,31 @@ const Version = () => { > (changelog) + {!isDev && internet_live && ( + + )} + {internet_live && ( + <> + {latestVersion} + + {latestDevVersion} + + + )} - {!isDev && ( - - )} -    diff --git a/interface/src/i18n/cz/index.ts b/interface/src/i18n/cz/index.ts index 6b9d0a32c..8d93d0187 100644 --- a/interface/src/i18n/cz/index.ts +++ b/interface/src/i18n/cz/index.ts @@ -177,7 +177,6 @@ const cz: Translation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Opravdu chcete resetovat zařízení EMS-ESP do továrního nastavení?', STABLE: 'Stabilní', DEVELOPMENT: 'Vývojová verze', - EMS_ESP_VER: 'Verze firmwaru', UPTIME: 'Doba provozu systému', FREE_MEMORY: 'Volná paměť', PSRAM: 'PSRAM (Velikost / Volná)', diff --git a/interface/src/i18n/de/index.ts b/interface/src/i18n/de/index.ts index e53e92cdc..476ebf097 100644 --- a/interface/src/i18n/de/index.ts +++ b/interface/src/i18n/de/index.ts @@ -177,7 +177,6 @@ const de: Translation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Sind Sie sicher, alle Einstellungen auf Werkseinstellung zu setzen?', STABLE: 'Stabil', DEVELOPMENT: 'Entwicklung', - EMS_ESP_VER: 'Firmware-Version', UPTIME: 'Systembetriebszeit', FREE_MEMORY: 'Freier RAM Speicher', PSRAM: 'PSRAM (Größe / Frei)', diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts index 0ad95342f..40c14a2e4 100644 --- a/interface/src/i18n/en/index.ts +++ b/interface/src/i18n/en/index.ts @@ -177,7 +177,6 @@ const en: Translation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Are you sure you want to reset EMS-ESP to its factory defaults?', STABLE: 'Stable', DEVELOPMENT: 'Development', - EMS_ESP_VER: 'Firmware Version', UPTIME: 'System Uptime', FREE_MEMORY: 'Free Memory', PSRAM: 'PSRAM (Size / Free)', diff --git a/interface/src/i18n/fr/index.ts b/interface/src/i18n/fr/index.ts index 759bd9ef4..4672a094c 100644 --- a/interface/src/i18n/fr/index.ts +++ b/interface/src/i18n/fr/index.ts @@ -177,7 +177,6 @@ const fr: Translation = { SYSTEM_FACTORY_TEXT_DIALOG: "Êtes-vous sûr de vouloir réinitialiser l'appareil à ses paramètres d'usine ?", STABLE: 'Stable', // TODO translate DEVELOPMENT: 'Développement', - EMS_ESP_VER: 'Firmware Version', // TODO translate UPTIME: 'Durée de fonctionnement du système', FREE_MEMORY: 'Libre Memory', PSRAM: 'PSRAM (Taille / Libre)', diff --git a/interface/src/i18n/it/index.ts b/interface/src/i18n/it/index.ts index e27340b09..8813d9dd3 100644 --- a/interface/src/i18n/it/index.ts +++ b/interface/src/i18n/it/index.ts @@ -177,7 +177,6 @@ const it: Translation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Sei sicuro di voler ripristinare il dispositivo alle impostazioni di fabbrica??', STABLE: 'Stable', // TODO translate DEVELOPMENT: 'Sviluppo', - EMS_ESP_VER: 'Versione Firmware', UPTIME: 'Tempo di attività del sistema', FREE_MEMORY: 'Free Memory', PSRAM: 'PSRAM (Size / Free)', diff --git a/interface/src/i18n/nl/index.ts b/interface/src/i18n/nl/index.ts index 9b5851139..8f9de0884 100644 --- a/interface/src/i18n/nl/index.ts +++ b/interface/src/i18n/nl/index.ts @@ -177,7 +177,6 @@ const nl: Translation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Weet je zeker dat je een reset naar fabrieksinstellingen uit wilt voeren?', STABLE: 'Stable', DEVELOPMENT: 'Development', - EMS_ESP_VER: 'Firmware Versie', UPTIME: 'Systeem Uptime', FREE_MEMORY: 'Free Memory', PSRAM: 'PSRAM (Size / Free)', diff --git a/interface/src/i18n/no/index.ts b/interface/src/i18n/no/index.ts index 048cb75f3..2b573c7e6 100644 --- a/interface/src/i18n/no/index.ts +++ b/interface/src/i18n/no/index.ts @@ -177,7 +177,6 @@ const no: Translation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Er du sikker på at du vil resette enheten til fabrikkinstillinger?', STABLE: 'Stable', // TODO translate DEVELOPMENT: 'Development', - EMS_ESP_VER: 'Firmware Version', // TODO translate UPTIME: 'System Oppetid', FREE_MEMORY: 'Ledig Memory', PSRAM: 'PSRAM (Størrelse / Ledig)', diff --git a/interface/src/i18n/pl/index.ts b/interface/src/i18n/pl/index.ts index 216dc58ea..99eaf709d 100644 --- a/interface/src/i18n/pl/index.ts +++ b/interface/src/i18n/pl/index.ts @@ -177,7 +177,6 @@ const pl: BaseTranslation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Na pewno chcesz przywrócić ustawienia fabryczne interfejsu EMS-ESP?', STABLE: 'Stable', // TODO translate DEVELOPMENT: 'Testowe', - EMS_ESP_VER: 'Wersja Firmware', UPTIME: 'Czas działania systemu', FREE_MEMORY: 'Wolne Memory', PSRAM: 'PSRAM (rozmiar / wolne)', diff --git a/interface/src/i18n/sk/index.ts b/interface/src/i18n/sk/index.ts index 07e88a183..77093b5e4 100644 --- a/interface/src/i18n/sk/index.ts +++ b/interface/src/i18n/sk/index.ts @@ -177,7 +177,6 @@ const sk: Translation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Naozaj chcete resetovať EMS-ESP na predvolené výrobné nastavenia?', STABLE: 'Stabilná', DEVELOPMENT: 'Vývojárska', - EMS_ESP_VER: 'Firmware verzia', UPTIME: 'Beh systému', FREE_MEMORY: 'Voľné Memory', PSRAM: 'PSRAM (Veľkosť / Voľné)', diff --git a/interface/src/i18n/sv/index.ts b/interface/src/i18n/sv/index.ts index 2dccd1c21..ad593e1a9 100644 --- a/interface/src/i18n/sv/index.ts +++ b/interface/src/i18n/sv/index.ts @@ -177,7 +177,6 @@ const sv: Translation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Är du säker att du vill fabriksåterställa enheten?', STABLE: 'Stable', // TODO translate DEVELOPMENT: 'Utveckling', - EMS_ESP_VER: 'Firmware Version', // TODO translate UPTIME: 'Systemets Upptid', FREE_MEMORY: 'Ledigt Memory', PSRAM: 'PSRAM (Storlek / Ledigt)', diff --git a/interface/src/i18n/tr/index.ts b/interface/src/i18n/tr/index.ts index 7f84a6fa4..a21f735fd 100644 --- a/interface/src/i18n/tr/index.ts +++ b/interface/src/i18n/tr/index.ts @@ -177,7 +177,6 @@ const tr: Translation = { SYSTEM_FACTORY_TEXT_DIALOG: 'Cihazı fabrika ayarlarına döndürmek istediğinize emin misiniz?', STABLE: 'Stable', // TODO translate DEVELOPMENT: 'Geliştirme', - EMS_ESP_VER: 'Firmware Sürümü', UPTIME: 'Sistem Çalışma Süresi', FREE_MEMORY: 'Yığın Memory', PSRAM: 'PSRAM (Boyut / Boş)', diff --git a/mock-api/rest_server.ts b/mock-api/rest_server.ts index c27ffb40e..bfa115189 100644 --- a/mock-api/rest_server.ts +++ b/mock-api/rest_server.ts @@ -30,11 +30,14 @@ const headers = { }; // Versions - all without the 'v' -const THIS_VERSION = '3.7.0'; -// const THIS_VERSION = '3.6.4'; // for testing -const LATEST_STABLE_VERSION = '3.7.0'; -const LATEST_DEV_VERSION = '3.7.1-dev.4'; -const VERSION_IS_UPGRADEABLE = true; +let THIS_VERSION = '3.7.0'; +let LATEST_STABLE_VERSION = '3.7.0'; +let LATEST_DEV_VERSION = '3.7.1-dev.4'; +let VERSION_IS_UPGRADEABLE = false; + +// for testing +// THIS_VERSION = '3.6.5'; +// VERSION_IS_UPGRADEABLE = true; // GLOBAL VARIABLES let countWifiScanPoll = 0; // wifi network scan