Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-18 10:41:29 -05:00
Code Issues Activity

🐛 Fix incorrect team features handling on onboarding team creation

Browse source
This commit is contained in:
Andrey Antukh 2024-04-10 15:26:33 +02:00
parent 389c394f39
commit 347276fb4e
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
backend/src/app/rpc/commands/teams.clj
View file

@ -869,7 +869,12 @@
::sm/params schema:create-team-with-invitations}
[{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id emails role] :as params}]
(db/with-atomic [conn pool]
(let [params (assoc params :profile-id profile-id)
(let [features (-> (cfeat/get-enabled-features cf/flags)
(cfeat/check-client-features! (:features params)))
params (assoc params
:profile-id profile-id
:features features)
cfg (assoc cfg ::db/conn conn)
team (create-team cfg params)
profile (db/get-by-id conn :profile profile-id)

10
frontend/src/app/main/data/dashboard.cljs
View file

@ -425,11 +425,11 @@
(let [{:keys [on-success on-error]
:or {on-success identity
on-error rx/throw}} (meta params)
features (features/get-enabled-features state)]
params {:name name
:emails #{emails}
:role role
:features features}
features (features/get-enabled-features state)
params {:name name
:emails emails
:role role
:features features}]
(->> (rp/cmd! :create-team-with-invitations params)
(rx/tap on-success)
(rx/map team-created)

4
frontend/src/app/main/ui/onboarding/team_choice.cljs
View file

@ -154,7 +154,7 @@
params (:clean-data @form)
emails (:emails params)
roles (mf/use-memo #(get-available-roles))
roles (mf/use-memo get-available-roles)
on-success
(mf/use-fn
@ -168,7 +168,7 @@
on-error
(mf/use-fn
(fn [_form _response]
(fn [_form _cause]
(st/emit! (msg/error "Error on creating team."))))
;; The SKIP branch only creates the team, without invitations