Convert RBAC Features Tree to use TreeBuilder (2)

app/controllers/ops_controller/ops_rbac.rb

@@ -87,7 +87,7 @@ def rbac_role_edit
     case params[:button]
     when 'cancel'      then rbac_edit_cancel('role')
     when 'save', 'add' then rbac_edit_save_or_add('role', 'miq_user_role')
-    when 'reset', nil  then rbac_edit_reset(params[:typ], 'role', MiqUserRole) # Reset or first time in
+    when 'reset', nil  then rbac_edit_reset(params[:typ], 'role', MiqUserRole) # Reset or form load
     end
   end
 
@@ -962,13 +962,12 @@ def rbac_group_right_tree(selected)
   def rbac_role_get_details(id)
     @edit = nil
     @record = @role = MiqUserRole.find_by_id(from_cid(id))
-    @role_features = @role.feature_identifiers.sort
-    @features_tree = rbac_build_features_tree
+    @rbac_menu_tree = build_rbac_feature_tree
   end
 
-  def rbac_build_features_tree
+  def build_rbac_feature_tree
     @role = @sb[:typ] == "copy" ? @record.dup : @record if @role.nil? # if on edit screen use @record
-    TreeBuilder.convert_bs_tree(OpsController::RbacTree.build(@role, @role_features, !@edit.nil?)).to_json
+    TreeBuilderOpsRbacFeatures.new("features_tree", "features", @sb, true, :role => @role, :editable => @edit.present?)
   end
 
   # Set form variables for role edit
@@ -1198,7 +1197,7 @@ def rbac_role_set_form_vars
     @edit[:current] = copy_hash(@edit[:new])
 
     @role_features = @record.feature_identifiers.sort
-    @features_tree = rbac_build_features_tree
+    @rbac_menu_tree = build_rbac_feature_tree
   end
 
   # Get array of total set of features from the children of selected features

app/presenters/menu/item.rb

@@ -1,5 +1,15 @@
 module Menu
   Item = Struct.new(:id, :name, :feature, :rbac_feature, :href, :type) do
+    extend ActiveModel::Naming
+
+    def self.base_class
+      Menu::Item
+    end
+
+    def self.base_model
+      model_name
+    end
+
     def initialize(an_id, a_name, features, rbac_feature, href, type = :default)
       super
       @parent = nil

app/presenters/menu/manager.rb

@@ -1,11 +1,17 @@
 module Menu
   class Manager
+    include Enumerable
     include Singleton
 
     class << self
       extend Forwardable
 
-      delegate %i(menu item_in_section? item section section_id_string_to_symbol each section_for_item_id) => :instance
+      delegate %i(menu item_in_section? item section section_id_string_to_symbol
+                  section_for_item_id each map detect select) => :instance
+    end
+
+    def each
+      @menu.each { |section| yield section }
     end
 
     private
@@ -50,10 +56,6 @@ def item_in_section?(item_id, section_id)
       @id_to_section[section_id].contains_item_id?(item_id)
     end
 
-    def each
-      @menu.each { |section| yield section }
-    end
-
     def initialize
       load_default_items
       load_custom_items

app/presenters/menu/section.rb

@@ -1,5 +1,15 @@
 module Menu
   Section = Struct.new(:id, :name, :icon, :items, :placement, :before, :type, :href) do
+    extend ActiveModel::Naming
+
+    def self.base_class
+      Menu::Section
+    end
+
+    def self.base_model
+      model_name
+    end
+
     def initialize(an_id, name, icon, *args)
       super
       self.items ||= []
@@ -17,7 +27,7 @@ def features
     end
 
     def features_recursive
-      Array(items).collect { |el| el.try(:feature) || el.try(:features) }.flatten.compact
+      Array(items).flat_map { |el| el.try(:feature) || el.try(:features) }.compact
     end
 
     def visible?

app/presenters/tree_builder.rb

@@ -261,9 +261,16 @@ def x_build_node(object, pid, options)
     node = x_build_single_node(object, pid, options)
 
     # Process the node's children
+    load_children = if object.kind_of?(Struct)
+                      # Load children for Sections, don't for other Menu Structs.
+                      object.kind_of?(Menu::Section)
+                    else
+                      object[:load_children]
+                    end
+
     node[:expand] = Array(@tree_state.x_tree(@name)[:open_nodes]).include?(node[:key]) || !!options[:open_all] || node[:expand]
     if ancestry_kids ||
-       object[:load_children] ||
+       load_children ||
        node[:expand] ||
        @options[:lazy] == false