From 22f4ee82bbac94fcd17016a1075fa68ad1259f58 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Wed, 13 Dec 2023 13:01:42 +0100 Subject: [PATCH 1/2] :bug: Show component name in copies component panel for deleted ones --- .../app/main/ui/workspace/sidebar/options/menus/component.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs index 880ac18e8..c000ac90c 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs @@ -428,7 +428,7 @@ shape (first shapes) id (:id shape) shape-name (:name shape) - component (ctf/resolve-component shape {:id current-file-id :data workspace-data} workspace-libraries) + component (ctf/resolve-component shape {:id current-file-id :data workspace-data} workspace-libraries {:include-deleted? true}) main-instance? (if components-v2 (ctk/main-instance? shape) true) toggle-content From b5296613de613f659f91ff167a69743c3a45161d Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Wed, 13 Dec 2023 16:49:32 +0100 Subject: [PATCH 2/2] :bug: Validate and repair also orphan shapes --- common/src/app/common/files/validate.cljc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/common/src/app/common/files/validate.cljc b/common/src/app/common/files/validate.cljc index 69651085d..0db17aaf6 100644 --- a/common/src/app/common/files/validate.cljc +++ b/common/src/app/common/files/validate.cljc @@ -186,7 +186,7 @@ (when-not (= (:main-instance-page component) (:id page)) (let [component-page (ctf/get-component-page (:data file) component) main-component (ctst/get-shape component-page (:main-instance-id component))] - ;; We must check if the same component has main instances in different pages. + ;; We must check if the same component has main instances in different pages. ;; In that case one of those instances shouldn't be main (if (:main-instance main-component) (report-error! :component-main @@ -474,7 +474,14 @@ [{:keys [data features] :as file} libraries] (when (contains? features "components/v2") (doseq [page (filter :id (ctpl/pages-seq data))] - (validate-shape! uuid/zero file page libraries)) + (let [orphans (->> page + :objects + vals + (filter #(not (contains? (:objects page) (:parent-id %)))) + (map :id))] + (validate-shape! uuid/zero file page libraries) + (doseq [shape-id orphans] + (validate-shape! shape-id file page libraries)))) (doseq [component (vals (:components data))] (validate-component! component file)))