From f2e389593a3dbd60634a33b8ffb5163fa68d8b21 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 1 Mar 2022 12:50:10 +0100 Subject: [PATCH 1/7] :bug: Fix graphic asset rename --- common/src/app/common/spec/change.cljc | 20 +++++++++++++++----- common/src/app/common/spec/file.cljc | 8 +++++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/common/src/app/common/spec/change.cljc b/common/src/app/common/spec/change.cljc index b38aa3e85..db9847b75 100644 --- a/common/src/app/common/spec/change.cljc +++ b/common/src/app/common/spec/change.cljc @@ -6,6 +6,7 @@ (ns app.common.spec.change (:require + [app.common.spec :as us] [app.common.spec.color :as color] [app.common.spec.file :as file] [app.common.spec.page :as page] @@ -124,16 +125,25 @@ (defmethod change-spec :add-recent-color [_] (s/keys :req-un [:internal.changes.add-recent-color/color])) -(s/def :internal.changes.media/object ::file/media-object) +(s/def :internal.changes.add-media/object ::file/media-object) (defmethod change-spec :add-media [_] - (s/keys :req-un [:internal.changes.media/object])) + (s/keys :req-un [:internal.changes.add-media/object])) -(s/def :internal.changes.media.mod/object - (s/and ::file/media-object #(contains? % :id))) + +(s/def :internal.changes.mod-media/width ::us/safe-integer) +(s/def :internal.changes.mod-media/height ::us/safe-integer) +(s/def :internal.changes.mod-media/path (s/nilable string?)) +(s/def :internal.changes.mod-media/mtype string?) +(s/def :internal.changes.mod-media/object + (s/keys :req-un [::id] + :opt-un [:internal.changes.mod-media/width + :internal.changes.mod-media/height + :internal.changes.mod-media/path + :internal.changes.mod-media/mtype])) (defmethod change-spec :mod-media [_] - (s/keys :req-un [:internal.changes.media.mod/object])) + (s/keys :req-un [:internal.changes.mod-media/object])) (defmethod change-spec :del-media [_] (s/keys :req-un [::id])) diff --git a/common/src/app/common/spec/file.cljc b/common/src/app/common/spec/file.cljc index a1e538ecc..2affdafbd 100644 --- a/common/src/app/common/spec/file.cljc +++ b/common/src/app/common/spec/file.cljc @@ -17,12 +17,18 @@ (s/def :internal.media-object/height ::us/safe-integer) (s/def :internal.media-object/mtype string?) +;; NOTE: This is marked as nilable for backward compatibility, but +;; right now is just exists or not exists. We can thin in a gradual +;; migration and then mark it as not nilable. +(s/def :internal.media-object/path (s/nilable string?)) + (s/def ::media-object (s/keys :req-un [::id ::name :internal.media-object/width :internal.media-object/height - :internal.media-object/mtype])) + :internal.media-object/mtype] + :opt-un [:internal.media-object/path])) (s/def ::colors (s/map-of uuid? ::color/color)) From 0534570784e9fd406b789345e8048e7428f31f16 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Tue, 1 Mar 2022 13:00:48 +0100 Subject: [PATCH 2/7] :bug: Fix typo in text palette --- frontend/src/app/main/ui/workspace/textpalette.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/main/ui/workspace/textpalette.cljs b/frontend/src/app/main/ui/workspace/textpalette.cljs index 4d9ca6158..10a71aab5 100644 --- a/frontend/src/app/main/ui/workspace/textpalette.cljs +++ b/frontend/src/app/main/ui/workspace/textpalette.cljs @@ -51,7 +51,7 @@ (when-not name-only? [:* [:div.typography-font (:name font-data)] - [:div.typography-data (str (:font-size typography) "pt | " (:name variant-data))]])])) + [:div.typography-data (str (:font-size typography) "px | " (:name variant-data))]])])) (mf/defc palette [{:keys [selected-ids current-file-id file-typographies shared-libs]}] From 03a082fe40832edc116b1cbfef9f9e070e1e22aa Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 1 Mar 2022 14:19:26 +0100 Subject: [PATCH 3/7] :bug: Fix metrics on websocket connections --- backend/src/app/util/websocket.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/app/util/websocket.clj b/backend/src/app/util/websocket.clj index 6acbd9e36..1562dec30 100644 --- a/backend/src/app/util/websocket.clj +++ b/backend/src/app/util/websocket.clj @@ -106,7 +106,7 @@ on-message (fn [_ message] - (mtx/run! metrics {:id :websocket-messages-total :labels ["send"] :inc 1}) + (mtx/run! metrics {:id :websocket-messages-total :labels ["recv"] :inc 1}) (try (let [message (t/decode-str message)] (a/offer! input-ch message)) From d1c834e64714dafe39c0ad326ae16c52605831f1 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 1 Mar 2022 14:34:13 +0100 Subject: [PATCH 4/7] :bug: Fix minor issue on executors monitor --- backend/src/app/rpc/mutations/profile.clj | 1 - backend/src/app/worker.clj | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/src/app/rpc/mutations/profile.clj b/backend/src/app/rpc/mutations/profile.clj index 4e2d207c8..07f3866b6 100644 --- a/backend/src/app/rpc/mutations/profile.clj +++ b/backend/src/app/rpc/mutations/profile.clj @@ -350,7 +350,6 @@ :opt-un [::lang ::theme])) (sv/defmethod ::update-profile - {::async/dispatch :default} [{:keys [pool] :as cfg} params] (db/with-atomic [conn pool] (let [profile (update-profile conn params)] diff --git a/backend/src/app/worker.clj b/backend/src/app/worker.clj index 44b72f63a..cf19b4138 100644 --- a/backend/src/app/worker.clj +++ b/backend/src/app/worker.clj @@ -79,9 +79,9 @@ (letfn [(log-stats [scheduler state] (doseq [[key ^ForkJoinPool executor] executors] (let [labels (into-array String [(name key)]) - active (.getActiveThreadCount executor) running (.getRunningThreadCount executor) queued (.getQueuedSubmissionCount executor) + active (.getPoolSize executor) steals (.getStealCount executor) steals-increment (- steals (or (get-in @state [key :steals]) 0)) steals-increment (if (neg? steals-increment) 0 steals-increment)] From 9eea7dabc295b296af416ad3b4f02e02f79d414e Mon Sep 17 00:00:00 2001 From: Eva Date: Wed, 2 Mar 2022 12:01:47 +0100 Subject: [PATCH 5/7] :bug: Fix length of names in sidebar --- CHANGES.md | 11 +++++++++++ .../styles/main/partials/sidebar-layers.scss | 6 ++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 05fa25ce0..f4ebe4387 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,5 +1,16 @@ # CHANGELOG +## 1.12.1-beta +### :boom: Breaking changes + +### :sparkles: New features + +### :bug: Bugs fixed + +- Fix length of names in sidebar [Taiga #2962](https://tree.taiga.io/project/penpot/issue/2962) + +### :heart: Community contributions by (Thank you!) + ## 1.12.0-beta ### :boom: Breaking changes diff --git a/frontend/resources/styles/main/partials/sidebar-layers.scss b/frontend/resources/styles/main/partials/sidebar-layers.scss index e8747f132..666319fe6 100644 --- a/frontend/resources/styles/main/partials/sidebar-layers.scss +++ b/frontend/resources/styles/main/partials/sidebar-layers.scss @@ -183,21 +183,19 @@ } input.element-name { - max-width: 130px; - width: 100%; + max-width: 75%; } span.element-name { color: $color-gray-20; display: block; font-size: $fs12; - max-width: 130px; + max-width: 75%; min-width: 40px; min-height: 16px; overflow-x: hidden; text-overflow: ellipsis; white-space: nowrap; - width: 100%; } .element-actions { From 4f379821b5c541b9e587d5dfcef90321bf0839bd Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Sun, 6 Mar 2022 16:14:36 +0100 Subject: [PATCH 6/7] :bug: Fix labels on loki logger --- CHANGES.md | 1 + backend/src/app/loggers/loki.clj | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index f4ebe4387..36a66f1de 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ ### :bug: Bugs fixed - Fix length of names in sidebar [Taiga #2962](https://tree.taiga.io/project/penpot/issue/2962) +- Fix issues on loki integration ### :heart: Community contributions by (Thank you!) diff --git a/backend/src/app/loggers/loki.clj b/backend/src/app/loggers/loki.clj index 228877789..77adc5f7e 100644 --- a/backend/src/app/loggers/loki.clj +++ b/backend/src/app/loggers/loki.clj @@ -52,8 +52,8 @@ (let [labels {:host (cfg/get :host) :tenant (cfg/get :tenant) :version (:full cfg/version) - :logger (:logger event) - :level (:level event)}] + :logger (:logger/name event) + :level (:logger/level event)}] {:streams [{:stream labels :values [[(str (* (inst-ms (:created-at event)) 1000000)) From 0cfd5095a747a3baf71cf1fc50fdd75c53eaca0e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 7 Mar 2022 11:31:36 +0100 Subject: [PATCH 7/7] :bug: Fix stack trace reporting on loki --- backend/src/app/loggers/loki.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/app/loggers/loki.clj b/backend/src/app/loggers/loki.clj index 77adc5f7e..d9631179e 100644 --- a/backend/src/app/loggers/loki.clj +++ b/backend/src/app/loggers/loki.clj @@ -58,8 +58,8 @@ [{:stream labels :values [[(str (* (inst-ms (:created-at event)) 1000000)) (str (:message event) - (when-let [error (:error event)] - (str "\n" (:trace error))))]]}]})) + (when-let [error (:trace event)] + (str "\n" error)))]]}]})) (defn- send-log [uri payload i]