Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reply button is not removed when deleting a code review comment #13774

Merged
merged 4 commits into from
Dec 3, 2020

Conversation

jpraet
Copy link
Member

@jpraet jpraet commented Dec 1, 2020

Fixes #13764

This adds a conversation-wrapper div around a code review comment thread. When the last comment in the conversation gets deleted, the conversation-wrapper now also gets deleted, removing the reply / (un)resolve buttons and resolved conversation wrapper.

I also extracted the conversation, which was duplicated in box.tmpl (left+right) and section_unified.tmpl, into a separate template.

web_src/js/index.js Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 1, 2020
@mrsdizzie mrsdizzie added type/bug topic/ui Change the appearance of the Gitea UI labels Dec 1, 2020
@mrsdizzie mrsdizzie added this to the 1.14.0 milestone Dec 1, 2020
Co-authored-by: mrsdizzie <info@mrsdizzie.com>
@codecov-io
Copy link

codecov-io commented Dec 1, 2020

Codecov Report

Merging #13774 (c947e43) into master (4353cf9) will decrease coverage by 0.07%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #13774      +/-   ##
==========================================
- Coverage   42.24%   42.17%   -0.08%     
==========================================
  Files         708      708              
  Lines       77145    77145              
==========================================
- Hits        32593    32537      -56     
- Misses      39182    39262      +80     
+ Partials     5370     5346      -24     
Impacted Files Coverage Δ
modules/notification/ui/ui.go 84.72% <0.00%> (-8.34%) ⬇️
models/issue_comment.go 45.46% <0.00%> (-6.80%) ⬇️
modules/notification/mail/mail.go 33.33% <0.00%> (-5.75%) ⬇️
modules/git/commit.go 49.67% <0.00%> (-3.95%) ⬇️
modules/notification/base/null.go 74.28% <0.00%> (-2.86%) ⬇️
modules/notification/notification.go 83.92% <0.00%> (-2.68%) ⬇️
modules/queue/unique_queue_disk_channel.go 53.84% <0.00%> (-1.54%) ⬇️
services/mailer/mail.go 60.21% <0.00%> (-1.08%) ⬇️
services/pull/pull.go 40.68% <0.00%> (-0.50%) ⬇️
models/repo.go 51.72% <0.00%> (+0.16%) ⬆️
... and 7 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4353cf9...c947e43. Read the comment docs.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Dec 2, 2020
@6543
Copy link
Member

6543 commented Dec 3, 2020

@jpraet by the way: if you allow maintainers to edit pulls - we could update pull's too :)

Pleace update branch

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 3, 2020
@lafriks
Copy link
Member

lafriks commented Dec 3, 2020

please merge latest changes

@jpraet
Copy link
Member Author

jpraet commented Dec 3, 2020

@jpraet by the way: if you allow maintainers to edit pulls - we could update pull's too :)

For some reason the "Allow edits from maintainers" checkbox is not showing up for me.

@lafriks
Copy link
Member

lafriks commented Dec 3, 2020

yeah, I think it is available only when creating PR :(

@lafriks lafriks merged commit 47e4d1a into go-gitea:master Dec 3, 2020
@silverwind
Copy link
Member

Very nice work, always great to see template deduplications which we are very guilty of 😉

@6543
Copy link
Member

6543 commented Dec 3, 2020

we should backport the fix - but I'm not sure if we should also backport template dedub?

@silverwind
Copy link
Member

This also has a dependency on the new mergeinto helper which I think is not in 1.13.

@6543
Copy link
Member

6543 commented Dec 3, 2020

@jpraet can you create a backport to 1.13 without the dedublication refactor ?

@jpraet
Copy link
Member Author

jpraet commented Dec 3, 2020

@6543 ok

jpraet added a commit to jpraet/gitea that referenced this pull request Dec 3, 2020
@6543 6543 added the backport/done All backports for this PR have been created label Dec 3, 2020
@go-gitea go-gitea locked and limited conversation to collaborators Jan 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reply button is not removed when deleting a code review comment
7 participants