Merge branch 'benphelps:main' into main

src/components/bookmarks/item.jsx

@@ -19,7 +19,7 @@ export default function Item({ bookmark }) {
           <div className="flex-shrink-0 flex items-center justify-center w-11 bg-theme-500/10 dark:bg-theme-900/50 text-theme-700 hover:text-theme-700 dark:text-theme-200 text-sm font-medium rounded-l-md">
             {bookmark.icon && 
               <div className="flex-shrink-0 w-5 h-5">
-                <ResolvedIcon icon={bookmark.icon} />
+                <ResolvedIcon icon={bookmark.icon} alt={bookmark.abbr} />
               </div>
             }
             {!bookmark.icon && bookmark.abbr}

src/components/resolvedicon.jsx

@@ -1,9 +1,9 @@
 import Image from "next/future/image";
 
-export default function ResolvedIcon({ icon, width = 32, height = 32 }) {
+export default function ResolvedIcon({ icon, width = 32, height = 32, alt = "logo" }) {
   // direct or relative URLs
   if (icon.startsWith("http") || icon.startsWith("/")) {
-    return <Image src={`${icon}`} width={width} height={height} alt="logo" />;
+    return <Image src={`${icon}`} width={width} height={height} alt={alt} />;
   }
 
   // mdi- prefixed, material design icons
@@ -31,7 +31,7 @@ export default function ResolvedIcon({ icon, width = 32, height = 32 }) {
       src={`https://cdn.jsdelivr.net/gh/walkxcode/dashboard-icons/png/${iconName}.png`}
       width={width}
       height={height}
-      alt="logo"
+      alt={alt}
     />
   );
-}
+}

src/widgets/components.js

@@ -24,6 +24,7 @@ const components = {
   medusa: dynamic(() => import("./medusa/component")),
   miniflux: dynamic(() => import("./miniflux/component")),
   mikrotik: dynamic(() => import("./mikrotik/component")),
+  moonraker: dynamic(() => import("./moonraker/component")),
   navidrome: dynamic(() => import("./navidrome/component")),
   nextdns: dynamic(() => import("./nextdns/component")),
   npm: dynamic(() => import("./npm/component")),

src/widgets/moonraker/component.jsx

@@ -0,0 +1,51 @@
+import { useTranslation } from "next-i18next";
+
+import Container from "components/services/widget/container";
+import Block from "components/services/widget/block";
+import useWidgetAPI from "utils/proxy/use-widget-api";
+
+export default function Component({ service }) {
+  const { t } = useTranslation();
+
+  const { widget } = service;
+
+  const { data: printStats, error: printStatsError } = useWidgetAPI(widget, "print_stats");
+  const { data: displayStatus, error: displayStatsError } = useWidgetAPI(widget, "display_status");
+  const { data: webHooks, error: webHooksError } = useWidgetAPI(widget, "webhooks");
+
+  if (printStatsError || displayStatsError || webHooksError) {
+    const finalError = printStatsError ?? displayStatsError ?? webHooksError;
+    return <Container error={finalError} />;
+  }
+
+  if (!printStats || !displayStatus || !webHooks) {
+    return (
+      <Container service={service}>
+        <Block label="moonraker.printer_state" />
+      </Container>
+    );
+  }
+
+  if (webHooks.result.status.webhooks.state === "shutdown") {
+    return (
+      <Container service={service}>
+        <Block label="moonraker.printer_state" value={webHooks.result.status.webhooks.state} />
+      </Container>
+    );
+  }
+
+  let currentLayer = "-";
+  let totalLayer = "-";
+  if (printStats.result.status.print_stats.info.total_layer !== null) {
+    currentLayer = printStats.result.status.print_stats.info.current_layer;
+    totalLayer = printStats.result.status.print_stats.info.total_layer;
+  }
+
+  return (
+    <Container service={service}>
+      <Block label="moonraker.layers" value={`${currentLayer} / ${totalLayer}`} />
+      <Block label="moonraker.print_progress" value={t("common.percent", { value: (displayStatus.result.status.display_status.progress * 100) })} />
+      <Block label="moonraker.print_status" value={printStats.result.status.print_stats.state} />
+    </Container>
+  );
+}

src/widgets/moonraker/widget.js

@@ -0,0 +1,20 @@
+import genericProxyHandler from "utils/proxy/handlers/generic";
+
+const widget = {
+  api: "{url}/printer/objects/query?{endpoint}",
+  proxyHandler: genericProxyHandler,
+
+  mappings: {
+    print_stats: {
+      endpoint: "print_stats",
+    },
+    display_status: {
+      endpoint: "display_status",
+    },
+    webhooks: {
+      endpoint: "webhooks",
+    },
+  },
+};
+
+export default widget;

src/widgets/widgets.js

@@ -19,6 +19,7 @@ import mastodon from "./mastodon/widget";
 import medusa from "./medusa/widget";
 import miniflux from "./miniflux/widget";
 import mikrotik from "./mikrotik/widget";
+import moonraker from "./moonraker/widget";
 import navidrome from "./navidrome/widget";
 import nextdns from "./nextdns/widget";
 import npm from "./npm/widget";
@@ -77,6 +78,7 @@ const widgets = {
   medusa,
   miniflux,
   mikrotik,
+  moonraker,
   navidrome,
   nextdns,
   npm,