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

🐛 Fix retrieve user comments in dashboard

Browse source
This commit is contained in:
alonso.torres 2023-07-11 15:38:54 +02:00 • committed by Aitor
parent 872648d393
commit fc35b0b853
4 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -72,6 +72,7 @@
- Fix bad frame-id for certain componentes [#3205](https://github.com/penpot/penpot/issues/3205) - Fix bad frame-id for certain componentes [#3205](https://github.com/penpot/penpot/issues/3205)
- Fix paste elements at bottom of frame [Taig #5253](https://tree.taiga.io/project/penpot/issue/5253) - Fix paste elements at bottom of frame [Taig #5253](https://tree.taiga.io/project/penpot/issue/5253)
- Fix new-file button on project not redirecting to the new file [Taiga #5610](https://tree.taiga.io/project/penpot/issue/5610) - Fix new-file button on project not redirecting to the new file [Taiga #5610](https://tree.taiga.io/project/penpot/issue/5610)
- Fix retrieve user comments in dashboard [Taiga #5607](https://tree.taiga.io/project/penpot/issue/5607)
### :arrow_up: Deps updates ### :arrow_up: Deps updates

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

@ -314,9 +314,18 @@
(ptk/reify ::retrieve-unread-comment-threads (ptk/reify ::retrieve-unread-comment-threads
ptk/WatchEvent ptk/WatchEvent
(watch [_ _ _] (watch [_ _ _]
(let [fetched #(assoc %2 :comment-threads (d/index-by :id %1))] (let [fetched-comments #(assoc %2 :comment-threads (d/index-by :id %1))
fetched-users #(assoc %2 :current-team-comments-users %1)]
(->> (rp/cmd! :get-unread-comment-threads {:team-id team-id}) (->> (rp/cmd! :get-unread-comment-threads {:team-id team-id})
(rx/map #(partial fetched %)) (rx/merge-map
(fn [comments]
(rx/concat
(rx/of (partial fetched-comments comments))
(->> (rx/from (map :file-id comments))
(rx/merge-map #(rp/cmd! :get-profiles-for-file-comments {:file-id %}))
(rx/reduce #(merge %1 (d/index-by :id %2)) {})
(rx/map #(partial fetched-users %))))))
(rx/catch #(rx/throw {:type :comment-error}))))))) (rx/catch #(rx/throw {:type :comment-error})))))))

3
frontend/src/app/main/refs.cljs
View file

@ -459,6 +459,9 @@
(def current-file-comments-users (def current-file-comments-users
(l/derived :current-file-comments-users st/state)) (l/derived :current-file-comments-users st/state))
(def current-team-comments-users
(l/derived :current-team-comments-users st/state))
(def viewer-fullscreen? (def viewer-fullscreen?
(l/derived (fn [state] (l/derived (fn [state]
(dm/get-in state [:viewer-local :fullscreen?])) (dm/get-in state [:viewer-local :fullscreen?]))

2
frontend/src/app/main/ui/dashboard/comments.cljs
View file

@ -32,7 +32,7 @@
show-dropdown (mf/use-fn #(reset! show-dropdown? true)) show-dropdown (mf/use-fn #(reset! show-dropdown? true))
hide-dropdown (mf/use-fn #(reset! show-dropdown? false)) hide-dropdown (mf/use-fn #(reset! show-dropdown? false))
threads-map (mf/deref refs/comment-threads) threads-map (mf/deref refs/comment-threads)
users (mf/deref refs/current-file-comments-users) users (mf/deref refs/current-team-comments-users)
tgroups (->> (vals threads-map) tgroups (->> (vals threads-map)
(sort-by :modified-at) (sort-by :modified-at)