From 347235916879cf2c75f4751406a379bea2bac3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Fri, 31 May 2024 17:13:40 +0200 Subject: [PATCH 1/5] :bug: Add validate and repair for :misplaced-slot --- common/src/app/common/files/repair.cljc | 13 +++++++++++++ common/src/app/common/files/validate.cljc | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/common/src/app/common/files/repair.cljc b/common/src/app/common/files/repair.cljc index 98e1642a9..cd2a656d2 100644 --- a/common/src/app/common/files/repair.cljc +++ b/common/src/app/common/files/repair.cljc @@ -460,6 +460,19 @@ (pcb/with-library-data file-data) (pcb/update-component (:id shape) repair-component)))) +(defmethod repair-error :misplaced-slot + [_ {:keys [shape page-id] :as error} file-data _] + (let [repair-shape + (fn [shape] + ;; Remove the swap slot + (log/debug :hint (str " -> remove swap-slot")) + (ctk/remove-swap-slot shape))] + + (log/dbg :hint "repairing shape :misplaced-slot" :id (:id shape) :name (:name shape) :page-id page-id) + (-> (pcb/empty-changes nil page-id) + (pcb/with-file-data file-data) + (pcb/update-shapes [(:id shape)] repair-shape)))) + (defmethod repair-error :missing-slot [_ {:keys [shape page-id args] :as error} file-data _] (let [repair-shape diff --git a/common/src/app/common/files/validate.cljc b/common/src/app/common/files/validate.cljc index 7959c5f31..7caceed49 100644 --- a/common/src/app/common/files/validate.cljc +++ b/common/src/app/common/files/validate.cljc @@ -52,6 +52,7 @@ :not-component-not-allowed :component-nil-objects-not-allowed :instance-head-not-frame + :misplaced-slot :missing-slot}) (def ^:private @@ -287,6 +288,14 @@ "Shape inside main instance should not have shape-ref" shape file page))) +(defn- check-empty-swap-slot + "Validate that this shape does not have any swap slot." + [shape file page] + (when (some? (ctk/get-swap-slot shape)) + (report-error :misplaced-slot + "This shape should not have swap slot" + shape file page))) + (defn- check-shape-main-root-top "Root shape of a top main instance: @@ -298,6 +307,7 @@ (check-component-main-head shape file page libraries) (check-component-root shape file page) (check-component-not-ref shape file page) + (check-empty-swap-slot shape file page) (run! #(check-shape % file page libraries :context :main-top) (:shapes shape))) (defn- check-shape-main-root-nested @@ -309,6 +319,7 @@ (check-component-main-head shape file page libraries) (check-component-not-root shape file page) (check-component-not-ref shape file page) + (check-empty-swap-slot shape file page) (run! #(check-shape % file page libraries :context :main-nested) (:shapes shape))) (defn- check-shape-copy-root-top @@ -323,6 +334,7 @@ (check-component-not-main-head shape file page libraries) (check-component-root shape file page) (check-component-ref shape file page libraries) + (check-empty-swap-slot shape file page) (run! #(check-shape % file page libraries :context :copy-top :library-exists library-exists) (:shapes shape)))) (defn- check-shape-copy-root-nested @@ -345,6 +357,7 @@ (check-component-not-main-not-head shape file page) (check-component-not-root shape file page) (check-component-not-ref shape file page) + (check-empty-swap-slot shape file page) (run! #(check-shape % file page libraries :context :main-any) (:shapes shape))) (defn- check-shape-copy-not-root @@ -353,6 +366,7 @@ (check-component-not-main-not-head shape file page) (check-component-not-root shape file page) (check-component-ref shape file page libraries) + (check-empty-swap-slot shape file page) (run! #(check-shape % file page libraries :context :copy-any) (:shapes shape))) (defn- check-shape-not-component @@ -362,6 +376,7 @@ (check-component-not-main-not-head shape file page) (check-component-not-root shape file page) (check-component-not-ref shape file page) + (check-empty-swap-slot shape file page) (run! #(check-shape % file page libraries :context :not-component) (:shapes shape))) (defn- check-shape From 5e8c164a441a97994fcb87381e749d237ac799e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Mon, 3 Jun 2024 11:37:13 +0200 Subject: [PATCH 2/5] :bug: Add migration to remove all misplaced slots --- common/src/app/common/files/defaults.cljc | 2 +- common/src/app/common/files/migrations.cljc | 17 ++++++++++++++++- common/src/app/common/types/component.cljc | 10 +++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/common/src/app/common/files/defaults.cljc b/common/src/app/common/files/defaults.cljc index 721adab70..5c15fc10d 100644 --- a/common/src/app/common/files/defaults.cljc +++ b/common/src/app/common/files/defaults.cljc @@ -6,4 +6,4 @@ (ns app.common.files.defaults) -(def version 47) +(def version 48) diff --git a/common/src/app/common/files/migrations.cljc b/common/src/app/common/files/migrations.cljc index 363311564..3b7803156 100644 --- a/common/src/app/common/files/migrations.cljc +++ b/common/src/app/common/files/migrations.cljc @@ -923,6 +923,20 @@ (-> data (update :pages-index update-vals update-page)))) +(defn migrate-up-48 + [data] + (letfn [(fix-shape [shape] + (let [swap-slot (ctk/get-swap-slot shape)] + (if (and (some? swap-slot) + (not (ctk/subcopy-head? shape))) + (ctk/remove-swap-slot shape) + shape))) + + (update-page [page] + (d/update-when page :objects update-vals fix-shape))] + (-> data + (update :pages-index update-vals update-page)))) + (def migrations "A vector of all applicable migrations" [{:id 2 :migrate-up migrate-up-2} @@ -961,4 +975,5 @@ {:id 44 :migrate-up migrate-up-44} {:id 45 :migrate-up migrate-up-45} {:id 46 :migrate-up migrate-up-46} - {:id 47 :migrate-up migrate-up-47}]) + {:id 47 :migrate-up migrate-up-47} + {:id 48 :migrate-up migrate-up-48}]) diff --git a/common/src/app/common/types/component.cljc b/common/src/app/common/types/component.cljc index 7c48e7f30..95bf3016a 100644 --- a/common/src/app/common/types/component.cljc +++ b/common/src/app/common/types/component.cljc @@ -130,6 +130,15 @@ (and (some? (:component-id shape)) (nil? (:component-root shape)))) +(defn subcopy-head? + "Check if this shape is the head of a subinstance that is a copy." + [shape] + ;; This is redundant with the previous one, but may give more security + ;; in case of bugs. + (and (some? (:component-id shape)) + (nil? (:component-root shape)) + (some? (:shape-ref shape)))) + (defn instance-of? [shape file-id component-id] (and (some? (:component-id shape)) @@ -227,7 +236,6 @@ :shape-ref :touched)) - (defn- extract-ids [shape] (if (map? shape) (let [current-id (:id shape) From 3294058e169f170acd20971743d232c5f5b2a41b Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 3 Jun 2024 11:15:00 +0200 Subject: [PATCH 3/5] :sparkles: Add stricter validation for audit events --- backend/src/app/rpc/commands/audit.clj | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/backend/src/app/rpc/commands/audit.clj b/backend/src/app/rpc/commands/audit.clj index 5db758b46..6af5f5b62 100644 --- a/backend/src/app/rpc/commands/audit.clj +++ b/backend/src/app/rpc/commands/audit.clj @@ -77,10 +77,19 @@ (when (seq events) (db/insert-many! pool :audit-log event-columns events)))) +(def valid-event-types + #{"action" "identify"}) + (def schema:event [:map {:title "Event"} - [:name [:string {:max 250}]] - [:type [:string {:max 250}]] + [:name + [:and {:gen/elements ["update-file", "get-profile"]} + [:string {:max 250}] + [:re #"[\d\w-]{1,50}"]]] + [:type + [:and {:gen/elements valid-event-types} + [:string {:max 250}] + [::sm/one-of {:format "string"} valid-event-types]]] [:props [:map-of :keyword :any]] [:context {:optional true} From 7c64ed84f1ed495133b707e2c3767e70f1d69341 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Mon, 3 Jun 2024 19:52:00 +0200 Subject: [PATCH 4/5] :bug: Fix swap slot is not removed on parent detach --- frontend/src/app/main/data/workspace/libraries_helpers.cljs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frontend/src/app/main/data/workspace/libraries_helpers.cljs b/frontend/src/app/main/data/workspace/libraries_helpers.cljs index ff03da46e..4c3b9d803 100644 --- a/frontend/src/app/main/data/workspace/libraries_helpers.cljs +++ b/frontend/src/app/main/data/workspace/libraries_helpers.cljs @@ -233,6 +233,10 @@ ; If the initial shape was component-root, first level subinstances are converted in top instances (pcb/update-shapes [shape-id] #(assoc % :component-root true)) + component-root? + ; If the initial shape was component-root, first level subinstances can't have swap-slot + (pcb/update-shapes [shape-id] ctk/remove-swap-slot) + :always ; Near shape-refs need to be advanced one level (generate-advance-nesting-level nil container libraries (:id shape))) From 54c506100da7a553ec6fa9064594ee0b6409f378 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Tue, 4 Jun 2024 10:53:53 +0200 Subject: [PATCH 5/5] :bug: Fix swap slot is not removed on parent detach (2) --- frontend/src/app/main/data/workspace/libraries_helpers.cljs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/app/main/data/workspace/libraries_helpers.cljs b/frontend/src/app/main/data/workspace/libraries_helpers.cljs index 4c3b9d803..35585af2e 100644 --- a/frontend/src/app/main/data/workspace/libraries_helpers.cljs +++ b/frontend/src/app/main/data/workspace/libraries_helpers.cljs @@ -233,8 +233,8 @@ ; If the initial shape was component-root, first level subinstances are converted in top instances (pcb/update-shapes [shape-id] #(assoc % :component-root true)) - component-root? - ; If the initial shape was component-root, first level subinstances can't have swap-slot + :always + ; First level subinstances of a detached component can't have swap-slot (pcb/update-shapes [shape-id] ctk/remove-swap-slot) :always