Harden QR export base URL parsing

Author: akira69

client/src/pages/printing/filamentQrCodeExportDialog.tsx

@@ -10,6 +10,7 @@ import { useSavedState } from "../../utils/saveload";
 import { useGetFilamentsByIds } from "../filaments/functions";
 import { IFilament } from "../filaments/model";
 import {
+  getConfiguredBaseUrl,
   SpoolQRCodePrintSettings,
   renderLabelContents,
   renderTemplateText,
@@ -29,18 +30,8 @@ interface FilamentQRCodeExportDialogProps {
 const FilamentQRCodeExportDialog = ({ filamentIds }: FilamentQRCodeExportDialogProps) => {
   const t = useTranslate();
   const baseUrlSetting = useGetSetting("base_url");
-  let parsedBaseUrl = "";
-  if (baseUrlSetting.data?.value !== undefined) {
-    try {
-      parsedBaseUrl = JSON.parse(baseUrlSetting.data.value) ?? "";
-    } catch {
-      // Older or manually edited settings may already be stored as a raw string.
-      parsedBaseUrl = baseUrlSetting.data.value;
-    }
-  }
-  // Fall back to the current origin so QR export previews still work before `base_url`
-  // is configured explicitly.
-  const baseUrlRoot = parsedBaseUrl !== "" ? parsedBaseUrl : window.location.origin;
+  // Accept both JSON-backed settings and legacy plain strings so old `base_url` values do not crash the dialog.
+  const baseUrlRoot = getConfiguredBaseUrl(baseUrlSetting.data?.value, window.location.origin);
   const [messageApi, contextHolder] = message.useMessage();
   const [useHTTPUrl, setUseHTTPUrl] = useSavedState("export-useHTTPUrl-filament", false);
 

client/src/pages/printing/spoolQrCodeExportDialog.tsx

@@ -10,6 +10,7 @@ import { useSavedState } from "../../utils/saveload";
 import { useGetSpoolsByIds } from "../spools/functions";
 import { ISpool } from "../spools/model";
 import {
+  getConfiguredBaseUrl,
   SpoolQRCodePrintSettings,
   renderLabelContents,
   renderTemplateText,
@@ -29,18 +30,8 @@ interface SpoolQRCodeExportDialog {
 const SpoolQRCodeExportDialog = ({ spoolIds }: SpoolQRCodeExportDialog) => {
   const t = useTranslate();
   const baseUrlSetting = useGetSetting("base_url");
-  let parsedBaseUrl = "";
-  if (baseUrlSetting.data?.value !== undefined) {
-    try {
-      parsedBaseUrl = JSON.parse(baseUrlSetting.data.value) ?? "";
-    } catch {
-      // Older or manually edited settings may already be stored as a raw string.
-      parsedBaseUrl = baseUrlSetting.data.value;
-    }
-  }
-  // Fall back to the current origin so QR export previews still work before `base_url`
-  // is configured explicitly.
-  const baseUrlRoot = parsedBaseUrl !== "" ? parsedBaseUrl : window.location.origin;
+  // Accept both JSON-backed settings and legacy plain strings so old `base_url` values do not crash the dialog.
+  const baseUrlRoot = getConfiguredBaseUrl(baseUrlSetting.data?.value, window.location.origin);
   const [messageApi, contextHolder] = message.useMessage();
   const [useHTTPUrl, setUseHTTPUrl] = useSavedState("export-useHTTPUrl", false);