Get clever with the enum_text type

alphagov · Jan 2, 2025 · 18f0848 · 18f0848
1 parent 5c6d396
commit 18f0848
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
@@ -30,12 +30,22 @@ def confirm_facets
         @params["facets"].delete(facet)
       end
 
+      if facet["type"] == "enum_text"
+        facet.delete("allowed_values")
+        facet["type"] = "text"
+      end
       if facet["display_as_result_metadata"]
         facet["display_as_result_metadata"] = facet["display_as_result_metadata"] == "true"
       end
       if facet["filterable"]
         facet["filterable"] = facet["filterable"] == "true"
       end
+      if facet["preposition"] == ""
+        facet.delete("preposition")
+      end
+      if facet["short_name"] == ""
+        facet.delete("short_name")
+      end
 
       if facet["allowed_values"]
         facet["allowed_values"] = facet["allowed_values"].gsub('\\"', '"').split('",').map do |str|

diff --git a/app/views/admin/_facet_fields.html.erb b/app/views/admin/_facet_fields.html.erb
@@ -24,10 +24,15 @@
   label: "Type",
   heading_size: "s",
   options: [
+      {
+        text: "Radio button",
+        value: "enum_text", # 'enum_text' only used to hide the 'filter options' field (TODO).
+        selected: facet["type"] == "text",
+      },
       {
         text: "Text",
         value: "text",
-        selected: facet["type"] == "text",
+        selected: facet["type"] == "text" && facet["allowed_values"].nil?,
       },
       {
         text: "Date",