Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-09 08:38:15 -05:00
Code Issues Activity

🐛 Fix validate and repair for orphan shapes

Browse source
This commit is contained in:
Alejandro Alonso 2023-11-20 11:14:20 +01:00 • committed by Andrey Antukh
parent 411499942c
commit 708c615c12
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/src/app/common/files/repair.cljc
View file

@ -72,7 +72,7 @@
(fn [parent-shape] (fn [parent-shape]
; Remove child shape from children list ; Remove child shape from children list
(log/debug :hint " -> Remove child " :child-id (:child-id args)) (log/debug :hint " -> Remove child " :child-id (:child-id args))
(update parent-shape :shapes d/removev #(= % (:child-id args))))] (update parent-shape :shapes (partial d/removev #(= % (:child-id args)))))]
(log/info :hint "Repairing shape :child-not-found" :id (:id shape) :name (:name shape) :page-id page-id) (log/info :hint "Repairing shape :child-not-found" :id (:id shape) :name (:name shape) :page-id page-id)
(-> (pcb/empty-changes nil page-id) (-> (pcb/empty-changes nil page-id)

13
common/src/app/common/files/validate.cljc
View file

@ -64,7 +64,7 @@
(def ^:dynamic *errors* nil) (def ^:dynamic *errors* nil)
(defn report-error! (defn report-error!
[code hint shape file page & args] [code hint shape file page & {:as args}]
(if (some? *errors*) (if (some? *errors*)
(vswap! *errors* conj {:code code (vswap! *errors* conj {:code code
:hint hint :hint hint
@ -122,11 +122,12 @@
shape file page))) shape file page)))
(doseq [child-id (:shapes shape)] (doseq [child-id (:shapes shape)]
(when (nil? (ctst/get-shape page child-id)) (let [child (ctst/get-shape page child-id)]
(report-error! :child-not-found (when (or (nil? child) (not= (:parent-id child) (:id shape)))
(str/ffmt "Child % not found" child-id) (report-error! :child-not-found
shape file page (str/ffmt "Child % not found" child-id)
:child-id child-id))))))) shape file page
:child-id child-id))))))))
(defn validate-frame! (defn validate-frame!
"Validate that the frame-id shape exists and is indeed a frame. Also "Validate that the frame-id shape exists and is indeed a frame. Also