From 58466e6488216eb67d8d0727c29f182f853bd9eb Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 26 Jun 2024 08:27:24 +0200 Subject: [PATCH 1/8] :bug: Color library loses association with shapes when exporting/importing the document --- CHANGES.md | 1 + frontend/src/app/worker/import.cljs | 32 +++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index eaf2c59a2..43ff3f8ab 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -49,6 +49,7 @@ - Export shapes that are rotated act a bit strange when reimported [Taiga #7585](https://tree.taiga.io/project/penpot/issue/7585) - Penpot crashes when a new colorpicker is created while uploading an image to another instance [Taiga #8119](https://tree.taiga.io/project/penpot/issue/8119) - Removing Underline and Strikethrough Affects the Previous Text Object [Taiga #8103](https://tree.taiga.io/project/penpot/issue/8103) +- Color library loses association with shapes when exporting/importing the document [Taiga #8132](https://tree.taiga.io/project/penpot/issue/8132) ## 2.0.3 diff --git a/frontend/src/app/worker/import.cljs b/frontend/src/app/worker/import.cljs index 186de184d..beb6e2b14 100644 --- a/frontend/src/app/worker/import.cljs +++ b/frontend/src/app/worker/import.cljs @@ -223,6 +223,32 @@ (uuid? (get item :typography-ref-file)) (d/update-when :typography-ref-file resolve))))))) +(defn resolve-fills-content + [fills context] + (let [resolve (:resolve context)] + (->> fills + (mapv + (fn [fill] + (cond-> fill + (uuid? (get fill :fill-color-ref-id)) + (d/update-when :fill-color-ref-id resolve) + + (uuid? (get fill :fill-color-ref-file)) + (d/update-when :fill-color-ref-file resolve))))))) + +(defn resolve-strokes-content + [fills context] + (let [resolve (:resolve context)] + (->> fills + (mapv + (fn [fill] + (cond-> fill + (uuid? (get fill :stroke-color-ref-id)) + (d/update-when :stroke-color-ref-id resolve) + + (uuid? (get fill :stroke-color-ref-file)) + (d/update-when :stroke-color-ref-file resolve))))))) + (defn resolve-data-ids [data type context] (let [resolve (:resolve context)] @@ -238,6 +264,12 @@ (cond-> (= type :text) (d/update-when :content resolve-text-content context)) + (cond-> (:fills data) + (d/update-when :fills resolve-fills-content context)) + + (cond-> (:strokes data) + (d/update-when :strokes resolve-strokes-content context)) + (cond-> (and (= type :frame) (= :grid (:layout data))) (update :layout-grid-cells From 9ca1535a65c9f85ba82f9b4e1c4a377696ce8d45 Mon Sep 17 00:00:00 2001 From: Alejandro Alonso Date: Wed, 26 Jun 2024 12:57:53 +0200 Subject: [PATCH 2/8] :bug: Selected colors do not appear in the color palette --- frontend/src/app/main/data/workspace/colors.cljs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/main/data/workspace/colors.cljs b/frontend/src/app/main/data/workspace/colors.cljs index 081ec5339..af771bd4a 100644 --- a/frontend/src/app/main/data/workspace/colors.cljs +++ b/frontend/src/app/main/data/workspace/colors.cljs @@ -609,9 +609,13 @@ (assoc :type :color)))))))) ptk/WatchEvent (watch [_ state _] - ;; Type can be null, because the colorpicker can be closed while a color image finish its upload - (when (and add-recent? (some? (:type state))) - (let [formated-color (get-color-from-colorpicker-state (:colorpicker state))] + (let [selected-type (-> state + :colorpicker + :type) + formated-color (get-color-from-colorpicker-state (:colorpicker state)) + ;; Type is set to color on closing the colorpicker, but we can can close it while still uploading an image fill + ignore-color? (and (= selected-type :color) (nil? (:color formated-color)))] + (when (and add-recent? (not ignore-color?)) (rx/of (dwl/add-recent-color formated-color))))))) (defn update-colorpicker-gradient From 37d0cec26518689b41dc29d8ec0cdcebf8474d51 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 26 Jun 2024 14:59:38 +0200 Subject: [PATCH 3/8] :bug: Properly report importation errors --- backend/src/app/http/sse.clj | 2 ++ backend/src/app/rpc/commands/binfile.clj | 26 ++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/backend/src/app/http/sse.clj b/backend/src/app/http/sse.clj index 868801091..3da84322c 100644 --- a/backend/src/app/http/sse.clj +++ b/backend/src/app/http/sse.clj @@ -61,6 +61,8 @@ (let [result (handler)] (events/tap :end result)) (catch Throwable cause + (l/err :hint "unexpected error on processing sse response" + :cause cause) (events/tap :error (errors/handle' cause request))) (finally (sp/close! events/*channel*) diff --git a/backend/src/app/rpc/commands/binfile.clj b/backend/src/app/rpc/commands/binfile.clj index d6759eb42..3f5bb931c 100644 --- a/backend/src/app/rpc/commands/binfile.clj +++ b/backend/src/app/rpc/commands/binfile.clj @@ -30,14 +30,12 @@ ;; --- Command: export-binfile -(def ^:private - schema:export-binfile - (sm/define - [:map {:title "export-binfile"} - [:name :string] - [:file-id ::sm/uuid] - [:include-libraries :boolean] - [:embed-assets :boolean]])) +(def ^:private schema:export-binfile + [:map {:title "export-binfile"} + [:name :string] + [:file-id ::sm/uuid] + [:include-libraries :boolean] + [:embed-assets :boolean]]) (sv/defmethod ::export-binfile "Export a penpot file in a binary format." @@ -76,13 +74,11 @@ {:id project-id}) result)) -(def ^:private - schema:import-binfile - (sm/define - [:map {:title "import-binfile"} - [:name :string] - [:project-id ::sm/uuid] - [:file ::media/upload]])) +(def ^:private schema:import-binfile + [:map {:title "import-binfile"} + [:name :string] + [:project-id ::sm/uuid] + [:file ::media/upload]]) (sv/defmethod ::import-binfile "Import a penpot file in a binary format." From 1c1929ed329fee963a2d0cc9fab95591b53e1644 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 26 Jun 2024 15:00:47 +0200 Subject: [PATCH 4/8] :paperclip: Add helpers for process deletion cascade of old objects --- backend/src/app/srepl/main.clj | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/backend/src/app/srepl/main.clj b/backend/src/app/srepl/main.clj index c71c58db0..aed63f1cd 100644 --- a/backend/src/app/srepl/main.clj +++ b/backend/src/app/srepl/main.clj @@ -582,6 +582,38 @@ :deleted-at (dt/now) :id file-id}))))) + +(defn process-deleted-teams-cascade + [] + (->> (db/exec! main/system ["select id, deleted_at from team where deleted_at is not null"]) + (run! (fn [{:keys [id deleted-at]}] + (wrk/invoke! (-> main/system + (assoc ::wrk/task :delete-object) + (assoc ::wrk/params {:object :team + :deleted-at deleted-at + :id id}))))))) + + +(defn process-deleted-projects-cascade + [] + (->> (db/exec! main/system ["select id, deleted_at from project where deleted_at is not null"]) + (run! (fn [{:keys [id deleted-at]}] + (wrk/invoke! (-> main/system + (assoc ::wrk/task :delete-object) + (assoc ::wrk/params {:object :project + :deleted-at deleted-at + :id id}))))))) + +(defn process-deleted-files-cascade + [] + (->> (db/exec! main/system ["select id, deleted_at from file where deleted_at is not null"]) + (run! (fn [{:keys [id deleted-at]}] + (wrk/invoke! (-> main/system + (assoc ::wrk/task :delete-object) + (assoc ::wrk/params {:object :file + :deleted-at deleted-at + :id id}))))))) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; MISC ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; From f393ce927359e7117c4479c276bb1d8b2f99b5fc Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Wed, 26 Jun 2024 19:46:29 +0200 Subject: [PATCH 5/8] :bug: Add migration for fix path shapes with invalid curve segment params --- common/src/app/common/files/defaults.cljc | 2 +- common/src/app/common/files/migrations.cljc | 51 ++++++++++++++++++++- common/src/app/common/svg.cljc | 1 - frontend/src/app/util/path/format.cljs | 2 + 4 files changed, 53 insertions(+), 3 deletions(-) diff --git a/common/src/app/common/files/defaults.cljc b/common/src/app/common/files/defaults.cljc index 91acf6539..0a2d031db 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 49) +(def version 50) diff --git a/common/src/app/common/files/migrations.cljc b/common/src/app/common/files/migrations.cljc index 434630977..528345a6c 100644 --- a/common/src/app/common/files/migrations.cljc +++ b/common/src/app/common/files/migrations.cljc @@ -957,6 +957,54 @@ (update data :pages-index update-vals update-page))) +(defn migrate-up-50 + "This migration mainly fixes paths with curve-to segments + without :c1x :c1y :c2x :c2y properties. Additionally, we found a + case where the params instead to be plain hash-map, is a points + instance. This migration normalizes all params to plain map." + + [data] + (let [update-segment + (fn [{:keys [command params] :as segment}] + (let [params (into {} params) + params (cond + (= :curve-to command) + (let [x (get params :x) + y (get params :y)] + + (cond-> params + (nil? (:c1x params)) + (assoc :c1x x) + + (nil? (:c1y params)) + (assoc :c1y y) + + (nil? (:c2x params)) + (assoc :c2x x) + + (nil? (:c2y params)) + (assoc :c2y y))) + + :else + params)] + + (assoc segment :params params))) + + update-shape + (fn [shape] + (if (cfh/path-shape? shape) + (d/update-when shape :content (fn [content] (mapv update-segment content))) + shape)) + + update-container + (fn [page] + (d/update-when page :objects update-vals update-shape))] + + (-> data + (update :pages-index update-vals update-container) + (update :components update-vals update-container)))) + + (def migrations "A vector of all applicable migrations" [{:id 2 :migrate-up migrate-up-2} @@ -997,4 +1045,5 @@ {:id 46 :migrate-up migrate-up-46} {:id 47 :migrate-up migrate-up-47} {:id 48 :migrate-up migrate-up-48} - {:id 49 :migrate-up migrate-up-49}]) + {:id 49 :migrate-up migrate-up-49} + {:id 50 :migrate-up migrate-up-50}]) diff --git a/common/src/app/common/svg.cljc b/common/src/app/common/svg.cljc index 1b50a9dde..4b9f71572 100644 --- a/common/src/app/common/svg.cljc +++ b/common/src/app/common/svg.cljc @@ -1046,7 +1046,6 @@ (str/includes? data "]*>" ""))) - (defn parse [text] #?(:cljs (tubax/xml->clj text) diff --git a/frontend/src/app/util/path/format.cljs b/frontend/src/app/util/path/format.cljs index 5a5860341..b120ff4d3 100644 --- a/frontend/src/app/util/path/format.cljs +++ b/frontend/src/app/util/path/format.cljs @@ -10,6 +10,8 @@ [app.common.svg.path.subpath :refer [pt=]] [app.util.array :as arr])) +;; TODO: move to common + (def path-precision 3) (defn- join-params From f786aff3fc0776efbe3acd89bdceba9ad2b97d5f Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Tue, 25 Jun 2024 13:36:37 +0200 Subject: [PATCH 6/8] :bug: Fix can't collapse groups when searching in the assets tab --- CHANGES.md | 1 + frontend/src/app/main/data/workspace.cljs | 8 ++++++++ frontend/src/app/main/ui/workspace/sidebar/assets.cljs | 4 ++++ .../app/main/ui/workspace/sidebar/assets/components.cljs | 6 ++++-- .../main/ui/workspace/sidebar/assets/file_library.cljs | 7 +++++-- 5 files changed, 22 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 43ff3f8ab..53f918038 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -50,6 +50,7 @@ - Penpot crashes when a new colorpicker is created while uploading an image to another instance [Taiga #8119](https://tree.taiga.io/project/penpot/issue/8119) - Removing Underline and Strikethrough Affects the Previous Text Object [Taiga #8103](https://tree.taiga.io/project/penpot/issue/8103) - Color library loses association with shapes when exporting/importing the document [Taiga #8132](https://tree.taiga.io/project/penpot/issue/8132) +- Fix can't collapse groups when searching in the assets tab [Taiga #8125](https://tree.taiga.io/project/penpot/issue/8125) ## 2.0.3 diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs index c2ce35228..5faee0a0c 100644 --- a/frontend/src/app/main/data/workspace.cljs +++ b/frontend/src/app/main/data/workspace.cljs @@ -1096,6 +1096,14 @@ (update [_ state] (assoc-in state [:workspace-assets :open-status file-id section] open?)))) +(defn clear-assets-section-open + [] + (ptk/reify ::clear-assets-section-open + ptk/UpdateEvent + (update [_ state] + (assoc-in state [:workspace-assets :open-status] {})))) + + (defn set-assets-group-open [file-id section path open?] (ptk/reify ::set-assets-group-open diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs index 85e31946b..a1ec84728 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/assets.cljs @@ -9,8 +9,10 @@ (:require [app.common.data.macros :as dm] [app.main.data.modal :as modal] + [app.main.data.workspace :as dw] [app.main.data.workspace.assets :as dwa] [app.main.refs :as refs] + [app.main.store :as st] [app.main.ui.components.context-menu-a11y :refer [context-menu-a11y]] [app.main.ui.components.search-bar :refer [search-bar]] [app.main.ui.context :as ctx] @@ -103,6 +105,7 @@ on-search-term-change (mf/use-fn (fn [event] + (st/emit! (dw/clear-assets-section-open)) (swap! filters* assoc :term event))) on-section-filter-change @@ -112,6 +115,7 @@ (dom/get-value)) (as-> (dom/get-current-target event) $ (dom/get-attribute $ "data-testid")))] + (st/emit! (dw/clear-assets-section-open)) (swap! filters* assoc :section value :open-menu false)))) show-libraries-dialog diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs index 371716d7e..eb2c59c01 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs @@ -192,8 +192,10 @@ on-drag-start do-rename cancel-rename on-rename-group on-group on-ungroup on-context-menu selected-full local]}] - (let [group-open? (or ^boolean force-open? - ^boolean (get open-groups prefix (if (= prefix "") true false))) + (let [group-open? (if (false? (get open-groups prefix)) ;; if the user has closed it specifically, respect that + false + (or ^boolean force-open? + ^boolean (get open-groups prefix (if (= prefix "") true false)))) dragging* (mf/use-state false) dragging? (deref dragging*) diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/file_library.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/file_library.cljs index 109d067a6..b255013aa 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets/file_library.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/assets/file_library.cljs @@ -318,6 +318,7 @@ (and has-term? (some pos? (map count [filtered-components filtered-colors filtered-media filtered-typographies])) (some #(> 60 (count %)) [filtered-components filtered-colors filtered-media filtered-typographies])))) + (mf/defc file-library {::mf/wrap-props false} [{:keys [file local? default-open? filters]}] @@ -333,8 +334,10 @@ open-status (mf/deref open-status-ref) force-open-lib? (force-lib-open? file-id filters) - open? (or force-open-lib? - (d/nilv (:library open-status) default-open?)) + open? (if (false? (:library open-status)) ;; if the user has closed it specifically, respect that + false + (or force-open-lib? + (d/nilv (:library open-status) default-open?))) unselect-all (mf/use-fn From a56e7e383fefd24acadab5820682217a61a49efd Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Tue, 25 Jun 2024 15:09:38 +0200 Subject: [PATCH 7/8] :bug: Fix 'Detach instance' shortcut is not working --- CHANGES.md | 2 ++ frontend/src/app/main/data/workspace/libraries.cljs | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 53f918038..f383730d3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -51,6 +51,8 @@ - Removing Underline and Strikethrough Affects the Previous Text Object [Taiga #8103](https://tree.taiga.io/project/penpot/issue/8103) - Color library loses association with shapes when exporting/importing the document [Taiga #8132](https://tree.taiga.io/project/penpot/issue/8132) - Fix can't collapse groups when searching in the assets tab [Taiga #8125](https://tree.taiga.io/project/penpot/issue/8125) +- Fix 'Detach instance' shortcut is not working [Taiga #8102](https://tree.taiga.io/project/penpot/issue/8102) + ## 2.0.3 diff --git a/frontend/src/app/main/data/workspace/libraries.cljs b/frontend/src/app/main/data/workspace/libraries.cljs index 81b064c49..a1beaf1b5 100644 --- a/frontend/src/app/main/data/workspace/libraries.cljs +++ b/frontend/src/app/main/data/workspace/libraries.cljs @@ -615,7 +615,6 @@ (let [page-id (:current-page-id state) objects (wsh/lookup-page-objects state page-id) file (wsh/get-local-file state) - container (cfh/get-container file :page page-id) libraries (wsh/get-libraries state) selected (->> state (wsh/lookup-selected) @@ -627,7 +626,7 @@ changes (when can-detach? (reduce (fn [changes id] - (cll/generate-detach-instance changes container libraries id)) + (cll/generate-detach-component changes id file page-id libraries)) (pcb/empty-changes it) selected))] From 950d6195f6bb711cbe6320f46b0ad9835714f47c Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Tue, 25 Jun 2024 16:28:59 +0200 Subject: [PATCH 8/8] :bug: Fix import file message does not detect 0 as error --- CHANGES.md | 1 + frontend/src/app/main/ui/dashboard/import.cljs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index f383730d3..5a75ae5a5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -52,6 +52,7 @@ - Color library loses association with shapes when exporting/importing the document [Taiga #8132](https://tree.taiga.io/project/penpot/issue/8132) - Fix can't collapse groups when searching in the assets tab [Taiga #8125](https://tree.taiga.io/project/penpot/issue/8125) - Fix 'Detach instance' shortcut is not working [Taiga #8102](https://tree.taiga.io/project/penpot/issue/8102) +- Fix import file message does not detect 0 as error [Taiga #6824](https://tree.taiga.io/project/penpot/issue/6824) ## 2.0.3 diff --git a/frontend/src/app/main/ui/dashboard/import.cljs b/frontend/src/app/main/ui/dashboard/import.cljs index 14f0318e3..51b437116 100644 --- a/frontend/src/app/main/ui/dashboard/import.cljs +++ b/frontend/src/app/main/ui/dashboard/import.cljs @@ -489,7 +489,7 @@ :else [:& context-notification - {:type :success + {:type (if (zero? success-num) :warning :success) :content (tr "dashboard.import.import-message" (i18n/c success-num))}])) (for [entry entries]