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

jpraet · 2023-12-29T18:16:53Z

Fixes #15981

…page-reload

lunny · 2024-01-22T10:38:29Z

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

…page-reload

delvh · 2024-01-22T13:53:16Z

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 · 2024-01-22T13:57:05Z

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.

…page-reload

GiteaBot · 2024-01-24T03:26:33Z

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

go-gitea#28654) Backport go-gitea#28654 Fixes go-gitea#15981

#28654) (#28917) Backport #28654 Fixes #15981

* 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)

go-gitea#28654) Fixes go-gitea#15981

wxiaoguang · 2024-02-04T03:42:41Z

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))}}


-> Do not render empty comments #29039

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.

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.

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 <[email protected]>

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

…#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.

…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.

…#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.

go-gitea#28654) Fixes go-gitea#15981

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.

…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.

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

0704a41

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 bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 29, 2023

github-actions bot added the modifies/frontend label Dec 29, 2023

Add missing newline at end of file

54776c9

delvh added type/bug topic/ui-interaction Change the process how users use Gitea instead of the visual appearance labels Dec 29, 2023

jpraet added the backport/v1.21 This PR should be backported to Gitea 1.21 label Dec 29, 2023

jpraet added this to the 1.22.0 milestone Dec 30, 2023

Merge branch 'main' into go-gitea#15981-resolve-conversation-without-…

bc4c13b

…page-reload

lunny approved these changes Jan 7, 2024

View reviewed changes

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

jpraet and others added 2 commits January 12, 2024 18:27

Merge branch 'main' into go-gitea#15981-resolve-conversation-without-…

e18e7e9

…page-reload

Merge branch 'main' into go-gitea#15981-resolve-conversation-without-…

30b974c

…page-reload

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

Merge branch 'main' into go-gitea#15981-resolve-conversation-without-…

bddc4e0

…page-reload

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

denyskon approved these changes Jan 22, 2024

View reviewed changes

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 added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 22, 2024

GiteaBot added 5 commits January 23, 2024 09:17

Merge branch 'main' into go-gitea#15981-resolve-conversation-without-…

4d58cfd

…page-reload

Merge branch 'main' into go-gitea#15981-resolve-conversation-without-…

562ade7

…page-reload

Merge branch 'main' into go-gitea#15981-resolve-conversation-without-…

9d4cb81

…page-reload

Merge branch 'main' into go-gitea#15981-resolve-conversation-without-…

34a21b0

…page-reload

Merge branch 'main' into go-gitea#15981-resolve-conversation-without-…

b353825

…page-reload

Merge branch 'main' into go-gitea#15981-resolve-conversation-without-…

8516ae7

…page-reload

lunny merged commit ee3e83e into go-gitea:main Jan 24, 2024
25 checks passed

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 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

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

0f018cb

go-gitea#28654) Backport go-gitea#28654 Fixes go-gitea#15981

jpraet mentioned this pull request Jan 24, 2024

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

Merged

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

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

9210ce4

#28654) (#28917) Backport #28654 Fixes #15981

henrygoodman pushed a commit to henrygoodman/gitea that referenced this pull request Jan 31, 2024

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

63aa1ba

go-gitea#28654) Fixes go-gitea#15981

wxiaoguang mentioned this pull request Feb 4, 2024

Do not render empty comments #29039

Merged

wxiaoguang reviewed Feb 4, 2024

View reviewed changes

GiteaBot mentioned this pull request Feb 4, 2024

Do not render empty comments (#29039) #29049

Merged

jpraet mentioned this pull request Feb 16, 2024

Load outdated comments when (un)resolving conversation on PR timeline #29203

Merged

jpraet mentioned this pull request Feb 17, 2024

Load outdated comments when (un)resolving conversation on PR timeline (#29203) #29221

Merged

silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024

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

e2177e9

go-gitea#28654) Fixes go-gitea#15981

github-actions bot locked as resolved and limited conversation to collaborators Mar 3, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

jpraet commented Dec 29, 2023

lunny commented Jan 22, 2024

delvh commented Jan 22, 2024 •

edited

Loading

denyskon commented Jan 22, 2024

GiteaBot commented Jan 24, 2024

wxiaoguang Feb 4, 2024

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

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

Conversation

jpraet commented Dec 29, 2023

lunny commented Jan 22, 2024

delvh commented Jan 22, 2024 • edited Loading

denyskon commented Jan 22, 2024

GiteaBot commented Jan 24, 2024

wxiaoguang Feb 4, 2024

Choose a reason for hiding this comment

delvh commented Jan 22, 2024 •

edited

Loading