Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-12 07:41:43 -05:00
Code Issues Activity

✨ Use commands instead of mutations for assets upload

Browse source 
And properly deprecate media rpc mutations
This commit is contained in:
Andrey Antukh 2023-01-18 11:20:36 +01:00
parent 1e1f551383
commit 3dd65db651
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
backend/src/app/rpc/mutations/media.clj
View file

@ -21,7 +21,7 @@
(sv/defmethod ::upload-file-media-object (sv/defmethod ::upload-file-media-object
{::doc/added "1.2" {::doc/added "1.2"
::doc/deprecated "1.17"} ::doc/deprecated "1.18"}
[{:keys [pool] :as cfg} {:keys [profile-id file-id content] :as params}] [{:keys [pool] :as cfg} {:keys [profile-id file-id content] :as params}]
(let [cfg (update cfg ::sto/storage media/configure-assets-storage)] (let [cfg (update cfg ::sto/storage media/configure-assets-storage)]
(files/check-edition-permissions! pool profile-id file-id) (files/check-edition-permissions! pool profile-id file-id)
@ -35,7 +35,7 @@
(sv/defmethod ::create-file-media-object-from-url (sv/defmethod ::create-file-media-object-from-url
{::doc/added "1.3" {::doc/added "1.3"
::doc/deprecated "1.17"} ::doc/deprecated "1.18"}
[{:keys [pool] :as cfg} {:keys [profile-id file-id] :as params}] [{:keys [pool] :as cfg} {:keys [profile-id file-id] :as params}]
(let [cfg (update cfg ::sto/storage media/configure-assets-storage)] (let [cfg (update cfg ::sto/storage media/configure-assets-storage)]
(files/check-edition-permissions! pool profile-id file-id) (files/check-edition-permissions! pool profile-id file-id)
@ -47,7 +47,7 @@
(sv/defmethod ::clone-file-media-object (sv/defmethod ::clone-file-media-object
{::doc/added "1.2" {::doc/added "1.2"
::doc/deprecated "1.17"} ::doc/deprecated "1.18"}
[{:keys [pool] :as cfg} {:keys [profile-id file-id] :as params}] [{:keys [pool] :as cfg} {:keys [profile-id file-id] :as params}]
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(files/check-edition-permissions! conn profile-id file-id) (files/check-edition-permissions! conn profile-id file-id)

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

@ -1427,7 +1427,7 @@
:file-id file-id :file-id file-id
:content blob :content blob
:is-local true})) :is-local true}))
(rx/mapcat #(rp/mutation! :upload-file-media-object %)) (rx/mapcat #(rp/cmd! :upload-file-media-object %))
(rx/map (fn [media] (rx/map (fn [media]
(assoc media :prev-id (:id imgpart)))))) (assoc media :prev-id (:id imgpart))))))

4
frontend/src/app/main/data/workspace/media.cljs
View file

@ -125,7 +125,7 @@
(rx/map dmm/validate-file) (rx/map dmm/validate-file)
(rx/filter (comp not svg-blob?)) (rx/filter (comp not svg-blob?))
(rx/map prepare-blob) (rx/map prepare-blob)
(rx/mapcat #(rp/mutation! :upload-file-media-object %)) (rx/mapcat #(rp/cmd! :upload-file-media-object %))
(rx/do on-image)) (rx/do on-image))
(->> (rx/from blobs) (->> (rx/from blobs)
@ -361,7 +361,7 @@
:type :info :type :info
:timeout nil :timeout nil
:tag :media-loading})) :tag :media-loading}))
(->> (rp/mutation! :clone-file-media-object params) (->> (rp/cmd! :clone-file-media-object params)
(rx/do on-success) (rx/do on-success)
(rx/catch on-error) (rx/catch on-error)
(rx/finalize #(st/emit! (dm/hide-tag :media-loading))))))))) (rx/finalize #(st/emit! (dm/hide-tag :media-loading)))))))))

4
frontend/src/app/worker/import.cljs
View file

@ -196,7 +196,7 @@
:content blob :content blob
:is-local true})) :is-local true}))
(rx/tap #(progress! context :upload-media name)) (rx/tap #(progress! context :upload-media name))
(rx/flat-map #(rp/mutation! :upload-file-media-object %)))) (rx/flat-map #(rp/cmd! :upload-file-media-object %))))
(defn resolve-text-content [node context] (defn resolve-text-content [node context]
(let [resolve (:resolve context)] (let [resolve (:resolve context)]
@ -511,7 +511,7 @@
:content content :content content
:is-local false}))) :is-local false})))
(rx/tap #(progress! context :upload-media (:name %))) (rx/tap #(progress! context :upload-media (:name %)))
(rx/merge-map #(rp/mutation! :upload-file-media-object %)) (rx/merge-map #(rp/cmd! :upload-file-media-object %))
(rx/map (constantly media)) (rx/map (constantly media))
(rx/catch #(do (.error js/console (str "Error uploading media: " (:name media)) ) (rx/catch #(do (.error js/console (str "Error uploading media: " (:name media)) )
(rx/empty))))))) (rx/empty)))))))