web/admin: fix chart display with no sources (#4782)

This commit is contained in:
Jens L 2023-02-24 22:54:11 +01:00 committed by GitHub
parent 886749dcb2
commit 612d1c76d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 11 deletions

View File

@ -7,7 +7,7 @@ import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
import { t } from "@lingui/macro"; import { t } from "@lingui/macro";
import { TemplateResult, html } from "lit"; import { TemplateResult, html } from "lit";
import { customElement } from "lit/decorators.js"; import { customElement, state } from "lit/decorators.js";
import { AdminApi, OutpostsApi, System } from "@goauthentik/api"; import { AdminApi, OutpostsApi, System } from "@goauthentik/api";
@ -18,6 +18,9 @@ export class SystemStatusCard extends AdminStatusCard<System> {
header = t`System status`; header = t`System status`;
icon = "pf-icon pf-icon-server"; icon = "pf-icon pf-icon-server";
@state()
statusSummary?: string;
async getPrimaryValue(): Promise<System> { async getPrimaryValue(): Promise<System> {
this.now = new Date(); this.now = new Date();
let status = await new AdminApi(DEFAULT_CONFIG).adminSystemRetrieve(); let status = await new AdminApi(DEFAULT_CONFIG).adminSystemRetrieve();
@ -50,7 +53,7 @@ export class SystemStatusCard extends AdminStatusCard<System> {
getStatus(value: System): Promise<AdminStatus> { getStatus(value: System): Promise<AdminStatus> {
if (value.embeddedOutpostHost === "") { if (value.embeddedOutpostHost === "") {
this.header = t`Warning`; this.statusSummary = t`Warning`;
return Promise.resolve<AdminStatus>({ return Promise.resolve<AdminStatus>({
icon: "fa fa-exclamation-triangle pf-m-warning", icon: "fa fa-exclamation-triangle pf-m-warning",
message: html`${t`Embedded outpost is not configured correctly.`} message: html`${t`Embedded outpost is not configured correctly.`}
@ -58,7 +61,7 @@ export class SystemStatusCard extends AdminStatusCard<System> {
}); });
} }
if (!value.httpIsSecure && document.location.protocol === "https:") { if (!value.httpIsSecure && document.location.protocol === "https:") {
this.header = t`Warning`; this.statusSummary = t`Warning`;
return Promise.resolve<AdminStatus>({ return Promise.resolve<AdminStatus>({
icon: "fa fa-exclamation-triangle pf-m-warning", icon: "fa fa-exclamation-triangle pf-m-warning",
message: html`${t`HTTPS is not detected correctly`}`, message: html`${t`HTTPS is not detected correctly`}`,
@ -66,13 +69,13 @@ export class SystemStatusCard extends AdminStatusCard<System> {
} }
const timeDiff = value.serverTime.getTime() - (this.now || new Date()).getTime(); const timeDiff = value.serverTime.getTime() - (this.now || new Date()).getTime();
if (timeDiff > 5000 || timeDiff < -5000) { if (timeDiff > 5000 || timeDiff < -5000) {
this.header = t`Warning`; this.statusSummary = t`Warning`;
return Promise.resolve<AdminStatus>({ return Promise.resolve<AdminStatus>({
icon: "fa fa-exclamation-triangle pf-m-warning", icon: "fa fa-exclamation-triangle pf-m-warning",
message: html`${t`Server and client are further than 5 seconds apart.`}`, message: html`${t`Server and client are further than 5 seconds apart.`}`,
}); });
} }
this.header = t`OK`; this.statusSummary = t`OK`;
return Promise.resolve<AdminStatus>({ return Promise.resolve<AdminStatus>({
icon: "fa fa-check-circle pf-m-success", icon: "fa fa-check-circle pf-m-success",
message: html`${t`Everything is ok.`}`, message: html`${t`Everything is ok.`}`,
@ -80,6 +83,6 @@ export class SystemStatusCard extends AdminStatusCard<System> {
} }
renderValue(): TemplateResult { renderValue(): TemplateResult {
return html`${this.header}`; return html`${this.statusSummary}`;
} }
} }

View File

@ -67,9 +67,9 @@ export class LDAPSyncStatusChart extends AKChart<LDAPSyncStats> {
); );
this.centerText = sources.pagination.count.toString(); this.centerText = sources.pagination.count.toString();
return { return {
healthy: sources.pagination.count === 0 ? 0 : metrics.healthy, healthy: metrics.healthy,
failed: metrics.failed, failed: metrics.failed,
unsynced: metrics.unsynced, unsynced: sources.pagination.count === 0 ? 1 : metrics.unsynced,
}; };
} }

View File

@ -57,9 +57,9 @@ export class OutpostStatusChart extends AKChart<OutpostStats> {
); );
this.centerText = outposts.pagination.count.toString(); this.centerText = outposts.pagination.count.toString();
return { return {
healthy: outposts.pagination.count === 0 ? 0 : healthy, healthy: healthy,
outdated, outdated: outdated,
unhealthy, unhealthy: outposts.pagination.count === 0 ? 1 : unhealthy,
}; };
} }