Skip to content

Usenet streaming with a WebDAV server and a SABnzbd-compatible API

C#

Added progress-bar to health-check-queue table.

nzbdav-dev1feaf41e37fb
diff --git a/frontend/app/clients/backend-client.server.ts b/frontend/app/clients/backend-client.server.ts
index 07b8a225..622de7e2 100644
--- a/frontend/app/clients/backend-client.server.ts
+++ b/frontend/app/clients/backend-client.server.ts
@@ -289,6 +289,7 @@ export type HealthCheckQueueItem = {
releaseDate: string | null,
lastHealthCheck: string | null,
nextHealthCheck: string | null,
+ progress: number,
}
export type HealthCheckHistoryResponse = {
diff --git a/frontend/app/routes/health/components/health-table/health-table.module.css b/frontend/app/routes/health/components/health-table/health-table.module.css
index 32a117b4..8aacb40f 100644
--- a/frontend/app/routes/health/components/health-table/health-table.module.css
+++ b/frontend/app/routes/health/components/health-table/health-table.module.css
@@ -186,8 +186,9 @@
}
.dateBadge {
- font-size: 13px;
- text-shadow: 0 0 4px rgba(0, 0, 0, 0.4);
+ font-size: 13px !important;
+ text-shadow: 0 0 4px rgba(0, 0, 0, 0.4) !important;
+ width: 85px;
}
/* mobile */
diff --git a/frontend/app/routes/health/components/health-table/health-table.tsx b/frontend/app/routes/health/components/health-table/health-table.tsx
index 443cb39f..62eee662 100644
--- a/frontend/app/routes/health/components/health-table/health-table.tsx
+++ b/frontend/app/routes/health/components/health-table/health-table.tsx
@@ -2,6 +2,8 @@ import { Table, Badge } from "react-bootstrap";
import type { HealthCheckQueueItem } from "~/clients/backend-client.server";
import styles from "./health-table.module.css";
import { Truncate } from "~/routes/queue/components/truncate/truncate";
+import { ProgressBadge } from "~/routes/queue/components/status-badge/status-badge";
+import { progress } from "~/routes/queue/components/status-badge/status-badge.module.css";
export type HealthTableProps = {
isEnabled: boolean,
@@ -65,7 +67,10 @@ export function HealthTable({ isEnabled, healthCheckItems }: HealthTableProps) {
{formatDateBadge(item.lastHealthCheck, 'Never', 'warning')}
</td>
<td className={`${styles.dateCell} ${styles.desktop}`}>
- {formatDateBadge(item.nextHealthCheck, 'ASAP', 'success')}
+ {item.progress > 0
+ ? <ProgressBadge className={styles.dateBadge} color={"#333"} percentNum={100 + item.progress}>{item.progress}%</ProgressBadge>
+ : formatDateBadge(item.nextHealthCheck, 'ASAP', 'success')
+ }
</td>
</tr>
))}
@@ -95,7 +100,10 @@ function DateDetailsTable({ item }: { item: HealthCheckQueueItem }) {
<div className={styles.dateDetailsRow}>
<div className={styles.dateDetailsLabel}>Next Health Check</div>
<div className={styles.dateDetailsValue}>
- {formatDateBadge(item.nextHealthCheck, 'ASAP', 'success')}
+ {item.progress > 0
+ ? <ProgressBadge className={styles.dateBadge} color={"#333"} percentNum={100 + item.progress}>{item.progress}%</ProgressBadge>
+ : formatDateBadge(item.nextHealthCheck, 'ASAP', 'success')
+ }
</div>
</div>
</div>
diff --git a/frontend/app/routes/health/route.tsx b/frontend/app/routes/health/route.tsx
index f53fec4c..b45af3cd 100644
--- a/frontend/app/routes/health/route.tsx
+++ b/frontend/app/routes/health/route.tsx
@@ -18,7 +18,7 @@ const topicSubscriptions = {
export async function loader() {
const enabledKey = 'repair.enable';
const [queueData, historyData, config] = await Promise.all([
- backendClient.getHealthCheckQueue(10),
+ backendClient.getHealthCheckQueue(30),
backendClient.getHealthCheckHistory(),
backendClient.getConfig([enabledKey])
]);
@@ -39,24 +39,60 @@ export default function Health({ loaderData }: Route.ComponentProps) {
const [historyStats, setHistoryStats] = useState(loaderData.historyStats);
const [queueItems, setQueueItems] = useState(loaderData.queueItems);
+ // effects
+ useEffect(() => {
+ if (queueItems.length >= 15) return;
+ const refetchData = async () => {
+ var response = await fetch('/api/get-health-check-queue?pageSize=30');
+ if (response.ok) {
+ const healthCheckQueue = await response.json();
+ setQueueItems(healthCheckQueue.items);
+ }
+ };
+ refetchData();
+ }, [queueItems, setQueueItems])
+
// events
- const onHealthItemStatus = useCallback((message: string) => {
+ const onHealthItemStatus = useCallback(async (message: string) => {
const [davItemId, healthResult, repairAction] = message.split('|');
setQueueItems(x => x.filter(item => item.id !== davItemId));
- // todo: if none of the stats match. we need to add a new stat group
- setHistoryStats(x => x.map(stat =>
- stat.result == Number(healthResult) && stat.repairStatus == Number(repairAction)
- ? { ...stat, count: stat.count + 1 }
- : stat
- ))
+ setHistoryStats(x => {
+ const healthResultNum = Number(healthResult);
+ const repairActionNum = Number(repairAction);
+
+ // attempt to find and update a matching statistic
+ let updated = false;
+ const newStats = x.map(stat => {
+ if (stat.result === healthResultNum && stat.repairStatus === repairActionNum) {
+ updated = true;
+ return { ...stat, count: stat.count + 1 };
+ }
+ return stat;
+ });
+
+ // if no statistic was updated, add a new one
+ if (!updated) {
+ return [
+ ...x,
+ {
+ result: healthResultNum,
+ repairStatus: repairActionNum,
+ count: 1
+ }
+ ];
+ }
+
+ // if an update occurred, return the modified array
+ return newStats;
+ });
}, [setQueueItems, setHistoryStats]);
const onHealthItemProgress = useCallback((message: string) => {
const [davItemId, progress] = message.split('|');
setQueueItems(x => x.map(item =>
item.id === davItemId
- ? { ...item, nextHealthCheck: progress }
+ ? { ...item, progress: Number(progress) }
: item
));
}, [setQueueItems]);
@@ -93,7 +129,7 @@ export default function Health({ loaderData }: Route.ComponentProps) {
<HealthStats stats={historyStats} />
</div>
<div className={styles.section}>
- <HealthTable isEnabled={isEnabled} healthCheckItems={queueItems} />
+ <HealthTable isEnabled={isEnabled} healthCheckItems={queueItems.filter((_, index) => index < 10)} />
</div>
</div>
);
diff --git a/frontend/app/routes/queue/components/status-badge/status-badge.tsx b/frontend/app/routes/queue/components/status-badge/status-badge.tsx
index 381b39fd..a7974850 100644
--- a/frontend/app/routes/queue/components/status-badge/status-badge.tsx
+++ b/frontend/app/routes/queue/components/status-badge/status-badge.tsx
@@ -34,20 +34,20 @@ export function StatusBadge({ status, percentage, error }: StatusBadgeProps) {
return (
<OverlayTrigger placement="top" overlay={overlay} trigger="click">
<div className={styles.container}>
- <Badge className={badgeClass} color={color} percentNum={percentNum}>{badgeText}</Badge>
+ <ProgressBadge className={badgeClass} color={color} percentNum={percentNum}>{badgeText}</ProgressBadge>
</div>
</OverlayTrigger>
);
}
-type BadgeProps = {
+type ProgressBadgeProps = {
className?: string,
color: string,
percentNum: number,
children?: React.ReactNode
}
-function Badge(props: BadgeProps) {
+export function ProgressBadge(props: ProgressBadgeProps) {
const isHealthCheck = props.percentNum > 100;
const progressClassName = isHealthCheck