Merge `explore orgs` into `explore users` #29816

delvh · 2024-03-15T14:52:54Z

Now, there is only one explore page to search for accounts.

The existing setting to define the redirect behavior of / has been changed so that it no longer redirects to the no longer existing /explore/organizations.
As such, this refactoring is not breaking.

Additionally, fix incorrect visibility behavior for /explore/users.
It was correct for /explore/organizations.

Fixes #29803

After

(Note that both tester and test-org are orgs, test2 is a bot, and test is a normal user)

Now, there is only one `explore` page to search for accounts. The existing setting to define the redirect behavior of `/` has been changed so that it no longer redirects to the no longer existing `/explore/organizations`. As such, this refactoring is not breaking. Additionally fix incorrect visibility behavior that was correct for `/explore/organizations` but incorrect for `/explore/users`. Fixes go-gitea#29803

delvh · 2024-03-15T15:02:54Z

models/user/search.go

+	if opts.Type.Has() {
+		cond = builder.Eq{"type": opts.Type}
+		if opts.IncludeReserved {
+			if opts.Type.Value() == UserTypeIndividual {
+				cond = cond.Or(builder.Eq{"type": UserTypeUserReserved}).Or(
+					builder.Eq{"type": UserTypeBot},
+				).Or(
+					builder.Eq{"type": UserTypeRemoteUser},
+				)
+			} else if opts.Type.Value() == UserTypeOrganization {
+				cond = cond.Or(builder.Eq{"type": UserTypeOrganizationReserved})
+			}
 		}
 	}


Review hint: Hide whitespace changes for this file

lunny · 2024-03-15T15:18:22Z

I don't think this is better than before. It's confusing mixed users and orgs.

silverwind · 2024-03-15T18:22:06Z

Maybe add a https://primer.github.io/octicons/organization-16 besides the org name to distinguish?

delvh · 2024-03-15T18:48:38Z

@silverwind

Additionally, I'd like to keep the refactoring clean, so that we add in these enhancements afterward.
What do you think?

I can also add it in this PR, but I would have liked to first make a refactoring and then a UX enhancement.
What's your preference on that?

silverwind · 2024-03-15T19:00:03Z

Don't really care, these are seldomly used pages. But I do have a slight preference because landing something "unfinished" into main branch is not so great.

delvh · 2024-03-15T20:21:13Z

@silverwind Done.
I've adapted the screenshots as well.

silverwind · 2024-03-15T21:25:15Z

Icon and text seem slightly misalign. Maybe it needs a gt-df gt-ac gt-fw (or equivalent tailwind classes) on the parent?

delvh · 2024-03-15T21:48:46Z

Done

silverwind · 2024-03-15T21:59:49Z

templates/explore/user_list.tmpl

@@ -7,11 +7,11 @@
 			<div class="flex-item-main">
 				<div class="flex-item-title">
 					{{if .IsOrganization}}
-						<span data-tooltip-content title="{{ctx.Locale.Tr "explore.user_is_organization" .DisplayName}}">{{svg "octicon-organization"}}</span>
+						<span class="tw-flex tw-justify-center tw-flex-wrap" data-tooltip-content title="{{ctx.Locale.Tr "explore.user_is_organization" .DisplayName}}">{{svg "octicon-organization"}}</span>


Not tw-items-center instead of tw-justify-center?

I have no idea.
I simply translated your suggestion into tailwind.
Also, I see no improvement when adding tw-items-center…

Ah, sorry gt-ac is actually tw-content-center.

Still no difference

I will check later. Maybe we should also move the icon into second row and add a User/Organization/Bot text besides it.

(the text is currently a tooltip)

lafriks · 2024-03-15T23:41:01Z

I don't think it should be called users, imho the most common use case is to search for organizations not users. Personally I would just drop user search from there but if combined it would be preferable to call the tab Organizations

delvh · 2024-03-15T23:45:21Z

