WIP

CHANGES.md

@@ -94,6 +94,7 @@ example. It's still usable as before, we just removed the example.
 - Fix incorrect interaction betwen hower and scroll on assets sidebar [Taiga #12389](https://tree.taiga.io/project/penpot/issue/12389)
 - Fix switch variants with paths [Taiga #12841](https://tree.taiga.io/project/penpot/issue/12841)
 - Fix referencing typography tokens on font-family tokens [Taiga #12492](https://tree.taiga.io/project/penpot/issue/12492)
+- Fix horizontal scroll on layer panel [Taiga #12843](https://tree.taiga.io/project/penpot/issue/12843)
 
 ## 2.11.1
 

backend/src/app/loggers/mattermost.clj

@@ -19,59 +19,62 @@
 
 (defonce enabled (atom true))
 
-(defn- send-mattermost-notification!
-  [cfg {:keys [id public-uri] :as report}]
-
-
-  (let [text (str "Exception: " public-uri "/dbg/error/" id " "
-                  (when-let [pid (:profile-id report)]
-                    (str "(pid: #uuid-" pid ")"))
-                  "\n"
-                  "- host: #" (:host report) "\n"
-                  "- tenant: #" (:tenant report) "\n"
-                  "- logger: #" (:logger report) "\n"
-                  "- request-path: `" (:request-path report) "`\n"
-                  "- frontend-version: `" (:frontend-version report) "`\n"
-                  "- backend-version: `" (:backend-version report) "`\n"
-                  "\n"
-                  "```\n"
-                  "Trace:\n"
-                  (:trace report)
-                  "```")
-
-        resp (http/req! cfg
+(defn- send-mattermost-notification
+  [cfg text]
+  (let [resp (http/req! cfg
                         {:uri (cf/get :error-report-webhook)
                          :method :post
                          :headers {"content-type" "application/json"}
-                         :body (json/encode-str {:text text})}
-                        {:sync? true})]
-
+                         :body (json/encode-str {:text text})})]
     (when (not= 200 (:status resp))
-      (l/warn :hint "error on sending data"
+      (l/warn :hint "error on sending data to mattermost"
               :response (pr-str resp)))))
 
-(defn record->report
+(defn- log-record->report
   [{:keys [::l/context ::l/id ::l/cause] :as record}]
   (assert (l/valid-record? record) "expectd valid log record")
-  {:id               id
-   :tenant           (cf/get :tenant)
-   :host             (cf/get :host)
-   :public-uri       (cf/get :public-uri)
-   :backend-version  (or (:version/backend context) (:full cf/version))
-   :frontend-version (:version/frontend context)
-   :profile-id       (:request/profile-id context)
-   :request-path     (:request/path context)
-   :logger           (::l/logger record)
-   :trace            (ex/format-throwable cause :detail? false :header? false)})
+  (let [tenant           (cf/get :tenant)
+        host             (cf/get :host)
+        public-uri       (cf/get :public-uri)
+        backend-version  (or (:version/backend context) (:full cf/version))
+        frontend-version (:version/frontend context)
+        profile-id       (:request/profile-id context)
+        request-path     (:request/path context)
+        logger           (::l/logger record)
+        trace            (ex/format-throwable cause :detail? false :header? false)]
 
-(defn handle-event
+    (str "#exception => " public-uri "/dbg/error/" id " "
+         (when-let [pid (:profile-id report)]
+           (str "(pid: #uuid-" pid ")"))
+         "\n"
+         "- host: #" (:host report) "\n"
+         "- tenant: #" (:tenant report) "\n"
+         "- logger: #" (:logger report) "\n"
+         "- request-path: `" (:request-path report) "`\n"
+         "- frontend-version: `" (:frontend-version report) "`\n"
+         "- backend-version: `" (:backend-version report) "`\n"
+         "\n"
+         "```\n"
+         "Trace:\n"
+         (:trace report)
+         "```")))
+
+(defn- process-log-record
   [cfg record]
-  (when @enabled
+  (when (ldb/error-record? record)
     (try
       (let [report (record->report record)]
         (send-mattermost-notification! cfg report))
       (catch Throwable cause
-        (l/warn :hint "unhandled error" :cause cause)))))
+        (l/warn :hint "error on processing log record" :cause cause)))))
+
+(defn- process-event
+  [cfg [type event]]
+  (when @enabled
+    (case type
+      :log-record (process-log-record cfg event))))
+
+                           ;; :xf (filter ldb/error-record?))]
 
 (defmethod ig/assert-key ::reporter
   [_ params]
@@ -80,26 +83,28 @@
 (defmethod ig/init-key ::reporter
   [_ cfg]
   (when-let [uri (cf/get :error-report-webhook)]
-    (px/thread
-      {:name "penpot/mattermost-reporter"
-       :virtual true}
-      (l/info :hint "initializing error reporter" :uri uri)
-      (let [input (sp/chan :buf (sp/sliding-buffer 128)
-                           :xf (filter ldb/error-record?))]
-        (add-watch l/log-record ::reporter #(sp/put! input %4))
-        (try
-          (loop []
-            (when-let [msg (sp/take! input)]
-              (handle-event cfg msg)
-              (recur)))
-          (catch InterruptedException _
-            (l/debug :hint "reporter interrupted"))
-          (catch Throwable cause
-            (l/error :hint "unexpected error" :cause cause))
-          (finally
-            (sp/close! input)
-            (remove-watch l/log-record ::reporter)
-            (l/info :hint "reporter terminated")))))))
+    (let [input  (sp/chan :buf (sp/sliding-buffer 128)
+                          :xf  (keep process-event))
+          thread (px/thread
+                   {:name "penpot/mattermost-reporter"}
+                   (l/info :hint "initializing mattermost reporter thread" :uri uri)
+                   (try
+                     (loop []
+                       (when-let [msg (sp/take! input)]
+                         (handle-event cfg msg)
+                         (recur)))
+                     (catch InterruptedException _
+                       (l/debug :hint "mattermost reporter interrupted"))
+                     (catch Throwable cause
+                       (l/error :hint "unexpected error on mattermost reporter" :cause cause))
+                     (finally
+                       (sp/close! input)
+                       (remove-watch l/log-record ::reporter)
+                       (l/info :hint "mattermost reporter terminated"))))]
+
+      (add-watch l/log-record ::reporter #(sp/put! input [:log-record %4]))
+
+      input)))
 
 (defmethod ig/halt-key! ::reporter
   [_ thread]

backend/src/app/worker/dispatcher.clj

@@ -137,33 +137,34 @@ RETURNING task.id, task.queue")
                 ::wait)))
 
           (run-batch []
-            (let [rconn (rds/connect cfg)]
-              (try
-                (-> cfg
-                    (assoc ::rds/conn rconn)
-                    (db/tx-run! run-batch'))
+            (try
+              (let [rconn (rds/connect cfg)]
+                (try
+                  (-> cfg
+                      (assoc ::rds/conn rconn)
+                      (db/tx-run! run-batch'))
+                  (finally
+                    (.close ^AutoCloseable rconn))))
 
-                (catch InterruptedException cause
-                  (throw cause))
-                (catch Exception cause
-                  (cond
-                    (rds/exception? cause)
-                    (do
-                      (l/wrn :hint "redis exception (will retry in an instant)" :cause cause)
-                      (px/sleep timeout))
+              (catch InterruptedException cause
+                (throw cause))
 
-                    (db/sql-exception? cause)
-                    (do
-                      (l/wrn :hint "database exception (will retry in an instant)" :cause cause)
-                      (px/sleep timeout))
+              (catch Exception cause
+                (cond
+                  (rds/exception? cause)
+                  (do
+                    (l/wrn :hint "redis exception (will retry in an instant)" :cause cause)
+                    (px/sleep timeout))
 
-                    :else
-                    (do
-                      (l/err :hint "unhandled exception (will retry in an instant)" :cause cause)
-                      (px/sleep timeout))))
+                  (db/sql-exception? cause)
+                  (do
+                    (l/wrn :hint "database exception (will retry in an instant)" :cause cause)
+                    (px/sleep timeout))
 
-                (finally
-                  (.close ^AutoCloseable rconn)))))
+                  :else
+                  (do
+                    (l/err :hint "unhandled exception (will retry in an instant)" :cause cause)
+                    (px/sleep timeout))))))
 
           (dispatcher []
             (l/inf :hint "started")
@@ -176,7 +177,7 @@ RETURNING task.id, task.queue")
               (catch InterruptedException _
                 (l/trc :hint "interrupted"))
               (catch Throwable cause
-                (l/err :hint " unexpected exception" :cause cause))
+                (l/err :hint "unexpected exception" :cause cause))
               (finally
                 (l/inf :hint "terminated"))))]
 

frontend/scripts/build

@@ -23,20 +23,21 @@ corepack enable;
 corepack install;
 yarn install || exit 1;
 
-rm -rf resources/public;
 rm -rf target/dist;
+rm -rf resources/public;
+
+mkdir -p resources/public;
+
+pushd ../render-wasm;
+./build
+popd
 
 yarn run build:app:main --config-merge "{:release-version \"${CURRENT_HASH}-${TS}\"}" $EXTRA_PARAMS;
-
-if [ "$INCLUDE_WASM" = "yes" ];  then
-    pushd ../render-wasm;
-    ./build
-    popd
-fi
-
 yarn run build:app:libs || exit 1;
 yarn run build:app:assets || exit 1;
 
+sed -i "s/\.\/render.js/.\/render.js?version=$CURRENT_VERSION/g" resources/public/js/worker/main*.js
+
 mkdir -p target/dist;
 rsync -avr resources/public/ target/dist/
 

frontend/shadow-cljs.edn

@@ -94,7 +94,7 @@
    {:main
     {:entries [app.worker]
      :web-worker true
-     :prepend-js "importScripts('/js/worker/render.js');"
+     :prepend-js "importScripts('./render.js');"
      :depends-on #{}}}
 
    :js-options

frontend/src/app/main/ui/workspace/sidebar/layer_item.scss

@@ -5,6 +5,7 @@
 // Copyright (c) KALEIDOS INC
 
 @use "refactor/common-refactor.scss" as deprecated;
+@use "ds/_utils.scss" as *;
 
 .layer-row {
   --layer-indentation-size: calc(#{deprecated.$s-4} * 6);
@@ -87,7 +88,7 @@
   height: deprecated.$s-32;
   width: calc(100% - (var(--depth) * var(--layer-indentation-size)));
   cursor: pointer;
-
+  min-width: px2rem(140);
   &.filtered {
     width: calc(100% - deprecated.$s-12);
   }

frontend/src/app/main/ui/workspace/sidebar/layers.scss

@@ -211,9 +211,7 @@
   overflow-x: auto;
   overflow-y: overlay;
   scrollbar-gutter: stable;
-
-  .element-list {
-    width: var(--left-sidebar-width);
-    display: grid;
-  }
+}
+.element-list {
+  display: grid;
 }

render-wasm/_build_env

@@ -63,6 +63,12 @@ function clean {
     cargo clean;
 }
 
+function setup {
+    corepack enable;
+    corepack install;
+    yarn install;
+}
+
 function build {
     cargo build $CARGO_PARAMS;
 }
@@ -70,6 +76,8 @@ function build {
 function copy_artifacts {
     DEST=$1;
 
+    mkdir -p $DEST;
+
     cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.js $DEST/$BUILD_NAME.js;
     cp target/wasm32-unknown-emscripten/$BUILD_MODE/render_wasm.wasm $DEST/$BUILD_NAME.wasm;
 

render-wasm/build

@@ -11,10 +11,7 @@ pushd $_SCRIPT_DIR;
 
 set -ex;
 
-corepack enable;
-corepack install;
-yarn install;
-
+setup;
 build;
 copy_artifacts "../frontend/resources/public/js";
 copy_shared_artifact;

render-wasm/watch

@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -x
 
 _SCRIPT_DIR=$(dirname $0);
 pushd $_SCRIPT_DIR;