Merge pull request #704 from romanblanco/button_order

Make method 'button_order?' return boolean

app/presenters/custom_buttons_mixin.rb

@@ -0,0 +1,31 @@
+module CustomButtonsMixin
+  extend ActiveSupport::Concern
+  def get_tree_aset_kids_for_nil_id(object, count_only)
+    count_only ? get_custom_buttons(object).count : get_custom_buttons(object).sort_by { |a| a.name.downcase }
+  end
+
+  def buttons_ordered?(object)
+    !!(object[:set_data] && object[:set_data][:button_order])
+  end
+
+  def get_custom_buttons(object)
+    # FIXME: don't we have a method for the splits?
+    # FIXME: cannot we ask for the null parent using Arel?
+    CustomButton.buttons_for(object.name.split('|').last.split('-').last).select do |uri|
+      uri.parent.nil?
+    end
+  end
+
+  def x_get_tree_aset_kids(object, count_only)
+    if object.id.nil?
+      get_tree_aset_kids_for_nil_id(object, count_only)
+    elsif count_only
+      object.members.count
+    else
+      button_order = buttons_ordered?(object) ? object[:set_data][:button_order] : nil
+      Array(button_order).each_with_object([]) do |bidx, arr|
+        object.members.each { |b| arr.push(b) if bidx == b.id && !arr.include?(b) }
+      end
+    end
+  end
+end

app/presenters/tree_builder_buttons.rb

@@ -1,4 +1,5 @@
 class TreeBuilderButtons < TreeBuilderAeCustomization
+  include CustomButtonsMixin
   has_kids_for CustomButtonSet, [:x_get_tree_aset_kids]
 
   private
@@ -35,38 +36,6 @@ def x_get_tree_custom_kids(object, count_only, _options)
     count_only_or_objects(count_only, objects)
   end
 
-  def get_custom_buttons(object)
-    # FIXME: don't we have a method for the splits?
-    # FIXME: cannot we ask for the null parent using Arel?
-    CustomButton.buttons_for(object.name.split('|').last.split('-').last).select do |uri|
-      uri.parent.nil?
-    end
-  end
-
-  def get_tree_aset_kids_for_nil_id(object, count_only)
-    count_only ? get_custom_buttons(object).count : get_custom_buttons(object).sort_by { |a| a.name.downcase }
-  end
-
-  def button_order?(object)
-    object[:set_data] && object[:set_data][:button_order]
-  end
-
-  def x_get_tree_aset_kids(object, count_only)
-    if object.id.nil?
-      get_tree_aset_kids_for_nil_id(object, count_only)
-    elsif count_only
-      object.members.count
-    else
-      # need to show button nodes in button order that they were saved in
-      button_order = button_order?(object) ? object[:set_data][:button_order] : nil
-      objects = []
-      Array(button_order).each do |bidx|
-        object.members.each { |b| objects.push(b) if bidx == b.id && !objects.include?(b) }
-      end
-      objects
-    end
-  end
-
   def buttons_node_image(node)
     case node
     when 'ExtManagementSystem' then {:icon  => 'pficon pficon-server'}

app/presenters/tree_builder_catalogs_class.rb

@@ -1,4 +1,5 @@
 class TreeBuilderCatalogsClass < TreeBuilder
+  include CustomButtonsMixin
   has_kids_for CustomButtonSet, [:x_get_tree_aset_kids]
 
   private
@@ -9,40 +10,13 @@ def x_get_tree_roots(count_only, options)
     when :stcat
       return count_only_or_objects(count_only, objects)
     when :sandt
-      return count_only_or_objects(count_only,
-                                   objects.unshift(ServiceTemplateCatalog.new(:name        => 'Unassigned',
-                                                                              :description => 'Unassigned Catalogs')),
-                                   nil)
-    end
-  end
-
-  # TODO: De-duplicate the following methods from tree_builder_buttons.rb
-  def get_custom_buttons(object)
-    # FIXME: don't we have a method for the splits?
-    # FIXME: cannot we ask for the null parent using Arel?
-    CustomButton.buttons_for(object.name.split('|').last.split('-').last).select do |uri|
-      uri.parent.nil?
-    end
-  end
-
-  def get_tree_aset_kids_for_nil_id(object, count_only)
-    count_only ? get_custom_buttons(object).count : get_custom_buttons(object).sort_by { |a| a.name.downcase }
-  end
-
-  def button_order?(object)
-    object[:set_data] && object[:set_data][:button_order]
-  end
-
-  def x_get_tree_aset_kids(object, count_only)
-    if object.id.nil?
-      get_tree_aset_kids_for_nil_id(object, count_only)
-    elsif count_only
-      object.members.count
-    else
-      button_order = button_order?(object) ? object[:set_data][:button_order] : nil
-      Array(button_order).each_with_object([]) do |bidx, arr|
-        object.members.each { |b| arr.push(b) if bidx == b.id && !arr.include?(b) }
-      end
+      return count_only_or_objects(
+        count_only,
+        objects.unshift(ServiceTemplateCatalog.new(
+          :name        => 'Unassigned',
+          :description => 'Unassigned Catalogs')),
+         nil
+      )
     end
   end
 end