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

Remove row clicking from notification table #22695

Merged
merged 10 commits into from
Mar 25, 2023

Conversation

jolheiser
Copy link
Member

Resolves #22692

I don't think there's a need for this entire row to be clickable (and even different links depending on which segment you click)
The links still point to the same spot, so no information is lost here.

@jolheiser jolheiser added the topic/ui Change the appearance of the Gitea UI label Jan 31, 2023
@jolheiser jolheiser added this to the 1.19.0 milestone Jan 31, 2023
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 31, 2023
@Daeraxa
Copy link

Daeraxa commented Jan 31, 2023

I would vote against this as it removes desired behaviour as far as I'm concerned. Not only is row clicking pretty standard UI practice (see github's own) but this is already the behaviour and the reported issue is about missing functionality on top of this. I don't really see justification to having to be pinpoint accurate when looking through a notification list.

@jolheiser
Copy link
Member Author

The alternative, then, would be to make the a take up all of the space, which may require some more tweaking with CSS.

I am fine if that's the consensus, but will need to fiddle around with it. Fomantic tables seem to want to generate padding, so it won't be quite as easy as just making the a take up given space.

@Daeraxa
Copy link

Daeraxa commented Jan 31, 2023

The other thought I had is wouldn't this negatively affect the touch/mobile interface as well?

@jolheiser
Copy link
Member Author

The other thought I had is wouldn't this negatively affect the touch/mobile interface as well?

If anything imo it would be better, less chance to misclick, as these table rows actually have different links depending on where in the segment you click.

@jolheiser
Copy link
Member Author

fwiw what "github does" is what I described above, where the a takes up all the space it can.

As well, for things that do the same no matter where you click I think it's fine, but ours is slightly different because you can click to the issue/PR, but there's also a segment for clicking to the repo itself.

So honestly I am fine with either solution, though I don't mind trying to fiddle with the CSS (later) to get it working as-is.

@jolheiser jolheiser changed the title Remove row clicking from notification table WIP: Remove row clicking from notification table Jan 31, 2023
@Daeraxa
Copy link

Daeraxa commented Jan 31, 2023

That's a good point, I hadn't noticed that bit. I'm not saying its something that would necessarily need to be adhered to (as GH is far from perfect on the UI front) is that the row click for the GH notifications only seems to stretch as far as it needs to then cuts off when it gets to the "other" links.

Edit: typing this at the same time as you did. Either way I'm just stating a (soft) preference, the main issue I think is inconsistency.

@zeripath
Copy link
Contributor

So I recall making the whole row clickable deliberately to keep things the same as on GH which also did the same thing at that point. Making the <a> take up the whole space seemed to be too difficult.

Now you can still right/middle click on the link bit...

@wxiaoguang
Copy link
Contributor

Interesting.

See #17388 , IMO the click behavior on the td was by purpose before.

If it's not, the JS should be removed together.

Signed-off-by: jolheiser <john.olheiser@gmail.com>
@jolheiser
Copy link
Member Author

jolheiser commented Feb 1, 2023

This is a far cry from making it full-height, but I could not find a "good" way to make it full-height without some very hacky CSS. (admittedly I am not a UI expert by any means)

What GitHub does, and what I suspect we should eventually do (if fomantic lets us), is instead of a table they use a list and cleverly styled divs to render the "table" which allows the anchor tag to encompass the content.


I am fine with taking pointers on clever CSS to make this work, accepting this PR as-is, or closing it as "the other way was good enough"

Screenshot from 2023-01-31 22-09-42

I personally find the dead-space to be a bit tacky, but it does at least bring it closer.

@wxiaoguang
Copy link
Contributor

It will be hacky to make a full height <a>, it needs to remove the td padding and do other works. IMO it's not worth to make it that complex.

The width: 100% should be good enough. And maybe the dead JS code could be removed (if it is only used here) to save browser's CPU time slightly.

@wxiaoguang
Copy link
Contributor

Hmm ... since the HTMLURL is touched, this PR will have conflicts with https://github.com/go-gitea/gitea/pull/21986/files#diff-40b7988fcd35c50d12157e06dc96b586404a4d1d3772a4b257340f11295bec5a

I never understand why people like keeping refactor PRs stale and keeping resolving conflicts.

@jolheiser jolheiser changed the title WIP: Remove row clicking from notification table Remove row clicking from notification table Feb 2, 2023
@lunny
Copy link
Member

lunny commented Feb 17, 2023

Please resolve the conflicts.

@wxiaoguang
Copy link
Contributor

Maybe the JS code should also be removed together. Since there won't be <td data-href anymore, the JS code becomes dead code.

// make table <tr> and <td> elements clickable like a link
$('tr[data-href], td[data-href]').on('click', function (e) {
const href = $(this).data('href');
if (e.target.nodeName === 'A') {
// if a user clicks on <a>, then the <tr> or <td> should not act as a link.
return;
}
if (e.ctrlKey || e.metaKey) {
// ctrl+click or meta+click opens a new window in modern browsers
window.open(href);
} else {
window.location = href;
}
});

@yardenshoham yardenshoham modified the milestones: 1.19.0, 1.20.0 Feb 22, 2023
@yardenshoham yardenshoham added the outdated/backport/v1.19 This PR should be backported to Gitea 1.19 label Feb 22, 2023
@wxiaoguang
Copy link
Contributor

Is this PR active? I am working on some JS clean-up work, and I could help to propose a sub PR for this PR (to clean the unused JS code).

@jolheiser
Copy link
Member Author

