3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-17 23:16:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

💄 Refactor clear selected files

Browse source
This commit is contained in:
Andrés Moya 2021-03-12 10:49:57 +01:00
parent c2332331ce
commit 4b2a4c8fa3
7 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
frontend/src/app/main/data/dashboard.cljs
View file

@ -60,7 +60,6 @@
(s/def ::set-of-uuid (s/def ::set-of-uuid
(s/every ::us/uuid :kind set?)) (s/every ::us/uuid :kind set?))
(declare clear-selected-files)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Data Fetching ;; Data Fetching
@ -149,10 +148,8 @@
ptk/WatchEvent ptk/WatchEvent
(watch [_ state stream] (watch [_ state stream]
(rx/concat (->> (rp/query :search-files params)
(->> (rp/query :search-files params) (rx/map #(partial fetched %)))))))
(rx/map #(partial fetched %)))
(rx/of (clear-selected-files)))))))
;; --- Fetch Files ;; --- Fetch Files
@ -164,10 +161,8 @@
(ptk/reify ::fetch-files (ptk/reify ::fetch-files
ptk/WatchEvent ptk/WatchEvent
(watch [_ state stream] (watch [_ state stream]
(rx/concat (->> (rp/query :files params)
(->> (rp/query :files params) (rx/map #(partial fetched %)))))))
(rx/map #(partial fetched %)))
(rx/of (clear-selected-files)))))))
;; --- Fetch Shared Files ;; --- Fetch Shared Files
@ -179,10 +174,8 @@
(ptk/reify ::fetch-shared-files (ptk/reify ::fetch-shared-files
ptk/WatchEvent ptk/WatchEvent
(watch [_ state stream] (watch [_ state stream]
(rx/concat (->> (rp/query :shared-files {:team-id team-id})
(->> (rp/query :shared-files {:team-id team-id}) (rx/map #(partial fetched %)))))))
(rx/map #(partial fetched %)))
(rx/of (clear-selected-files)))))))
;; --- Fetch recent files ;; --- Fetch recent files
@ -195,10 +188,8 @@
ptk/WatchEvent ptk/WatchEvent
(watch [_ state stream] (watch [_ state stream]
(let [params {:team-id team-id}] (let [params {:team-id team-id}]
(rx/concat (->> (rp/query :recent-files params)
(->> (rp/query :recent-files params) (rx/map #(recent-files-fetched team-id %)))))))
(rx/map #(recent-files-fetched team-id %)))
(rx/of (clear-selected-files)))))))
(defn recent-files-fetched (defn recent-files-fetched
[team-id files] [team-id files]

14
frontend/src/app/main/ui/dashboard/file_menu.cljs
View file

@ -86,12 +86,14 @@
:project-id project-id} :project-id project-id}
mdata {:on-success mdata {:on-success
(st/emitf (dm/success (tr "dashboard.success-move-file")) #(do
(if navigate? (st/emit! (dm/success (tr "dashboard.success-move-file")))
(rt/nav :dashboard-files (if navigate?
{:team-id team-id (st/emit! (rt/nav :dashboard-files
:project-id project-id}) {:team-id team-id
(dd/fetch-recent-files {:team-id team-id})))}] :project-id project-id}))
(st/emit! (dd/fetch-recent-files {:team-id team-id})
(dd/clear-selected-files))))}]
(st/emitf (dd/move-files (with-meta data mdata)))))) (st/emitf (dd/move-files (with-meta data mdata))))))

3
frontend/src/app/main/ui/dashboard/files.cljs
View file

@ -94,7 +94,8 @@
(mf/use-effect (mf/use-effect
(mf/deps (:id project)) (mf/deps (:id project))
(fn [] (fn []
(st/emit! (dd/fetch-files {:project-id (:id project)})))) (st/emit! (dd/fetch-files {:project-id (:id project)})
(dd/clear-selected-files))))
[:* [:*
[:& header {:team team :project project}] [:& header {:team team :project project}]

3
frontend/src/app/main/ui/dashboard/grid.cljs
View file

@ -321,7 +321,8 @@
mdata {:on-success mdata {:on-success
(st/emitf (dm/success (tr "dashboard.success-move-file")) (st/emitf (dm/success (tr "dashboard.success-move-file"))
(dd/fetch-recent-files {:team-id team-id}))}] (dd/fetch-recent-files {:team-id team-id})
(dd/clear-selected-files))}]
(st/emit! (dd/move-files (with-meta data mdata)))))))] (st/emit! (dd/move-files (with-meta data mdata)))))))]
[:section.dashboard-grid {:on-drag-enter on-drag-enter [:section.dashboard-grid {:on-drag-enter on-drag-enter

3
frontend/src/app/main/ui/dashboard/libraries.cljs
View file

@ -32,7 +32,8 @@
(reverse))] (reverse))]
(mf/use-effect (mf/use-effect
(mf/deps team) (mf/deps team)
#(st/emit! (dd/fetch-shared-files {:team-id (:id team)}))) #(st/emit! (dd/fetch-shared-files {:team-id (:id team)})
(dd/clear-selected-files)))
[:* [:*
[:header.dashboard-header [:header.dashboard-header

3
frontend/src/app/main/ui/dashboard/projects.cljs
View file

@ -162,7 +162,8 @@
(mf/use-effect (mf/use-effect
(mf/deps team) (mf/deps team)
(fn [] (fn []
(st/emit! (dd/fetch-recent-files {:team-id (:id team)})))) (st/emit! (dd/fetch-recent-files {:team-id (:id team)})
(dd/clear-selected-files))))
(when (seq projects) (when (seq projects)
[:* [:*

3
frontend/src/app/main/ui/dashboard/search.cljs
View file

@ -29,7 +29,8 @@
(mf/use-effect (mf/use-effect
(mf/deps team search-term) (mf/deps team search-term)
(st/emitf (dd/search-files {:team-id (:id team) (st/emitf (dd/search-files {:team-id (:id team)
:search-term search-term}))) :search-term search-term})
(dd/clear-selected-files)))
[:* [:*
[:header.dashboard-header [:header.dashboard-header