diff --git a/Dockerfile.allinone b/Dockerfile.allinone index a5913b361..3fdb4f115 100644 --- a/Dockerfile.allinone +++ b/Dockerfile.allinone @@ -129,16 +129,6 @@ RUN ARCH=$(dpkg --print-architecture) && \ dpkg -i /tmp/pandoc.deb && \ rm /tmp/pandoc.deb -# Install Typst for PDF rendering (Typst has built-in professional styling -# for tables, headings, code blocks, etc., no CSS needed). -RUN ARCH=$(dpkg --print-architecture) && \ - if [ "$ARCH" = "amd64" ]; then TYPST_ARCH="x86_64-unknown-linux-musl"; \ - else TYPST_ARCH="aarch64-unknown-linux-musl"; fi && \ - wget -qO /tmp/typst.tar.xz "https://github.com/typst/typst/releases/download/v0.14.2/typst-${TYPST_ARCH}.tar.xz" && \ - tar -xf /tmp/typst.tar.xz -C /tmp && \ - cp /tmp/typst-*/typst /usr/local/bin/typst && \ - rm -rf /tmp/typst* && \ - typst --version # Install Node.js 20.x (for running frontend) RUN curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \ diff --git a/surfsense_backend/Dockerfile b/surfsense_backend/Dockerfile index 985d487f0..bda57c98d 100644 --- a/surfsense_backend/Dockerfile +++ b/surfsense_backend/Dockerfile @@ -28,16 +28,6 @@ RUN ARCH=$(dpkg --print-architecture) && \ dpkg -i /tmp/pandoc.deb && \ rm /tmp/pandoc.deb -# Install Typst for PDF rendering (Typst has built-in professional styling -# for tables, headings, code blocks, etc., no CSS needed). -RUN ARCH=$(dpkg --print-architecture) && \ - if [ "$ARCH" = "amd64" ]; then TYPST_ARCH="x86_64-unknown-linux-musl"; \ - else TYPST_ARCH="aarch64-unknown-linux-musl"; fi && \ - wget -qO /tmp/typst.tar.xz "https://github.com/typst/typst/releases/download/v0.14.2/typst-${TYPST_ARCH}.tar.xz" && \ - tar -xf /tmp/typst.tar.xz -C /tmp && \ - cp /tmp/typst-*/typst /usr/local/bin/typst && \ - rm -rf /tmp/typst* && \ - typst --version # Update certificates and install SSL tools RUN update-ca-certificates diff --git a/surfsense_web/components/report-panel/report-panel.tsx b/surfsense_web/components/report-panel/report-panel.tsx index bba0a41ab..829670ce9 100644 --- a/surfsense_web/components/report-panel/report-panel.tsx +++ b/surfsense_web/components/report-panel/report-panel.tsx @@ -14,7 +14,6 @@ import { DropdownMenuItem, DropdownMenuTrigger, } from "@/components/ui/dropdown-menu"; -import { Spinner } from "@/components/ui/spinner"; import { useMediaQuery } from "@/hooks/use-media-query"; import { baseApiService } from "@/lib/apis/base-api.service"; import { authenticatedFetch } from "@/lib/auth-utils"; @@ -294,20 +293,18 @@ function ReportPanelContent({ Hide for public viewers who have no auth token. */} {!shareToken && ( <> - handleExport("pdf")} - disabled={exporting !== null} - > - {exporting === "pdf" && } - Download PDF - - handleExport("docx")} - disabled={exporting !== null} - > - {exporting === "docx" && } - Download DOCX - + handleExport("pdf")} + disabled={exporting !== null} + > + Download PDF + + handleExport("docx")} + disabled={exporting !== null} + > + Download DOCX + )}