From 1119bbb292845156b9c4884d6ef69b9f7f915352 Mon Sep 17 00:00:00 2001
From: Emi Matchu <emi@matchu.dev>
Date: Sun, 1 Dec 2024 09:26:40 -0800
Subject: [PATCH] Extract the more complex support form helpers into templates

I think helpers are fine for the simpler ones that are basically *just*
wrapper tags, but once it starts getting into `concat`, I think that's
too unfamiliar of a syntax for developers; let's bail into our usual
templating system!

I'm not sure about putting them in `application/support_form` like this.
That's cute for one-offs like `application/hanger_spinner`, because
`render partial: "hanger_spinner"` assumes the `application` view folder
by default, but that doesn't work once it's nested: it looks for a
`views/support_form` folder.

I think maybe it could soon be time to bail from the strict "view
folders belong to controllers" thing, similar to how we did for
`SupportFormHelper`, and add a `components` folder or similar? Idk, not
sure yet!
---
 app/helpers/support_form_helper.rb            | 49 ++++++-------------
 .../support_form/_errors.html.haml            |  7 +++
 .../support_form/_radio_fieldset.html.haml    |  4 ++
 .../support_form/_thumbnail_input.html.haml   |  5 ++
 4 files changed, 31 insertions(+), 34 deletions(-)
 create mode 100644 app/views/application/support_form/_errors.html.haml
 create mode 100644 app/views/application/support_form/_radio_fieldset.html.haml
 create mode 100644 app/views/application/support_form/_thumbnail_input.html.haml

diff --git a/app/helpers/support_form_helper.rb b/app/helpers/support_form_helper.rb
index aa61b7d1..a3dd4831 100644
--- a/app/helpers/support_form_helper.rb
+++ b/app/helpers/support_form_helper.rb
@@ -1,44 +1,28 @@
 module SupportFormHelper
 	class SupportFormBuilder < ActionView::Helpers::FormBuilder
 		attr_reader :template
-		delegate :concat, :content_tag, :image_tag, to: :template, private: true
+		delegate :capture, :content_tag, :render, to: :template, private: true
 
 		def errors
-			return nil if object.errors.empty?
-
-			error_list = content_tag(:ul) do
-				object.errors.each do |error|
-					concat content_tag(:li, error.full_message)
-				end
-			end
-
-			content_tag(:p) do
-				concat "Could not save:"
-				concat error_list
-			end
+			render partial: "application/support_form/errors", locals: {form: self}
 		end
 
 		def fields(&block)
 			content_tag(:ul, class: "fields", &block)
 		end
 
-		def field(**kwargs, &block)
-			content_tag(:li, **kwargs, &block)
+		def field(**options, &block)
+			content_tag(:li, **options, &block)
 		end
 
-		def radio_fieldset(legend, **kwargs, &block)
-			kwargs.reverse_merge!("data-type": "radio")
-			field(**kwargs) do
-				content_tag(:fieldset) do
-					concat content_tag(:legend, legend)
-					concat content_tag(:ul, &block)
-				end
-			end
+		def radio_fieldset(legend, **options, &block)
+			render partial: "application/support_form/radio_fieldset",
+				locals: {form: self, legend:, options:, content: capture(&block)}
 		end
 
-		def radio_field(**kwargs, &block)
+		def radio_field(**options, &block)
 			content_tag(:li) do
-				content_tag(:label, **kwargs, &block)
+				content_tag(:label, **options, &block)
 			end
 		end
 
@@ -47,19 +31,16 @@ module SupportFormHelper
 		end
 
 		def thumbnail_input(method)
-			url = object.send(method)
-			content_tag(:div, class: "thumbnail-input") do
-				concat image_tag(url, alt: "Thumbnail") if url.present?
-				concat url_field(method)
-			end
+			render partial: "application/support_form/thumbnail_input",
+				locals: {form: self, method:}
 		end
 	end
 
-	def support_form_with(**kwargs, &block)
-		kwargs.merge!(
+	def support_form_with(**options, &block)
+		options.merge!(
 			builder: SupportFormBuilder,
-			class: ["support-form", kwargs[:class]],
+			class: ["support-form", options[:class]],
 		)
-		form_with(**kwargs, &block)
+		form_with(**options, &block)
 	end
 end
diff --git a/app/views/application/support_form/_errors.html.haml b/app/views/application/support_form/_errors.html.haml
new file mode 100644
index 00000000..2ef09587
--- /dev/null
+++ b/app/views/application/support_form/_errors.html.haml
@@ -0,0 +1,7 @@
+- if form.object.errors.any?
+	%section.errors
+		Could not save:
+
+		%ul
+			- form.object.errors.each do |error|
+				%li= error.full_message
diff --git a/app/views/application/support_form/_radio_fieldset.html.haml b/app/views/application/support_form/_radio_fieldset.html.haml
new file mode 100644
index 00000000..925d3d53
--- /dev/null
+++ b/app/views/application/support_form/_radio_fieldset.html.haml
@@ -0,0 +1,4 @@
+= form.field("data-type": "radio", **options) do
+	%fieldset
+		%legend= legend
+		%ul= content
diff --git a/app/views/application/support_form/_thumbnail_input.html.haml b/app/views/application/support_form/_thumbnail_input.html.haml
new file mode 100644
index 00000000..e34d7413
--- /dev/null
+++ b/app/views/application/support_form/_thumbnail_input.html.haml
@@ -0,0 +1,5 @@
+- url = form.object.send(method)
+.thumbnail-input
+	- if url.present?
+		= image_tag url, alt: "Thumbnail"
+	= form.url_field method