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

🐛 Fix contextual menu in dashboard shared libraries section

Browse source
This commit is contained in:
Andrés Moya 2021-06-24 15:39:12 +02:00 • committed by Alonso Torres
parent 3295685938
commit 150427cd39
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -20,6 +20,7 @@
- Fix dashboard navigation on moving file to other team [Taiga #1817](https://tree.taiga.io/project/penpot/issue/1817). - Fix dashboard navigation on moving file to other team [Taiga #1817](https://tree.taiga.io/project/penpot/issue/1817).
- Fix workspace header presence styles and invalid link [Taiga #1813](https://tree.taiga.io/project/penpot/issue/1813). - Fix workspace header presence styles and invalid link [Taiga #1813](https://tree.taiga.io/project/penpot/issue/1813).
- Fix color-input wrong behavior (on workspace page color) [Taiga #1795](https://tree.taiga.io/project/penpot/issue/1795). - Fix color-input wrong behavior (on workspace page color) [Taiga #1795](https://tree.taiga.io/project/penpot/issue/1795).
- Fix file contextual menu in shared libraries at dashboard [Taiga #1865](https://tree.taiga.io/project/penpot/issue/1865).
### :arrow_up: Deps updates ### :arrow_up: Deps updates
### :boom: Breaking changes ### :boom: Breaking changes

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

@ -73,6 +73,7 @@
(-> (assoc :current-team-id id) (-> (assoc :current-team-id id)
(dissoc :dashboard-files) (dissoc :dashboard-files)
(dissoc :dashboard-projects) (dissoc :dashboard-projects)
(dissoc :dashboard-shared-files)
(dissoc :dashboard-recent-files) (dissoc :dashboard-recent-files)
(dissoc :dashboard-team-members) (dissoc :dashboard-team-members)
(dissoc :dashboard-team-stats))))) (dissoc :dashboard-team-stats)))))
@ -206,7 +207,10 @@
(ptk/reify ::shared-files-fetched (ptk/reify ::shared-files-fetched
ptk/UpdateEvent ptk/UpdateEvent
(update [_ state] (update [_ state]
(assoc state :dashboard-shared-files (d/index-by :id files))))) (let [files (d/index-by :id files)]
(-> state
(assoc :dashboard-shared-files files)
(update :dashboard-files d/merge files))))))
(defn fetch-shared-files (defn fetch-shared-files
[] []
@ -548,6 +552,7 @@
(update [_ state] (update [_ state]
(-> state (-> state
(d/update-when :dashboard-files dissoc id) (d/update-when :dashboard-files dissoc id)
(d/update-when :dashboard-shared-files dissoc id)
(d/update-when :dashboard-recent-files dissoc id))) (d/update-when :dashboard-recent-files dissoc id)))
ptk/WatchEvent ptk/WatchEvent
@ -566,6 +571,7 @@
(update [_ state] (update [_ state]
(-> state (-> state
(d/update-in-when [:dashboard-files id :name] (constantly name)) (d/update-in-when [:dashboard-files id :name] (constantly name))
(d/update-in-when [:dashboard-shared-files id :name] (constantly name))
(d/update-in-when [:dashboard-recent-files id :name] (constantly name)))) (d/update-in-when [:dashboard-recent-files id :name] (constantly name))))
ptk/WatchEvent ptk/WatchEvent
@ -584,7 +590,10 @@
(update [_ state] (update [_ state]
(-> state (-> state
(d/update-in-when [:dashboard-files id :is-shared] (constantly is-shared)) (d/update-in-when [:dashboard-files id :is-shared] (constantly is-shared))
(d/update-in-when [:dashboard-recent-files id :is-shared] (constantly is-shared)))) (d/update-in-when [:dashboard-recent-files id :is-shared] (constantly is-shared))
(cond->
(not is-shared)
(d/update-when :dashboard-shared-files dissoc id))))
ptk/WatchEvent ptk/WatchEvent
(watch [_ _ _] (watch [_ _ _]