3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-18 11:26:45 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix incorrect internal features handling on duplicating a file

Browse source 
Mainly because of incorrect collection of new features on file migration
when a file is duplicated. The original file is not touched.
This commit is contained in:
Andrey Antukh 2023-12-07 11:44:54 +01:00 • committed by Andrés Moya
parent 417366d998
commit 55f7656b77
1 changed files with 19 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,8 +19,9 @@
[app.loggers.webhooks :as-alias webhooks] [app.loggers.webhooks :as-alias webhooks]
[app.rpc :as-alias rpc] [app.rpc :as-alias rpc]
[app.rpc.commands.binfile :as binfile] [app.rpc.commands.binfile :as binfile]
[app.rpc.commands.files :as files]
[app.rpc.commands.projects :as proj] [app.rpc.commands.projects :as proj]
[app.rpc.commands.teams :as teams :refer [create-project-role create-project]] [app.rpc.commands.teams :as teams]
[app.rpc.doc :as-alias doc] [app.rpc.doc :as-alias doc]
[app.setup :as-alias setup] [app.setup :as-alias setup]
[app.setup.templates :as tmpl] [app.setup.templates :as tmpl]
@ -106,22 +107,23 @@
(update-fdata [fdata new-id] (update-fdata [fdata new-id]
(-> fdata (-> fdata
(blob/decode)
(assoc :id new-id) (assoc :id new-id)
(pmg/migrate-data) (pmg/migrate-data)
(update :pages-index relink-shapes) (update :pages-index relink-shapes)
(update :components relink-shapes) (update :components relink-shapes)
(update :media relink-media) (update :media relink-media)
(d/without-nils) (d/without-nils)
(feat.fdata/process-pointers pmap/clone) (feat.fdata/process-pointers pmap/clone)))]
(blob/encode)))]
(binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg id) (binding [pmap/*load-fn* (partial feat.fdata/load-pointer cfg id)
pmap/*tracked* (pmap/create-tracked)] pmap/*tracked* (pmap/create-tracked)
cfeat/*new* (atom #{})]
(let [new-id (get index id) (let [new-id (get index id)
file (-> file file (-> file
(assoc :id new-id) (assoc :id new-id)
(update :data update-fdata new-id))] (update :data update-fdata new-id)
(update :features into (deref cfeat/*new*))
(update :features cfeat/migrate-legacy-features))]
(feat.fdata/persist-pointers! cfg new-id) (feat.fdata/persist-pointers! cfg new-id)
file)))) file))))
@ -185,7 +187,11 @@
file (process-file cfg index file)] file (process-file cfg index file)]
(db/insert! conn :file file) (db/insert! conn :file
(-> file
(update :features #(db/create-array conn "text" %))
(update :data blob/encode)))
(db/insert! conn :file-profile-rel (db/insert! conn :file-profile-rel
{:file-id (:id file) {:file-id (:id file)
:profile-id profile-id :profile-id profile-id
@ -203,16 +209,13 @@
(defn duplicate-file (defn duplicate-file
[{:keys [::db/conn] :as cfg} {:keys [profile-id file-id] :as params}] [{:keys [::db/conn] :as cfg} {:keys [profile-id file-id] :as params}]
(let [file (db/get-by-id conn :file file-id) (let [;; We don't touch the original file on duplication
file (files/get-file cfg file-id :migrate? false)
index {file-id (uuid/next)} index {file-id (uuid/next)}
params (assoc params :index index :file file)] params (assoc params :index index :file file)]
(proj/check-edition-permissions! conn profile-id (:project-id file)) (proj/check-edition-permissions! conn profile-id (:project-id file))
(db/exec-one! conn ["SET CONSTRAINTS ALL DEFERRED"]) (db/exec-one! conn ["SET CONSTRAINTS ALL DEFERRED"])
(duplicate-file* cfg params {:reset-shared-flag true})))
;; FIXME: why we decode the data here?
(-> (duplicate-file* cfg params {:reset-shared-flag true})
(update :data blob/decode)
(update :features db/decode-pgarray #{}))))
;; --- COMMAND: Duplicate Project ;; --- COMMAND: Duplicate Project
@ -259,8 +262,8 @@
;; create the duplicated project and assign the current profile as ;; create the duplicated project and assign the current profile as
;; a project owner ;; a project owner
(create-project conn project) (teams/create-project conn project)
(create-project-role conn profile-id (:id project) :owner) (teams/create-project-role conn profile-id (:id project) :owner)
;; duplicate all files ;; duplicate all files
(let [index (reduce #(assoc %1 (:id %2) (uuid/next)) {} files) (let [index (reduce #(assoc %1 (:id %2) (uuid/next)) {} files)
@ -269,7 +272,7 @@
(assoc :project-id (:id project)) (assoc :project-id (:id project))
(assoc :index index))] (assoc :index index))]
(doseq [{:keys [id]} files] (doseq [{:keys [id]} files]
(let [file (db/get-by-id conn :file id) (let [file (files/get-file cfg id :migrate? false)
params (assoc params :file file) params (assoc params :file file)
opts {:reset-shared-flag false}] opts {:reset-shared-flag false}]
(duplicate-file* cfg params opts)))) (duplicate-file* cfg params opts))))