📎 Update version.txt file

This reverts commit a7f39e89f6.

.clj-kondo/config.edn

@@ -6,7 +6,6 @@
   rumext.v2/defc clojure.core/defn
   rumext.v2/fnc clojure.core/fn
   app.common.data/export clojure.core/def
-  app.db/with-atomic clojure.core/with-open
   app.common.data.macros/get-in clojure.core/get-in
   app.common.data.macros/with-open clojure.core/with-open
   app.common.data.macros/select-keys clojure.core/select-keys
@@ -17,6 +16,7 @@
   {app.common.data.macros/export hooks.export/export
    potok.core/reify hooks.export/potok-reify
    app.util.services/defmethod hooks.export/service-defmethod
+   app.db/with-atomic hooks.export/penpot-with-atomic
    }}
 
  :output

.clj-kondo/hooks/export.clj

@@ -39,6 +39,43 @@
                          other))]
       {:node result})))
 
+(defn penpot-with-atomic
+  [{:keys [node]}]
+  (let [[_ params & other] (:children node)
+
+        result (if (api/vector-node? params)
+                 (api/list-node
+                  (into [(api/token-node (symbol "clojure.core" "with-open")) params] other))
+                 (api/list-node
+                  (into [(api/token-node (symbol "clojure.core" "with-open"))
+                         (api/vector-node [params params])]
+                        other)))
+
+        ]
+    {:node result}))
+
+(defn penpot-defrecord
+  [{:keys [:node]}]
+  (let [[rnode rtype rparams & other] (:children node)
+
+        nodes [(api/token-node (symbol "do"))
+               (api/list-node
+                (into [(api/token-node (symbol (name (:value rnode)))) rtype rparams] other))
+               (api/list-node
+                [(api/token-node (symbol "defn"))
+                 (api/token-node (symbol (str "pos->" (:string-value rtype))))
+                 (api/vector-node
+                  (->> (:children rparams)
+                       (mapv (fn [t]
+                               (api/token-node (symbol (str "_" (:string-value t))))))))
+                 (api/token-node nil)])]
+
+        result (api/list-node nodes)]
+
+    ;; (prn "=====>" (into {} rparams))
+    ;; (prn (api/sexpr result))
+    {:node result}))
+
 (defn clojure-specify
   [{:keys [:node]}]
   (let [[rnode rtype & other] (:children node)
@@ -48,7 +85,6 @@
                        other))]
     {:node result}))
 
