sort displayed addons (bnc#888567)

src/lib/registration/addon_sorter.rb

@@ -0,0 +1,42 @@
+
+module Registration
+
+  class AddonSorter
+    attr_reader :addons
+
+    def initialize(addons)
+      @addons = addons
+    end
+
+    def sort
+      # first paid extensions, then free extensions, modules at the end
+      # see https://bugzilla.novell.com/show_bug.cgi?id=888567#c21
+      sort_addons(paid_extensions) + sort_addons(free_extensions) + sort_addons(modules)
+    end
+
+    private
+
+    def modules
+      # TODO FIXME use a SCC flag
+      addons.select { |addon| addon.name.match(/module/i)}
+    end
+
+    def extensions
+      addons - modules
+    end
+
+    def paid_extensions
+      extensions.reject(&:free)
+    end
+
+    def free_extensions
+      extensions.select(&:free)
+    end
+
+    # sort addon by name
+    def sort_addons(addons)
+      addons.sort_by { |addon| addon.name }
+    end
+  end
+
+end

src/lib/registration/ui/addon_selection_dialog.rb

@@ -1,6 +1,7 @@
 
 require "yast"
 require "registration/addon"
+require "registration/addon_sorter"
 
 module Registration
   module UI
@@ -27,7 +28,12 @@ def self.run(registration)
 
       def initialize(registration)
         textdomain "registration"
-        @addons = Addon.find_all(registration)
+        addons = Addon.find_all(registration)
+
+        # sort the addons
+        sorter = AddonSorter.new(addons)
+        @addons = sorter.sort
+
         log.info "Available addons: #{@addons}"
       end
 

test/addon_sorter_spec.rb

@@ -0,0 +1,26 @@
+#! /usr/bin/env rspec
+
+require_relative "spec_helper"
+
+require "yaml"
+require "registration/addon"
+require "registration/addon_sorter"
+
+describe Registration::AddonSorter do
+  let(:available_addons) { YAML.load_file(fixtures_file("available_addons.yml")) }
+
+  subject(:addon_sorter) do
+    Registration::AddonSorter.new(available_addons)
+  end
+
+  describe "#sort" do
+    it "sorts the addons" do
+      expected = ["sle-hae", "sle-ha-geo", "sle-sdk", "sle-we",
+        "sle-module-adv-systems-management", "sle-module-legacy",
+        "sle-module-public-cloud", "sle-module-web-scripting"]
+
+      expect(subject.sort.map(&:identifier)).to eql(expected)
+    end
+  end
+
+end