github/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-04-28 04:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix regression on show access request dialog (#7005)

Browse Source
This commit is contained in:
Andrey Antukh 2025-07-29 14:58:02 +02:00 committed by GitHub
parent 36d3d94ec9
commit 5161ef15bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
frontend/src/app/main/ui/static.cljs
View File

@ -11,6 +11,7 @@
[app.common.data :as d]
[app.common.pprint :as pp]
[app.common.uri :as u]
[app.main.data.auth :refer [is-authenticated?]]
[app.main.data.common :as dcm]
[app.main.data.event :as ev]
[app.main.refs :as refs]
@ -485,24 +486,24 @@
{::mf/props :obj}
[{:keys [data route] :as props}]
(let [type (:type data)
path (:path route)
(let [type (:type data)
path (:path route)
params (:query-params route)
params (:query-params route)
workspace? (str/includes? path "workspace")
dashboard? (str/includes? path "dashboard")
view? (str/includes? path "view")
workspace? (str/includes? path "workspace")
dashboard? (str/includes? path "dashboard")
view? (str/includes? path "view")
;; We store the request access info int this state
info* (mf/use-state nil)
info (deref info*)
info* (mf/use-state nil)
info (deref info*)
loaded? (get info :loaded false)
profile (mf/deref refs/profile)
profile (mf/deref refs/profile)
auth-error?
(= type :authentication)
auth-error? (= type :authentication)
authenticated?
(is-authenticated? profile)
request-access?
(and
@ -517,8 +518,7 @@
(rx/subs! (partial reset! info*)
(partial reset! info* {:loaded true})))))
(if auth-error?
(if (and auth-error? (not authenticated?))
[:> context-wrapper*
{:is-workspace workspace?
:is-dashboard dashboard?
@ -526,7 +526,7 @@
:profile profile}
[:> login-dialog* {}]]
(when loaded?
(when (get info :loaded false)
(if request-access?
[:> context-wrapper* {:is-workspace workspace?
:is-dashboard dashboard?