mirror of
https://github.com/penpot/penpot.git
synced 2025-08-06 07:48:32 +02:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
commit
496afb0f25
11 changed files with 40 additions and 63 deletions
|
@ -516,6 +516,9 @@
|
|||
: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))
|
||||
|
@ -770,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
|
||||
|
@ -783,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)))
|
||||
|
@ -801,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.
|
||||
|
|
|
@ -378,21 +378,6 @@
|
|||
[{:keys [::rpc/profile-id]} {:keys [modified-at revn]}]
|
||||
(str profile-id (dt/format-instant modified-at :iso) revn))
|
||||
|
||||
|
||||
|
||||
(sv/defmethod ::hey
|
||||
{::doc/added "1.17"
|
||||
::rpc/auth false}
|
||||
[_ _]
|
||||
(str (rand-int 100)))
|
||||
|
||||
(sv/defmethod ::ho
|
||||
{::doc/added "1.17"
|
||||
::rpc/auth false}
|
||||
[_ _]
|
||||
(str (rand-int 1000)))
|
||||
|
||||
|
||||
(sv/defmethod ::get-file
|
||||
"Retrieve a file by its ID. Only authenticated users."
|
||||
{::doc/added "1.17"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue