Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-10 00:40:30 -05:00
Code Issues Activity

✨ Make team leave & reassing as atomic operation.

Browse source
This commit is contained in:
Andrey Antukh 2021-11-25 11:27:35 +01:00 committed by Andrés Moya
parent b68d721b39
commit 54f8487b46
2 changed files with 42 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
backend/src/app/rpc/mutations/teams.clj
View file

@ -104,25 +104,52 @@
;; --- Mutation: Leave Team ;; --- Mutation: Leave Team
(s/def ::reassign-to ::us/uuid)
(s/def ::leave-team (s/def ::leave-team
(s/keys :req-un [::profile-id ::id])) (s/keys :req-un [::profile-id ::id]
:opt-un [::reassign-to]))
(sv/defmethod ::leave-team (sv/defmethod ::leave-team
[{:keys [pool] :as cfg} {:keys [id profile-id] :as params}] [{:keys [pool] :as cfg} {:keys [id profile-id reassign-to]}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(let [perms (teams/get-permissions conn profile-id id) (let [perms (teams/get-permissions conn profile-id id)
members (teams/retrieve-team-members conn id)] members (teams/retrieve-team-members conn id)]
(when (:is-owner perms) (cond
;; we can only proceed if there are more members in the team
;; besides the current profile
(<= (count members) 1)
(ex/raise :type :validation
:code :cant-leave-team
:context {:members (count members)})
;; if the `reassign-to` is filled and has a different value
;; than the current profile-id, we proceed to reassing the
;; owner role to profile identified by the `reassign-to`.
(and reassign-to (not= reassign-to profile-id))
(let [member (d/seek #(= reassign-to (:id %)) members)]
(when-not member
(ex/raise :type :not-found :code :member-does-not-exist))
;; unasign owner role to current profile
(db/update! conn :team-profile-rel
{:is-owner false}
{:team-id id
:profile-id profile-id})
;; assign owner role to new profile
(db/update! conn :team-profile-rel
(role->params :owner)
{:team-id id :profile-id reassign-to}))
;; and finally, if all other conditions does not match and the
;; current profile is owner, we dont allow it because there
;; must always be an owner.
(:is-owner perms)
(ex/raise :type :validation (ex/raise :type :validation
:code :owner-cant-leave-team :code :owner-cant-leave-team
:hint "releasing owner before leave")) :hint "releasing owner before leave"))
(when-not (> (count members) 1)
(ex/raise :type :validation
:code :cant-leave-team
:context {:members (count members)}))
(db/delete! conn :team-profile-rel (db/delete! conn :team-profile-rel
{:profile-id profile-id {:profile-id profile-id
:team-id id}) :team-id id})

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

@ -397,16 +397,13 @@
(let [{:keys [on-success on-error] (let [{:keys [on-success on-error]
:or {on-success identity :or {on-success identity
on-error rx/throw}} (meta params) on-error rx/throw}} (meta params)
team-id (:current-team-id state)] team-id (:current-team-id state)
(rx/concat params (cond-> {:id team-id}
(when (uuid? reassign-to) (uuid? reassign-to)
(->> (rp/mutation! :update-team-member-role {:team-id team-id (assoc :reassign-to reassign-to))]
:role :owner (->> (rp/mutation! :leave-team params)
:member-id reassign-to})
(rx/ignore)))
(->> (rp/mutation! :leave-team {:id team-id})
(rx/tap on-success) (rx/tap on-success)
(rx/catch on-error))))))) (rx/catch on-error))))))
(defn invite-team-member (defn invite-team-member
[{:keys [email role] :as params}] [{:keys [email role] :as params}]