Skip to content

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

C#

Update UI status badge to reflect nzb-uploading status.

nzbdav-dev916bb4d8d874
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 95098bf3..1fb1268b 100644
--- a/frontend/app/routes/health/components/health-table/health-table.tsx
+++ b/frontend/app/routes/health/components/health-table/health-table.tsx
@@ -2,7 +2,7 @@ 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 { StatusBadge } from "~/routes/queue/components/status-badge/status-badge";
export type HealthTableProps = {
isEnabled: boolean,
@@ -67,7 +67,7 @@ export function HealthTable({ isEnabled, healthCheckItems }: HealthTableProps) {
</td>
<td className={`${styles.dateCell} ${styles.desktop}`}>
{item.progress > 0
- ? <ProgressBadge className={styles.dateBadge} color={"#333"} percentNum={100 + item.progress}>{item.progress}%</ProgressBadge>
+ ? <StatusBadge status="health-checking" className={styles.dateBadge} percentage={item.progress.toString()} />
: formatDateBadge(item.nextHealthCheck, 'ASAP', 'success')
}
</td>
@@ -100,7 +100,7 @@ function DateDetailsTable({ item }: { item: HealthCheckQueueItem }) {
<div className={styles.dateDetailsLabel}>Next Health Check</div>
<div className={styles.dateDetailsValue}>
{item.progress > 0
- ? <ProgressBadge className={styles.dateBadge} color={"#333"} percentNum={100 + item.progress}>{item.progress}%</ProgressBadge>
+ ? <StatusBadge status="health-checking" className={styles.dateBadge} percentage={item.progress.toString()} />
: formatDateBadge(item.nextHealthCheck, 'ASAP', 'success')
}
</div>
diff --git a/frontend/app/routes/queue/components/page-table/page-table.module.css b/frontend/app/routes/queue/components/page-table/page-table.module.css
index f91dc3f1..48ef1573 100644
--- a/frontend/app/routes/queue/components/page-table/page-table.module.css
+++ b/frontend/app/routes/queue/components/page-table/page-table.module.css
@@ -89,7 +89,11 @@
}
.uploading {
- background: rgba(128, 150, 255, 0.1);
+ background: rgba(0, 255, 255, 0.05);
+ }
+
+ .uploading + :not(.uploading) {
+ border-top: 3px solid hsl(192, 100%, 11%);
}
}
diff --git a/frontend/app/routes/queue/components/queue-table/queue-table.tsx b/frontend/app/routes/queue/components/queue-table/queue-table.tsx
index 07f4206d..57e2454f 100644
--- a/frontend/app/routes/queue/components/queue-table/queue-table.tsx
+++ b/frontend/app/routes/queue/components/queue-table/queue-table.tsx
@@ -146,6 +146,7 @@ export function QueueRow({ slot, onIsSelectedChanged, onIsRemovingChanged, onRem
fileSizeBytes={Number(slot.mb) * 1024 * 1024}
actions={<ActionButton type="delete" disabled={!!slot.isRemoving} onClick={onRemove} />}
onRowSelectionChanged={isSelected => onIsSelectedChanged(slot.nzo_id, isSelected)}
+ error={slot.error}
/>
<ConfirmModal
show={isConfirmingRemoval}
diff --git a/frontend/app/routes/queue/components/status-badge/status-badge.module.css b/frontend/app/routes/queue/components/status-badge/status-badge.module.css
index 598019ac..7637e46a 100644
--- a/frontend/app/routes/queue/components/status-badge/status-badge.module.css
+++ b/frontend/app/routes/queue/components/status-badge/status-badge.module.css
@@ -18,7 +18,7 @@
width: 85px;
}
-.badge-text {
+.badgeText {
position: relative;
}
@@ -41,6 +41,10 @@
background-color: #60aa4a;
}
+.uploadProgress {
+ background-color: hsl(198.69deg 74.6% 44.28%);
+}
+
@media not (min-width: 900px) {
.container {
display: flex;
@@ -49,7 +53,7 @@
@media not (pointer: coarse),
(min-width: 900px) {
- .failure-badge:hover {
+ .failureBadge:hover {
cursor: pointer;
}
}
\ No newline at end of file
diff --git a/frontend/app/routes/queue/components/status-badge/status-badge.module.css.d.ts b/frontend/app/routes/queue/components/status-badge/status-badge.module.css.d.ts
index 73c49d3a..4cc0911d 100644
--- a/frontend/app/routes/queue/components/status-badge/status-badge.module.css.d.ts
+++ b/frontend/app/routes/queue/components/status-badge/status-badge.module.css.d.ts
@@ -1,10 +1,11 @@
declare const styles: {
readonly "container": string;
readonly "badge": string;
- readonly "badge-text": string;
+ readonly "badgeText": string;
readonly "progress": string;
readonly "healthcheckProgress": string;
- readonly "failure-badge": string;
+ readonly "uploadProgress": string;
+ readonly "failureBadge": string;
readonly "gray": string;
};
export = styles;
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 8004f843..f0a5676e 100644
--- a/frontend/app/routes/queue/components/status-badge/status-badge.tsx
+++ b/frontend/app/routes/queue/components/status-badge/status-badge.tsx
@@ -1,75 +1,119 @@
import { OverlayTrigger, Tooltip } from "react-bootstrap";
import styles from "./status-badge.module.css";
-import type React from "react";
-import { className } from "~/utils/styling";
+import { classNames } from "~/utils/styling";
export type StatusBadgeProps = {
+ className?: string,
status: string,
percentage?: string,
error?: string,
}
-export function StatusBadge({ status, percentage, error }: StatusBadgeProps) {
+export function StatusBadge({ className, status, percentage, error }: StatusBadgeProps) {
const statusLower = status?.toLowerCase();
- const percentNum = statusLower === "downloading" ? Number(percentage) : 0;
-
- // determine badge color
- let color = "grey";
- if (statusLower === "completed") color = "rgba(var(--bs-success-rgb)";
- if (statusLower === "failed") color = "rgba(var(--bs-danger-rgb)";
- if (statusLower === "downloading" || percentNum > 0) color = `#333`;
-
- // determine badge text
- let badgeText = statusLower;
- if (statusLower === "downloading" || percentNum > 0)
- badgeText = `${percentNum > 100 ? percentNum - 100 : percentNum}%`;
-
- // determine class name
- if (error?.startsWith("Article with message-id")) error = "Missing articles";
- const badgeClass = statusLower === "failed" ? styles["failure-badge"] : "";
- const overlay = statusLower == "failed"
- ? <Tooltip>{error}</Tooltip>
- : <></>;
- return (
- <OverlayTrigger placement="top" overlay={overlay} trigger="click">
+ if (statusLower === "completed") {
+ return (
<div className={styles.container}>
- <ProgressBadge className={badgeClass} color={color} percentNum={percentNum}>{badgeText}</ProgressBadge>
+ <div className={styles.badge} style={{ backgroundColor: "rgba(var(--bs-success-rgb)" }}>
+ <div className={styles.badgeText}>{statusLower}</div>
+ </div>
</div>
- </OverlayTrigger>
- );
-}
+ );
+ }
-type ProgressBadgeProps = {
- className?: string,
- color: string,
- percentNum: number,
- children?: React.ReactNode
-}
+ if (statusLower === "failed" || statusLower == "upload failed") {
+ const badgeText = statusLower == "upload failed" ? "🡅 failed" : "failed";
+ if (error?.startsWith("Article with message-id"))
+ error = "Missing articles";
-export function ProgressBadge(props: ProgressBadgeProps) {
- const isHealthCheck = props.percentNum > 100;
+ return (
+ <OverlayTrigger placement="top" overlay={<Tooltip>{error}</Tooltip>} trigger="click">
+ <div className={classNames([styles.container, styles.failureBadge])}>
+ <div className={styles.badge} style={{ backgroundColor: "rgba(var(--bs-danger-rgb)" }}>
+ <div className={styles.badgeText}>{badgeText}</div>
+ </div>
+ </div>
+ </OverlayTrigger >
+ );
+ }
- const progressOneClass = isHealthCheck
- ? `${styles.progress} ${styles.gray}`
- : styles.progress;
+ if (statusLower === "downloading") {
+ const percentNum = Number(percentage);
+ const badgeText = `${percentNum > 100 ? percentNum - 100 : percentNum}%`;
+ const isHealthChecking = percentNum > 100;
- const progressOneStyle = (props.percentNum >= 0)
- ? { width: `${Math.min(props.percentNum, 100)}%` }
- : undefined;
+ // download progress-bar
+ const downloadProgressClass = isHealthChecking
+ ? `${styles.progress} ${styles.gray}`
+ : styles.progress;
+ const downloadProgressStyle = (percentNum >= 0)
+ ? { width: `${Math.min(percentNum, 100)}%` }
+ : undefined;
- const progressTwoClass = `${styles.progress} ${styles.healthcheckProgress}`;
+ // health-check progress-bar
+ const healthCheckProgressClass = `${styles.progress} ${styles.healthcheckProgress}`;
+ const healthCheckProgressStyle = isHealthChecking
+ ? { width: `${Math.min(percentNum - 100, 100)}%` }
+ : undefined;
- const progressTwoStyle = isHealthCheck
- ? { width: `${Math.min(props.percentNum - 100, 100)}%` }
- : undefined;
+ return (
+ <div className={styles.container}>
+ <div className={styles.badge} style={{ backgroundColor: "#333" }}>
+ <div className={downloadProgressClass} style={downloadProgressStyle} />
+ <div className={healthCheckProgressClass} style={healthCheckProgressStyle} />
+ <div className={styles.badgeText}>{badgeText}</div>
+ </div>
+ </div>
+ );
+ }
+
+ if (statusLower === "uploading") {
+ const percentNum = Number(percentage);
+ const badgeText = `🡅 ${percentNum}%`;
+ const uploadProgressClass = `${styles.progress} ${styles.uploadProgress}`;
+ const uploadProgressStyle = { width: `${Math.min(percentNum, 100)}%` };
+
+ return (
+ <div className={styles.container}>
+ <div className={styles.badge} style={{ backgroundColor: "#333" }}>
+ <div className={uploadProgressClass} style={uploadProgressStyle} />
+ <div className={styles.badgeText}>{badgeText}</div>
+ </div>
+ </div>
+ );
+ }
+
+ if (statusLower === "pending") {
+ return (
+ <div className={styles.container}>
+ <div className={styles.badge} style={{ backgroundColor: "#333" }}>
+ <div className={styles.badgeText}>{'🡅 pending'}</div>
+ </div>
+ </div>
+ );
+ }
+
+ if (statusLower === "health-checking") {
+ const percentNum = Number(percentage);
+ const badgeText = `${percentNum}%`;
+ const healthCheckProgressClass = `${styles.progress} ${styles.healthcheckProgress}`;
+ const healthCheckProgressStyle = { width: `${Math.min(percentNum, 100)}%` };
+
+ return (
+ <div className={classNames([styles.badge, className])} style={{ backgroundColor: "#333" }}>
+ <div className={healthCheckProgressClass} style={healthCheckProgressStyle} />
+ <div className={styles.badgeText}>{badgeText}</div>
+ </div>
+ );
+ }
return (
- <div {...className([styles.badge, props.className])} style={{ backgroundColor: props.color }}>
- <div className={progressOneClass} style={progressOneStyle} />
- <div className={progressTwoClass} style={progressTwoStyle} />
- <div className={styles["badge-text"]}>{props.children}</div>
+ <div className={styles.container}>
+ <div className={styles.badge} style={{ backgroundColor: "grey" }}>
+ <div className={styles.badgeText}>{statusLower}</div>
+ </div>
</div>
);
}
\ No newline at end of file