fix: (regression 0.55.0) admin/home: wrong message when port 8080 is automatically used in place of default 80
Massimo Melina committed
Jan 12, 2025 at 18:06 UTC
33640066df0c51bede564961c3c9b7673df9298e
1 file changed
+3
-4
admin/src/HomePage.ts
+3
-4
@@ -39,12 +39,11 @@ export default function HomePage() {
39
const goSecure = !http?.listening && https?.listening ? 's' : ''
40
const srv = goSecure ? https : (http?.listening && http)
41
const href = srv && `http${goSecure}://`+window.location.hostname + (srv.port === (goSecure ? 443 : 80) ? '' : ':'+srv.port)
42
- const serverStatus = _.pick(status, ['http', 'https'])
43
- const serverErrors = objSameKeys(serverStatus, v =>
44
- v.busy ? [`port ${v.port} already used by ${v.busy}${SOLUTION_SEP}choose a `, cfgLink('different port'), ` or stop ${v.busy}`]
42
+ const serverErrors = objSameKeys(_.pick(status, ['http', 'https']), v =>
43
+ v.busy ? [`port ${v.configuredPort} already used by ${v.busy}${SOLUTION_SEP}choose a `, cfgLink('different port'), ` or stop ${v.busy}`]
44
: v.error )
45
const errors = serverErrors && onlyTruthy(Object.entries(serverErrors).map(([k,v]) =>
47
- v && [md(`Protocol <u>${k}</u> cannot work: `), v,
46
+ v && [md(`Protocol <u>${k}</u>: `), v,
47
(isCertError(v) || isKeyError(v)) && [
48
SOLUTION_SEP, h(LinkBtn, {
49
onClick() { suggestMakingCert().then(() => wait(999)).then(cfg.reload).then(reloadStatus) } },