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

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

Browse source
This commit is contained in:
Andrey Antukh 2025-06-18 10:39:23 +02:00
commit 88ed08916e
12 changed files with 149 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -65,6 +65,7 @@ on-premises instances** that want to keep up to date.
- Misalignments at Create account [Taiga #11315](https://tree.taiga.io/project/penpot/issue/11315)
- Fix issue with importing files where flex/grid is used [Taiga #11334](https://tree.taiga.io/project/penpot/issue/11334)
- Fix wrong color in the export progress bar [Taiga #11299](https://tree.taiga.io/project/penpot/issue/11299)
- Fix right sidebar width overflow on long layer names [Taiga #11212](https://tree.taiga.io/project/penpot/issue/11212)
## 2.7.2

20
backend/src/app/rpc/commands/auth.clj
View file

@ -231,13 +231,14 @@
:hint "email has complaint reports")))
(defn prepare-register
[{:keys [::db/pool] :as cfg} {:keys [email accept-newsletter-updates] :as params}]
[{:keys [::db/pool] :as cfg} {:keys [fullname email accept-newsletter-updates] :as params}]
(validate-register-attempt! cfg params)
(let [email (profile/clean-email email)
profile (profile/get-profile-by-email pool email)
params {:email email
:fullname fullname
:password (:password params)
:invitation-token (:invitation-token params)
:backend "penpot"
@ -254,8 +255,10 @@
(def schema:prepare-register-profile
[:map {:title "prepare-register-profile"}
[:fullname ::sm/text]
[:email ::sm/email]
[:password schema:password]
[:create-welcome-file {:optional true} :boolean]
[:invitation-token {:optional true} schema:token]])
(sv/defmethod ::prepare-register-profile
@ -359,13 +362,9 @@
:extra-data ptoken})))
(defn register-profile
[{:keys [::db/conn ::wrk/executor] :as cfg} {:keys [token fullname theme] :as params}]
(let [theme (when (= theme "light") theme)
claims (tokens/verify (::setup/props cfg) {:token token :iss :prepared-register})
params (-> claims
(into params)
(assoc :fullname fullname)
(assoc :theme theme))
[{:keys [::db/conn ::wrk/executor] :as cfg} {:keys [token] :as params}]
(let [claims (tokens/verify (::setup/props cfg) {:token token :iss :prepared-register})
params (into claims params)
profile (if-let [profile-id (:profile-id claims)]
(profile/get-profile conn profile-id)
@ -479,10 +478,7 @@
(def schema:register-profile
[:map {:title "register-profile"}
[:token schema:token]
[:fullname [::sm/word-string {:max 100}]]
[:theme {:optional true} [:string {:max 10}]]
[:create-welcome-file {:optional true} :boolean]])
[:token schema:token]])
(sv/defmethod ::register-profile
{::rpc/auth false

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

@ -379,15 +379,14 @@
(t/deftest prepare-register-and-register-profile-1
(let [data {::th/type :prepare-register-profile
:email "user@example.com"
:fullname "foobar"
:password "foobar"}
out (th/command! data)
token (get-in out [:result :token])]
(t/is (string? token))
;; try register without token
(let [data {::th/type :register-profile
:fullname "foobar"
:accept-terms-and-privacy true}
(let [data {::th/type :register-profile}
out (th/command! data)]
;; (th/print-result! out)
(let [error (:error out)]
@ -398,11 +397,8 @@
;; try correct register
(let [data {::th/type :register-profile
:token token
:fullname "foobar"
:utm_campaign "utma"
:mtm_campaign "mtma"
:accept-terms-and-privacy true
:accept-newsletter-subscription true}]
:mtm_campaign "mtma"}]
(let [{:keys [result error]} (th/command! data)]
(t/is (nil? error))))
@ -424,6 +420,7 @@
;; PREPARE REGISTER
(let [data {::th/type :prepare-register-profile
:email "hello@example.com"
:fullname "foobar"
:password "foobar"}
out (th/command! data)
token (get-in out [:result :token])]
@ -432,10 +429,7 @@
;; DO REGISTRATION
(let [data {::th/type :register-profile
:token @current-token
:fullname "foobar"
:accept-terms-and-privacy true
:accept-newsletter-subscription true}
:token @current-token}
out (th/command! data)]
(t/is (nil? (:error out)))
(t/is (= 1 (:call-count @mock))))
@ -445,6 +439,7 @@
;; PREPARE REGISTER: second attempt
(let [data {::th/type :prepare-register-profile
:email "hello@example.com"
:fullname "foobar"
:password "foobar"}
out (th/command! data)
token (get-in out [:result :token])]
@ -479,6 +474,7 @@
;; PREPARE REGISTER
(let [data {::th/type :prepare-register-profile
:email "hello@example.com"
:fullname "foobar"
:password "foobar"}
out (th/command! data)
token (get-in out [:result :token])]
@ -487,10 +483,7 @@
;; DO REGISTRATION
(let [data {::th/type :register-profile
:token @current-token
:fullname "foobar"
:accept-terms-and-privacy true
:accept-newsletter-subscription true}
:token @current-token}
out (th/command! data)]
(t/is (nil? (:error out)))
(t/is (= 1 (:call-count @mock))))
@ -504,6 +497,7 @@
;; PREPARE REGISTER: second attempt
(let [data {::th/type :prepare-register-profile
:email "hello@example.com"
:fullname "foobar"
:password "foobar"}
out (th/command! data)
token (get-in out [:result :token])]
@ -514,10 +508,7 @@
:return true}]
;; DO REGISTRATION: second attempt
(let [data {::th/type :register-profile
:token @current-token
:fullname "foobar"
:accept-terms-and-privacy true
:accept-newsletter-subscription true}
:token @current-token}
out (th/command! data)]
(t/is (nil? (:error out)))
(t/is (= 0 (:call-count @mock))))))))
@ -532,6 +523,7 @@
:member-email "user@example.com"})
data {::th/type :prepare-register-profile
:invitation-token itoken
:fullname "foobar"
:email "user@example.com"
:password "foobar"}
@ -542,8 +534,7 @@
(let [rtoken (:token result)
data {::th/type :register-profile
:token rtoken
:fullname "foobar"}
:token rtoken}
{:keys [result error] :as out} (th/command! data)]
;; (th/print-result! out)
@ -563,6 +554,7 @@
data {::th/type :prepare-register-profile
:invitation-token itoken
:email "user@example.com"
:fullname "foobar"
:password "foobar"}
out (th/command! data)]
@ -582,6 +574,7 @@
:member-email "user@example.com"})
data {::th/type :prepare-register-profile
:invitation-token itoken
:fullname "foobar"
:email "user@example.com"
:password "foobar"}
out (th/command! data)]
@ -604,6 +597,7 @@
data {::th/type :prepare-register-profile
:invitation-token itoken
:email "user@example.com"
:fullname "foobar"
:password "foobar"}
out (th/command! data)]
@ -624,6 +618,7 @@
data {::th/type :prepare-register-profile
:invitation-token itoken
:fullname "foobar"
:email "user@example.com"
:password "foobar"}
out (th/command! data)]
@ -636,6 +631,7 @@
(t/deftest prepare-register-with-registration-disabled
(with-redefs [app.config/flags #{}]
(let [data {::th/type :prepare-register-profile
:fullname "foobar"
:email "user@example.com"
:password "foobar"}
out (th/command! data)]
@ -648,6 +644,7 @@
(t/deftest prepare-register-with-existing-user
(let [profile (th/create-profile* 1)
data {::th/type :prepare-register-profile
:fullname "foobar"
:email (:email profile)
:password "foobar"}
out (th/command! data)]
@ -660,6 +657,7 @@
(let [pool (:app.db/pool th/*system*)
data {::th/type :prepare-register-profile
:fullname "foobar"
:email "user@example.com"
:password "foobar"}]
@ -674,6 +672,7 @@
(t/deftest register-profile-with-complained-email
(let [pool (:app.db/pool th/*system*)
data {::th/type :prepare-register-profile
:fullname "foobar"
:email "user@example.com"
:password "foobar"}]
@ -688,6 +687,7 @@
(t/deftest register-profile-with-email-as-password
(let [data {::th/type :prepare-register-profile
:fullname "foobar"
:email "user@example.com"
:password "USER@example.com"}
out (th/command! data)]

7
common/src/app/common/types/color.cljc
View file

@ -22,7 +22,7 @@
;; SCHEMAS & TYPES
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(def valid-color-attrs
(def ^:private required-color-attrs
"A set used for proper check if color should contain only one of the
attrs listed in this set."
#{:image :gradient :color})
@ -31,7 +31,7 @@
"Check if color has correct color attrs"
[color]
(let [attrs (set (keys color))
result (set/intersection attrs valid-color-attrs)]
result (set/intersection attrs required-color-attrs)]
(= 1 (count result))))
(def ^:private hex-color-rx
@ -126,6 +126,9 @@
(sm/optional-keys schema:image-color)]
[:fn has-valid-color-attrs?]])
(def color-attrs
(into required-color-attrs (sm/keys schema:color-attrs)))
(def schema:library-color-attrs
[:map {:title "ColorAttrs" :closed true}
[:id ::sm/uuid]

2
common/src/app/common/types/path/helpers.cljc
View file

@ -98,7 +98,7 @@
(defn segment->point
([segment] (segment->point segment :x))
([segment coord]
(let [params (get segment :params)]
(when-let [params (get segment :params)]
(case coord
:c1 (gpt/point (get params :c1x)
(get params :c1y))

45
common/src/app/common/types/path/segment.cljc
View file

@ -363,7 +363,7 @@
(defn make-curve-point
"Changes the content to make the point a 'curve'. The handlers will be
positioned in the same vector that results from the previous->next
points but with fixed length."
points but with fixed length; return a plain segments vector"
[content point]
(let [;; We perform this operation before because it can be
@ -372,15 +372,19 @@
indices
(point-indices content point)
;; We transform content to a plain format for execute the
;; algorithm because right now is the only way to execute it
content
(vec content)
vectors
(map (fn [index]
(let [segment (nth content index)
(let [segment (get content index)
prev-i (dec index)
prev (when (not (= :move-to (:command segment)))
(get content prev-i))
next-i (inc index)
next (get content next-i)
next (when (not (= :move-to (:command next)))
next)]
{:index index
@ -394,14 +398,8 @@
indices)
points
(into #{} xf:mapcat-points vectors)
(into #{} xf:mapcat-points vectors)]
;; We transform content to a plain format for execute the
;; algorithm because right now is the only way to execute it
content
(vec content)
content
(if (= (count points) 2)
(let [[fpoint spoint] (vec points)
v1 (gpt/to-vec fpoint point)
@ -466,9 +464,7 @@
(= :curve-to (:command next-c))
(update next-i #(line->curve point %))))]
(reduce add-curve content vectors)))]
(impl/from-plain content)))
(reduce add-curve content vectors)))))
(defn get-segments-with-points
"Given a content and a set of points return all the segments in the path
@ -628,27 +624,38 @@
(rest content))))))))
(defn join-nodes
"Creates new segments between points that weren't previously"
"Creates new segments between points that weren't previously.
Returns plain segments vector."
[content points]
(let [segments-set (into #{}
(let [;; Materialize the content to a vector (plain format)
content
(vec content)
segments-set
(into #{}
(map (juxt :start :end))
(get-segments-with-points content points))
create-line-command (fn [point other]
create-line-segment
(fn [point other]
[(helpers/make-move-to point)
(helpers/make-line-to other)])
not-segment? (fn [point other] (and (not (contains? segments-set [point other]))
not-segment?
(fn [point other]
(and (not (contains? segments-set [point other]))
(not (contains? segments-set [other point]))))
new-content (->> (d/map-perm create-line-command not-segment? points)
;; FIXME: implement map-perm in terms of transducer, will
;; improve performance and remove the need to use flatten
new-content
(->> (d/map-perm create-line-segment not-segment? points)
(flatten)
(into []))]
(into content new-content)))
(defn separate-nodes
"Removes the segments between the points given"
[content points]

2
exporter/src/app/handlers/export_shapes.cljs
View file

@ -141,7 +141,7 @@
proc (-> (p/do
(p/loop [exports (seq exports)]
(when-let [export (-> (first exports)
(when-let [export (some-> (first exports)
(assoc :skip-children skip-children))]
(p/do
(rd/render export append)

32
frontend/src/app/main/ui/auth/register.cljs
View file

@ -82,7 +82,7 @@
on-error
(mf/use-fn
(fn [form cause]
(fn [cause]
(let [{:keys [type code] :as edata} (ex-data cause)]
(condp = [type code]
[:restriction :registration-disabled]
@ -101,7 +101,10 @@
(swap! form assoc-in [:errors :password]
{:message (tr "errors.email-as-password")})
(st/emit! (ntf/error (tr "errors.generic")))))))
(do
(when-let [explain (get edata :explain)]
(println explain))
(st/emit! (ntf/error (tr "errors.generic"))))))))
on-success
(mf/use-fn
@ -109,10 +112,9 @@
(fn [params]
(if (fn? on-success-callback)
(on-success-callback (:email params))
(cond
(some? (:token params))
(let [token (:token params)]
(some? (:invitation-token params))
(let [token (:invitation-token params)]
(st/emit! (rt/nav :auth-verify-token {:token token})))
(:is-active params)
@ -126,25 +128,25 @@
on-register-profile
(mf/use-fn
(mf/deps on-success on-error)
(fn [form]
(fn [params]
(reset! submitted? true)
(let [create-welcome-file?
(cf/external-feature-flag "onboarding-03" "test")
params
(cond-> form
create-welcome-file? (assoc :create-welcome-file true))]
(->> (rp/cmd! :register-profile params)
(rx/subs! on-success on-error #(reset! submitted? false))))))
(rx/subs! on-success on-error #(reset! submitted? false)))))
on-submit
(mf/use-fn
(mf/deps on-success-callback)
(fn [form _event]
(reset! submitted? true)
(let [cdata (:clean-data @form)]
(let [create-welcome-file?
(cf/external-feature-flag "onboarding-03" "test")
cdata
(cond-> (:clean-data @form)
create-welcome-file?
(assoc :create-welcome-file true))]
(->> (rp/cmd! :prepare-register-profile cdata)
(rx/map #(merge % cdata))
(rx/finalize #(reset! submitted? false))
(rx/subs! on-register-profile)))))]

2
frontend/src/app/main/ui/inspect/right_sidebar.scss
View file

@ -35,7 +35,7 @@
.shape-row {
display: grid;
grid-template-columns: auto 1fr;
grid-template-columns: auto minmax(0, 1fr);
gap: $s-8;
align-items: center;
height: $s-32;

2
frontend/src/app/main/ui/settings/options.cljs
View file

@ -41,7 +41,7 @@
(update :lang #(or % ""))
(update :theme #(if (= % "default")
"dark"
%))))
(or % "dark")))))
form (fm/use-form :schema schema:options-form
:initial initial)]

2
frontend/src/app/main/ui/workspace/sidebar.scss
View file

@ -63,7 +63,7 @@ $width-settings-bar-max: $sz-500;
.right-settings-bar {
grid-area: right-sidebar;
display: grid;
grid-template-rows: auto 1fr;
grid-template-rows: auto minmax(0, 1fr);
height: 100vh;
width: $width-settings-bar;
background-color: var(--panel-background-color);

4
frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs
View file

@ -10,6 +10,7 @@
[app.common.colors :as cc]
[app.common.data :as d]
[app.common.data.macros :as dm]
[app.common.types.color :as types.color]
[app.common.types.shape.attrs :refer [default-color]]
[app.main.data.modal :as modal]
[app.main.data.workspace.colors :as dwc]
@ -125,7 +126,8 @@
(fn [value]
(let [color (-> color
(assoc :opacity (/ value 100))
(dissoc :ref-id :ref-file))]
(dissoc :ref-id :ref-file)
(select-keys types.color/color-attrs))]
(st/emit! (dwc/add-recent-color color)
(on-change color)))))