-
 (defn service-defmethod
   [{:keys [:node]}]
   (let [[rnode rtype ?meta & other] (:children node)

CHANGES.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.19.1
+
+### :bug: Bugs fixed
+
+- Fix components not registered as updated [Taiga #5725](https://tree.taiga.io/project/penpot/issue/5725)
+
 ## 1.19.0
 
 ### :boom: Breaking changes & Deprecations

backend/deps.edn

@@ -21,8 +21,8 @@
   java-http-clj/java-http-clj {:mvn/version "0.4.3"}
 
   funcool/yetti
-  {:git/tag "v9.15"
-   :git/sha "aa9b967"
+  {:git/tag "v9.16"
+   :git/sha "7df3e08"
    :git/url "https://github.com/funcool/yetti.git"
    :exclusions [org.slf4j/slf4j-api]}
 

backend/resources/app/templates/api-doc-entry.tmpl

@@ -22,11 +22,7 @@
       {% endif %}
       {% if item.params-schema-js %}
         <span class="tag">
-          <span>SC</span>
-        </span>
-      {% else %}
-        <span class="tag">
-          <span>SP</span>
+          <span>SCHEMA</span>
         </span>
       {% endif %}
     </div>

backend/resources/app/templates/api-doc.tmpl

@@ -38,7 +38,7 @@
         <h2>GENERAL NOTES</h2>
 
         <h3>Authentication</h3>
-        <p>The penpot backend right now offerts two way for authenticate the request:
+        <p>The penpot backend right now offers two way for authenticate the request:
         <b>cookies</b> (the same mechanism that we use ourselves on accessing the API from the
         web application) and <b>access tokens</b>.</p>
 

backend/resources/app/templates/error-list.tmpl

@@ -6,13 +6,19 @@ penpot - error list
 
 {% block content %}
 <nav>
-  <h1>Latest error reports:</h1>
+  <div class="title">
+    <h1>Error reports (last 200)</h1>
+  </div>
 </nav>
 <main class="horizontal-list">
   <ul>
     {% for item in items %}
-    <li><a class="date" href="/dbg/error/{{item.id}}">{{item.created-at}}</a> 
-        <span class="title">{{item.hint|abbreviate:150}}</span></li>
+      <li>
+        <a class="date" href="/dbg/error/{{item.id}}">{{item.created-at}}</a>
+        <a class="hint" href="/dbg/error/{{item.id}}">
+          <span class="title">{{item.hint|abbreviate:150}}</span>
+        </a>
+      </li>
     {% endfor %}
   </ul>
 </main>

backend/resources/app/templates/error-report.v3.tmpl

@@ -1,13 +1,13 @@
  {% extends "app/templates/base.tmpl" %}
 
 {% block title %}
-penpot - error report v2 {{id}}
+Report: {{hint|abbreviate:150}} - {{id}} - Penpot Error Report (v3)
 {% endblock %}
 
 {% block content %}
 <nav>
   <div>[<a href="/dbg/error">⮜</a>]</div>
-  <div>[<a href="#message">message</a>]</div>
+  <div>[<a href="#head">head</a>]</div>
   <div>[<a href="#props">props</a>]</div>
   <div>[<a href="#context">context</a>]</div>
   {% if params %}
@@ -29,10 +29,11 @@ penpot - error report v2 {{id}}
 <main>
   <div class="table">
     <div class="table-row multiline">
-      <div id="message" class="table-key">MESSAGE: </div>
-
+      <div id="head" class="table-key">HEAD</div>
       <div class="table-val">
-        <h1>{{hint}}</h1>
+        <h1><span class="not-important">Hint:</span> <br/> {{hint}}</h1>
+        <h2><span class="not-important">Reported at:</span> <br/> {{created-at}}</h2>
+        <h2><span class="not-important">Report ID:</span> <br/> {{id}}</h2>
       </div>
     </div>
 
@@ -71,7 +72,7 @@ penpot - error report v2 {{id}}
 
     {% if value %}
     <div class="table-row multiline">
-      <div id="value" class="table-key">VALIDATION VALUE: </div>
+      <div id="value" class="table-key">VALUE: </div>
       <div class="table-val">
         <pre>{{value}}</pre>
       </div>

backend/resources/app/templates/styles.css

@@ -36,6 +36,11 @@ small {
   color: #888;
 }
 
+.not-important {
+  color: #888;
+  font-weight: 200;
+}
+
 small > strong {
   font-size: 9px;
 }
@@ -50,7 +55,13 @@ nav {
   background: #e3e3e3;
 }
 
-nav > h1 {
+nav > .title {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+}
+
+nav > .title > h1 {
   padding: 0px;
   margin: 0px;
   font-size: 11px;
@@ -151,7 +162,6 @@ nav > div:not(:last-child) {
   line-height: 18px;
   min-width: 210px;
   margin: 0px 20px;
-  cursor: pointer;
   display: flex;
   border-radius: 3px;
 }

backend/src/app/auth/oidc.clj

@@ -391,13 +391,14 @@
 (defn- get-user-info
   [{:keys [provider]} tdata]
   (try
-    (let [{:keys [kid alg] :as theader} (jwt/decode-header (:token/id tdata))]
-      (when-let [key (if (str/starts-with? (name alg) "hs")
-                       (:client-secret provider)
-                       (get-in provider [:jwks kid]))]
+    (when (:token/id tdata)
+      (let [{:keys [kid alg] :as theader} (jwt/decode-header (:token/id tdata))]
+        (when-let [key (if (str/starts-with? (name alg) "hs")
+                         (:client-secret provider)
+                         (get-in provider [:jwks kid]))]
 
-        (let [claims (jwt/unsign (:token/id tdata) key {:alg alg})]
-          (dissoc claims :exp :iss :iat :sid :aud :sub))))
+          (let [claims (jwt/unsign (:token/id tdata) key {:alg alg})]
+            (dissoc claims :exp :iss :iat :sid :aud :sub)))))
     (catch Throwable cause
       (l/warn :hint "unable to get user info from JWT token (unexpected exception)"
               :cause cause))))
@@ -566,7 +567,7 @@
           profile (get-profile cfg info)]
       (generate-redirect cfg request info profile))
     (catch Throwable cause
-      (l/error :hint "error on oauth process" :cause cause)
+      (l/warn :hint "error on oauth process" :cause cause)
       (generate-error-redirect cfg cause))))
 
 (def provider-lookup

backend/src/app/db.clj

@@ -5,7 +5,7 @@
 ;; Copyright (c) KALEIDOS INC
 
 (ns app.db
-  (:refer-clojure :exclude [get])
+  (:refer-clojure :exclude [get run!])
   (:require
    [app.common.data :as d]
    [app.common.exceptions :as ex]
@@ -218,7 +218,13 @@
 
 (defmacro with-atomic
   [& args]
-  `(jdbc/with-transaction ~@args))
+  (if (symbol? (first args))
+    (let [cfgs (first args)
+          body (rest args)]
+      `(jdbc/with-transaction [conn# (::pool ~cfgs)]
+         (let [~cfgs (assoc ~cfgs ::conn conn#)]
+           ~@body)))
+    `(jdbc/with-transaction ~@args)))
 
 (defn open
   [pool]
@@ -293,6 +299,10 @@
                 :hint "database object not found"))
     row))
 
+(defn plan
+  [ds sql]
+  (jdbc/plan ds sql sql/default-opts))
+
 (defn get-by-id
   [ds table id & {:as opts}]
   (get ds table {:id id} opts))
@@ -381,6 +391,52 @@
   ([^Connection conn ^Savepoint sp]
    (.rollback conn sp)))
 
+(defn tx-run!
+  [cfg f]
+  (cond
+    (connection? cfg)
+    (tx-run! {::conn cfg} f)
+
+    (pool? cfg)
+    (tx-run! {::pool cfg} f)
+
+    (::conn cfg)
+    (let [conn (::conn cfg)
+          sp   (savepoint conn)]
+      (try
+        (let [result (f cfg)]
+          (release! conn sp)
+          result)
+        (catch Throwable cause
+          (rollback! sp)
+          (throw cause))))
+
+    (::pool cfg)
+    (with-atomic [conn (::pool cfg)]
+      (f (assoc cfg ::conn conn)))
+
+    :else
+    (throw (IllegalArgumentException. "invalid arguments"))))
+
+(defn run!
+  [cfg f]
+  (cond
+    (connection? cfg)
+    (run! {::conn cfg} f)
+
+    (pool? cfg)
+    (run! {::pool cfg} f)
+
+    (::conn cfg)
+    (f cfg)
+
+    (::pool cfg)
+    (with-open [^Connection conn (open (::pool cfg))]
+      (f (assoc cfg ::conn conn)))
+
+    :else
+    (throw (IllegalArgumentException. "invalid arguments"))))
+
 (defn interval
   [o]
   (cond

backend/src/app/http/debug.clj

@@ -238,9 +238,11 @@
             (-> (io/resource "app/templates/error-report.v2.tmpl")
                 (tmpl/render report)))
 
-          (render-template-v3 [{report :content}]
+          (render-template-v3 [{:keys [content id created-at]}]
             (-> (io/resource "app/templates/error-report.v3.tmpl")
-                (tmpl/render report)))
+                (tmpl/render (-> content
+                                 (assoc :id id)
+                                 (assoc :created-at (dt/format-instant created-at :rfc1123))))))
           ]
 
     (when-not (authorized? pool request)
@@ -264,7 +266,7 @@
           content->>'~:hint' AS hint
      FROM server_error_report
     ORDER BY created_at DESC
-    LIMIT 100")
+    LIMIT 200")
 
 (defn error-list-handler
   [{:keys [::db/pool]} request]

backend/src/app/http/errors.clj

@@ -10,6 +10,7 @@
    [app.common.exceptions :as ex]
    [app.common.logging :as l]
    [app.common.schema :as sm]
+   [app.config :as cf]
    [app.http :as-alias http]
    [app.http.access-token :as-alias actoken]
    [app.http.session :as-alias session]
@@ -30,14 +31,14 @@
   (let [claims (-> {}
                    (into (::session/token-claims request))
                    (into (::actoken/token-claims request)))]
-    {:path       (:path request)
-     :method     (:method request)
-     :params     (:params request)
-     :ip-addr    (parse-client-ip request)
-     :user-agent (yrq/get-header request "user-agent")
-     :profile-id (:uid claims)
-     :version    (or (yrq/get-header request "x-frontend-version")
-                     "unknown")}))
+    {:request/path       (:path request)
+     :request/method     (:method request)
+     :request/params     (:params request)
+     :request/user-agent (yrq/get-header request "user-agent")
+     :request/ip-addr    (parse-client-ip request)
+     :request/profile-id (:uid claims)
+     :version/frontend   (or (yrq/get-header request "x-frontend-version") "unknown")
+     :version/backend    (:full cf/version)}))
 
 (defmulti handle-exception
   (fn [err & _rest]
@@ -73,7 +74,7 @@
      ::yrs/headers headers}))
 
 (defmethod handle-exception :validation
-  [err _]
+  [err request]
   (let [{:keys [code] :as data} (ex-data err)]
     (cond
       (= code :spec-validation)
@@ -94,6 +95,11 @@
       (= code :request-body-too-large)
       {::yrs/status 413 ::yrs/body data}
 
+      (= code :invalid-image)
+      (binding [l/*context* (request->context request)]
+        (l/error :hint "unexpected error on processing image" :cause err)
+        {::yrs/status 400 ::yrs/body data})
+
       :else
       {::yrs/status 400 ::yrs/body data})))
 

backend/src/app/http/middleware.clj

@@ -22,9 +22,10 @@
   (:import
    com.fasterxml.jackson.core.JsonParseException
    com.fasterxml.jackson.core.io.JsonEOFException
+   com.fasterxml.jackson.databind.exc.MismatchedInputException
    io.undertow.server.RequestTooBigException
-   java.io.OutputStream
-   java.io.InputStream))
+   java.io.InputStream
+   java.io.OutputStream))
 
 (set! *warn-on-reflection* true)
 
@@ -78,11 +79,13 @@
 
 
               (or (instance? JsonEOFException cause)
-                  (instance? JsonParseException cause))
+                  (instance? JsonParseException cause)
+                  (instance? MismatchedInputException cause))
               (raise (ex/error :type :validation
                                :code :malformed-json
                                :hint (ex-message cause)
                                :cause cause))
+
               :else
               (raise cause)))]
 
@@ -118,7 +121,9 @@
                       (t/write! tw data)))
                   (catch java.io.IOException _)
                   (catch Throwable cause
-                    (l/error :hint "unexpected error on encoding response" :cause cause))
+                    (binding [l/*context* {:value data}]
+                      (l/error :hint "unexpected error on encoding response"
+                               :cause cause)))
                   (finally
                     (.close ^OutputStream output-stream))))))
 
@@ -131,8 +136,9 @@
 
                   (catch java.io.IOException _)
                   (catch Throwable cause
-                    (l/error :hint "unexpected error on encoding response"
-                             :cause cause))
+                    (binding [l/*context* {:value data}]
+                      (l/error :hint "unexpected error on encoding response"
+                               :cause cause)))
                   (finally
                     (.close ^OutputStream output-stream))))))
 

backend/src/app/http/websocket.clj

@@ -11,6 +11,7 @@
    [app.common.logging :as l]
    [app.common.pprint :as pp]
    [app.common.spec :as us]
+   [app.common.uuid :as uuid]
    [app.db :as db]
    [app.http.session :as session]
    [app.metrics :as mtx]
@@ -99,7 +100,10 @@
     (sp/pipe ch output-ch false)
 
     ;; Subscribe to the profile topic on msgbus/redis
-    (mbus/sub! msgbus :topic profile-id :chan ch)))
+    (mbus/sub! msgbus :topic profile-id :chan ch)
+
+    ;; Subscribe to the system topic on msgbus/redis
+    (mbus/sub! msgbus :topic (str uuid/zero) :chan ch)))
 
 (defmethod handle-message :close
   [{:keys [::mbus/msgbus]} {:keys [::ws/id ::ws/state ::profile-id ::session-id]} _]

backend/src/app/loggers/database.clj

@@ -40,35 +40,33 @@
   [{:keys [::l/context ::l/message ::l/props ::l/logger ::l/level ::l/cause] :as record}]
   (us/assert! ::l/record record)
 
-  (let [data (ex-data cause)]
+  (let [data (ex-data cause)
+        ctx  (-> context
+                 (assoc :tenant (cf/get :tenant))
+                 (assoc :host (cf/get :host))
+                 (assoc :public-uri (cf/get :public-uri))
+                 (assoc :logger/name logger)
+                 (assoc :logger/level level)
+                 (dissoc :request/params :value :params :data))]
     (merge
-     {:context (-> context
-                   (assoc :tenant (cf/get :tenant))
-                   (assoc :host (cf/get :host))
-                   (assoc :public-uri (cf/get :public-uri))
-                   (assoc :version (:full cf/version))
-                   (assoc :logger-name logger)
-                   (assoc :logger-level level)
-                   (dissoc :params)
-                   (pp/pprint-str :width 200))
-
-      :props   (pp/pprint-str props :width 200)
+     {:context (-> (into (sorted-map) ctx)
+                   (pp/pprint-str :width 200 :length 50 :level 10))
+      :props   (pp/pprint-str props :width 200 :length 50)
       :hint    (or (ex-message cause) @message)
       :trace   (ex/format-throwable cause :data? false :explain? false :header? false :summary? false)}
 
-     (when-let [params (:params context)]
-       {:params (pp/pprint-str params :width 200)})
+     (when-let [params (or (:request/params context) (:params context))]
+       {:params (pp/pprint-str params :width 200 :length 50 :level 10)})
+
+     (when-let [value (:value context)]
+       {:value (pp/pprint-str value :width 200 :length 50 :level 10)})
 
      (when-let [data (some-> data (dissoc ::s/problems ::s/value ::s/spec ::sm/explain :hint))]
        {:data (pp/pprint-str data :width 200)})
 
-     (when-let [value (-> data ::sm/explain :value)]
-       {:value (pp/pprint-str value :width 200)})
-
-     (when-let [explain (ex/explain data)]
+     (when-let [explain (ex/explain data {:level 10 :length 50})]
        {:explain explain}))))
 
-
 (defn error-record?
   [{:keys [::l/level ::l/cause]}]
   (and (= :error level)

backend/src/app/loggers/mattermost.clj

@@ -30,7 +30,9 @@
                   "```\n"
                   "- host: `" (:host report) "`\n"
                   "- tenant: `" (:tenant report) "`\n"
-                  "- version: `" (:version report) "`\n"
+                  "- request-path: `" (:request-path report) "`\n"
+                  "- frontend-version: `" (:frontend-version report) "`\n"
+                  "- backend-version: `" (:backend-version report) "`\n"
                   "\n"
                   "Trace:\n"
                   (:trace report)
@@ -50,13 +52,15 @@
 (defn record->report
   [{:keys [::l/context ::l/id ::l/cause] :as record}]
   (us/assert! ::l/record record)
-  {:id         id
-   :tenant     (cf/get :tenant)
-   :host       (cf/get :host)
-   :public-uri (cf/get :public-uri)
-   :version    (:full cf/version)
-   :profile-id (:profile-id context)
-   :trace      (ex/format-throwable cause :detail? false :header? false)})
+  {: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)
+   :trace            (ex/format-throwable cause :detail? false :header? false)})
 
 (defn handle-event
   [cfg record]

backend/src/app/media.clj

@@ -9,7 +9,6 @@
   (:require
    [app.common.data :as d]
    [app.common.exceptions :as ex]
-   [app.common.logging :as l]
    [app.common.media :as cm]
    [app.common.schema :as sm]
    [app.common.schema.generators :as sg]
@@ -227,7 +226,6 @@
 
 (defmethod process-error org.im4java.core.InfoException
   [error]
-  (l/error :hint "unexpected error on processing image" :cause error)
   (ex/raise :type :validation
             :code :invalid-image
             :hint "invalid image"

backend/src/app/migrations.clj

@@ -324,6 +324,9 @@
    {:name "0104-mod-file-thumbnail-table"
     :fn (mg/resource "app/migrations/sql/0104-mod-file-thumbnail-table.sql")}
 
+   {:name "0105-mod-server-error-report-table"
+    :fn (mg/resource "app/migrations/sql/0105-mod-server-error-report-table.sql")}
+
    ])
 
 (defn apply-migrations!

backend/src/app/migrations/sql/0105-mod-server-error-report-table.sql

@@ -0,0 +1,2 @@
+CREATE INDEX server_error_report__created_at__idx
+    ON server_error_report ( created_at );

backend/src/app/rpc/commands/audit.clj

@@ -68,6 +68,7 @@
    ::climit/key-fn ::rpc/profile-id
    ::sm/params schema:push-audit-events
    ::audit/skip true
+   ::doc/skip true
    ::doc/added "1.17"}
   [{:keys [::db/pool] :as cfg} params]
   (if (or (db/read-only? pool)

backend/src/app/rpc/commands/binfile.clj

@@ -294,28 +294,40 @@
   [output & {:keys [level] :or {level 0}}]
   (ZstdOutputStream. ^OutputStream output (int level)))
 
-(defn- retrieve-file
-  [pool file-id]
-  (dm/with-open [conn (db/open pool)]
-    (binding [pmap/*load-fn* (partial files/load-pointer conn file-id)]
-      (some-> (db/get* conn :file {:id file-id})
-              (files/decode-row)
-              (files/process-pointers deref)))))
+(defn- get-files
+  [cfg ids]
+  (letfn [(get-files* [{:keys [::db/conn]}]
+            (let [sql (str "SELECT id FROM file "
+                           " WHERE id = ANY(?) ")
+                  ids (db/create-array conn "uuid" ids)]
+              (->> (db/exec! conn [sql ids])
+                   (into [] (map :id))
+                   (not-empty))))]
 
-(def ^:private sql:file-media-objects
-  "SELECT * FROM file_media_object WHERE id = ANY(?)")
+    (db/run! cfg get-files*)))
 
-(defn- retrieve-file-media
-  [pool {:keys [data id] :as file}]
+(defn- get-file
+  [cfg file-id]
+  (letfn [(get-file* [{:keys [::db/conn]}]
+            (binding [pmap/*load-fn* (partial files/load-pointer conn file-id)]
+              (some-> (db/get* conn :file {:id file-id} {::db/remove-deleted? false})
+                      (files/decode-row)
+                      (files/process-pointers deref))))]
+
+    (db/run! cfg get-file*)))
+
+(defn- get-file-media
+  [{:keys [::db/pool]} {:keys [data id] :as file}]
   (dm/with-open [conn (db/open pool)]
     (let [ids (app.tasks.file-gc/collect-used-media data)
-          ids (db/create-array conn "uuid" ids)]
+          ids (db/create-array conn "uuid" ids)
+          sql (str "SELECT * FROM file_media_object WHERE id = ANY(?)")]
 
       ;; We assoc the file-id again to the file-media-object row
       ;; because there are cases that used objects refer to other
       ;; files and we need to ensure in the exportation process that
       ;; all ids matches
-      (->> (db/exec! conn [sql:file-media-objects ids])
+      (->> (db/exec! conn [sql ids])
            (mapv #(assoc % :file-id id))))))
 
 (def ^:private storage-object-id-xf
@@ -325,34 +337,32 @@
 
 (def ^:private sql:file-libraries
   "WITH RECURSIVE libs AS (
-     SELECT fl.id, fl.deleted_at
+     SELECT fl.id
        FROM file AS fl
        JOIN file_library_rel AS flr ON (flr.library_file_id = fl.id)
       WHERE flr.file_id = ANY(?)
     UNION
-     SELECT fl.id, fl.deleted_at
+     SELECT fl.id
        FROM file AS fl
        JOIN file_library_rel AS flr ON (flr.library_file_id = fl.id)
        JOIN libs AS l ON (flr.file_id = l.id)
    )
    SELECT DISTINCT l.id
-     FROM libs AS l
-    WHERE l.deleted_at IS NULL OR l.deleted_at > now();")
+     FROM libs AS l")
 
-(defn- retrieve-libraries
-  [pool ids]
+(defn- get-libraries
+  [{:keys [::db/pool]} ids]
   (dm/with-open [conn (db/open pool)]
     (let [ids (db/create-array conn "uuid" ids)]
       (map :id (db/exec! pool [sql:file-libraries ids])))))
 
-(def ^:private sql:file-library-rels
-  "SELECT * FROM file_library_rel
-    WHERE file_id = ANY(?)")
-
-(defn- retrieve-library-relations
-  [pool ids]
-  (dm/with-open [conn (db/open pool)]
-    (db/exec! conn [sql:file-library-rels (db/create-array conn "uuid" ids)])))
+(defn- get-library-relations
+  [cfg ids]
+  (db/run! cfg (fn [{:keys [::db/conn]}]
+                 (let [ids (db/create-array conn "uuid" ids)
+                       sql (str "SELECT flr.* FROM file_library_rel AS flr "
+                                " WHERE flr.file_id = ANY(?)")]
+                   (db/exec! conn [sql ids])))))
 
 (defn- create-or-update-file
   [conn params]
@@ -378,7 +388,7 @@
 ;; --- EXPORT WRITER
 
 (defn- embed-file-assets
-  [data conn file-id]
+  [data cfg file-id]
   (letfn [(walk-map-form [form state]
             (cond
               (uuid? (:fill-color-ref-file form))
@@ -408,7 +418,7 @@
             ;; NOTE: there is a possibility that shape refers to an
             ;; non-existant file because the file was removed. In this
             ;; case we just ignore the asset.
-            (if-let [lib (retrieve-file conn lib-id)]
+            (if-let [lib (get-file cfg lib-id)]
               (reduce (partial process-asset lib) data items)
               data))
 
@@ -476,31 +486,39 @@
               [:v1/metadata :v1/files :v1/rels :v1/sobjects])))))
 
 (defmethod write-section :v1/metadata
-  [{:keys [::db/pool ::output ::file-ids ::include-libraries?]}]
-  (let [libs  (when include-libraries?
-                (retrieve-libraries pool file-ids))
-        files (into file-ids libs)]
-    (write-obj! output {:version cf/version :files files})
-    (vswap! *state* assoc :files files)))
+  [{:keys [::output ::file-ids ::include-libraries?] :as cfg}]
+  (if-let [fids (get-files cfg file-ids)]
+    (let [lids (when include-libraries?
+                 (get-libraries cfg file-ids))
+          ids  (into fids lids)]
+      (write-obj! output {:version cf/version :files ids})
+      (vswap! *state* assoc :files ids))
+    (ex/raise :type :not-found
+              :code :files-not-found
+              :hint "unable to retrieve files for export")))
 
 (defmethod write-section :v1/files
-  [{:keys [::db/pool ::output ::embed-assets?]}]
+  [{:keys [::output ::embed-assets?] :as cfg}]
 
   ;; Initialize SIDS with empty vector
   (vswap! *state* assoc :sids [])
 
   (doseq [file-id (-> *state* deref :files)]
-    (let [file  (cond-> (retrieve-file pool file-id)
+    (let [file  (cond-> (get-file cfg file-id)
                   embed-assets?
-                  (update :data embed-file-assets pool file-id))
+                  (update :data embed-file-assets cfg file-id))
 
-          media (retrieve-file-media pool file)]
+          media (get-file-media cfg file)]
 
       (l/debug :hint "write penpot file"
                :id file-id
+               :name (:name file)
                :media (count media)
                ::l/sync? true)
 
+      (doseq [item media]
+        (l/debug :hint "write penpot file media object" :id (:id item) ::l/sync? true))
+
       (doto output
         (write-obj! file)
         (write-obj! media))
@@ -508,9 +526,10 @@
       (vswap! *state* update :sids into storage-object-id-xf media))))
 
 (defmethod write-section :v1/rels
-  [{:keys [::db/pool ::output ::include-libraries?]}]
-  (let [rels  (when include-libraries?
-                (retrieve-library-relations pool (-> *state* deref :files)))]
+  [{:keys [::output ::include-libraries?] :as cfg}]
+  (let [ids  (-> *state* deref :files)
+        rels (when include-libraries?
+               (get-library-relations cfg ids))]
     (l/debug :hint "found rels" :total (count rels) ::l/sync? true)
     (write-obj! output rels)))
 
@@ -518,6 +537,7 @@
   [{:keys [::sto/storage ::output]}]
   (let [sids    (-> *state* deref :sids)
         storage (media/configure-assets-storage storage)]
+
     (l/debug :hint "found sobjects"
              :items (count sids)
              ::l/sync? true)
@@ -630,6 +650,8 @@
       (when (not= file-id expected-file-id)
         (ex/raise :type :validation
                   :code :inconsistent-penpot-file
+                  :found-id file-id
+                  :expected-id expected-file-id
                   :hint "the penpot file seems corrupt, found unexpected uuid (file-id)"))
 
       ;; Update index using with media
@@ -679,18 +701,27 @@
 
 (defmethod read-section :v1/rels
   [{:keys [::db/conn ::input ::timestamp]}]
-  (let [rels (read-obj! input)]
+  (let [rels (read-obj! input)
+        ids  (into #{} (-> *state* deref :files))]
     ;; Insert all file relations
-    (doseq [rel rels]
+    (doseq [{:keys [library-file-id] :as rel} rels]
       (let [rel (-> rel
                     (assoc :synced-at timestamp)
                     (update :file-id lookup-index)
                     (update :library-file-id lookup-index))]
-        (l/debug :hint "create file library link"
-                 :file-id (:file-id rel)
-                 :lib-id (:library-file-id rel)
-                 ::l/sync? true)
-        (db/insert! conn :file-library-rel rel)))))
+
+        (if (contains? ids library-file-id)
+          (do
+            (l/debug :hint "create file library link"
+                     :file-id (:file-id rel)
+                     :lib-id (:library-file-id rel)
+                     ::l/sync? true)
+            (db/insert! conn :file-library-rel rel))
+
+          (l/warn :hint "ignoring file library link"
+                  :file-id (:file-id rel)
+                  :lib-id (:library-file-id rel)
+                  ::l/sync? true))))))
 
 (defmethod read-section :v1/sobjects
   [{:keys [::sto/storage ::db/conn ::input ::overwrite?]}]
@@ -742,7 +773,7 @@
 (defn- lookup-index
   [id]
   (let [val (get-in @*state* [:index id])]
-    (l/trace :fn "lookup-index" :id id :val val ::l/sync? true)
+    (l/debug :fn "lookup-index" :id id :val val ::l/sync? true)
     (when (and (not (::ignore-index-errors? *options*)) (not val))
       (ex/raise :type :validation
                 :code :incomplete-index
@@ -755,7 +786,7 @@
          index index]
     (if-let [id (first items)]
       (let [new-id (if (::overwrite? *options*) id (uuid/next))]
-        (l/trace :fn "update-index" :id id :new-id new-id ::l/sync? true)
+        (l/debug :fn "update-index" :id id :new-id new-id ::l/sync? true)
         (recur (rest items)
                (assoc index id new-id)))
       index)))
@@ -773,8 +804,7 @@
               (update-in [:metadata :id] lookup-index)
 
               ;; Relink paths with fill image
-              (and (map? (:fill-image form))
-                   (= :path (:type form)))
+              (map? (:fill-image form))
               (update-in [:fill-image :id] lookup-index)
 
               ;; This covers old shapes and the new :fills.

backend/src/app/rpc/commands/files_thumbnails.clj

@@ -67,6 +67,7 @@
 (sv/defmethod ::get-file-object-thumbnails
   "Retrieve a file object thumbnails."
   {::doc/added "1.17"
+   ::doc/module :files
    ::sm/params [:map {:title "get-file-object-thumbnails"}
                 [:file-id ::sm/uuid]]
    ::sm/result [:map-of :string :string]
@@ -112,6 +113,7 @@
 
 (sv/defmethod ::get-file-thumbnail
   {::doc/added "1.17"
+   ::doc/module :files
    ::doc/deprecated "1.19"}
   [{:keys [::db/pool]} {:keys [::rpc/profile-id file-id revn]}]
   (dm/with-open [conn (db/open pool)]
@@ -220,6 +222,7 @@
   mainly for render thumbnails on dashboard."
 
   {::doc/added "1.17"
+   ::doc/module :files
    ::sm/params [:map {:title "get-file-data-for-thumbnail"}
                 [:file-id ::sm/uuid]
                 [:features {:optional true} ::files/features]]
@@ -267,6 +270,7 @@
 
 (sv/defmethod ::upsert-file-object-thumbnail
   {::doc/added "1.17"
+   ::doc/module :files
    ::doc/deprecated "1.19"
    ::audit/skip true}
   [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id] :as params}]
@@ -312,6 +316,7 @@
 
 (sv/defmethod ::create-file-object-thumbnail
   {:doc/added "1.19"
+   ::doc/module :files
    ::audit/skip true
    ::sm/params schema:create-file-object-thumbnail}
 
@@ -350,6 +355,7 @@
 
 (sv/defmethod ::delete-file-object-thumbnail
   {:doc/added "1.19"
+   ::doc/module :files
    ::audit/skip true}
   [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id object-id]}]
 
@@ -388,6 +394,7 @@
   "Creates or updates the file thumbnail. Mainly used for paint the
   grid thumbnails."
   {::doc/added "1.17"
+   ::doc/module :files
    ::doc/deprecated "1.19"
    ::audit/skip true}
   [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id] :as params}]
@@ -430,6 +437,7 @@
   "Creates or updates the file thumbnail. Mainly used for paint the
   grid thumbnails."
   {::doc/added "1.19"
+   ::doc/module :files
    ::audit/skip true
    ::sm/params [:map {:title "create-file-thumbnail"}
                 [:file-id ::sm/uuid]

backend/src/app/rpc/commands/ldap.clj

@@ -38,7 +38,8 @@
   "Performs the authentication using LDAP backend. Only works if LDAP
   is properly configured and enabled with `login-with-ldap` flag."
   {::rpc/auth false
-   ::doc/added "1.15"}
+   ::doc/added "1.15"
+   ::doc/module :auth}
   [{:keys [::main/props ::ldap/provider] :as cfg} params]
   (when-not provider
     (ex/raise :type :restriction

backend/src/app/rpc/commands/media.clj

@@ -171,7 +171,8 @@
           :opt-un [::id ::name]))
 
 (sv/defmethod ::create-file-media-object-from-url
-  {::doc/added "1.17"}
+  {::doc/added "1.17"
+   ::doc/deprecated "1.19"}
   [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id] :as params}]
   (let [cfg (update cfg ::sto/storage media/configure-assets-storage)]
     (files/check-edition-permissions! pool profile-id file-id)

backend/src/app/rpc/commands/search.clj

@@ -64,6 +64,7 @@
           :opt-un [::search-term]))
 
 (sv/defmethod ::search-files
-  {::doc/added "1.17"}
+  {::doc/added "1.17"
+   ::doc/module :files}
   [{:keys [::db/pool]} {:keys [::rpc/profile-id team-id search-term]}]
   (some->> search-term (search-files pool profile-id team-id)))

backend/src/app/rpc/commands/verify_token.clj

@@ -34,7 +34,8 @@
 
 (sv/defmethod ::verify-token
   {::rpc/auth false
-   ::doc/added "1.15"}
+   ::doc/added "1.15"
+   ::doc/module :auth}
   [{:keys [::db/pool] :as cfg} {:keys [token] :as params}]
   (db/with-atomic [conn pool]
     (let [claims (tokens/verify (::main/props cfg) {:token token})

backend/src/app/rpc/doc.clj

@@ -54,14 +54,14 @@
             {:name (::sv/name mdata)
              :module (or (some-> (::module mdata) d/name)
                          (-> (:ns mdata) (str/split ".") last))
-             :auth (:auth mdata true)
+             :auth (::rpc/auth mdata true)
              :webhook (::webhooks/event? mdata false)
              :docs (::sv/docstring mdata)
              :deprecated (::deprecated mdata)
              :added (::added mdata)
              :changes (some->> (::changes mdata) (partition-all 2) (map vec))
              :spec (fmt-spec mdata)
-             :entrypoint (str (cf/get :public-uri) "/api/rpc/commands/" (::sv/name mdata))
+             :entrypoint (str (cf/get :public-uri) "/api/rpc/command/" (::sv/name mdata))
 
              :params-schema-js   (fmt-schema :js mdata ::sm/params)
              :result-schema-js   (fmt-schema :js mdata ::sm/result)
@@ -75,6 +75,7 @@
      (->> methods
           (map val)
           (map first)
+          (remove ::skip)
           (map get-context)
           (sort-by (juxt :module :name)))}))
 
@@ -155,7 +156,7 @@
                          (map (partial gen-method-doc options))
                          (sort-by (juxt :module :name))
                          (map (fn [doc]
-                                [(str/ffmt "/commands/%" (:name doc)) (:repr doc)]))
+                                [(str/ffmt "/command/%" (:name doc)) (:repr doc)]))
                          (into {})))]
     {:openapi "3.0.0"
      :info {:version (:main cf/version)}

backend/src/app/srepl/main.clj

@@ -8,10 +8,15 @@
   "A collection of adhoc fixes scripts."
   #_:clj-kondo/ignore
   (:require
+   [app.common.data :as d]
+   [app.common.data.macros :as dm]
    [app.common.logging :as l]
    [app.common.pprint :as p]
    [app.common.spec :as us]
+   [app.common.uuid :as uuid]
+   [app.config :as cf]
    [app.db :as db]
+   [app.msgbus :as mbus]
    [app.rpc.commands.auth :as auth]
    [app.rpc.commands.profile :as profile]
    [app.srepl.fixes :as f]
@@ -164,3 +169,106 @@
   (alter-var-root var (fn [f]
                         (or (::original (meta f)) f))))
 
+(defn notify!
+  [{:keys [::mbus/msgbus ::db/pool]} & {:keys [dest code message level]
+                                        :or {code :generic level :info}
+                                        :as params}]
+  (dm/verify!
+   ["invalid level %" level]
+   (contains? #{:success :error :info :warning} level))
+
+  (dm/verify!
+   ["invalid code: %" code]
+   (contains? #{:generic :upgrade-version} code))
+
+  (letfn [(send [dest]
+            (l/inf :hint "sending notification" :dest (str dest))
+            (let [message {:type :notification
+                           :code code
+                           :level level
+                           :version (:full cf/version)
+                           :subs-id dest
+                           :message message}
+                  message (->> (dissoc params :dest :code :message :level)
+                               (merge message))]
+              (mbus/pub! msgbus
+                         :topic (str dest)
+                         :message message)))
+
+          (resolve-profile [email]
+            (some-> (db/get* pool :profile {:email (str/lower email)} {:columns [:id]}) :id vector))
+
+          (resolve-team [team-id]
+            (->> (db/query pool :team-profile-rel
+                           {:team-id team-id}
+                           {:columns [:profile-id]})
+                 (map :profile-id)))
+
+          (parse-uuid [v]
+            (if (uuid? v)
+              v
+              (d/parse-uuid v)))
+
+          (resolve-dest [dest]
+            (cond
+              (uuid? dest)
+              [dest]
+
+              (string? dest)
+              (some-> dest parse-uuid resolve-dest)
+
+              (nil? dest)
+              (resolve-dest uuid/zero)
+
+              (map? dest)
+              (sequence (comp
+                         (map vec)
+                         (mapcat resolve-dest))
+                        dest)
+
+              (and (coll? dest)
+                   (every? coll? dest))
+              (sequence (comp
+                         (map vec)
+                         (mapcat resolve-dest))
+                        dest)
+
+              (vector? dest)
+              (let [[op param] dest]
+                (cond
+                  (= op :email)
+                  (cond
+                    (and (coll? param)
+                         (every? string? param))
+                    (sequence (comp
+                               (keep resolve-profile)
+                               (mapcat identity))
+                              param)
+
+                    (string? param)
+                    (resolve-profile param))
+
+                  (= op :team-id)
+                  (cond
+                    (coll? param)
+                    (sequence (comp
+                               (mapcat resolve-team)
+                               (keep parse-uuid))
+                              param)
+
+                    (uuid? param)
+                    (resolve-team param)
+
+                    (string? param)
+                    (some-> param parse-uuid resolve-team))
+
+                  (= op :profile-id)
+                  (if (coll? param)
+                    (sequence (keep parse-uuid) param)
+                    (resolve-dest param))))))
+          ]
+
+    (->> (resolve-dest dest)
+         (filter some?)
+         (into #{})
+         (run! send))))

backend/src/app/tasks/file_gc.clj

@@ -113,8 +113,15 @@
                (mapcat vals)
                (keep (fn [{:keys [type] :as obj}]
                        (case type
-                         :path (get-in obj [:fill-image :id])
+                         :path  (get-in obj [:fill-image :id])
+                         :bool  (get-in obj [:fill-image :id])
+                         ;; NOTE: because of some bug, we ended with
+                         ;; many shape types having the ability to
+                         ;; have fill-image attribute (which initially
+                         ;; designed for :path shapes).
+                         :group (get-in obj [:fill-image :id])
                          :image (get-in obj [:metadata :id])
+
                          nil))))
         pages (concat
                (vals (:pages-index data))

backend/src/app/worker.clj

@@ -489,16 +489,8 @@
           (l/error :hint "worker: unhandled exception" :cause cause))))))
 
 (defn- get-error-context
-  [error item]
-  (let [data (ex-data error)]
-    (merge
-     {:hint          (ex-message error)
-      :spec-problems (some->> data ::s/problems (take 10) seq vec)
-      :spec-value    (some->> data ::s/value)
-      :data          (some-> data (dissoc ::s/problems ::s/value ::s/spec))
-      :params        item}
-     (when-let [explain (ex/explain data)]
-       {:spec-explain explain}))))
+  [_ item]
+  {:params item})
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; CRON
@@ -597,10 +589,10 @@
       (catch InterruptedException _
         (l/debug :hint "cron: task interrupted" :task-id id))
       (catch Throwable cause
-        (l/error :hint "cron: unhandled exception on running task"
-                 ::l/context (get-error-context cause task)
-                 :task-id id
-                 :cause cause))
+        (binding [l/*context* (get-error-context cause task)]
+          (l/error :hint "cron: unhandled exception on running task"
+                   :task-id id
+                   :cause cause)))
       (finally
         (when-not (px/interrupted? :current)
           (schedule-cron-task cfg task))))))

common/src/app/common/pages/changes.cljc

@@ -93,6 +93,13 @@
       [:component-id {:optional true} ::sm/uuid]
       [:ignore-touched {:optional true} :boolean]]]
 
+    [:fix-obj
+     [:map {:title "FixObjChange"}
+      [:type [:= :fix-obj]]
+      [:id ::sm/uuid]
+      [:page-id {:optional true} ::sm/uuid]
+      [:component-id {:optional true} ::sm/uuid]]]
+
     [:mov-objects
      [:map {:title "MovObjectsChange"}
       [:type [:= :mov-objects]]
@@ -218,7 +225,7 @@
 
 (sm/def! ::changes
   [:sequential {:gen/max 2} ::change])
- 
+
 (def change?
   (sm/pred-fn ::change))
 
@@ -322,7 +329,9 @@
                                          component-root (ctn/get-component-shape objects shape {:allow-main? true})]
                                      (if (and (some? component-root) (ctk/main-instance? component-root))
                                        (ctkl/set-component-modified data (:component-id component-root))
-                                       data))
+                                       (if (some? component-id)
+                                         (ctkl/set-component-modified data component-id)
+                                         data)))
                                    data))]
 
     (as-> data $
@@ -337,6 +346,12 @@
     (d/update-in-when data [:pages-index page-id] ctst/delete-shape id ignore-touched)
     (d/update-in-when data [:components component-id] ctst/delete-shape id ignore-touched)))
 
+(defmethod process-change :fix-obj
+  [data {:keys [page-id component-id] :as params}]
+  (if page-id
+    (d/update-in-when data [:pages-index page-id] ctst/fix-shape-children params)
+    (d/update-in-when data [:components component-id] ctst/fix-shape-children params)))
+
 ;; FIXME: remove, seems like this method is already unused
 ;; reg-objects operation "regenerates" the geometry and selrect of the parent groups
 (defmethod process-change :reg-objects

common/src/app/common/pages/common.cljc

@@ -12,7 +12,7 @@
    [app.common.schema :as sm]
    [app.common.uuid :as uuid]))
 
-(def file-version 21)
+(def file-version 22)
 (def default-color clr/gray-20)
 (def root uuid/zero)
 

common/src/app/common/pages/migrations.cljc

@@ -16,6 +16,7 @@
    [app.common.math :as mth]
    [app.common.pages :as cp]
    [app.common.pages.helpers :as cph]
+   [app.common.text :as txt]
    [app.common.types.shape :as cts]
    [app.common.uuid :as uuid]
    [cuerdas.core :as str]))
@@ -465,3 +466,38 @@
 
 ;; TODO: pending to do a migration for delete already not used fill
 ;; and stroke props. This should be done for >1.14.x version.
+
+(defmethod migrate 22
+  [data]
+  (letfn [(valid-ref? [ref]
+            (or (uuid? ref)
+                (nil? ref)))
+
+          (valid-node? [node]
+            (and (valid-ref? (:typography-ref-file node))
+                 (valid-ref? (:typography-ref-id node))
+                 (valid-ref? (:fill-color-ref-file node))
+                 (valid-ref? (:fill-color-ref-id node))))
+
+          (fix-ref [ref]
+            (if (valid-ref? ref) ref nil))
+
+          (fix-node [node]
+            (-> node
+                (d/update-when :typography-ref-file fix-ref)
+                (d/update-when :typography-ref-id fix-ref)
+                (d/update-when :fill-color-ref-file fix-ref)
+                (d/update-when :fill-color-ref-id fix-ref)))
+
+          (update-object [object]
+            (let [invalid-node? (complement valid-node?)]
+              (cond-> object
+                (cph/text-shape? object)
+                (update :content #(txt/transform-nodes invalid-node? fix-node %)))))
+
+          (update-container [container]
+            (update container :objects update-vals update-object))]
+
+    (-> data
+        (update :pages-index update-vals update-container)
+        (update :components update-vals update-container))))

common/src/app/common/spec.cljc

@@ -29,8 +29,10 @@
 (def uuid-rx
   #"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$")
 
-(def max-safe-int (int 1e6))
-(def min-safe-int (int -1e6))
+;; Integer/MAX_VALUE
+(def max-safe-int 2147483647)
+;; Integer/MIN_VALUE
+(def min-safe-int -2147483648)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; DEFAULT SPECS

common/src/app/common/types/grid.cljc

@@ -21,7 +21,7 @@
 (sm/def! ::column-params
   [:map
    [:color ::grid-color]
-   [:type [::sm/one-of #{:stretch :left :center :right}]]
+   [:type {:optional true} [::sm/one-of #{:stretch :left :center :right}]]
    [:size {:optional true} [:maybe ::sm/safe-number]]
    [:margin {:optional true} [:maybe ::sm/safe-number]]
    [:item-length {:optional true} [:maybe ::sm/safe-number]]

common/src/app/common/types/shape.cljc

@@ -72,10 +72,10 @@
   [:vector {:gen/max 5} ::gpt/point])
 
 (sm/def! ::fill
-  [:map {:title "Fill" :min 1}
+  [:map {:title "Fill"}
    [:fill-color {:optional true} ::ctc/rgb-color]
    [:fill-opacity {:optional true} ::sm/safe-number]
-   [:fill-color-gradient {:optional true} ::ctc/gradient]
+   [:fill-color-gradient {:optional true} [:maybe ::ctc/gradient]]
    [:fill-color-ref-file {:optional true} [:maybe ::sm/uuid]]
    [:fill-color-ref-id {:optional true} [:maybe ::sm/uuid]]])
 
@@ -156,7 +156,7 @@
   [:map {:title "GroupAttrs"}
    [:type [:= :group]]
    [:id ::sm/uuid]
-   [:shapes [:vector {:min 1 :gen/max 10 :gen/min 1} ::sm/uuid]]])
+   [:shapes {:optional true} [:maybe [:vector {:gen/max 10 :gen/min 1} ::sm/uuid]]]])
 
 (sm/def! ::frame-attrs
   [:map {:title "FrameAttrs"}
@@ -172,18 +172,20 @@
   [:map {:title "BoolAttrs"}
    [:type [:= :bool]]
    [:id ::sm/uuid]
-   [:shapes [:vector {:min 1 :gen/max 10 :gen/min 1} ::sm/uuid]]
+   [:shapes {:optional true} [:maybe [:vector {:gen/max 10 :gen/min 1} ::sm/uuid]]]
 
    ;; FIXME: improve this schema
    [:bool-type :keyword]
 
-   ;; FIXME: improve this schema
    [:bool-content
     [:vector {:gen/max 2}
      [:map
       [:command :keyword]
       [:relative {:optional true} :boolean]
-      [:params [:map-of {:gen/max 5} :keyword ::sm/safe-number]]]]]])
+      [:prev-pos {:optional true} ::gpt/point]
+      [:params {:optional true}
+       [:maybe
+        [:map-of {:gen/max 5} :keyword ::sm/safe-number]]]]]]])
 
 (sm/def! ::rect-attrs
   [:map {:title "RectAttrs"}
@@ -208,14 +210,19 @@
     [:map
      [:width :int]
      [:height :int]
-     [:mtype :string]
+     [:mtype {:optional true} [:maybe :string]]
      [:id ::sm/uuid]]]])
 
 (sm/def! ::path-attrs
   [:map {:title "PathAttrs"}
    [:type [:= :path]]
    [:id ::sm/uuid]
+   [:x {:optional true} [:maybe ::sm/safe-number]]
+   [:y {:optional true} [:maybe ::sm/safe-number]]
+   [:width {:optional true} [:maybe ::sm/safe-number]]
+   [:height {:optional true} [:maybe ::sm/safe-number]]
    [:content
+    {:optional true}
     [:vector
      [:map
       [:command :keyword]

common/src/app/common/types/shape/text.cljc

@@ -21,44 +21,46 @@
    [:type [:= "root"]]
    [:key {:optional true} :string]
    [:children
-    [:vector {:min 1 :gen/max 2 :gen/min 1}
-     [:map
-      [:type [:= "paragraph-set"]]
-      [:key {:optional true} :string]
-      [:children
-       [:vector {:min 1 :gen/max 2 :gen/min 1}
-        [:map
-         [:type [:= "paragraph"]]
-         [:key {:optional true} :string]
-         [:fills {:optional true}
-          [:maybe
-           [:vector {:gen/max 2} ::shape/fill]]]
-         [:font-family {:optional true} :string]
-         [:font-size {:optional true} :string]
-         [:font-style {:optional true} :string]
-         [:font-weight {:optional true} :string]
-         [:direction {:optional true} :string]
-         [:text-decoration {:optional true} :string]
-         [:text-transform {:optional true} :string]
-         [:typography-ref-id {:optional true} [:maybe ::sm/uuid]]
-         [:typography-ref-file {:optional true} [:maybe ::sm/uuid]]
-         [:children
-          [:vector {:min 1 :gen/max 2 :gen/min 1}
-           [:map
-            [:text :string]
-            [:key {:optional true} :string]
-            [:fills {:optional true}
-             [:maybe
-              [:vector {:gen/max 2} ::shape/fill]]]
-            [:font-family {:optional true} :string]
-            [:font-size {:optional true} :string]
-            [:font-style {:optional true} :string]
-            [:font-weight {:optional true} :string]
-            [:direction {:optional true} :string]
-            [:text-decoration {:optional true} :string]
-            [:text-transform {:optional true} :string]
-            [:typography-ref-id {:optional true} [:maybe ::sm/uuid]]
-            [:typography-ref-file {:optional true} [:maybe ::sm/uuid]]]]]]]]]]]])
+    {:optional true}
+    [:maybe
+     [:vector {:min 1 :gen/max 2 :gen/min 1}
+      [:map
+       [:type [:= "paragraph-set"]]
+       [:key {:optional true} :string]
+       [:children
+        [:vector {:min 1 :gen/max 2 :gen/min 1}
+         [:map
+          [:type [:= "paragraph"]]
+          [:key {:optional true} :string]
+          [:fills {:optional true}
+           [:maybe
+            [:vector {:gen/max 2} ::shape/fill]]]
+          [:font-family {:optional true} :string]
+          [:font-size {:optional true} :string]
+          [:font-style {:optional true} :string]
+          [:font-weight {:optional true} :string]
+          [:direction {:optional true} :string]
+          [:text-decoration {:optional true} :string]
+          [:text-transform {:optional true} :string]
+          [:typography-ref-id {:optional true} [:maybe ::sm/uuid]]
+          [:typography-ref-file {:optional true} [:maybe ::sm/uuid]]
+          [:children
+           [:vector {:min 1 :gen/max 2 :gen/min 1}
+            [:map
+             [:text :string]
+             [:key {:optional true} :string]
+             [:fills {:optional true}
+              [:maybe
+               [:vector {:gen/max 2} ::shape/fill]]]
+             [:font-family {:optional true} :string]
+             [:font-size {:optional true} :string]
+             [:font-style {:optional true} :string]
+             [:font-weight {:optional true} :string]
+             [:direction {:optional true} :string]
+             [:text-decoration {:optional true} :string]
+             [:text-transform {:optional true} :string]
+             [:typography-ref-id {:optional true} [:maybe ::sm/uuid]]
+             [:typography-ref-file {:optional true} [:maybe ::sm/uuid]]]]]]]]]]]]])
 
 
 

common/src/app/common/types/shape_tree.cljc

@@ -90,16 +90,24 @@
 
            (delete-from-objects [objects]
              (if-let [target (get objects shape-id)]
-               (let [parent-id     (or (:parent-id target)
-                                       (:frame-id target))
-                     children-ids  (cph/get-children-ids objects shape-id)]
-                 (-> (reduce dissoc objects children-ids)
-                     (dissoc shape-id)
+               (let [parent-id    (or (:parent-id target)
+                                      (:frame-id target))
+                     children-ids (cph/get-children-ids objects shape-id)]
+                 (-> (reduce dissoc objects (cons shape-id children-ids))
                      (d/update-when parent-id delete-from-parent)))
                objects))]
 
      (update container :objects delete-from-objects))))
 
+(defn fix-shape-children
+  "Checks and fix the children relations of the shape. If a children does not
+  exists on the objects tree, it will be removed from shape."
+  [{:keys [objects] :as container} {:keys [id] :as params}]
+  (let [contains? (partial contains? objects)]
+    (d/update-in-when container [:objects id :shapes]
+                      (fn [shapes]
+                        (into [] (filter contains?) shapes)))))
+
 (defn get-frames
   "Retrieves all frame objects as vector"
   ([objects] (get-frames objects nil))
@@ -350,6 +358,7 @@
                   (some? force-id) force-id
                   keep-ids? (:id object)
                   :else (uuid/next))]
+
      (loop [child-ids (seq (:shapes object))
             new-direct-children []
             new-children []

docker/images/Dockerfile.exporter

@@ -104,7 +104,7 @@ WORKDIR /opt/penpot/exporter
 USER penpot:penpot
 
 RUN set -ex; \
-    yarn; \
-    yarn run playwright install chromium;
+    yarn --network-timeout 1000000; \
+    yarn --network-timeout 1000000 run playwright install chromium;
 
 CMD ["node", "app.js"]

frontend/resources/styles/common/framework.scss

@@ -1157,6 +1157,7 @@ input[type="range"]:focus::-ms-fill-upper {
 
     .wrapper {
       display: flex;
+      align-items: center;
 
       .icon {
         padding: $size-2;
@@ -1173,6 +1174,9 @@ input[type="range"]:focus::-ms-fill-upper {
         padding: $size-2;
         width: 100%;
         align-items: center;
+
+        padding: 10px 15px;
+        min-height: 48px;
       }
     }
 

frontend/src/app/main.cljs

@@ -50,6 +50,23 @@
   (mf/mount (mf/element ui/app) (dom/get-element "app"))
   (mf/mount (mf/element modal)  (dom/get-element "modal")))
 
+(defn- initialize-profile
+  "Event used mainly on application bootstrap; it fetches the profile
+  and if and only if the fetched profile corresponds to an
+  authenticated user; proceed to fetch teams."
+  [stream]
+  (rx/merge
+   (rx/of (du/fetch-profile))
+   (->> stream
+        (rx/filter (ptk/type? ::profile-fetched))
+        (rx/take 1)
+        (rx/map deref)
+        (rx/mapcat (fn [profile]
+                     (if (du/is-authenticated? profile)
+                       (rx/of (du/fetch-teams))
+                       (rx/empty))))
+        (rx/observe-on :async))))
+
 (defn initialize
   []
   (ptk/reify ::initialize
@@ -61,14 +78,19 @@
     (watch [_ _ stream]
       (rx/merge
        (rx/of (ev/initialize)
-              (feat/initialize)
-              (du/initialize-profile))
+              (feat/initialize))
 
+       (initialize-profile stream)
+
+       ;; Once profile is fetched, initialize all penpot application
+       ;; routes
        (->> stream
             (rx/filter du/profile-fetched?)
             (rx/take 1)
             (rx/map #(rt/init-routes)))
 
+       ;; Once profile fetched and the current user is authenticated,
+       ;; proceed to initialize the websockets connection.
        (->> stream
             (rx/filter du/profile-fetched?)
             (rx/map deref)

frontend/src/app/main/data/common.cljs

@@ -7,7 +7,10 @@
 (ns app.main.data.common
   "A general purpose events."
   (:require
+   [app.config :as cf]
+   [app.main.data.messages :as msg]
    [app.main.repo :as rp]
+   [app.util.i18n :refer [tr]]
    [beicon.core :as rx]
    [potok.core :as ptk]))
 
@@ -43,3 +46,33 @@
     (watch [_ _ _]
       (->> (rp/cmd! :delete-share-link {:id id})
            (rx/ignore)))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; NOTIFICATIONS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(defn force-reload!
+  []
+  (.reload js/location))
+
+(defn handle-notification
+  [{:keys [message code level] :as params}]
+  (ptk/reify ::show-notification
+    ptk/WatchEvent
+    (watch [_ _ _]
+      (case code
+        :upgrade-version
+        (when (or (not= (:version params) (:full cf/version))
+                  (true? (:force params)))
+          (rx/of (msg/dialog
+                  :content (tr "notifications.by-code.upgrade-version")
+                  :controls :inline-actions
+                  :type level
+                  :actions [{:label "Refresh" :callback force-reload!}]
+                  :tag :notification)))
+
+        (rx/of (msg/dialog
+                :content message
+                :controls :close
+                :type level
+                :tag :notification))))))

frontend/src/app/main/data/dashboard.cljs

@@ -13,10 +13,12 @@
    [app.common.uri :as u]
    [app.common.uuid :as uuid]
    [app.config :as cf]
+   [app.main.data.common :refer [handle-notification]]
    [app.main.data.events :as ev]
    [app.main.data.fonts :as df]
    [app.main.data.media :as di]
    [app.main.data.users :as du]
+   [app.main.data.websocket :as dws]
    [app.main.features :as features]
    [app.main.repo :as rp]
    [app.util.dom :as dom]
@@ -61,7 +63,23 @@
        (ptk/watch (fetch-projects) state stream)
        (ptk/watch (fetch-team-members) state stream)
        (ptk/watch (du/fetch-teams) state stream)
-       (ptk/watch (du/fetch-users {:team-id id}) state stream)))))
+       (ptk/watch (du/fetch-users {:team-id id}) state stream)
+
+       (let [stoper    (rx/filter (ptk/type? ::finalize) stream)
+            profile-id (:profile-id state)]
+         (->> stream
+              (rx/filter (ptk/type? ::dws/message))
+              (rx/map deref)
+              (rx/filter (fn [{:keys [subs-id type] :as msg}]
+                           (and (or (= subs-id uuid/zero)
+                                    (= subs-id profile-id))
+                                (= :notification type))))
+              (rx/map handle-notification)
+              (rx/take-until stoper)))))))
+
+(defn finalize
+  [params]
+  (ptk/data-event ::finalize params))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Data Fetching (context aware: current team)

frontend/src/app/main/data/messages.cljs

@@ -120,6 +120,17 @@
           :position :fixed
           :timeout timeout})))
 
+(defn dialog
+  [& {:keys [content controls actions position tag type]
+      :or {controls :none position :floating type :info}}]
+  (show (d/without-nils
+         {:content content
+          :type type
+          :position position
+          :controls controls
+          :actions actions
+          :tag tag})))
+
 (defn info-dialog
   ([content controls actions]
    (info-dialog content controls actions nil))

frontend/src/app/main/data/users.cljs

@@ -117,28 +117,6 @@
       (->> (rp/cmd! :get-profile)
            (rx/map profile-fetched)))))
 
-;; --- EVENT: INITIALIZE PROFILE
-
-(defn initialize-profile
-  "Event used mainly on application bootstrap; it fetches the profile
-  and if and only if the fetched profile corresponds to an
-  authenticated user; proceed to fetch teams."
-  []
-  (ptk/reify ::initialize-profile
-    ptk/WatchEvent
-    (watch [_ _ stream]
-      (rx/merge
-       (rx/of (fetch-profile))
-       (->> stream
-            (rx/filter (ptk/type? ::profile-fetched))
-            (rx/take 1)
-            (rx/map deref)
-            (rx/mapcat (fn [profile]
-                         (if (= uuid/zero (:id profile))
-                           (rx/empty)
-                           (rx/of (fetch-teams)))))
-            (rx/observe-on :async))))))
-
 ;; --- EVENT: login
 
 (defn- logged-in
@@ -164,7 +142,8 @@
         (when (is-authenticated? profile)
           (->> (rx/of (profile-fetched profile)
                       (fetch-teams)
-                      (get-redirect-event))
+                      (get-redirect-event)
+                      (ws/initialize))
                (rx/observe-on :async)))))))
 
 (declare login-from-register)

frontend/src/app/main/data/workspace.cljs

@@ -44,6 +44,7 @@
    [app.main.data.workspace.drawing.common :as dwdc]
    [app.main.data.workspace.edition :as dwe]
    [app.main.data.workspace.fix-bool-contents :as fbc]
+   [app.main.data.workspace.fix-broken-shape-links :as fbs]
    [app.main.data.workspace.fix-deleted-fonts :as fdf]
    [app.main.data.workspace.groups :as dwg]
    [app.main.data.workspace.guides :as dwgu]
@@ -130,8 +131,10 @@
             has-graphics?  (-> file :media seq)
             components-v2  (features/active-feature? state :components-v2)]
         (rx/merge
-         (rx/of (fbc/fix-bool-contents))
-         (rx/of (fdf/fix-deleted-fonts))
+         (rx/of (fbc/fix-bool-contents)
+                (fdf/fix-deleted-fonts)
+                (fbs/fix-broken-shapes))
+
          (if (and has-graphics? components-v2)
            (rx/of (remove-graphics (:id file) (:name file)))
            (rx/empty)))))))
@@ -1817,9 +1820,14 @@
                           detach? (or (foreign-instance? shape paste-objects state)
                                       (and (ctk/in-component-copy-not-root? shape)
                                            (not= (:id component-shape)
-                                                 (:id component-shape-parent))))]
+                                                 (:id component-shape-parent))))
+                          assign-shapes? (and (or (cph/group-shape? shape)
+                                                  (cph/bool-shape? shape))
+                                              (nil? (:shapes shape)))]
                       (-> shape
                           (assoc :frame-id frame-id :parent-id parent-id)
+                          (cond-> assign-shapes?
+                            (assoc :shapes []))
                           (cond-> detach?
                             (->
                              ;; this is used later, if the paste needs to create a new component from the detached shape

frontend/src/app/main/data/workspace/changes.cljs

@@ -8,6 +8,7 @@
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
+   [app.common.exceptions :as ex]
    [app.common.logging :as log]
    [app.common.pages :as cp]
    [app.common.pages.changes :as cpc]
@@ -205,6 +206,7 @@
               path            (if (= file-id current-file-id)
                                 [:workspace-data]
                                 [:workspace-libraries file-id :data])]
+
           (try
             (dm/assert!
              "expect valid vector of changes"
@@ -217,7 +219,11 @@
                                         (ctst/update-object-indices page-id))))
 
             (catch :default err
-              (log/error :js/error err)
+              (when-let [data (ex-data err)]
+                (js/console.log (ex/explain data)))
+
+              (when (ex/error? err)
+                (js/console.log (.-stack ^js err)))
               (vreset! error err)
               state))))
 

frontend/src/app/main/data/workspace/colors.cljs

@@ -353,9 +353,12 @@
           (-> state
               (assoc-in [:workspace-global :picking-color?] true)
               (assoc ::md/modal {:id (random-uuid)
-                                 :data {:color colors/black :opacity 1}
                                  :type :colorpicker
-                                 :props {:on-change handle-change-color}
+                                 :props {:data {:color colors/black
+                                                :opacity 1}
+                                         :disable-opacity false
+                                         :disable-gradient false
+                                         :on-change handle-change-color}
                                  :allow-click-outside true})))))))
 
 (defn color-att->text

frontend/src/app/main/data/workspace/fix_broken_shape_links.cljs

@@ -0,0 +1,55 @@
+;; This Source Code Form is subject to the terms of the Mozilla Public
+;; License, v. 2.0. If a copy of the MPL was not distributed with this
+;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+;;
+;; Copyright (c) KALEIDOS INC
+
+(ns app.main.data.workspace.fix-broken-shape-links
+  (:require
+   [app.main.data.workspace.changes :as dch]
+   [beicon.core :as rx]
+   [potok.core :as ptk]))
+
+(defn- generate-changes
+  [attr {:keys [objects id] :as container}]
+  (let [base      {:type :fix-obj attr id}
+        contains? (partial contains? objects)
+        xform     (comp
+                   ;; FIXME: Ensure all obj have id field (this is needed
+                   ;; because some bug adds an ephimeral shape with id ZERO,
+                   ;; with a single attr `:shapes` having a vector of ids
+                   ;; pointing to not existing shapes). That happens on
+                   ;; components. THIS IS A WORKAOURD
+                   (map (fn [[id obj]]
+                          (if (some? (:id obj))
+                            obj
+                            (assoc obj :id id))))
+
+                   ;; Remove all valid shapes
+                   (remove (fn [obj]
+                             (every? contains? (:shapes obj))))
+
+                   (map (fn [obj]
+                          (assoc base :id (:id obj)))))]
+
+    (sequence xform objects)))
+
+(defn fix-broken-shapes
+  []
+  (ptk/reify ::fix-broken-shape-links
+    ptk/WatchEvent
+    (watch [it state _]
+      (let [data    (get state :workspace-data)
+            changes (concat
+                     (mapcat (partial generate-changes :page-id)
+                             (vals (:pages-index data)))
+                     (mapcat (partial generate-changes :component-id)
+                             (vals (:components data))))]
+
+        (if (seq changes)
+          (rx/of (dch/commit-changes
+                  {:origin it
+                   :redo-changes (vec changes)
+                   :undo-changes []
+                   :save-undo? false}))
+          (rx/empty))))))

frontend/src/app/main/data/workspace/media.cljs

@@ -73,16 +73,20 @@
            (rx/map #(svg/add-svg-shapes (assoc svg-data :image-data %) position))))))
 
 (defn- process-uris
-  [{:keys [file-id local? name uris mtype on-image on-svg]}]
+  [{:keys [file-id local? name uris mtype on-image on-svg] }]
   (letfn [(svg-url? [url]
             (or (and mtype (= mtype "image/svg+xml"))
                 (str/ends-with? url ".svg")))
 
-          (prepare [uri]
-            {:file-id file-id
-             :is-local local?
-             :name (or name (svg/extract-name uri))
-             :url uri})
+          (upload [uri]
+            (->> (http/send! {:method :get :uri uri :mode :no-cors :response-type :blob})
+                 (rx/map :body)
+                 (rx/map (fn [content]
+                           {:file-id file-id
+                            :name (or name (svg/extract-name uri))
+                            :is-local local?
+                            :content content}))
+                 (rx/mapcat #(rp/cmd! :upload-file-media-object %))))
 
           (fetch-svg [name uri]
             (->> (http/send! {:method :get :uri uri :mode :no-cors})
@@ -93,8 +97,7 @@
     (rx/merge
      (->> (rx/from uris)
           (rx/filter (comp not svg-url?))
-          (rx/map prepare)
-          (rx/mapcat #(rp/cmd! :create-file-media-object-from-url %))
+          (rx/mapcat upload)
           (rx/do on-image))
 
      (->> (rx/from uris)
@@ -142,7 +145,7 @@
    [:local? :boolean]
    [:name {:optional true} :string]
    [:data {:optional true} :any] ; FIXME
-   [:uris {:optional true} [:vector :string]]
+   [:uris {:optional true} [:sequential :string]]
    [:mtype {:optional true} :string]])
 
 (defn- process-media-objects
@@ -213,8 +216,6 @@
                       :on-image #(st/emit! (dwl/add-media %)))]
     (process-media-objects params)))
 
-;; TODO: it is really need handle SVG here, looks like it already
-;; handled separately
 (defn upload-media-workspace
   [{:keys [position file-id] :as params}]
   (let [params (assoc params

frontend/src/app/main/data/workspace/notifications.cljs

@@ -10,6 +10,8 @@
    [app.common.data.macros :as dm]
    [app.common.pages.changes :as cpc]
    [app.common.schema :as sm]
+   [app.common.uuid :as uuid]
+   [app.main.data.common :refer [handle-notification]]
    [app.main.data.websocket :as dws]
    [app.main.data.workspace.changes :as dch]
    [app.main.data.workspace.libraries :as dwl]
@@ -57,8 +59,9 @@
                                   (rx/filter (ptk/type? ::dws/message))
                                   (rx/map deref)
                                   (rx/filter (fn [{:keys [subs-id] :as msg}]
-                                               (or (= subs-id team-id)
+                                               (or (= subs-id uuid/zero)
                                                    (= subs-id profile-id)
+                                                   (= subs-id team-id)
                                                    (= subs-id file-id))))
                                   (rx/map process-message))
 
@@ -96,6 +99,7 @@
     :pointer-update (handle-pointer-update msg)
     :file-change    (handle-file-change msg)
     :library-change (handle-library-change msg)
+    :notification   (handle-notification msg)
     nil))
 
 (defn- handle-pointer-send

frontend/src/app/main/data/workspace/selection.cljs

@@ -409,6 +409,8 @@
 
      :else
      (let [frame?      (cph/frame-shape? obj)
+           group?      (cph/group-shape? obj)
+           bool?       (cph/bool-shape? obj)
            new-id      (ids-map (:id obj))
            parent-id   (or parent-id frame-id)
            name        (:name obj)
@@ -427,9 +429,15 @@
                                   :name name
                                   :parent-id parent-id
                                   :frame-id frame-id)
+
                            (dissoc :shapes
                                    :main-instance?
                                    :use-for-thumbnail?)
+
+                           (cond->
+                             (or group? bool?)
+                             (assoc :shapes []))
+
                            (gsh/move delta)
                            (d/update-when :interactions #(ctsi/remap-interactions % ids-map objects)))
 

frontend/src/app/main/data/workspace/shapes.cljs

@@ -57,6 +57,11 @@
                         cts/default-frame-attrs
                         cts/default-shape-attrs)
 
+        default-attrs (if (or (= :group (:type attrs))
+                              (= :bool (:type attrs)))
+                        (assoc default-attrs :shapes [])
+                        default-attrs)
+
         selected-non-frames
         (into #{} (comp (map (d/getf objects))
                         (remove cph/frame-shape?))
@@ -288,7 +293,7 @@
            (let [all-ids   (into empty-parents ids)
                  contains? (partial contains? all-ids)
                  xform     (comp (map lookup)
-                                 (filter cph/group-shape?)
+                                 (filter #(or (cph/group-shape? %) (cph/bool-shape? %)))
                                  (remove #(->> (:shapes %) (remove contains?) seq))
                                  (map :id))
                  parents   (into #{} xform all-parents)]

frontend/src/app/main/data/workspace/svg_upload.cljs

@@ -8,6 +8,7 @@
   (:require
    [app.common.colors :as clr]
    [app.common.data :as d]
+   [app.common.data.macros :as dm]
    [app.common.exceptions :as ex]
    [app.common.geom.matrix :as gmt]
    [app.common.geom.point :as gpt]
@@ -123,56 +124,65 @@
           (assoc-in [:fills 0 :fill-opacity] (-> (get-in shape [:svg-attrs :style :fill-opacity])
                                                  (d/parse-double 1)))))))
 
-(defn setup-stroke [shape]
-  (let [stroke-linecap (-> (or (get-in shape [:svg-attrs :stroke-linecap])
-                               (get-in shape [:svg-attrs :style :stroke-linecap]))
-                           ((d/nilf str/trim))
-                           ((d/nilf keyword)))
-        color-attr (str/trim (get-in shape [:svg-attrs :stroke]))
-        color-attr (if (= color-attr "currentColor") clr/black color-attr)
-        color-style (str/trim (get-in shape [:svg-attrs :style :stroke]))
-        color-style (if (= color-style "currentColor") clr/black color-style)
 
-        shape
-        (cond-> shape
-          ;; Color present as attribute
-          (uc/color? color-attr)
-          (-> (update :svg-attrs dissoc :stroke)
-              (assoc-in [:strokes 0 :stroke-color] (uc/parse-color color-attr)))
+(defn- setup-stroke
+  [shape]
+  (let [attrs   (get shape :svg-attrs)
+        style   (get attrs :style)
 
-          ;; Color present as style
-          (uc/color? color-style)
-          (-> (update-in [:svg-attrs :style] dissoc :stroke)
-              (assoc-in [:strokes 0 :stroke-color] (uc/parse-color color-style)))
+        stroke  (or (str/trim (:stroke attrs))
+                    (str/trim (:stroke style)))
 
-          (get-in shape [:svg-attrs :stroke-opacity])
-          (-> (update :svg-attrs dissoc :stroke-opacity)
-              (assoc-in [:strokes 0 :stroke-opacity] (-> (get-in shape [:svg-attrs :stroke-opacity])
-                                                         (d/parse-double 1))))
+        color   (cond
+                  (= stroke "currentColor") clr/black
+                  (= stroke "none")         nil
+                  :else                     (uc/parse-color stroke))
 
-          (get-in shape [:svg-attrs :style :stroke-opacity])
-          (-> (update-in [:svg-attrs :style] dissoc :stroke-opacity)
-              (assoc-in [:strokes 0 :stroke-opacity] (-> (get-in shape [:svg-attrs :style :stroke-opacity])
-                                                         (d/parse-double 1))))
+        opacity (when (some? color)
+                  (d/parse-double
+                   (or (:stroke-opacity attrs)
+                       (:stroke-opacity style))
+                   1))
 
-          (get-in shape [:svg-attrs :stroke-width])
-          (-> (update :svg-attrs dissoc :stroke-width)
-              (assoc-in [:strokes 0 :stroke-width] (-> (get-in shape [:svg-attrs :stroke-width])
-                                                       (d/parse-double))))
+        width   (when (some? color)
+                  (d/parse-double
+                   (or (:stroke-width attrs)
+                       (:stroke-width style))
+                   1))
 
-          (get-in shape [:svg-attrs :style :stroke-width])
-          (-> (update-in [:svg-attrs :style] dissoc :stroke-width)
-              (assoc-in [:strokes 0 :stroke-width] (-> (get-in shape [:svg-attrs :style :stroke-width])
-                                                       (d/parse-double))))
+        linecap (or (get attrs :stroke-linecap)
+                    (get style :stroke-linecap))
+        linecap (some-> linecap str/trim keyword)
 
-          (and stroke-linecap (= (:type shape) :path))
-          (-> (update-in [:svg-attrs :style] dissoc :stroke-linecap)
-              (cond-> (#{:round :square} stroke-linecap)
-                (assoc :stroke-cap-start stroke-linecap
-                       :stroke-cap-end   stroke-linecap))))]
+        attrs   (-> attrs
+                    (dissoc :stroke)
+                    (dissoc :stroke-width)
+                    (dissoc :stroke-opacity)
+                    (update :style (fn [style]
+                                     (-> style
+                                         (dissoc :stroke)
+                                         (dissoc :stroke-linecap)
+                                         (dissoc :stroke-width)
+                                         (dissoc :stroke-opacity)))))]
 
-    (cond-> shape
-      (d/any-key? (get-in shape [:strokes 0]) :stroke-color :stroke-opacity :stroke-width :stroke-cap-start :stroke-cap-end)
+    (cond-> (assoc shape :svg-attrs attrs)
+      (some? color)
+      (assoc-in [:strokes 0 :stroke-color] color)
+
+      (and (some? color) (some? opacity))
+      (assoc-in [:strokes 0 :stroke-opacity] opacity)
+
+      (and (some? color) (some? width))
+      (assoc-in [:strokes 0 :stroke-width] width)
+
+      (and (some? linecap) (= (:type shape) :path)
+           (or (= linecap :round) (= linecap :square)))
+      (assoc :stroke-cap-start linecap
+             :stroke-cap-end linecap)
+
+      (d/any-key? (dm/get-in shape [:strokes 0])
+                  :stroke-color :stroke-opacity :stroke-width
+                  :stroke-cap-start :stroke-cap-end)
       (assoc-in [:strokes 0 :stroke-style] :svg))))
 
 (defn setup-opacity [shape]

frontend/src/app/main/ui/dashboard.cljs

@@ -154,18 +154,18 @@
     (hooks/use-shortcuts ::dashboard sc/shortcuts)
 
     (mf/with-effect [team-id]
-      (st/emit! (dd/initialize {:id team-id})))
+      (st/emit! (dd/initialize {:id team-id}))
+      (fn []
+        (dd/finalize {:id team-id})))
 
-    (mf/use-effect
-     (fn []
-       (let [events [(events/listen goog/global "keydown"
-                                    (fn [event]
-                                      (when (kbd/enter? event)
-                                        (dom/stop-propagation event)
-                                        (st/emit! (dd/open-selected-file)))))]]
-         (fn []
-           (doseq [key events]
-             (events/unlistenByKey key))))))
+    (mf/with-effect []
+      (let [key (events/listen goog/global "keydown"
+                               (fn [event]
+                                 (when (kbd/enter? event)
+                                   (dom/stop-propagation event)
+                                   (st/emit! (dd/open-selected-file)))))]
+        (fn []
+          (events/unlistenByKey key))))
 
     [:& (mf/provider ctx/current-team-id) {:value team-id}
      [:& (mf/provider ctx/current-project-id) {:value project-id}

frontend/src/app/main/ui/hooks/resize.cljs

@@ -106,7 +106,7 @@
 
              (mf/set-ref-val! prev-val-ref node))))]
 
-    (mf/with-effect []
+    (mf/with-layout-effect []
       ;; On dismount we need to disconnect the current observer
       (fn []
         (when-let [observer (mf/ref-val observer-ref)]

frontend/src/app/main/ui/shapes/attrs.cljs

@@ -89,7 +89,7 @@
      (obj/merge! attrs (clj->js fill-attrs)))))
 
 (defn add-stroke [attrs stroke-data render-id index]
-  (let [stroke-style (:stroke-style stroke-data :none)
+  (let [stroke-style (:stroke-style stroke-data :solid)
         stroke-color-gradient-id (str "stroke-color-gradient_" render-id "_" index)
         stroke-width (:stroke-width stroke-data 1)]
     (if (not= stroke-style :none)

frontend/src/app/main/ui/viewer/shapes.cljs

@@ -38,11 +38,10 @@
 
 (defn- find-relative-to-base-frame
   [shape objects overlays-ids base-frame]
-  (if (or (empty? overlays-ids) (nil? shape) (cph/root? shape))
-    base-frame
-    (if (contains? overlays-ids (:id shape))
-      shape
-      (find-relative-to-base-frame (cph/get-parent objects (:id shape)) objects overlays-ids base-frame))))
+  (cond
+    (cph/frame-shape? shape) shape
+    (or (empty? overlays-ids) (nil? shape) (cph/root? shape)) base-frame
+    :else (find-relative-to-base-frame (cph/get-parent objects (:id shape)) objects overlays-ids base-frame)))
 
 (defn- activate-interaction
   [interaction shape base-frame frame-offset objects overlays]

frontend/src/app/main/ui/workspace/sidebar/options/menus/interactions.cljs

@@ -319,7 +319,8 @@
          [:div.interactions-element.separator
           [:span.element-set-subtitle.wide (tr "workspace.options.interaction-trigger")]
           [:select.input-select
-           {:value (str (:event-type interaction))
+           {:data-mousetrap-dont-stop true ;; makes mousetrap to not stop at this element
+            :value (str (:event-type interaction))
             :on-change change-event-type}
            (for [[value name] (event-type-names)]
              (when-not (and (= value :after-delay)
@@ -342,7 +343,8 @@
          [:div.interactions-element.separator
           [:span.element-set-subtitle.wide (tr "workspace.options.interaction-action")]
           [:select.input-select
-           {:value (str (:action-type interaction))
+           {:data-mousetrap-dont-stop true ;; makes mousetrap to not stop at this element
+            :value (str (:action-type interaction))
             :on-change change-action-type}
            (for [[value name] (action-type-names)]
              [:option {:key (dm/str "action-" value)
@@ -353,7 +355,8 @@
            [:div.interactions-element
             [:span.element-set-subtitle.wide (tr "workspace.options.interaction-destination")]
             [:select.input-select
-             {:value (str (:destination interaction))
+             {:data-mousetrap-dont-stop true ;; makes mousetrap to not stop at this element
+              :value (str (:destination interaction))
               :on-change change-destination}
              (if (= (:action-type interaction) :close-overlay)
                [:option {:value ""} (tr "workspace.options.interaction-self")]
@@ -390,7 +393,8 @@
             [:div.interactions-element
              [:span.element-set-subtitle.wide (tr "workspace.options.interaction-relative-to")]
              [:select.input-select
-              {:value (str (:position-relative-to interaction))
+              {:data-mousetrap-dont-stop true ;; makes mousetrap to not stop at this element
+               :value (str (:position-relative-to interaction))
                :on-change change-position-relative-to}
               (when (not= (:overlay-pos-type interaction) :manual)
                 [:*
@@ -405,7 +409,8 @@
             [:div.interactions-element
              [:span.element-set-subtitle.wide (tr "workspace.options.interaction-position")]
              [:select.input-select
-              {:value (str (:overlay-pos-type interaction))
+              {:data-mousetrap-dont-stop true ;; makes mousetrap to not stop at this element
+               :value (str (:overlay-pos-type interaction))
                :on-change (partial change-overlay-pos-type (:id shape))}
               (for [[value name] (overlay-pos-type-names)]
                 [:option {:value (str value)} name])]]
@@ -467,7 +472,8 @@
              [:div.interactions-element.separator
               [:span.element-set-subtitle.wide (tr "workspace.options.interaction-animation")]
               [:select.input-select
-               {:value (str (-> interaction :animation :animation-type))
+               {:data-mousetrap-dont-stop true ;; makes mousetrap to not stop at this element
+                :value (str (-> interaction :animation :animation-type))
                 :on-change change-animation-type}
                [:option {:value ""} (tr "workspace.options.interaction-animation-none")]
                (for [[value name] (animation-type-names interaction)]
@@ -529,7 +535,8 @@
                [:div.interactions-element
                 [:span.element-set-subtitle.wide (tr "workspace.options.interaction-easing")]
                 [:select.input-select
-                 {:value (str (-> interaction :animation :easing))
+                 {:data-mousetrap-dont-stop true ;; makes mousetrap to not stop at this element
+                  :value (str (-> interaction :animation :easing))
                   :on-change change-easing}
                  (for [[value name] (easing-names)]
                    [:option {:value (str value)} name])]

frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs

@@ -319,7 +319,7 @@
          layout-container-ids layout-container-values
          layout-item-ids      layout-item-values]
         (mf/use-memo
-         (mf/deps objects-no-measures)
+         (mf/deps shapes objects-no-measures)
          (fn []
            (into
             []

frontend/src/app/main/ui/workspace/viewport/actions.cljs

@@ -451,8 +451,8 @@
          (dnd/has-type? event "text/uri-list")
          (let [data   (dnd/get-data event "text/uri-list")
                lines  (str/lines data)
-               uris   (->> lines (filter #(str/starts-with? % "http")))
-               data   (->> lines (filter #(str/starts-with? % "data:image/")))
+               uris   (filterv #(str/starts-with? % "http") lines)
+               data   (filterv #(str/starts-with? % "data:image/") lines)
                params {:file-id (:id file)
                        :position viewport-coord}
                params (if (seq uris)

frontend/src/app/render.cljs

@@ -151,9 +151,9 @@
                                 (rx/tap (fn [[fonts]]
                                           (when (seq fonts)
                                             (st/emit! (df/fonts-fetched fonts)))))
-                                (rx/map (comp :objects second))))))
+                                (rx/map (fn [[_ page]] {:objects (:objects page)}))))))
 
-        objects (use-resource fetch-state)]
+        {:keys [objects]} (use-resource fetch-state)]
 
     (when objects
       (for [object-id object-ids]

frontend/src/app/thumbnail_renderer.cljs

@@ -97,11 +97,12 @@
 (defn- svg-update-image!
   "Updates an image in an SVG to a Data URI."
   [image]
-  (when-let [href (dom/get-attribute image "href")]
+  (if-let [href (dom/get-attribute image "href")]
     (->> (fetch-as-data-uri href)
          (rx/map (fn [url]
                    (dom/set-attribute! image "href" url)
-                   image)))))
+                   image)))
+    (rx/empty)))
 
 (defn- svg-resolve-images!
   "Resolves all images in an SVG to Data URIs."

frontend/src/app/util/color.cljs

@@ -8,6 +8,7 @@
   "Color conversion utils."
   (:require
    [app.common.data :as d]
+   [app.common.data.macros :as dm]
    [app.util.i18n :as i18n :refer [tr]]
    [app.util.object :as obj]
    [app.util.strings :as ust]
@@ -176,14 +177,16 @@
       (= id :multiple)
       (= file-id :multiple)))
 
-(defn color? [^string color-str]
-  (and (not (nil? color-str))
-       (seq color-str)
-       (gcolor/isValidColor color-str)))
+(defn color?
+  [color]
+  (and (string? color)
+       (gcolor/isValidColor color)))
 
-(defn parse-color [^string color-str]
-  (let [result (gcolor/parse color-str)]
-    (str (.-hex ^js result))))
+(defn parse-color
+  [color]
+  (when (color? color)
+    (let [result (gcolor/parse color)]
+      (dm/str (.-hex ^js result)))))
 
 (def color-names
   (obj/get-keys ^js gcolor/names))

frontend/src/app/util/import/parser.cljs

@@ -737,12 +737,13 @@
                             :fill-color-ref-file (get-meta fill-node :fill-color-ref-file uuid/uuid)
                             :fill-color-ref-id (get-meta fill-node :fill-color-ref-id uuid/uuid)
                             :fill-opacity (get-meta fill-node :fill-opacity d/parse-double)}))
-                   (mapv d/without-nils))]
+                   (mapv d/without-nils)
+                   (filterv #(not= (:fill-color %) "none")))]
     (if (seq fills)
       fills
       (->> [(-> (add-fill {} node svg-data)
                 (d/without-nils))]
-           (filterv not-empty)))))
+           (filterv #(and (not-empty %) (not= (:fill-color %) "none")))))))
 
 (defn parse-strokes
   [node svg-data]
@@ -761,12 +762,13 @@
                               :stroke-alignment (get-meta stroke-node :stroke-alignment keyword)
                               :stroke-cap-start (get-meta stroke-node :stroke-cap-start keyword)
                               :stroke-cap-end (get-meta stroke-node :stroke-cap-end keyword)}))
-                     (mapv d/without-nils))]
+                     (mapv d/without-nils)
+                     (filterv #(not= (:stroke-color %) "none")))]
     (if (seq strokes)
       strokes
       (->> [(-> (add-stroke {} node svg-data)
                 (d/without-nils))]
-           (filterv #(and (not-empty %) (not= (:stroke-style %) :none)))))))
+           (filterv #(and (not-empty %) (not= (:stroke-color %) "none") (not= (:stroke-style %) :none)))))))
 
 (defn add-svg-content
   [props node]

frontend/translations/en.po

@@ -4960,3 +4960,7 @@ msgstr "Marketing"
 #: src/app/main/ui/onboarding/questions.cljs
 msgid "questions.student-teacher"
 msgstr "Student or teacher"
+
+#: src/app/main/data/common.cljs
+msgid "notifications.by-code.upgrade-version"
+msgstr "A new version is available, please refresh the page"

version.txt

@@ -1 +1 @@
-1.19.0
+1.19.1