Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-10 08:50:57 -05:00
Code Issues Activity

✨ Show error instead of dialog

Browse source
This commit is contained in:
Andrés Moya 2022-09-05 16:05:07 +02:00
parent 3a6876eeec
commit f1b536034a
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
frontend/src/app/main/data/viewer.cljs
View file

@ -15,10 +15,9 @@
[app.common.types.shape.interactions :as ctsi]
[app.main.data.comments :as dcm]
[app.main.data.fonts :as df]
[app.main.data.modal :as modal]
[app.main.data.messages :as msg]
[app.main.features :as features]
[app.main.repo :as rp]
[app.main.store :as st]
[app.util.globals :as ug]
[app.util.i18n :as i18n :refer [tr]]
[app.util.router :as rt]
@ -124,14 +123,10 @@
(->> (rx/of (df/fonts-fetched fonts)
(bundle-fetched (merge bundle params))))))
(rx/catch (fn [err]
(let [team-id (-> state :teams keys first)]
(if (and (= (:type err) :restriction)
(= (:code err) :feature-disabled))
(rx/of (modal/show
{:type :alert
:message (tr "errors.components-v2")
:on-accept #(st/emit! (rt/nav ""))}))
(rx/throw err))))))))))
(if (and (= (:type err) :restriction)
(= (:code err) :feature-disabled))
(rx/of (msg/error (tr "errors.components-v2") {:timeout nil}))
(rx/throw err)))))))))
(declare go-to-frame-auto)

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

@ -27,9 +27,8 @@
([router id] (resolve router id {} {}))
([router id path-params] (resolve router id path-params {}))
([router id path-params query-params]
(if-let [match (r/match-by-name router id path-params)]
(r/match->path match query-params)
"")))
(when-let [match (r/match-by-name router id path-params)]
(r/match->path match query-params))))
(defn create
[routes]