From 70b57f92b416b5376633ad555eb89bfaa7eacc78 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Thu, 25 Jan 2024 14:25:46 +0100 Subject: [PATCH] :bug: Fix broken path content on comp-v2 migration --- backend/src/app/features/components_v2.clj | 38 +++++++++++++++++ common/src/app/common/geom/shapes/path.cljc | 1 + common/src/app/common/types/shape.cljc | 12 +----- common/src/app/common/types/shape/path.cljc | 47 +++++++++++++++++++++ 4 files changed, 88 insertions(+), 10 deletions(-) create mode 100644 common/src/app/common/types/shape/path.cljc diff --git a/backend/src/app/features/components_v2.clj b/backend/src/app/features/components_v2.clj index d6adeb477..516db13f8 100644 --- a/backend/src/app/features/components_v2.clj +++ b/backend/src/app/features/components_v2.clj @@ -19,6 +19,7 @@ [app.common.geom.point :as gpt] [app.common.geom.rect :as grc] [app.common.geom.shapes :as gsh] + [app.common.geom.shapes.path :as gshp] [app.common.logging :as l] [app.common.math :as mth] [app.common.schema :as sm] @@ -33,6 +34,7 @@ [app.common.types.pages-list :as ctpl] [app.common.types.shape :as cts] [app.common.types.shape-tree :as ctst] + [app.common.types.shape.path :as ctsp] [app.common.types.shape.text :as ctsx] [app.common.uuid :as uuid] [app.db :as db] @@ -110,6 +112,12 @@ (def valid-text-content? (sm/lazy-validator ::ctsx/content)) +(def valid-path-content? + (sm/lazy-validator ::ctsp/content)) + +(def valid-path-segment? + (sm/lazy-validator ::ctsp/segment)) + (defn- prepare-file-data "Apply some specific migrations or fixes to things that are allowed in v1 but not in v2, or that are the result of old bugs." @@ -271,6 +279,35 @@ (update :pages-index update-vals fix-container) (d/update-when :components update-vals fix-container)))) + fix-broken-paths + (fn [file-data] + (letfn [(fix-container [container] + (d/update-when container :objects update-vals fix-shape)) + + (fix-shape [shape] + (if (and (cfh/path-shape? shape) + (seq (:content shape)) + (not (valid-path-content? (:content shape)))) + (let [shape (update shape :content fix-path-content) + [points selrect] (gshp/content->points+selrect shape (:content shape))] + (-> shape + (dissoc :bool-content) + (dissoc :bool-type) + (assoc :points points) + (assoc :selrect selrect))) + shape)) + + (fix-path-content [content] + (let [[seg1 :as content] (filterv valid-path-segment? content)] + (if (and seg1 (not= :move-to (:command seg1))) + (let [params (select-keys (:params seg1) [:x :y])] + (into [{:command :move-to :params params}] content)) + content)))] + + (-> file-data + (update :pages-index update-vals fix-container) + (d/update-when :components update-vals fix-container)))) + fix-recent-colors (fn [file-data] ;; Remove invalid colors in :recent-colors @@ -562,6 +599,7 @@ (fix-recent-colors) (fix-missing-image-metadata) (fix-text-shapes-converted-to-path) + (fix-broken-paths) (delete-big-geometry-shapes) (fix-broken-parents) (fix-orphan-shapes) diff --git a/common/src/app/common/geom/shapes/path.cljc b/common/src/app/common/geom/shapes/path.cljc index 018beaeb3..84f0b5241 100644 --- a/common/src/app/common/geom/shapes/path.cljc +++ b/common/src/app/common/geom/shapes/path.cljc @@ -981,6 +981,7 @@ selrect (-> points (gco/transform-points points-center transform-inverse) (grc/points->rect))] + [points selrect])) (defn open-path? diff --git a/common/src/app/common/types/shape.cljc b/common/src/app/common/types/shape.cljc index 6187a7aa7..cdc7ccb16 100644 --- a/common/src/app/common/types/shape.cljc +++ b/common/src/app/common/types/shape.cljc @@ -25,6 +25,7 @@ [app.common.types.shape.export :as ctse] [app.common.types.shape.interactions :as ctsi] [app.common.types.shape.layout :as ctsl] + [app.common.types.shape.path :as ctsp] [app.common.types.shape.shadow :as ctss] [app.common.types.shape.text :as ctsx] [app.common.uuid :as uuid] @@ -256,16 +257,7 @@ (sm/define! ::path-attrs [:map {:title "PathAttrs"} [:type [:= :path]] - [:x {:optional true} [:maybe ::sm/safe-number]] - [:y {:optional true} [:maybe ::sm/safe-number]] - [:width {:optional true} [:maybe ::sm/safe-number]] - [:height {:optional true} [:maybe ::sm/safe-number]] - [:content - {:optional true} - [:vector - [:map - [:command :keyword] - [:params {:optional true} [:maybe :map]]]]]]) + [:content ::ctsp/content]]) (sm/define! ::text-attrs [:map {:title "TextAttrs"} diff --git a/common/src/app/common/types/shape/path.cljc b/common/src/app/common/types/shape/path.cljc new file mode 100644 index 000000000..d633bb85c --- /dev/null +++ b/common/src/app/common/types/shape/path.cljc @@ -0,0 +1,47 @@ +;; 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 app.common.types.shape.path + (:require + [app.common.schema :as sm])) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;; SCHEMA +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(sm/define! ::segment + [:multi {:title "PathSegment" :dispatch :command} + [:line-to + [:map + [:command [:= :line-to]] + [:params + [:map + [:x ::sm/safe-number] + [:y ::sm/safe-number]]]]] + [:close-path + [:map + [:command [:= :close-path]]]] + [:move-to + [:map + [:command [:= :move-to]] + [:params + [:map + [:x ::sm/safe-number] + [:y ::sm/safe-number]]]]] + [:curve-to + [:map + [:command [:= :curve-to]] + [:params + [:map + [:x ::sm/safe-number] + [:y ::sm/safe-number] + [:c1x ::sm/safe-number] + [:c1y ::sm/safe-number] + [:c2x ::sm/safe-number] + [:c2y ::sm/safe-number]]]]]]) + +(sm/define! ::content + [:vector ::segment])