🐛 Fix duplicated suffix on single-file WASM exports (#13125)

This commit is contained in:
Elena Torró 2026-11-17 17:39:04 +01:00 committed by GitHub
parent 0915f89419
commit 14b9d77e9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions

View File

@ -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))

View File

@ -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)))