Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-24 23:49:45 -05:00
Code Issues Activity

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

Browse source
This commit is contained in:
Andrey Antukh 2024-04-17 19:32:39 +02:00
commit b9ed0e1146
6 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/src/app/rpc/commands/profile.clj
View file

@ -46,6 +46,10 @@
(let [email (str/lower email)
email (if (str/starts-with? email "mailto:")
(subs email 7)
email)
email (if (or (str/starts-with? email "<")
(str/ends-with? email ">"))
(str/trim email "<>")
email)]
email))

5
backend/src/app/rpc/commands/viewer.clj
View file

@ -38,6 +38,11 @@
team (-> (db/get conn :team {:id (:team-id project)})
(teams/decode-row))
members (into #{} (->> (teams/get-team-members conn (:team-id project))
(map :id)))
perms (assoc perms :in-team (contains? members profile-id))
_ (-> (cfeat/get-team-enabled-features cf/flags team)
(cfeat/check-client-features! (:features params))
(cfeat/check-file-features! (:features file)))

10
backend/src/app/worker/runner.clj
View file

@ -139,7 +139,7 @@
:else
(try
(l/trc :hint "start"
(l/dbg :hint "start"
:name (:name task)
:task-id (str task-id)
:queue queue
@ -149,7 +149,7 @@
result (handle-task task)
elapsed (dt/format-duration (tpoint))]
(l/trc :hint "end"
(l/dbg :hint "end"
:name (:name task)
:task-id (str task-id)
:queue queue
@ -228,9 +228,9 @@
(recur))))
(catch InterruptedException _
(l/debug :hint "interrupted"
:id id
:queue queue))
(l/dbg :hint "interrupted"
:id id
:queue queue))
(catch Throwable cause
(l/err :hint "unexpected exception"
:id id

8
backend/test/backend_tests/rpc_profile_test.clj
View file

@ -27,6 +27,14 @@
(t/use-fixtures :once th/state-init)
(t/use-fixtures :each th/database-reset)
(t/deftest clean-email
(t/is "foo@example.com" (profile/clean-email "mailto:foo@example.com"))
(t/is "foo@example.com" (profile/clean-email "mailto:<foo@example.com>"))
(t/is "foo@example.com" (profile/clean-email "<foo@example.com>"))
(t/is "foo@example.com" (profile/clean-email "foo@example.com>"))
(t/is "foo@example.com" (profile/clean-email "<foo@example.com")))
;; Test with wrong credentials
(t/deftest profile-login-failed-1
(let [profile (th/create-profile* 1)

5
frontend/src/app/main/ui/components/tab_container.cljs
View file

@ -54,9 +54,10 @@
(let [props (.-props tab)
id (.-id props)
title (.-title props)
sid (d/name id)]
sid (d/name id)
tooltip (if (string? title) title nil)]
[:div {:key (str/concat "tab-" sid)
:title title
:title tooltip
:data-id sid
:on-click on-click
:class (stl/css-case

12
frontend/src/app/main/ui/viewer/header.cljs
View file

@ -180,7 +180,7 @@
:on-zoom-fit handle-zoom-fit
:on-fullscreen toggle-fullscreen}]
(when (:can-edit permissions)
(when (:in-team permissions)
[:span {:on-click go-to-workspace
:class (stl/css :edit-btn)}
i/curve])
@ -191,7 +191,9 @@
:on-click toggle-fullscreen}
i/expand]
(when (:is-admin permissions)
(when (and
(:in-team permissions)
(:is-admin permissions))
[:button {:on-click open-share-dialog
:class (stl/css :share-btn)}
(tr "labels.share")])
@ -301,8 +303,8 @@
;; If the user doesn't have permission we disable the link
[:a {:class (stl/css :home-link)
:on-click go-to-dashboard
:style {:cursor (when-not (:can-edit permissions) "auto")
:pointer-events (when-not (:can-edit permissions) "none")}}
:style {:cursor (when-not (:in-team permissions) "auto")
:pointer-events (when-not (:in-team permissions) "none")}}
[:span {:class (stl/css :logo-icon)}
i/logo-icon]]
@ -321,7 +323,7 @@
:title (tr "viewer.header.interactions-section" (sc/get-tooltip :open-interactions))}
i/play]
(when (or (:can-edit permissions)
(when (or (:in-team permissions)
(= (:who-comment permissions) "all"))
[:button {:on-click navigate
:data-value "comments"