jolheiser commented Mar 24, 2023

Is this PR active? I am working on some JS clean-up work, and I could help to propose a sub PR for this PR (to clean the unused JS code).

That would be great!
Otherwise I can clean it up later this evening/weekend.

@wxiaoguang
Copy link
Contributor

PR: jolheiser#3

Although it looks like changing a lot, actually only the last commit is related. Other commits are all from "main" branch, because I have to merge the PR's branch with main first, to resolve conflicts.

jolheiser and others added 2 commits March 24, 2023 10:44
…ation-table

# Conflicts:
#	templates/user/notification/notification_div.tmpl
#	web_src/less/_user.less
@jolheiser
Copy link
Member Author

@wxiaoguang looks like I messed something up in my merge, so I reconciled the updating my branch and then cherry-picked your fix commit. Would you mind taking a look to make sure I pulled it correctly and resolved the merge the same as you?

@wxiaoguang
Copy link
Contributor

Nvm. I guess you did a squash merge? IMO a "fast foward" or a normal merge won't cause these messes 😁

I think it looks good to me, thank you very much.

@jolheiser
Copy link
Member Author

Nvm. I guess you did a squash merge? IMO a "fast foward" or a normal merge won't cause these messes 😁

Yep, I used the default without considering it 😓

Thanks for the review!

@wxiaoguang
Copy link
Contributor

ps: I guess line 70: https://github.com/go-gitea/gitea/pull/22695/files#diff-40b7988fcd35c50d12157e06dc96b586404a4d1d3772a4b257340f11295bec5aR70

The <td data-href="{{$repo.Link}}"> could be <td> now?

Signed-off-by: jolheiser <john.olheiser@gmail.com>
@codecov-commenter
Copy link

Codecov Report

Merging #22695 (dfc6547) into main (f521e88) will increase coverage by 0.00%.
The diff coverage is 41.00%.

❗ Current head dfc6547 differs from pull request most recent head 5662acd. Consider uploading reports for the commit 5662acd to get more accurate results

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@           Coverage Diff            @@
##             main   #22695    +/-   ##
========================================
  Coverage   47.14%   47.15%            
========================================
  Files        1149     1155     +6     
  Lines      151446   152396   +950     
========================================
+ Hits        71397    71855   +458     
- Misses      71611    72069   +458     
- Partials     8438     8472    +34     
Impacted Files Coverage Δ
cmd/dump.go 0.66% <0.00%> (-0.01%) ⬇️
cmd/web.go 0.00% <0.00%> (ø)
models/actions/run.go 1.64% <0.00%> (-0.08%) ⬇️
models/actions/runner.go 1.44% <ø> (ø)
models/packages/package.go 45.45% <0.00%> (-1.13%) ⬇️
models/user/search.go 77.50% <0.00%> (-6.29%) ⬇️
modules/actions/workflows.go 0.00% <0.00%> (ø)
modules/context/context.go 64.54% <0.00%> (-3.53%) ⬇️
modules/doctor/storage.go 30.65% <0.00%> (-1.29%) ⬇️
modules/setting/git.go 45.45% <ø> (ø)
... and 36 more

... and 45 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Member

@silverwind silverwind left a comment

Choose a reason for hiding this comment

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

This does also fix the padding issue on empty list. I think generally this list should be reworked to no longer be a <table>, but that can be done later.

@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 Mar 25, 2023
@jolheiser jolheiser merged commit 73b4010 into go-gitea:main Mar 25, 2023
@jolheiser jolheiser deleted the notification-table branch March 25, 2023 19:37
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Mar 25, 2023
Resolves go-gitea#22692

I don't think there's a need for this entire row to be clickable (and
even different links depending on which segment you click)
The links still point to the same spot, so no information is lost here.

---------

Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Mar 25, 2023
lafriks pushed a commit that referenced this pull request Mar 25, 2023
Backport #22695 by @jolheiser

Resolves #22692

Signed-off-by: jolheiser <john.olheiser@gmail.com>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 27, 2023
* upstream/main: (23 commits)
  Fix project card preview select and template select (go-gitea#23684)
  [skip ci] Updated translations via Crowdin
  Add git dashes separator to some "log" and "diff" commands (go-gitea#23606)
  Add Simplified Chinese translate for oauth2-provider (go-gitea#23713)
  Fix incorrect `toggle` buttons (go-gitea#23676)
  Fine tune more downdrop settings, use SVG for labels, improve Repo Topic Edit form (go-gitea#23626)
  Allow new file and edit file preview if it has editable extension (go-gitea#23624)
  [skip ci] Updated translations via Crowdin
  Clean some legacy files and move some build files (go-gitea#23699)
  Remove row clicking from notification table (go-gitea#22695)
  Describe Gitea's purpose more accurately (go-gitea#23698)
  [skip ci] Updated translations via Crowdin
  ensure go/bin path exists when copying hugo bin into it (go-gitea#23692)
  Create commit status when event is `pull_request_sync` (go-gitea#23683)
  Add `deps-docs` command to makefile (go-gitea#23686)
  Fix incorrect package doc link (go-gitea#23679)
  Improve indices for `action` table (go-gitea#23532)
  Clarify that Gitea requires JavaScript (go-gitea#23677)
  Use data-tooltip-content for tippy tooltip (go-gitea#23649)
  Add aria attributes to interactive time tooltips. (go-gitea#23661)
  ...
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
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. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 topic/ui Change the appearance of the Gitea UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot right or middle click notification background to follow the link
10 participants