github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-10-29 05:50:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Open the import dialog again from template links (#12131)

Browse Source 
Template links (#?template=<url>) keep their params in a bare "#?"
fragment. Since routing moved to the query string, only "#/" legacy
hashes are translated, and the root route was an empty query string,
so the template param was dropped and the dashboard opened without the
import dialog. Route a "#?" fragment as the query token, and treat a
query without a screen param as the root, as before.

Logged out users also lost the template: get-teams requires a session
and its 401 ended the flow before the params were kept for after login.
Skip it for the anonymous profile. This part already failed on main.

Closes #12127

AI-assisted-by: claude-opus-5-5
This commit is contained in:
Eva Marco 2026-10-07 14:03:08 +02:00 committed by GitHub
parent 6defe26a78
commit ddce3c2c95
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 85 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
frontend/src/app/main/ui/routes.cljs
View File

@ -140,6 +140,13 @@
(u/query-string->map (:query uri)))})))
(defn- legacy-query-token
"Legacy root links (e.g. `#?template=<url>`) keep their params in a
bare `#?…` fragment. Return them as a query token, or nil."
[hash]
(when (str/starts-with? hash "#?")
(subs hash 1)))
(defn- store-session-params
[{:keys [template plugin]}]
(binding [storage/*sync* true]
@ -226,7 +233,8 @@
(let [location (.-location js/document)
location-path (dm/str (.-origin location) (.-pathname location))
valid-location? (= location-path (dm/str cf/public-uri))
legacy-hash (.-hash location)]
legacy-hash (.-hash location)
legacy-token (legacy-query-token legacy-hash)]
(cond
(not valid-location?)
@ -242,6 +250,10 @@
(st/emit! (rt/nav name params {::rt/replace true}))
(on-query-navigate router token send-event-info?))
;; TODO(next-version): delete with `legacy-routes`.
(some? legacy-token)
(on-query-navigate router legacy-token send-event-info?)
:else
(on-query-navigate router token send-event-info?))))
@ -251,7 +263,10 @@
(subs token 1)
(or token ""))
query-params (u/query-string->map token-query)
empty-token? (str/blank? token-query)
;; Without a `screen` the token targets the app root; its params
;; (e.g. `template`) are forwarded to the dashboard or kept for
;; after login.
root? (nil? (rt/get-query-param query-params :screen))
match (rt/match router token)]
(if (some? match)
(handle-sso-error-and-navigate match send-event-info? (rt/get-current-href))
@ -261,9 +276,13 @@
;; on invitations workflows (and probably other cases).
(->> (rp/cmd! :get-profile)
(rx/mapcat (fn [profile]
(->> (rp/cmd! :get-teams {})
(rx/map (fn [teams]
(assoc profile ::teams (into #{} (map :id) teams)))))))
;; get-teams requires a session; anonymous users
;; only need their params kept for after login.
(if (= (:id profile) uuid/zero)
(rx/of profile)
(->> (rp/cmd! :get-teams {})
(rx/map (fn [teams]
(assoc profile ::teams (into #{} (map :id) teams))))))))
(rx/subs! (fn [{:keys [id ::teams] :as profile}]
(cond
(= id uuid/zero)
@ -271,7 +290,7 @@
(store-session-params query-params)
(st/emit! (rt/nav :auth-login)))
empty-token?
root?
(let [default-team-id (:default-team-id profile)
last-team-id (dtm/get-last-team-id)
team-id (if (contains? teams last-team-id)

60
frontend/test/frontend_tests/ui/routes_test.cljs
View File

@ -9,9 +9,11 @@
[app.common.time :as ct]
[app.common.uuid :as uuid]
[app.config :as cf]
[app.main.data.team :as dtm]
[app.main.repo :as rp]
[app.main.store :as st]
[app.main.ui.routes :as routes]
[app.util.storage :as storage]
[beicon.v2.core :as rx]
[cljs.test :as t :include-macros true]
[frontend-tests.helpers.mock :as mock]))
@ -95,3 +97,61 @@
(t/is (= 2 (count @events)))
(done'))
done))))
;; Template links (`#?template=<url>`) predate query-string routing: the
;; params live in a bare `#?…` fragment and there is no `screen` (#12127).
(def ^:private template-url
"https://penpot.github.io/penpot-files/tutorial-for-beginners%20v.2.0.penpot")
(def ^:private template-param
"The query param as the router decodes it."
"https://penpot.github.io/penpot-files/tutorial-for-beginners v.2.0.penpot")
(t/deftest legacy-query-hash-becomes-a-query-token
(t/is (= (str "?template=" template-url)
(#'routes/legacy-query-token (str "#?template=" template-url))))
(t/is (nil? (#'routes/legacy-query-token "#/workspace?team-id=1")))
(t/is (nil? (#'routes/legacy-query-token ""))))
(t/deftest query-without-screen-goes-to-dashboard-with-its-params
(t/async done
(let [team-id (uuid/next)
events (atom [])]
(mock/with-mocks
{rp/cmd! (mock/stub
(fn [command _]
(case command
:get-profile (rx/of {:id (uuid/next) :default-team-id team-id})
:get-teams (rx/of [{:id team-id}]))))
dtm/get-last-team-id (mock/stub (fn [] nil))
st/emit! (mock/stub (fn [& emitted] (swap! events into emitted)))}
(fn [done']
(#'routes/on-query-navigate #{:dashboard-recent} (str "?template=" template-url) false)
(let [{:keys [id params]} (some-> (first @events) deref)]
(t/is (= :dashboard-recent id))
(t/is (= template-param (:template params)))
(t/is (= team-id (:team-id params))))
(done'))
done))))
(t/deftest query-without-screen-keeps-template-for-after-login
(t/async done
(let [events (atom [])]
(mock/with-mocks
{rp/cmd! (mock/stub
(fn [command _]
(case command
:get-profile (rx/of {:id uuid/zero})
;; The backend requires a session for get-teams.
:get-teams (rx/throw (ex-info "authentication required"
{:type :authentication})))))
st/emit! (mock/stub (fn [& emitted] (swap! events into emitted)))}
(fn [done']
(#'routes/on-query-navigate #{:auth-login} (str "?template=" template-url) false)
(t/is (= template-param (:template @storage/session)))
(t/is (= :auth-login (:id (some-> (first @events) deref))))
(binding [storage/*sync* true]
(swap! storage/session dissoc :template))
(done'))
done))))