From 82e4e4797ac87a5395776e3145a7912a8da718f2 Mon Sep 17 00:00:00 2001 From: Roland Date: Thu, 3 Oct 2024 21:58:13 -0600 Subject: [PATCH] Not displaying internet warning when WROL mode is active. --- app/src/DashboardPage.js | 44 ++++++++++++++-------------- app/src/components/admin/Settings.js | 2 +- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/app/src/DashboardPage.js b/app/src/DashboardPage.js index 6d9617ba..adc3bb78 100644 --- a/app/src/DashboardPage.js +++ b/app/src/DashboardPage.js @@ -38,25 +38,22 @@ function FlagsMessages() { const flags = status['flags']; - let refreshing; - let refreshRequired; - let kiwixRestart; - let dbDown; - let internetDown; + let refreshingMessage; + let refreshRequiredMessage; // Do not tell the maintainer to refresh the files if they are already refreshing. - if (flags['refreshing']) { + if (flags.refreshing) { // Actively refreshing. - refreshing = + refreshingMessage = Your files are being refreshed.

Click here to view the progress

; - } else if (!flags['refresh_complete']) { + } else if (!flags.refresh_complete) { // `refresh_complete` flag is not set. Tell the maintainer to refresh the files. - refreshRequired = + refreshRequiredMessage = Refresh required @@ -65,31 +62,34 @@ function FlagsMessages() { ; } - if (flags['kiwix_restart']) { - kiwixRestart = ; - } - - if (!flags['db_up']) { - dbDown = + let dbDownMessage; + if (!flags.db_up) { + dbDownMessage = Database is down API is unable to connect to the database. Check the server logs. } - if (!flags.have_internet) { - internetDown = + let kiwixRestartMessage; + if (flags.kiwix_restart) { + kiwixRestartMessage = ; + } + + let internetDownMessage; + if (!flags.have_internet && !flags.wrol_mode) { + internetDownMessage = No Internet WROLPi has no Internet. Downloads will not start. ; } return <> - {refreshing} - {dbDown || refreshRequired} - {settings && settings['ignore_outdated_zims'] === false && flags['outdated_zims'] ? + {refreshingMessage} + {dbDownMessage || refreshRequiredMessage} + {settings && settings['ignore_outdated_zims'] === false && flags.outdated_zims ? : null} - {kiwixRestart} - {status.wrol_mode || internetDown} + {kiwixRestartMessage} + {internetDownMessage} } diff --git a/app/src/components/admin/Settings.js b/app/src/components/admin/Settings.js index 6bb8094b..97b63ec4 100644 --- a/app/src/components/admin/Settings.js +++ b/app/src/components/admin/Settings.js @@ -515,7 +515,7 @@ export function SettingsPage() {

Configs control a WROLPi, they are the source of truth. Any changes to a config will be applied to the - database when import (typically at startup).

+ database when imported (typically at startup).