Skip to content

[OP-20529] Remove redundant visibility check and load principals directly #26317

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

Merged
ulferts merged 1 commit into from
Oct 26, 2026
Merged

[OP-20529] Remove redundant visibility check and load principals directly #26317

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions modules/grids/app/components/grids/widgets/members.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def title
t(".title")
end

def members_by_role # rubocop:disable Metrics/AbcSize
def members_by_role
# Sanity check: If we can't view members, we can return immediatly.
# This way we don't need to check if current_user is allowed to view_members
# multiple times.
Expand All @@ -53,27 +53,23 @@ def members_by_role # rubocop:disable Metrics/AbcSize
.group(:id, :name)
.count
.map do |(id, name), total_count|
principals = members_for_role(id).limit(limit).map(&:principal)

{
id:,
name:,
members: principals,
members: principals_for_role(id).limit(limit),
total_count: total_count,
remaining: [total_count - limit, 0].max,
has_more: total_count > limit
}
end
end

def members_for_role(role_id)
def principals_for_role(role_id)
project
.members
.visible(current_user)
.joins(:member_roles)
.principals
.joins(members: :member_roles)
.where(member_roles: { role_id: })
.includes(:principal)
.order(created_at: :desc)
.order(members: { created_at: :desc })
end

def can_view_members?
Expand Down
Loading