3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-21 01:36:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Remove duplicated rpc method for creating file object thumbnails

Browse source
This commit is contained in:
Andrey Antukh 2023-11-24 10:38:18 +01:00
parent b566abbd04
commit 925f2dc30f
3 changed files with 8 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

41
backend/src/app/rpc/commands/files_thumbnails.clj
View file

@ -236,7 +236,8 @@
"insert into file_tagged_object_thumbnail(file_id, object_id, media_id, tag) "insert into file_tagged_object_thumbnail(file_id, object_id, media_id, tag)
values (?, ?, ?, ?) values (?, ?, ?, ?)
on conflict(file_id, tag, object_id) do on conflict(file_id, tag, object_id) do
update set media_id = ?;") update set media_id = ?
returning *;")
(defn- create-file-object-thumbnail! (defn- create-file-object-thumbnail!
[{:keys [::db/conn ::sto/storage]} file-id object-id media tag] [{:keys [::db/conn ::sto/storage]} file-id object-id media tag]
@ -280,8 +281,7 @@
(-> cfg (-> cfg
(update ::sto/storage media/configure-assets-storage) (update ::sto/storage media/configure-assets-storage)
(assoc ::db/conn conn) (assoc ::db/conn conn)
(create-file-object-thumbnail! file-id object-id media (or tag "frame"))) (create-file-object-thumbnail! file-id object-id media (or tag "frame"))))))
nil)))
;; --- MUTATION COMMAND: delete-file-object-thumbnail ;; --- MUTATION COMMAND: delete-file-object-thumbnail
@ -320,41 +320,6 @@
(delete-file-object-thumbnail! file-id object-id)) (delete-file-object-thumbnail! file-id object-id))
nil))) nil)))
;; --- MUTATION COMMAND: upsert-file-object-thumbnail
(def ^:private schema:upsert-file-object-thumbnail
[:map {:title "upsert-file-object-thumbnail"}
[:file-id ::sm/uuid]
[:object-id :string]
[:media ::media/upload]
[:tag {:optional true} :string]])
(defn- upsert-file-object-thumbnail!
[cfg file-id object-id media tag]
(delete-file-object-thumbnail! cfg file-id object-id)
(create-file-object-thumbnail! cfg file-id object-id media (or tag "frame")))
(sv/defmethod ::upsert-file-object-thumbnail
{::doc/added "1.20"
::doc/module :files
::climit/id :file-thumbnail-ops
::climit/key-fn ::rpc/profile-id
::audit/skip true
::sm/params schema:upsert-file-object-thumbnail}
[{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id file-id object-id media tag]}]
(db/with-atomic [conn pool]
(files/check-edition-permissions! conn profile-id file-id)
(media/validate-media-type! media)
(media/validate-media-size! media)
(when-not (db/read-only? conn)
(-> cfg
(update ::sto/storage media/configure-assets-storage)
(assoc ::db/conn conn)
(upsert-file-object-thumbnail! file-id object-id media tag))
nil)))
;; --- MUTATION COMMAND: create-file-thumbnail ;; --- MUTATION COMMAND: create-file-thumbnail
(def ^:private sql:create-file-thumbnail (def ^:private sql:create-file-thumbnail

2
frontend/src/app/main/data/workspace/thumbnails.cljs
View file

@ -164,7 +164,7 @@
:object-id object-id :object-id object-id
:media blob :media blob
:tag (or tag "frame")}] :tag (or tag "frame")}]
(rp/cmd! :upsert-file-object-thumbnail params)))) (rp/cmd! :create-file-object-thumbnail params))))
(rx/catch rx/empty) (rx/catch rx/empty)
(rx/ignore))))) (rx/ignore)))))
(rx/catch (fn [cause] (rx/catch (fn [cause]

8
frontend/src/app/main/repo.cljs
View file

@ -47,10 +47,10 @@
(def default-options (def default-options
{:update-file {:query-params [:id]} {:update-file {:query-params [:id]}
:get-raw-file {:rename-to :get-file :raw-transit? true} :get-raw-file {:rename-to :get-file :raw-transit? true}
:upsert-file-object-thumbnail {:query-params [:file-id :object-id :tag]
:form-data? true} :create-file-object-thumbnail
:create-file-object-thumbnail {:query-params [:file-id :object-id :tag] {:query-params [:file-id :object-id :tag]
:form-data? true} :form-data? true}
:create-file-thumbnail :create-file-thumbnail
{:query-params [:file-id :revn] {:query-params [:file-id :revn]