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.

Sign up for GitHub

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

Jump to bottom

Do not render empty comments #29039

Merged
merged 2 commits into from
Feb 4, 2024
Merged

Do not render empty comments #29039

merged 2 commits into from
Feb 4, 2024

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Feb 4, 2024 •
edited
Loading

Follow #28654

The comments might be empty, so the templates shouldn't (and couldn't) use it to render. When there is no comment, the UI should also be updated to empty, so returning an empty body is good enough.

And record a discussion from #28949 :

But the experience is very odd when I click the resolve the conversation and then the comment disapeared.

Even if it doesn't disappear by clicking "resolve the conversation", it would also disappear when you refresh the page.

Indeed it is a design problem. Maybe it should tell the user that "The outdated comment won't show" on the UI.

@wxiaoguang wxiaoguang added this to the 1.22.0 milestone Feb 4, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 4, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 4, 2024
@wxiaoguang wxiaoguang added type/bug backport/v1.21 This PR should be backported to Gitea 1.21 labels Feb 4, 2024
@wxiaoguang wxiaoguang force-pushed the fix-render-conversation branch from 909446f to 65610e7 Compare February 4, 2024 03:40
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Feb 4, 2024
@wxiaoguang wxiaoguang mentioned this pull request Feb 4, 2024
Merged
@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 Feb 4, 2024
@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 Feb 4, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) February 4, 2024 12:41
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 4, 2024
@wxiaoguang wxiaoguang merged commit b4513f4 into go-gitea:main Feb 4, 2024
25 checks passed
@wxiaoguang wxiaoguang deleted the fix-render-conversation branch February 4, 2024 13:05
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Feb 4, 2024
@wxiaoguang @GiteaBot
Do not render empty comments (go-gitea#29039)
a11bd2a 
Follow go-gitea#28654

The `comments` might be empty, so the templates shouldn't (and couldn't)
use it to render. When there is no comment, the UI should also be
updated to empty, so returning an empty body is good enough.
@GiteaBot GiteaBot mentioned this pull request Feb 4, 2024
Merged
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Feb 4, 2024
@wxiaoguang wxiaoguang mentioned this pull request Feb 4, 2024
Closed
wxiaoguang added a commit that referenced this pull request Feb 4, 2024
@GiteaBot @wxiaoguang
Do not render empty comments (#29039) (#29049)
aadbbf4 
Backport #29039 by wxiaoguang

Follow #28654

The `comments` might be empty, so the templates shouldn't (and couldn't)
use it to render. When there is no comment, the UI should also be
updated to empty, so returning an empty body is good enough.

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@go-gitea go-gitea locked and limited conversation to collaborators Feb 5, 2024
@go-gitea go-gitea deleted a comment from oliverpool Feb 21, 2024
@go-gitea go-gitea deleted a comment from wxiaoguang Feb 21, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@KN4CK3R KN4CK3R KN4CK3R approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
4 participants
@wxiaoguang @lunny @KN4CK3R @GiteaBot