Karl/homepage
1
0
Fork 0
mirror of https://github.com/karl0ss/homepage.git synced 2025-05-01 21:13:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

silenced more request errors + small fix in display logic

Browse Source
This commit is contained in:
williamwoldum 2023-01-17 12:50:08 +01:00
parent 9f008fc04e
commit a880cdbc68
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/widgets/octoPrint/component.jsx
View File

@ -40,7 +40,9 @@ export default function Component({ service }) {
); );
} }
if (printerStats === 500) { const state = printerStats.state.text;
if (state === "Not found" || Object.entries(printerStats.temperature).length === 0) {
return ( return (
<Container service={service}> <Container service={service}>
<Block label="octoPrint.printer_state" value={printerStats.state.text} /> <Block label="octoPrint.printer_state" value={printerStats.state.text} />
@ -48,14 +50,14 @@ export default function Component({ service }) {
); );
} }
const state = printerStats.state.text;
if (state === "Printing" || state === "Paused") { if (state === "Printing" || state === "Paused") {
if (jobStatsError) { if (jobStatsError) {
return <Container error={jobStatsError} />; return <Container error={jobStatsError} />;
} }
if (!jobStats) { const { printTimeLeft, printTime, completion } = jobStats.progress;
if (!jobStats || !printTimeLeft || !printTime || !completion) {
return ( return (
<Container service={service}> <Container service={service}>
<Block label="octoPrint.job_time_elapsed" /> <Block label="octoPrint.job_time_elapsed" />
@ -65,8 +67,6 @@ export default function Component({ service }) {
); );
} }
const { printTimeLeft, printTime, completion } = jobStats.progress;
return ( return (
<> <>
<Container service={service}> <Container service={service}>

4
src/widgets/octoPrint/proxy.js
View File

@ -27,8 +27,8 @@ export default async function octoPrintProxyHandler(req, res, map) {
let resultData = data; let resultData = data;
if (!validateWidgetData(widget, endpoint, resultData)) { if (!validateWidgetData(widget, endpoint, resultData)) {
if (status === 500 && widget.silencePrinterNotFound) { if ((status === 500 || status === 502 || status === 409) && widget.silencePrinterNotFound) {
resultData = 500; resultData = { state: { text: "Not found" } };
return res.status(status).send(resultData); return res.status(status).send(resultData);
} }
return res.status(status).json({ error: { message: "Invalid data", url, data: resultData } }); return res.status(status).json({ error: { message: "Invalid data", url, data: resultData } });