Merge remote-tracking branch 'origin/staging' into develop

This commit is contained in:
Andrey Antukh 2025-07-29 15:22:14 +02:00
commit 44daa1cf65
2 changed files with 17 additions and 16 deletions

View File

@ -79,6 +79,7 @@
- Fix unexpected exception on processing old texts [Github #6889](https://github.com/penpot/penpot/pull/6889)
- Fix UI theme selection from main menu [Taiga #11567](https://tree.taiga.io/project/penpot/issue/11567)
- Add missing migration information to file snapshots [Github #686](https://github.com/penpot/penpot/pull/6864)
- Fix error on inspect tab when selecting multiple shapes [Taiga #11655](https://tree.taiga.io/project/penpot/issue/11655)
## 2.8.0

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?