Merge pull request #1944 from alphagov/metadata-ordering

Don't sort facets by type

Author: thomasleese

app/presenters/specialist_document_presenter.rb

@@ -128,7 +128,7 @@ def facet_values
   end
 
   def facets_with_friendly_values
-    sorted_facets_with_values.map do |facet|
+    facets_with_values.map do |facet|
       facet_key = facet["key"]
       # Cast all values into an array
       values = [facet_values[facet_key]].flatten
@@ -146,14 +146,13 @@ def facets_with_friendly_values
     end
   end
 
-  def sorted_facets_with_values
+  def facets_with_values
     return [] unless facets && facet_values.any?
 
     facets
       .select { |f| facet_values[f["key"]] && facet_values[f["key"]].present? }
       .reject { |f| f["key"] == first_published_at_facet_key }
       .reject { |f| f["key"] == internal_notes_facet_key }
-      .sort_by { |f| f["type"] }
   end
 
   def friendly_facet_date(dates)

test/presenters/specialist_document_presenter_test.rb

@@ -295,40 +295,6 @@ def example_facet(overrides = {})
       assert_equal "1 January 2010", presented_metadata["Facet name"]
     end
 
-    test "puts date facets together and before text facets" do
-      example = example_with_finder_facets(
-        [
-          {
-            "name" => "Facet name",
-            "key" => "facet-key",
-            "type" => "text",
-          },
-          {
-            "name" => "First date facet",
-            "key" => "first-date-facet",
-            "type" => "date",
-          },
-          {
-            "name" => "Second date facet",
-            "key" => "second-date-facet",
-            "type" => "date",
-          },
-          {
-            "name" => "More text",
-            "key" => "more-text",
-            "type" => "text",
-          },
-        ],
-        "facet-key" => "Text",
-        "first-date-facet" => "2010-01-01",
-        "second-date-facet" => "2010-02-03",
-        "more-text" => "More text",
-      )
-
-      expected_order = ["First date facet", "Second date facet", "Facet name", "More text"]
-      assert_equal expected_order, present_example(example).important_metadata.keys
-    end
-
     test "sends an error notification when there is no finder" do
       example = schema_item("aaib-reports")
       example["links"]["finder"] = []