Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-14 16:51:18 -05:00
Code Issues Activity

🐛 Fixes problems with comments section

Browse source
This commit is contained in:
alonso.torres 2021-03-10 11:48:09 +01:00
parent 172372d4c0
commit c12cbbca2e
4 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES.md
View file

@ -26,6 +26,8 @@
- Fix problem with masks interactions outside bounds [#718](https://github.com/penpot/penpot/issues/718) - Fix problem with masks interactions outside bounds [#718](https://github.com/penpot/penpot/issues/718)
- Fix issues with Alt key in distance measurement [#672](https://github.com/penpot/penpot/issues/672) - Fix issues with Alt key in distance measurement [#672](https://github.com/penpot/penpot/issues/672)
- Fix problem with rotation degree input [#741](https://github.com/penpot/penpot/issues/741) - Fix problem with rotation degree input [#741](https://github.com/penpot/penpot/issues/741)
- Fix problem with resolved comments [Taiga #1406](https://tree.taiga.io/project/penpot/issue/1406)
- Fix problem with comments styles on dashboard [Taiga #1405](https://tree.taiga.io/project/penpot/issue/1405)
### :heart: Community contributions by (Thank you!) ### :heart: Community contributions by (Thank you!)

4
backend/src/app/rpc/mutations/comments.clj
View file

@ -146,14 +146,14 @@
(db/with-atomic [conn pool] (db/with-atomic [conn pool]
(let [thread (db/get-by-id conn :comment-thread id {:for-update true})] (let [thread (db/get-by-id conn :comment-thread id {:for-update true})]
(when-not thread (when-not thread
(ex/raise :type :not-found) (ex/raise :type :not-found))
(files/check-read-permissions! conn profile-id (:file-id thread)) (files/check-read-permissions! conn profile-id (:file-id thread))
(db/update! conn :comment-thread (db/update! conn :comment-thread
{:is-resolved is-resolved} {:is-resolved is-resolved}
{:id id}) {:id id})
nil)))) nil)))
;; --- Mutation: Add Comment ;; --- Mutation: Add Comment

17
frontend/resources/styles/main/partials/comments.scss
View file

@ -246,6 +246,7 @@
pointer-events: auto; pointer-events: auto;
.thread-groups { .thread-groups {
hr { hr {
border: 0; border: 0;
height: 1px; height: 1px;
@ -424,16 +425,18 @@
} }
} }
.thread-group { .thread-groups {
.section-title { max-height: calc(30rem - 40px);
color: $color-black; overflow: auto;
}
.threads { hr {
max-height: 25rem; background-color: $color-gray-10;
overflow: auto;
} }
} }
.thread-group .section-title {
color: $color-black;
}
.comment { .comment {
.author .name .fullname { .author .name .fullname {

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

@ -327,9 +327,7 @@
(let [{:keys [show mode open]} cstate] (let [{:keys [show mode open]} cstate]
(cond->> threads (cond->> threads
(= :pending show) (= :pending show)
(filter (fn [item] (filter (comp not :is-resolved))
(or (not (:is-resolved item))
(= (:id item) open))))
(= :yours mode) (= :yours mode)
(filter #(contains? (:participants %) (:id profile)))))) (filter #(contains? (:participants %) (:id profile))))))