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

🐛 Fix feature validation on moving projects

Browse source
This commit is contained in:
Andrey Antukh 2023-12-13 16:17:58 +01:00
parent 2dbe7bca07
commit b19a6321de
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
backend/src/app/rpc/commands/management.clj
View file

@ -13,6 +13,7 @@
[app.common.files.migrations :as pmg] [app.common.files.migrations :as pmg]
[app.common.schema :as sm] [app.common.schema :as sm]
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[app.config :as cf]
[app.db :as db] [app.db :as db]
[app.features.fdata :as feat.fdata] [app.features.fdata :as feat.fdata]
[app.http.sse :as sse] [app.http.sse :as sse]
@ -283,7 +284,7 @@
;; --- COMMAND: Move file ;; --- COMMAND: Move file
(def sql:get-files (def sql:get-files
"select id, project_id from file where id = ANY(?)") "select id, features, project_id from file where id = ANY(?)")
(def sql:move-files (def sql:move-files
"update file set project_id = ? where id = ANY(?)") "update file set project_id = ? where id = ANY(?)")
@ -307,7 +308,8 @@
[{:keys [::db/conn] :as cfg} {:keys [profile-id ids project-id] :as params}] [{:keys [::db/conn] :as cfg} {:keys [profile-id ids project-id] :as params}]
(let [fids (db/create-array conn "uuid" ids) (let [fids (db/create-array conn "uuid" ids)
files (db/exec! conn [sql:get-files fids]) files (->> (db/exec! conn [sql:get-files fids])
(map files/decode-row))
source (into #{} (map :project-id) files) source (into #{} (map :project-id) files)
pids (->> (conj source project-id) pids (->> (conj source project-id)
(db/create-array conn "uuid"))] (db/create-array conn "uuid"))]
@ -327,7 +329,12 @@
;; Check the team compatibility ;; Check the team compatibility
(let [orig-team (teams/get-team conn :profile-id profile-id :project-id (first source)) (let [orig-team (teams/get-team conn :profile-id profile-id :project-id (first source))
dest-team (teams/get-team conn :profile-id profile-id :project-id project-id)] dest-team (teams/get-team conn :profile-id profile-id :project-id project-id)]
(cfeat/check-teams-compatibility! orig-team dest-team)) (cfeat/check-teams-compatibility! orig-team dest-team)
;; Check if all pending to move files are compaib
(let [features (cfeat/get-team-enabled-features cf/flags dest-team)]
(doseq [file files]
(cfeat/check-file-features! features (:features file)))))
;; move all files to the project ;; move all files to the project
(db/exec-one! conn [sql:move-files project-id fids]) (db/exec-one! conn [sql:move-files project-id fids])