🎉 Add new shape & rect data structures

Also optimizes some functions for faster shape and rect props access (there is still a lot of work ahead optimizing the rest of the functions) Also normalizes shape creation and validation for ensuring correct setup of all the mandatory properties.
2025-12-11 22:14:05 +01:00 · 2023-05-26 16:37:15 +02:00
parent 9f5640c1db
commit 405aa66357
130 changed files with 3038 additions and 2901 deletions
--- a/common/test/common_tests/files_migrations_test.cljc
+++ b/common/test/common_tests/files_migrations_test.cljc
@@ -0,0 +1,91 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns common-tests.files-migrations-test
+  (:require
+   [app.common.data :as d]
+   [app.common.files.migrations :as cpm]
+   [app.common.pages :as cp]
+   [app.common.uuid :as uuid]
+   [clojure.pprint :refer [pprint]]
+   [clojure.test :as t]))
+
+(t/deftest test-migration-8-1
+  (let [page-id (uuid/custom 0 0)
+        objects [{:type :rect :id (uuid/custom 1 0)}
+                 {:type :group
+                  :id (uuid/custom 1 1)
+                  :selrect {}
+                  :shapes [(uuid/custom 1 2) (uuid/custom 1 0)]}
+                 {:type :group
+                  :id (uuid/custom 1 2)
+                  :selrect {}
+                  :shapes [(uuid/custom 1 3)]}
+                 {:type :group
+                  :id (uuid/custom 1 3)
+                  :selrect {}
+                  :shapes [(uuid/custom 1 4)]}
+                 {:type :group
+                  :id (uuid/custom 1 4)
+                  :selrect {}
+                  :shapes [(uuid/custom 1 5)]}
+                 {:type :path :id (uuid/custom 1 5)}]
+
+        data    {:pages-index {page-id {:objects (d/index-by :id objects)}}
+                 :components {}
+                 :version 7}
+
+        res     (cpm/migrate-data data 8)]
+
+    ;; (pprint data)
+    ;; (pprint res)
+
+    (t/is (= (dissoc data :version)
+             (dissoc res :version)))))
+
+(t/deftest test-migration-8-2
+  (let [page-id (uuid/custom 0 0)
+        objects [{:type :rect :id (uuid/custom 1 0)}
+                 {:type :group
+                  :id (uuid/custom 1 1)
+                  :selrect {}
+                  :shapes [(uuid/custom 1 2) (uuid/custom 1 0)]}
+                 {:type :group
+                  :id (uuid/custom 1 2)
+                  :selrect {}
+                  :shapes [(uuid/custom 1 3)]}
+                 {:type :group
+                  :id (uuid/custom 1 3)
+                  :selrect {}
+                  :shapes [(uuid/custom 1 4)]}
+                 {:type :group
+                  :id (uuid/custom 1 4)
+                  :selrect {}
+                  :shapes []}
+                 {:type :path :id (uuid/custom 1 5)}]
+
+        data    {:pages-index {page-id {:objects (d/index-by :id objects)}}
+                 :components {}
+                 :version 7}
+
+        expect   (-> data
+                    (update-in [:pages-index page-id :objects] dissoc
+                               (uuid/custom 1 2)
+                               (uuid/custom 1 3)
+                               (uuid/custom 1 4))
+                    (update-in [:pages-index page-id :objects (uuid/custom 1 1) :shapes]
+                               (fn [shapes]
+                                 (let [id (uuid/custom 1 2)]
+                                   (into [] (remove #(= id %)) shapes)))))
+
+        res     (cpm/migrate-data data 8)]
+
+    ;; (pprint res)
+    ;; (pprint expect)
+
+    (t/is (= (dissoc expect :version)
+             (dissoc res :version)))
+    ))