3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-06 11:08:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix race-condition on 404 states.

Browse source
This commit is contained in:
Andrey Antukh 2021-10-05 13:28:51 +02:00 • committed by Andrés Moya
parent 6722ca41bf
commit 9c1c755836
6 changed files with 46 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

69
frontend/src/app/util/router.cljs
View file

@ -21,12 +21,12 @@
(defn resolve
([router id] (resolve router id {} {}))
([router id params] (resolve router id params {}))
([router id params qparams]
(when-let [match (r/match-by-name router id params)]
(if (empty? qparams)
([router id path-params] (resolve router id path-params {}))
([router id path-params query-params]
(when-let [match (r/match-by-name router id path-params)]
(if (empty? query-params)
(r/match->path match)
(let [query (u/map->query-string qparams)]
(let [query (u/map->query-string query-params)]
(-> (u/uri (r/match->path match))
(assoc :query query)
(str)))))))
@ -48,12 +48,12 @@
[router path]
(let [uri (u/uri path)]
(when-let [match (r/match-by-path router (:path uri))]
(let [qparams (u/query-string->map (:query uri))
params {:path (:path-params match)
:query qparams}]
(let [query-params (u/query-string->map (:query uri))
params {:path (:path-params match)
:query query-params}]
(-> match
(assoc :params params)
(assoc :query-params qparams))))))
(assoc :query-params query-params))))))
;; --- Navigate (Event)
@ -65,58 +65,65 @@
ptk/UpdateEvent
(update [_ state]
(assoc state :route match))))
(-> state
(assoc :route match)
(dissoc :exception)))))
(defn navigate*
[id params qparams replace]
[id path-params query-params replace]
(ptk/reify ::navigate
IDeref
(-deref [_]
{:id id
:path-params params
:query-params qparams
:path-params path-params
:query-params query-params
:replace replace})
ptk/UpdateEvent
(update [_ state]
(dissoc state :exception))
ptk/EffectEvent
(effect [_ state _]
(ts/asap
#(let [router (:router state)
history (:history state)
path (resolve router id params qparams)]
(if ^boolean replace
(let [router (:router state)
history (:history state)
path (resolve router id path-params query-params)]
(ts/asap
#(if ^boolean replace
(bhistory/replace-token! history path)
(bhistory/set-token! history path)))))))
(defn assign-exception
[error]
(ptk/reify ::assign-exception
ptk/UpdateEvent
(update [_ state]
(if (nil? error)
(dissoc state :exception)
(assoc state :exception error)))))
(defn nav
([id] (nav id nil nil))
([id params] (nav id params nil))
([id params qparams] (navigate* id params qparams false)))
([id path-params] (nav id path-params nil))
([id path-params query-params] (navigate* id path-params query-params false)))
(defn nav'
([id] (nav id nil nil))
([id params] (nav id params nil))
([id params qparams] (navigate* id params qparams true)))
([id path-params] (nav id path-params nil))
([id path-params query-params] (navigate* id path-params query-params true)))
(def navigate nav)
(deftype NavigateNewWindow [id params qparams]
(deftype NavigateNewWindow [id path-params query-params]
ptk/EffectEvent
(effect [_ state _]
(let [router (:router state)
path (resolve router id params qparams)
path (resolve router id path-params query-params)
uri (-> (u/uri cfg/public-uri)
(assoc :fragment path))
name (str (name id) "-" (:file-id params))]
name (str (name id) "-" (:file-id path-params))]
(dom/open-new-window (str uri) name))))
(defn nav-new-window
([id] (nav-new-window id nil nil))
([id params] (nav-new-window id params nil))
([id params qparams] (NavigateNewWindow. id params qparams)))
([id path-params] (nav-new-window id path-params nil))
([id path-params query-params] (NavigateNewWindow. id path-params query-params)))
(defn nav-new-window*
[{:keys [rname path-params query-params name]}]