Stanislav Lashmanov (1fbfb0ac) at 18 Mar 00:26

Stanislav Lashmanov (42ec3417) at 18 Mar 00:07

... and 196 more commits

@jerasmus hi! Could you please review this last step for enabling CRUD in merge request Rapid Diffs?

Stanislav Lashmanov (0059b8a4) at 17 Mar 23:07

... and 62 more commits

Stanislav Lashmanov (c1f2f4a9) at 17 Mar 22:20

@mle could you please have a look?

Stanislav Lashmanov (4afa6563) at 17 Mar 21:59

... and 1 more commit

@mle thoughts on this? I was thinking of showing a short message saying ' comments hidden, show file changes in order to see them.'. Here's the MR. WDYT?

What and why

Closes #593921

When a diff file is shown as no_preview (binary, too large, or otherwise not expandable inline), any line-level threads on that file are invisible — there are no diff rows to anchor them to. After a page reload the user has no indication that comments exist.

This adds an info alert directly inside the collapsed diff file whenever it has hidden line threads, showing the count: "N thread(s) hidden. Show file changes in order to see them." The alert updates reactively as discussions load and is cleaned up when the adapter is torn down.

The change covers both merge request and commit diff pages.

Reproduction steps (commit page)

1. Find or create a commit that touches a binary or otherwise non-previewable file.
2. Expand the diff, leave a line comment, then reload the page.
3. Before: the no_preview diff shows no indication of the comment.
4. After: an info alert appears inside the collapsed file: "1 thread hidden. Show file changes in order to see it."

Showcase

Stanislav Lashmanov (710c16f9) at 17 Mar 21:48

I did not forget about this and it's actually quite a complex issue. We need to address this in Rapid Diffs for sure, but there's another issue with this. Even if we add a comment for an expanded diff we need to either:

1. Expand it on the server when the comment is present only in the expanded view
2. Contain all the skipped comments to be visible within a collapsed diff

I've created issues for both of these problems:

1. Support comments on previously collapsed diffs (#593919)
2. Show hidden comments for collapsed diffs (#593921)

@thomasrandolph hi! Could you please review this one when you get a chance?

Stanislav Lashmanov (53723b0c) at 17 Mar 20:53

... and 678 more commits

We could always start with that and see if we can improve it in the future?

We're aligned then. I'll wait for a merge of this MR and Gitaly version bump, then we can enable the new codepath behind a feature flag.

@slashmanov Isn't it possible that a file has only whitespace changes and so it's only visible in one context of the changes? What happens in that case?

@phikai this happens (and will continue to happen):

2/2 here is line counters with the whitespace changes shown, otherwise it would be 0/0.

Is that the right understanding? I still don't think that's ideal since presumably you could have a different file count vs. the number of visible files?

@phikai that's the correct understanding. However the number of files shown is not going to change. This only affects line counters.

I can't reproduce it right now. I'll reopen if I can reproduce it again reliably.