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

Don't reload timeline page when (un)resolving or replying conversation #28654

Merged
merged 13 commits into from
Jan 24, 2024
Merged

Don't reload timeline page when (un)resolving or replying conversation #28654

merged 13 commits into from
Jan 24, 2024

Conversation

jpraet
Copy link
Member

@jpraet jpraet commented Dec 29, 2023

Fixes #15981

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 29, 2023
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 29, 2023
@delvh delvh added type/bug topic/ui-interaction Change the process how users use Gitea instead of the visual appearance labels Dec 29, 2023
@jpraet jpraet added the backport/v1.21 This PR should be backported to Gitea 1.21 label Dec 29, 2023
@jpraet jpraet added this to the 1.22.0 milestone Dec 30, 2023
@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 Jan 7, 2024
@lunny
Copy link
Member

lunny commented Jan 22, 2024

Last Call @go-gitea/technical-oversight-committee

@denyskon denyskon added the giteabot/update-branch Hint for the bot that it should update a PR with the latest state on main label Jan 22, 2024
@GiteaBot GiteaBot removed the giteabot/update-branch Hint for the bot that it should update a PR with the latest state on main label Jan 22, 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 Jan 22, 2024
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 22, 2024
@delvh
Copy link
Member

delvh commented Jan 22, 2024 •
edited
Loading

Erm… What is our current stance on htmx?
I've only watched the debate peripherally, did we revert it or not for now?
If we didn't, wouldn't it make sense here to use htmx as well?

@denyskon
Copy link
Member

We did revert, without a consensus on how to proceed yet. I think we can merge this, and reimplement in the future if needed. After all, this PR doesn't add much code.

@lunny lunny merged commit ee3e83e into go-gitea:main Jan 24, 2024
25 checks passed
@GiteaBot
Copy link
Contributor

I was unable to create a backport for 1.21. @jpraet, please send one manually. 🍵

go run ./contrib/backport 28654
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Jan 24, 2024
@denyskon denyskon removed backport/v1.21 This PR should be backported to Gitea 1.21 backport/manual No power to the bots! Create your backport yourself! labels Jan 24, 2024
jpraet added a commit to jpraet/gitea that referenced this pull request Jan 24, 2024
@jpraet
Don't reload timeline page when (un)resolving or replying conversation (
0f018cb 
go-gitea#28654)

Backport go-gitea#28654

Fixes go-gitea#15981
@jpraet jpraet mentioned this pull request Jan 24, 2024
Merged
@denyskon denyskon added backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! labels Jan 24, 2024
KN4CK3R pushed a commit that referenced this pull request Jan 24, 2024
@jpraet
Don't reload timeline page when (un)resolving or replying conversation (
9210ce4 
#28654) (#28917)

