From 14b9d77e9f2790399137c161b14d784feaaeb69d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elena=20Torr=C3=B3?= Date: Tue, 17 Nov 2026 17:39:04 +0100 Subject: [PATCH] :bug: Fix duplicated suffix on single-file WASM exports (#13125) --- frontend/src/app/worker/exports.cljs | 17 +++++++++-------- .../frontend_tests/worker/exports_test.cljs | 9 +++++++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/frontend/src/app/worker/exports.cljs b/frontend/src/app/worker/exports.cljs index fa83b4ef29..5513ea029f 100644 --- a/frontend/src/app/worker/exports.cljs +++ b/frontend/src/app/worker/exports.cljs @@ -128,6 +128,14 @@ :name name :suffix suffix}) +(defn local-export-filename + "A single export's `:name` already carries the suffix (added by the UI)." + [kind entry export-name] + (case kind + :pdf-frames (str (or export-name "export") ".pdf") + :single (wasm.exports/sanitize-filename (dissoc entry :suffix) #{}) + (str (or export-name "export") ".zip"))) + (defn- run-local-export [{:keys [job-id kind exports objects background] export-name :name}] (let [exports (mapv export-entry exports)] @@ -162,14 +170,7 @@ :else (let [entry (first exports) - filename (case kind - :pdf-frames - (str (or export-name "export") ".pdf") - - :single - (wasm.exports/sanitize-filename entry #{}) - - (str (or export-name "export") ".zip")) + filename (local-export-filename kind entry export-name) mtype (case kind :pdf-frames "application/pdf" :single (export-mtype (:type entry)) diff --git a/frontend/test/frontend_tests/worker/exports_test.cljs b/frontend/test/frontend_tests/worker/exports_test.cljs index 5f1a9f6953..02f0f42f60 100644 --- a/frontend/test/frontend_tests/worker/exports_test.cljs +++ b/frontend/test/frontend_tests/worker/exports_test.cljs @@ -7,6 +7,7 @@ (ns frontend-tests.worker.exports-test (:require [app.common.uuid :as uuid] + [app.worker.exports :as wexports] [app.worker.wasm :as wwasm] [beicon.v2.core :as rx] [cljs.test :as t :include-macros true] @@ -48,6 +49,14 @@ @order) "job B starts only after job A has finished"))) +(t/deftest single-export-filename-does-not-repeat-suffix + (t/is (= "Ellipseabc.svg" + (wexports/local-export-filename + :single {:name "Ellipseabc" :suffix "abc" :type :svg} nil))) + (t/is (= "Ellipse.png" + (wexports/local-export-filename + :single {:name "Ellipse" :suffix nil :type :png} nil)))) + (t/deftest cancel-job-is-visible-to-cancelled (let [job-id (uuid/next)] (t/is (false? (wwasm/cancelled? job-id)))