3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-04-29 19:06:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Andrey Antukh 2025-04-24 15:11:12 +02:00
commit 050692952e
2 changed files with 142 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.md
View file

@ -48,7 +48,7 @@
- Increase the height of the right sidebar dropdowns [Taiga #10615](https://tree.taiga.io/project/penpot/issue/10615) - Increase the height of the right sidebar dropdowns [Taiga #10615](https://tree.taiga.io/project/penpot/issue/10615)
- Fix scroll on token themes modal [Taiga #10745](https://tree.taiga.io/project/penpot/issue/10745) - Fix scroll on token themes modal [Taiga #10745](https://tree.taiga.io/project/penpot/issue/10745)
- Fix collapsing grouped sets in "edit Theme" closes the dialog [Taiga #10771](https://tree.taiga.io/project/penpot/issue/10771) - Fix collapsing grouped sets in "edit Theme" closes the dialog [Taiga #10771](https://tree.taiga.io/project/penpot/issue/10771)
- Fix unexpected exception on path editor on merge segments when undo stack is empty - Fix unexpected exception on path editor on merge segments when undo stack is empty
- Fix pricing CTA to be under a config flag [Taiga #10808](https://tree.taiga.io/project/penpot/issue/10808) - Fix pricing CTA to be under a config flag [Taiga #10808](https://tree.taiga.io/project/penpot/issue/10808)
- Fix allow moving a main component into another [Taiga #10818](https://tree.taiga.io/project/penpot/issue/10818) - Fix allow moving a main component into another [Taiga #10818](https://tree.taiga.io/project/penpot/issue/10818)

259
common/src/app/common/files/migrations.cljc
View file

@ -121,9 +121,9 @@
(into [] shapes) (into [] shapes)
shapes)))) shapes))))
(update-page [page] (update-page [page]
(update page :objects update-vals update-object))] (update page :objects d/update-vals update-object))]
(update data :pages-index update-vals update-page))) (update data :pages-index d/update-vals update-page)))
(defmethod migrate-data "legacy-3" (defmethod migrate-data "legacy-3"
[data _] [data _]
@ -174,9 +174,9 @@
(fix-empty-points))) (fix-empty-points)))
(update-page [page] (update-page [page]
(update page :objects update-vals update-object))] (update page :objects d/update-vals update-object))]
(update data :pages-index update-vals update-page))) (update data :pages-index d/update-vals update-page)))
;; Put the id of the local file in :component-file in instances of ;; Put the id of the local file in :component-file in instances of
;; local components ;; local components
@ -189,9 +189,9 @@
object)) object))
(update-page [page] (update-page [page]
(update page :objects update-vals update-object))] (update page :objects d/update-vals update-object))]
(update data :pages-index update-vals update-page))) (update data :pages-index d/update-vals update-page)))
;; Fixes issues with selrect/points for shapes with width/height = ;; Fixes issues with selrect/points for shapes with width/height =
;; 0 (line-like paths) ;; 0 (line-like paths)
@ -214,11 +214,11 @@
shape)) shape))
(update-container [container] (update-container [container]
(update container :objects update-vals fix-line-paths))] (update container :objects d/update-vals fix-line-paths))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
;; Remove interactions pointing to deleted frames ;; Remove interactions pointing to deleted frames
(defmethod migrate-data "legacy-7" (defmethod migrate-data "legacy-7"
@ -229,9 +229,9 @@
(filterv #(get-in page [:objects (:destination %)]) interactions)))) (filterv #(get-in page [:objects (:destination %)]) interactions))))
(update-page [page] (update-page [page]
(update page :objects update-vals (partial update-object page)))] (update page :objects d/update-vals (partial update-object page)))]
(update data :pages-index update-vals update-page))) (update data :pages-index d/update-vals update-page)))
;; Remove groups without any shape, both in pages and components ;; Remove groups without any shape, both in pages and components
(defmethod migrate-data "legacy-8" (defmethod migrate-data "legacy-8"
@ -271,8 +271,8 @@
(assoc container :objects objects)))))] (assoc container :objects objects)))))]
(-> data (-> data
(update :pages-index update-vals clean-container) (update :pages-index d/update-vals clean-container)
(update :components update-vals clean-container)))) (d/update-when :components d/update-vals clean-container))))
(defmethod migrate-data "legacy-9" (defmethod migrate-data "legacy-9"
[data _] [data _]
@ -306,7 +306,7 @@
[data _] [data _]
(letfn [(update-page [page] (letfn [(update-page [page]
(d/update-in-when page [:objects uuid/zero] dissoc :points :selrect))] (d/update-in-when page [:objects uuid/zero] dissoc :points :selrect))]
(update data :pages-index update-vals update-page))) (update data :pages-index d/update-vals update-page)))
(defmethod migrate-data "legacy-11" (defmethod migrate-data "legacy-11"
[data _] [data _]
@ -320,7 +320,7 @@
(update page :objects (fn [objects] (update page :objects (fn [objects]
(update-vals objects (partial update-object objects)))))] (update-vals objects (partial update-object objects)))))]
(update data :pages-index update-vals update-page))) (update data :pages-index d/update-vals update-page)))
(defmethod migrate-data "legacy-12" (defmethod migrate-data "legacy-12"
[data _] [data _]
@ -330,9 +330,9 @@
(assoc :size nil))) (assoc :size nil)))
(update-page [page] (update-page [page]
(d/update-in-when page [:options :saved-grids] update-vals update-grid))] (d/update-in-when page [:options :saved-grids] d/update-vals update-grid))]
(update data :pages-index update-vals update-page))) (update data :pages-index d/update-vals update-page)))
;; Add rx and ry to images ;; Add rx and ry to images
(defmethod migrate-data "legacy-13" (defmethod migrate-data "legacy-13"
@ -350,9 +350,9 @@
(fix-radius))) (fix-radius)))
(update-page [page] (update-page [page]
(update page :objects update-vals update-object))] (update page :objects d/update-vals update-object))]
(update data :pages-index update-vals update-page))) (update data :pages-index d/update-vals update-page)))
(defmethod migrate-data "legacy-14" (defmethod migrate-data "legacy-14"
[data _] [data _]
@ -382,8 +382,8 @@
container))] container))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-16" (defmethod migrate-data "legacy-16"
[data _] [data _]
@ -425,11 +425,11 @@
(assign-fills))) (assign-fills)))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-17" (defmethod migrate-data "legacy-17"
[data _] [data _]
@ -454,11 +454,11 @@
(assoc :fills []))) (assoc :fills [])))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
;; Remove position-data to solve a bug with the text positioning ;; Remove position-data to solve a bug with the text positioning
(defmethod migrate-data "legacy-18" (defmethod migrate-data "legacy-18"
@ -469,11 +469,11 @@
(dissoc :position-data))) (dissoc :position-data)))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-19" (defmethod migrate-data "legacy-19"
[data _] [data _]
@ -485,11 +485,11 @@
(dissoc :position-data))) (dissoc :position-data)))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-25" (defmethod migrate-data "legacy-25"
[data _] [data _]
@ -501,10 +501,10 @@
(update :selrect grc/make-rect) (update :selrect grc/make-rect)
(cts/create-shape)))) (cts/create-shape))))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-26" (defmethod migrate-data "legacy-26"
[data _] [data _]
@ -517,11 +517,11 @@
(assoc :transform-inverse (gmt/matrix)))) (assoc :transform-inverse (gmt/matrix))))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-27" (defmethod migrate-data "legacy-27"
[data _] [data _]
@ -548,11 +548,11 @@
(dissoc :saved-component-root?)))) (dissoc :saved-component-root?))))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-28" (defmethod migrate-data "legacy-28"
[data _] [data _]
@ -577,8 +577,8 @@
(d/update-when container :objects #(update-vals % (partial update-object %))))] (d/update-when container :objects #(update-vals % (partial update-object %))))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-29" (defmethod migrate-data "legacy-29"
[data _] [data _]
@ -609,11 +609,11 @@
(update :content #(txt/transform-nodes invalid-node? fix-node %))))) (update :content #(txt/transform-nodes invalid-node? fix-node %)))))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-31" (defmethod migrate-data "legacy-31"
[data _] [data _]
@ -624,10 +624,10 @@
(dissoc :use-for-thumbnail?)))) (dissoc :use-for-thumbnail?))))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-32" (defmethod migrate-data "legacy-32"
[data _] [data _]
@ -642,11 +642,11 @@
object))) object)))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-33" (defmethod migrate-data "legacy-33"
[data _] [data _]
@ -664,9 +664,9 @@
object)) object))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container)))) (update :pages-index d/update-vals update-container))))
(defmethod migrate-data "legacy-34" (defmethod migrate-data "legacy-34"
[data _] [data _]
@ -676,10 +676,10 @@
(dissoc object :x :y :width :height) (dissoc object :x :y :width :height)
object)) object))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-36" (defmethod migrate-data "legacy-36"
[data _] [data _]
@ -689,8 +689,8 @@
(dissoc objects nil) (dissoc objects nil)
objects))))] objects))))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-37" (defmethod migrate-data "legacy-37"
[data _] [data _]
@ -718,11 +718,11 @@
shape))) shape)))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-shape))] (d/update-when container :objects d/update-vals update-shape))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-39" (defmethod migrate-data "legacy-39"
[data _] [data _]
@ -740,11 +740,11 @@
shape)) shape))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-shape))] (d/update-when container :objects d/update-vals update-shape))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-40" (defmethod migrate-data "legacy-40"
[data _] [data _]
@ -764,11 +764,11 @@
shape)) shape))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-shape))] (d/update-when container :objects d/update-vals update-shape))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-41" (defmethod migrate-data "legacy-41"
[data _] [data _]
@ -797,11 +797,11 @@
shape)) shape))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-shape))] (d/update-when container :objects d/update-vals update-shape))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-42" (defmethod migrate-data "legacy-42"
[data _] [data _]
@ -814,11 +814,11 @@
object)) object))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(def ^:private valid-fill? (def ^:private valid-fill?
(sm/lazy-validator ::cts/fill)) (sm/lazy-validator ::cts/fill))
@ -843,11 +843,11 @@
object)) object))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-44" (defmethod migrate-data "legacy-44"
[data _] [data _]
@ -864,10 +864,10 @@
(d/update-when object :shadow #(into [] xform %)))) (d/update-when object :shadow #(into [] xform %))))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-45" (defmethod migrate-data "legacy-45"
[data _] [data _]
@ -880,9 +880,9 @@
:parent-id parent-id))) :parent-id parent-id)))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals fix-shape))] (d/update-when container :objects d/update-vals fix-shape))]
(-> data (-> data
(update :pages-index update-vals update-container)))) (update :pages-index d/update-vals update-container))))
(defmethod migrate-data "legacy-46" (defmethod migrate-data "legacy-46"
[data _] [data _]
@ -890,10 +890,10 @@
(dissoc object :thumbnail)) (dissoc object :thumbnail))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-47" (defmethod migrate-data "legacy-47"
[data _] [data _]
@ -914,9 +914,9 @@
shape))) shape)))
(update-page [page] (update-page [page]
(d/update-when page :objects update-vals (partial fix-shape page)))] (d/update-when page :objects d/update-vals (partial fix-shape page)))]
(-> data (-> data
(update :pages-index update-vals update-page)))) (update :pages-index d/update-vals update-page))))
(defmethod migrate-data "legacy-48" (defmethod migrate-data "legacy-48"
[data _] [data _]
@ -928,9 +928,9 @@
shape))) shape)))
(update-page [page] (update-page [page]
(d/update-when page :objects update-vals fix-shape))] (d/update-when page :objects d/update-vals fix-shape))]
(-> data (-> data
(update :pages-index update-vals update-page)))) (update :pages-index d/update-vals update-page))))
;; Remove hide-in-viewer for shapes that are origin or destination of an interaction ;; Remove hide-in-viewer for shapes that are origin or destination of an interaction
(defmethod migrate-data "legacy-49" (defmethod migrate-data "legacy-49"
@ -948,9 +948,9 @@
(mapcat :interactions) (mapcat :interactions)
(map :destination) (map :destination)
(set))] (set))]
(update page :objects update-vals (partial update-object destinations))))] (update page :objects d/update-vals (partial update-object destinations))))]
(update data :pages-index update-vals update-page))) (update data :pages-index d/update-vals update-page)))
;; This migration mainly fixes paths with curve-to segments ;; This migration mainly fixes paths with curve-to segments
;; without :c1x :c1y :c2x :c2y properties. Additionally, we found a ;; without :c1x :c1y :c2x :c2y properties. Additionally, we found a
@ -993,11 +993,11 @@
update-container update-container
(fn [page] (fn [page]
(d/update-when page :objects update-vals update-shape))] (d/update-when page :objects d/update-vals update-shape))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(def ^:private valid-color? (def ^:private valid-color?
(sm/lazy-validator ::ctc/color)) (sm/lazy-validator ::ctc/color))
@ -1017,9 +1017,9 @@
shape)) shape))
(update-page [page] (update-page [page]
(d/update-when page :objects update-vals update-shape))] (d/update-when page :objects d/update-vals update-shape))]
(update data :pages-index update-vals update-page))) (update data :pages-index d/update-vals update-page)))
(defmethod migrate-data "legacy-53" (defmethod migrate-data "legacy-53"
@ -1039,11 +1039,11 @@
(d/update-when shape :shadow #(into [] xform %)))) (d/update-when shape :shadow #(into [] xform %))))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-shape))] (d/update-when container :objects d/update-vals update-shape))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
;; This migration moves page options to the page level ;; This migration moves page options to the page level
(defmethod migrate-data "legacy-55" (defmethod migrate-data "legacy-55"
@ -1095,11 +1095,11 @@
(update :content (partial txt/transform-nodes identity fix-fills))))) (update :content (partial txt/transform-nodes identity fix-fills)))))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-57" (defmethod migrate-data "legacy-57"
@ -1126,7 +1126,7 @@
(-> data (-> data
(update :pages (fn [pages] (into [] (remove nil?) pages))) (update :pages (fn [pages] (into [] (remove nil?) pages)))
(update :pages-index dissoc nil) (update :pages-index dissoc nil)
(update :pages-index update-vals update-page)))) (update :pages-index d/update-vals update-page))))
(defmethod migrate-data "legacy-59" (defmethod migrate-data "legacy-59"
[data _] [data _]
@ -1137,11 +1137,11 @@
(d/update-when shape :touched #(into #{} (map fix-touched) %))) (d/update-when shape :touched #(into #{} (map fix-touched) %)))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-shape))] (d/update-when container :objects d/update-vals update-shape))]
(-> data (-> data
(update :pages-index update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-62" (defmethod migrate-data "legacy-62"
[data _] [data _]
@ -1174,7 +1174,7 @@
;; so the relevant objects are inside the component ;; so the relevant objects are inside the component
(d/update-when component :objects remove-cycles))] (d/update-when component :objects remove-cycles))]
(update data :components update-vals update-component))) (d/update-when data :components d/update-vals update-component)))
(defmethod migrate-data "legacy-65" (defmethod migrate-data "legacy-65"
[data _] [data _]
@ -1185,14 +1185,14 @@
update-page update-page
(fn [page] (fn [page]
(-> (update-object page) (-> (update-object page)
(update :objects update-vals update-object)))] (update :objects d/update-vals update-object)))]
(-> data (-> data
(update-object) (update-object)
(d/update-when :pages-index update-vals update-page) (update :pages-index d/update-vals update-page)
(d/update-when :colors update-vals update-object) (d/update-when :colors d/update-vals update-object)
(d/update-when :typographies update-vals update-object) (d/update-when :typographies d/update-vals update-object)
(d/update-when :components update-vals update-object)))) (d/update-when :components d/update-vals update-object))))
(defmethod migrate-data "legacy-66" (defmethod migrate-data "legacy-66"
[data _] [data _]
@ -1210,7 +1210,7 @@
(-> data (-> data
(update :pages-index d/update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components d/update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "legacy-67" (defmethod migrate-data "legacy-67"
[data _] [data _]
@ -1218,11 +1218,11 @@
(d/update-when object :shadow #(into [] (reverse %)))) (d/update-when object :shadow #(into [] (reverse %))))
(update-container [container] (update-container [container]
(d/update-when container :objects update-vals update-object))] (d/update-when container :objects d/update-vals update-object))]
(-> data (-> data
(update :pages-index d/update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components d/update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "0001-remove-tokens-from-groups" (defmethod migrate-data "0001-remove-tokens-from-groups"
[data _] [data _]
@ -1262,7 +1262,7 @@
(-> data (-> data
(update :pages-index d/update-vals update-container) (update :pages-index d/update-vals update-container)
(update :components d/update-vals update-container)))) (d/update-when :components d/update-vals update-container))))
(defmethod migrate-data "0002-normalize-bool-content" (defmethod migrate-data "0002-normalize-bool-content"
[data _] [data _]
@ -1284,6 +1284,28 @@
(update :pages-index update-vals update-container) (update :pages-index update-vals update-container)
(update :components update-vals update-container)))) (update :components update-vals update-container))))
(defmethod migrate-data "0003-fix-root-shape"
[data _]
(letfn [(update-object [shape]
(if (= (:id shape) uuid/zero)
(-> shape
(assoc :parent-id uuid/zero)
(assoc :frame-id uuid/zero)
;; We explicitly dissoc them and let the shape-setup
;; to regenerate it with valid values.
(dissoc :selrect)
(dissoc :points)
(cts/setup-shape))
shape))
(update-container [container]
(d/update-when container :objects d/update-vals update-object))]
(-> data
(update :pages-index d/update-vals update-container)
(d/update-when :components d/update-vals update-container)
(d/without-nils))))
(def available-migrations (def available-migrations
(into (d/ordered-set) (into (d/ordered-set)
["legacy-2" ["legacy-2"
@ -1340,4 +1362,5 @@
"legacy-67" "legacy-67"
"0001-remove-tokens-from-groups" "0001-remove-tokens-from-groups"
"0002-normalize-bool-content" "0002-normalize-bool-content"
"0002-clean-shape-interactions"])) "0002-clean-shape-interactions"
"0003-fix-root-shape"]))