Not displaying internet warning when WROL mode is active.

This commit is contained in:
Roland 2024-10-03 21:58:13 -06:00
parent d4fc3d1c07
commit 82e4e4797a
No known key found for this signature in database
GPG key ID: 1BA620CE6C9A4680
2 changed files with 23 additions and 23 deletions

View file

@ -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 = <Message icon>
refreshingMessage = <Message icon>
<Icon name='circle notched' loading/>
<Message.Content>
<Message.Header>Your files are being refreshed.</Message.Header>
<p><Link to='/files'>Click here to view the progress</Link></p>
</Message.Content>
</Message>;
} else if (!flags['refresh_complete']) {
} else if (!flags.refresh_complete) {
// `refresh_complete` flag is not set. Tell the maintainer to refresh the files.
refreshRequired = <Message icon warning onClick={refreshFiles}>
refreshRequiredMessage = <Message icon warning onClick={refreshFiles}>
<Icon name='hand point right'/>
<Message.Content>
<Message.Header>Refresh required</Message.Header>
@ -65,31 +62,34 @@ function FlagsMessages() {
</Message>;
}
if (flags['kiwix_restart']) {
kiwixRestart = <KiwixRestartMessage/>;
}
if (!flags['db_up']) {
dbDown = <ErrorMessage>
let dbDownMessage;
if (!flags.db_up) {
dbDownMessage = <ErrorMessage>
<Message.Header>Database is down</Message.Header>
API is unable to connect to the database. Check the server logs.
</ErrorMessage>
}
if (!flags.have_internet) {
internetDown = <ErrorMessage icon='globe'>
let kiwixRestartMessage;
if (flags.kiwix_restart) {
kiwixRestartMessage = <KiwixRestartMessage/>;
}
let internetDownMessage;
if (!flags.have_internet && !flags.wrol_mode) {
internetDownMessage = <ErrorMessage icon='globe'>
<Message.Header>No Internet</Message.Header>
WROLPi has no Internet. Downloads will not start.
</ErrorMessage>;
}
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 ?
<OutdatedZimsMessage onClick={fetchSettings}/> : null}
{kiwixRestart}
{status.wrol_mode || internetDown}
{kiwixRestartMessage}
{internetDownMessage}
</>
}

View file

@ -515,7 +515,7 @@ export function SettingsPage() {
</Grid>
<p>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).</p>
database when imported (typically at startup).</p>
<ConfigsTable
configs={configs}