3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-28 15:07:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Show info while loading images

Browse source
This commit is contained in:
Andrés Moya 2020-05-29 12:05:27 +02:00 • committed by Alonso Torres
parent e3e8180b7a
commit bac35853d3
3 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

14
frontend/src/uxbox/main/data/images.cljs
View file

@ -375,11 +375,13 @@
(throw (ex-info (tr "errors.image-format-unsupported") {})))
file)
on-success on-uploaded
on-success #(do (st/emit! dm/hide)
(on-uploaded %))
on-error #(if (.-message %)
(rx/of (dm/error (.-message %)))
(rx/of (dm/error (tr "errors.unexpected-error"))))
on-error #(do (st/emit! dm/hide)
(if (.-message %)
(rx/of (dm/error (.-message %)))
(rx/of (dm/error (tr "errors.unexpected-error")))))
prepare
(fn [file]
@ -387,6 +389,10 @@
:library-id library-id
:content file})]
(st/emit! (dm/show {:content (tr "image.loading")
:type :info
:timeout nil}))
(->> (rx/from files)
(rx/map check-file)
(rx/map prepare)

19
frontend/src/uxbox/main/data/workspace/persistence.cljs
View file

@ -305,13 +305,11 @@
([file on-uploaded]
(us/verify fn? on-uploaded)
(ptk/reify ::upload-image
ptk/UpdateEvent
(update [_ state]
(assoc-in state [:workspace-local :uploading] true))
ptk/WatchEvent
(watch [_ state stream]
(let [check-file
(let [file-id (get-in state [:workspace-page :file-id])
check-file
(fn [file]
(when (> (.-size file) max-file-size)
(throw (ex-info (tr "errors.image-too-large") {})))
@ -319,14 +317,10 @@
(throw (ex-info (tr "errors.image-format-unsupported") {})))
file)
finalize-upload #(assoc-in % [:workspace-local :uploading] false)
file-id (get-in state [:workspace-page :file-id])
on-success #(do (st/emit! finalize-upload)
on-success #(do (st/emit! dm/hide)
(on-uploaded %))
on-error #(do (st/emit! finalize-upload)
on-error #(do (st/emit! dm/hide)
(if (.-message %)
(rx/of (dm/error (.-message %)))
(rx/of (dm/error (tr "errors.unexpected-error")))))
@ -337,6 +331,9 @@
:file-id file-id
:content file})]
(st/emit! (dm/show {:content (tr "image.loading")
:type :info
:timeout nil}))
(->> (rx/of file)
(rx/map check-file)
(rx/map prepare)