(Alternatively, the distinction could also be repos, owner.
However, I don't think that's any better either as owner is only a code-internal concept we haven't communicated to our end users, and orgs are on all accounts users too)

Furthermore, you can still query users with it, so it would be false advertising since an org is a user but a user is not necessarily an org.

Or how do you see it?

lafriks · 2024-03-15T23:57:03Z

(Alternatively, the distinction could also be repos, owner.
However, I don't think that's any better either as owner is only a code-internal concept we haven't communicated to our end users, and orgs are on all accounts users too)

Furthermore, you can still query users with it, so it would be false advertising since an org is a user but a user is not necessarily an org.

Or how do you see it?

If you look from business side of view (not how it's technically saved in database) these are both different things. But from use case scenario in this place you would most commonly look for organizations to get to it's repositories not user profile

lunny · 2024-03-16T04:04:11Z

If you think both UI are similar because we haven't displayed more information on the list pages. I think the direction is displaying more user or org-related information on the list page but not sharing it.

wxiaoguang · 2024-03-16T04:58:45Z

I also agree that the concept "User" and "Org" are fundamentally different. Although they share the same base table, but they are different things to end users, and it should avoid mixing them together.

eeyrjmr · 2024-03-16T10:23:07Z

just to add my 2c ...
while the backend may mean ORG and USERS are (almost) synonymous, to a user they are not.

From a UX perspective having the tab just called "users" will confuse people ... "I want to find the project page, where do I search".

From people behaviour there is a mental distinction between what a USER is and what an ORG is since an ORG is a collection of related repositories to meet a common goal . A user however is someone that interacts with gitea/git, is associated with a project (aka ORG) and may have a collection of repositories that at face value would appear to be randomly associated but means something to a user (forks of associated repositories [users or org], their own pet projects).

Likewise users are associated to org's via teams but orgs are not associated to a user.

NOW... from a streamlining of the UI... this might make sense but

it can't be called users BECAUSE users use this page, orgs do not and users use this page to find orgs or users
clearly indicate whether it is a USER or a ORG, especially as people use odd names and name orgs oddly (from the example in the OP you cannot tell if the returns are a USER or an ORG... you can guess from the name or if you know)

yp05327 · 2024-03-27T08:53:14Z

At least, add an option next to sort, then we can select which type of user to search, individual or organization.
Then, at least, we can:
If I want to search individual account, then no organization account display. (Same as before)
If I want to search organization account, then no individual account display. (Same as before)
If I don't know which kind of it is, then search both individual and organization account. (New option)

lunny · 2024-03-27T09:03:03Z

I cannot imagine we have the requirement to search both users and orgs.

wxiaoguang · 2025-01-01T13:11:52Z

According to #29816 (comment) , should we still keep this PR?

delvh · 2025-01-01T16:46:16Z

Probably not.
I still understand the reason only partially, but apparently others are using this feature differently from me…

delvh added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label Mar 15, 2024

delvh self-assigned this Mar 15, 2024

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 15, 2024

pull-request-size bot added the size/L label Mar 15, 2024

github-actions bot added modifies/translation modifies/api This PR adds API routes or modifies them modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files labels Mar 15, 2024

delvh added 2 commits March 15, 2024 15:56

Fix incorrect template key

f5a41d8

Fix more route typos

c67a656

delvh commented Mar 15, 2024

View reviewed changes

Display if a user is an organization, bot, or individual

abd62c4

delvh mentioned this pull request Mar 15, 2024

Deduplicate frequent translation strings #29823

Closed

Center the icons

9410465

silverwind reviewed Mar 15, 2024

View reviewed changes

delvh added 2 commits March 16, 2024 00:50

Fix oversight

7214c81

Fix accidentally committed style classes

8e9ae9e

wxiaoguang added the issue/needs-feedback For bugs, we need more details. For features, the feature must be described in more detail label Jan 1, 2025

delvh closed this Jan 1, 2025

delvh deleted the merge-explore-pages branch January 1, 2025 16:46

go-gitea locked as resolved and limited conversation to collaborators Apr 1, 2025

Uh oh!

Merge explore orgs into explore users #29816

Merge explore orgs into explore users #29816

Uh oh!

Conversation

delvh commented Mar 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

After

Uh oh!

delvh Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

lunny commented Mar 15, 2024

Uh oh!

silverwind commented Mar 15, 2024

Uh oh!

delvh commented Mar 15, 2024

Uh oh!

silverwind commented Mar 15, 2024

Uh oh!

delvh commented Mar 15, 2024

Uh oh!

silverwind commented Mar 15, 2024

Uh oh!

delvh commented Mar 15, 2024

Uh oh!

silverwind Mar 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

delvh Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

silverwind Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

delvh Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

silverwind Mar 15, 2024

Choose a reason for hiding this comment

Uh oh!

delvh Mar 16, 2024

Choose a reason for hiding this comment

Uh oh!

lafriks commented Mar 15, 2024

Uh oh!

delvh commented Mar 15, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lafriks commented Mar 15, 2024

Uh oh!

lunny commented Mar 16, 2024

Uh oh!

wxiaoguang commented Mar 16, 2024

Uh oh!

eeyrjmr commented Mar 16, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yp05327 commented Mar 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lunny commented Mar 27, 2024

Uh oh!

wxiaoguang commented Jan 1, 2025

Uh oh!

delvh commented Jan 1, 2025

Uh oh!

Uh oh!

Merge `explore orgs` into `explore users` #29816

Merge `explore orgs` into `explore users` #29816

delvh commented Mar 15, 2024 •

edited

Loading

silverwind Mar 15, 2024 •

edited

Loading

delvh commented Mar 15, 2024 •

edited

Loading

eeyrjmr commented Mar 16, 2024 •

edited

Loading

yp05327 commented Mar 27, 2024 •

edited

Loading