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.

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

Jump to bottom

API for vm_infras in reconfigure form #22980

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −5
Open

API for vm_infras in reconfigure form #22980

Show file tree
Hide file tree
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
10 changes: 10 additions & 0 deletions db/fixtures/miq_product_features.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4186,6 +4186,16 @@
:feature_type: view
:identifier: cloud_database_flavor_show

# Vm Infra
- :name: Vm Infras
:description: Every thing to Vm infras
:feature_type: node
:identifier: vm_infra
:children:
- :name: View
:description: View Vm Infras
:feature_type: view
:identifier: vm_infra_view
Comment on lines +4189 to +4198
Copy link
Member

Choose a reason for hiding this comment

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

Confused why we're adding a new top level node when we already have Reconfigure VMs / vm_reconfigure_all https://github.com/ManageIQ/manageiq/blob/master/db/fixtures/miq_product_features.yml#L5949-L5973

Copy link
Member

Choose a reason for hiding this comment

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

Do we need infra specific features?
Can we use 1 set of privileges for both views?


# Cloud Network
- :name: Cloud Networks
Expand Down
23 changes: 18 additions & 5 deletions lib/rbac/filterer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,8 @@ def search(options = {})
if targets.first.kind_of?(Numeric)
target_ids = targets
# assume klass is passed in
elsif targets.first.kind_of?(Hash)
target_ids = targets.first[:objectIds]
Comment on lines +265 to +266
Copy link
Member

@kbrock kbrock Apr 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

targets should be passed in as a scope Vm.all or maybe an array of ids [1,2,3].

Don't add this here.
And to be honest, probably should not need to make changes in here unless we are not properly filtering a class.

else
target_ids = targets.collect(&:id)
klass = targets.first.class
Expand Down Expand Up @@ -337,7 +339,18 @@ def search(options = {})
auth_count = inner_scope.except(:offset, :limit, :order).count(:all)
end
end
targets = scope

if targets.count != 1
targets = scope
else
first_target = targets.first

if first_target.is_a?(Hash) && first_target[:objectIds].blank?
targets = scope
elsif targets.all? { |element| Integer === element }
targets = scope
end
end

unless options[:skip_counts]
auth_count ||= attrs[:apply_limit_in_sql] && limit ? targets.except(:offset, :limit, :order).count(:all) : targets.length
Expand Down Expand Up @@ -367,7 +380,7 @@ def search(options = {})
end

# Preserve sort order of incoming target_ids
if !target_ids.nil? && !order
if !target_ids.nil? && !order && !targets.kind_of?(Array)
Copy link
Member

Choose a reason for hiding this comment

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

please share reason for this change.
The implications of this change will impact many many places of the application.

I do agree, that this sorting is called in a few places that I wish it were not.

The solution I find is to pass in a scope and that solves this problem.

targets = targets.sort_by { |a| target_ids.index(a.id) }
end
targets = targets.to_a if targets.kind_of?(Enumerator::Lazy)
Expand Down Expand Up @@ -505,7 +518,7 @@ def rbac_class(scope)
# So once calc_filtered_ids uses pluck_ids for all, then that filter
# can converted across to a 100% sql friendly query
def pluck_ids(targets)
targets.pluck(:id) if targets
targets&.pluck(:id)
end

def self_service_ownership_scope?(miq_group, klass)
Expand Down Expand Up @@ -589,14 +602,14 @@ def scope_by_ids(scope, filtered_ids)
end

def get_belongsto_filter_object_ids(klass, filter)
return nil if !BELONGSTO_FILTER_CLASSES.include?(safe_base_class(klass).name) || filter.blank?
return nil if BELONGSTO_FILTER_CLASSES.exclude?(safe_base_class(klass).name) || filter.blank?

get_belongsto_matches(filter, rbac_class(klass)).collect(&:id)
end

def get_managed_filter_object_ids(scope, filter)
klass = scope.respond_to?(:klass) ? scope.klass : scope
return nil if !TAGGABLE_FILTER_CLASSES.include?(safe_base_class(klass).name) || filter.blank?
return nil if TAGGABLE_FILTER_CLASSES.exclude?(safe_base_class(klass).name) || filter.blank?
return scope.where(filter.to_sql.first) if filter.kind_of?(MiqExpression)

scope.find_tags_by_grouping(filter, :ns => '*').reorder(nil)
Expand Down