Backport #28654
Fixes #15981
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jan 25, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
40a7eb6 
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Show in Web UI if file is vendored and generated (go-gitea#28620)
  Don't reload timeline page when (un)resolving or replying conversation (go-gitea#28654)
  Allow to sync tags from admin dashboard (go-gitea#28045)
  Don't run push mirrors for archived repos (go-gitea#27140)
  Only migrate the first 255 chars of a Github issue title (go-gitea#28902)
  Fix hardcoded GitHub icon used as migrated release avatar (go-gitea#28910)
  [skip ci] Updated translations via Crowdin
  Update go dependencies and fix go-git (go-gitea#28893)
henrygoodman pushed a commit to henrygoodman/gitea that referenced this pull request Jan 31, 2024
@jpraet @henrygoodman
Don't reload timeline page when (un)resolving or replying conversation (
63aa1ba 
go-gitea#28654)

Fixes go-gitea#15981
@wxiaoguang wxiaoguang mentioned this pull request Feb 4, 2024
Merged
wxiaoguang
wxiaoguang reviewed Feb 4, 2024
View reviewed changes
templates/repo/issue/view_content/conversation.tmpl
{{$invalid := (index .comments 0).Invalidated}}
{{$resolved := (index .comments 0).IsResolved}}
{{$resolveDoer := (index .comments 0).ResolveDoer}}
{{$isNotPending := (not (eq (index .comments 0).Review.Type 0))}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-> Do not render empty comments #29039

wxiaoguang added a commit that referenced this pull request Feb 4, 2024
@wxiaoguang
Do not render empty comments (#29039)
b4513f4 
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.
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
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>
nrdufour added a commit to nrdufour/home-ops that referenced this pull request Feb 4, 2024
@nrdufour
chore(deps): update docker.io/gitea/gitea docker tag to v1.21.5 (#355)
b9154f4 
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [docker.io/gitea/gitea](https://github.com/go-gitea/gitea) | patch | `1.21.4` -> `1.21.5` |

---

### Release Notes

<details>
<summary>go-gitea/gitea (docker.io/gitea/gitea)</summary>

### [`v1.21.5`](https://github.com/go-gitea/gitea/releases/tag/v1.21.5)

[Compare Source](go-gitea/gitea@v1.21.4...v1.21.5)

-   SECURITY
    -   Prevent anonymous container access if `RequireSignInView` is enabled ([#&#8203;28877](go-gitea/gitea#28877)) ([#&#8203;28882](go-gitea/gitea#28882))
    -   Update go dependencies and fix go-git ([#&#8203;28893](go-gitea/gitea#28893)) ([#&#8203;28934](go-gitea/gitea#28934))
-   BUGFIXES
    -   Revert "Speed up loading the dashboard on mysql/mariadb ([#&#8203;28546](go-gitea/gitea#28546))" ([#&#8203;29006](go-gitea/gitea#29006)) ([#&#8203;29007](go-gitea/gitea#29007))
    -   Fix an actions schedule bug ([#&#8203;28942](go-gitea/gitea#28942)) ([#&#8203;28999](go-gitea/gitea#28999))
    -   Fix update enable_prune even if mirror_interval is not provided ([#&#8203;28905](go-gitea/gitea#28905)) ([#&#8203;28929](go-gitea/gitea#28929))
    -   Fix uploaded artifacts should be overwritten ([#&#8203;28726](go-gitea/gitea#28726)) backport v1.21 ([#&#8203;28832](go-gitea/gitea#28832))
    -   Preserve BOM in web editor ([#&#8203;28935](go-gitea/gitea#28935)) ([#&#8203;28959](go-gitea/gitea#28959))
    -   Strip `/` from relative links ([#&#8203;28932](go-gitea/gitea#28932)) ([#&#8203;28952](go-gitea/gitea#28952))
    -   Don't remove all mirror repository's releases when mirroring ([#&#8203;28817](go-gitea/gitea#28817)) ([#&#8203;28939](go-gitea/gitea#28939))
    -   Implement `MigrateRepository` for the actions notifier ([#&#8203;28920](go-gitea/gitea#28920)) ([#&#8203;28923](go-gitea/gitea#28923))
    -   Respect branch info for relative links ([#&#8203;28909](go-gitea/gitea#28909)) ([#&#8203;28922](go-gitea/gitea#28922))
    -   Don't reload timeline page when (un)resolving or replying conversation ([#&#8203;28654](go-gitea/gitea#28654)) ([#&#8203;28917](go-gitea/gitea#28917))
    -   Only migrate the first 255 chars of a Github issue title ([#&#8203;28902](go-gitea/gitea#28902)) ([#&#8203;28912](go-gitea/gitea#28912))
    -   Fix sort bug on repository issues list ([#&#8203;28897](go-gitea/gitea#28897)) ([#&#8203;28901](go-gitea/gitea#28901))
    -   Fix `DeleteCollaboration` transaction behaviour ([#&#8203;28886](go-gitea/gitea#28886)) ([#&#8203;28889](go-gitea/gitea#28889))
    -   Fix schedule not trigger bug because matching full ref name with short ref name ([#&#8203;28874](go-gitea/gitea#28874)) ([#&#8203;28888](go-gitea/gitea#28888))
    -   Fix migrate storage bug ([#&#8203;28830](go-gitea/gitea#28830)) ([#&#8203;28867](go-gitea/gitea#28867))
    -   Fix archive creating LFS hooks and breaking pull requests ([#&#8203;28848](go-gitea/gitea#28848)) ([#&#8203;28851](go-gitea/gitea#28851))
    -   Fix reverting a merge commit failing ([#&#8203;28794](go-gitea/gitea#28794)) ([#&#8203;28825](go-gitea/gitea#28825))
    -   Upgrade xorm to v1.3.7 to fix a resource leak problem caused by Iterate ([#&#8203;28891](go-gitea/gitea#28891)) ([#&#8203;28895](go-gitea/gitea#28895))
    -   Fix incorrect PostgreSQL connection string for Unix sockets ([#&#8203;28865](go-gitea/gitea#28865)) ([#&#8203;28870](go-gitea/gitea#28870))
-   ENHANCEMENTS
    -   Make loading animation less aggressive ([#&#8203;28955](go-gitea/gitea#28955)) ([#&#8203;28956](go-gitea/gitea#28956))
    -   Avoid duplicate JS error messages on UI ([#&#8203;28873](go-gitea/gitea#28873)) ([#&#8203;28881](go-gitea/gitea#28881))
    -   Bump `@github/relative-time-element` to 4.3.1 ([#&#8203;28819](go-gitea/gitea#28819)) ([#&#8203;28826](go-gitea/gitea#28826))
-   MISC
    -   Warn that `DISABLE_QUERY_AUTH_TOKEN` is false only if it's explicitly defined ([#&#8203;28783](go-gitea/gitea#28783)) ([#&#8203;28868](go-gitea/gitea#28868))
    -   Remove duplicated checkinit on git module ([#&#8203;28824](go-gitea/gitea#28824)) ([#&#8203;28831](go-gitea/gitea#28831))

Instances on **[Gitea Cloud](https://cloud.gitea.com)** will be automatically upgraded to this version during the specified maintenance window.

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4xNjUuMCIsInVwZGF0ZWRJblZlciI6IjM3LjE2NS4wIiwidGFyZ2V0QnJhbmNoIjoibWFpbiJ9-->

Reviewed-on: https://git.home/nrdufour/home-ops/pulls/355
Co-authored-by: Renovate <renovate@ptinem.io>
Co-committed-by: Renovate <renovate@ptinem.io>
@jpraet jpraet mentioned this pull request Feb 16, 2024
Merged
lunny pushed a commit that referenced this pull request Feb 17, 2024
@jpraet
Load outdated comments when (un)resolving conversation on PR timeline (…
22b9c2c 
…#29203)

Relates to #28654, #29039 and #29050.

The "show outdated comments" flag should only apply to the file diff
view.
On the PR timeline, outdated comments are always shown.
So they should also be loaded when (un)resolving a conversation on the
timeline page.
jpraet added a commit to jpraet/gitea that referenced this pull request Feb 17, 2024
@jpraet
Load outdated comments when (un)resolving conversation on PR timeline (…
4c38b2a 
…go-gitea#29203)

Backport go-gitea#29203

Relates to go-gitea#28654, go-gitea#29039 and go-gitea#29050.

The "show outdated comments" flag should only apply to the file diff
view.
On the PR timeline, outdated comments are always shown.
So they should also be loaded when (un)resolving a conversation on the
timeline page.
@jpraet jpraet mentioned this pull request Feb 17, 2024
Merged
lunny pushed a commit that referenced this pull request Feb 18, 2024
@jpraet
Load outdated comments when (un)resolving conversation on PR timeline (…
3604b7d 
…#29203) (#29221)

Backport #29203

Relates to #28654, #29039 and #29050.

The "show outdated comments" flag should only apply to the file diff
view.
On the PR timeline, outdated comments are always shown. So they should
also be loaded when (un)resolving a conversation on the timeline page.
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
@jpraet @silverwind
Don't reload timeline page when (un)resolving or replying conversation (
e2177e9 
go-gitea#28654)

Fixes go-gitea#15981
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
@wxiaoguang @silverwind
Do not render empty comments (go-gitea#29039)
8440e05 
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.
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
@jpraet @silverwind
Load outdated comments when (un)resolving conversation on PR timeline (…
a928126 
…go-gitea#29203)

Relates to go-gitea#28654, go-gitea#29039 and go-gitea#29050.

The "show outdated comments" flag should only apply to the file diff
view.
On the PR timeline, outdated comments are always shown.
So they should also be loaded when (un)resolving a conversation on the
timeline page.
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 3, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@wxiaoguang wxiaoguang wxiaoguang left review comments

@denyskon denyskon denyskon approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. topic/ui-interaction Change the process how users use Gitea instead of the visual appearance type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

[Bug] Do not reload page after resolving a conversation
6 participants
@jpraet @lunny @delvh @denyskon @GiteaBot @wxiaoguang