katalyst-content 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9558cc7faf09be934b8dbf023ff6ca6edf5a2b3668fe5257bbef59357a094e05
-  data.tar.gz: 5772c57c1058220532f2fce359115e9851aa0d8836314118e56d8eb99a173281
+  metadata.gz: ce423d4d4bb7d893c648269c366f476cbd96608d9d28fbf29a2bcbf169f5de9f
+  data.tar.gz: bf06500cb74acb31718e604fc307b588239a202df76a5ba0f99b2f7e0920b4a7
 SHA512:
-  metadata.gz: 5f70e7a6d56b74c25ce4c1882cf3c3925ba967160731272986a1298f42e713262af98bad60e1227207824e6745e6bd789d18c8c1c291fba400689c99015a18ba
-  data.tar.gz: a099fbe7acd0585d356774492b2ea836fa02d855e0f344695022ac7de9a750fb4701945153814a5fa3ada8671c57f6aeb25915c008c235613a7459c4e6215930
+  metadata.gz: 529034763b15a240a55240beaf396cd635228762cda698724bc8d2ae4b157f1fafb31e53f3a454677f5304d8d0a996cce9892dcef10bf11939ac781e84cc586f
+  data.tar.gz: d950bc7a15c6f62a996dd172e32ae4a1b3209d6d49a372a88654cc8aae012f29d438b30fa67bea45c3611e7c57272e7617b88223f4d59c4a50db9f7f042cafa2

data/app/controllers/katalyst/content/items_controller.rb

@@ -9,8 +9,6 @@ module Katalyst
 
       attr_reader :container, :item, :editor
 
-      default_form_builder "Katalyst::Content::EditorHelper::FormBuilder"
-
       helper EditorHelper
 
       def new

data/app/helpers/katalyst/content/editor_helper.rb

@@ -5,59 +5,32 @@ module Katalyst
     module EditorHelper
       include TableHelper
 
-      using Katalyst::HtmlAttributes::HasHtmlAttributes
+      class FormBuilder < ActionView::Helpers::FormBuilder
+        include GOVUKDesignSystemFormBuilder::Builder
+        include Katalyst::Content::Form::Builder
 
-      def content_editor_rich_text_attributes(attributes = {})
-        {
-          data: {
-            controller: "content--editor--trix",
-            action:     "trix-initialize->content--editor--trix#trixInitialize",
-          },
-        }.merge_html(attributes)
+        delegate :content_tag, :tag, :safe_join, :link_to, :capture, to: :@template
       end
 
-      module Builder
-        def content_heading_fieldset(legend: { text: t("activerecord.attributes.katalyst/content/item.heading") })
-          govuk_fieldset(legend:) do
-            concat(content_heading_field(label: { class: "govuk-visually-hidden" }))
-            concat(content_heading_style_field)
-          end
-        end
-
-        def content_heading_field(**)
-          govuk_text_field(:heading, **)
-        end
-
-        def content_heading_style_field(**)
-          govuk_enum_select(:heading_style, **)
-        end
-
-        def content_url_field(**)
-          govuk_text_field(:url, **)
-        end
-
-        def content_http_method_field(**)
-          govuk_enum_select(:http_method, **)
-        end
-
-        def content_target_field(**)
-          govuk_enum_select(:target, **)
-        end
+      # @deprecated no longer required
+      def content_editor_rich_text_attributes(attributes = {})
+        attributes
+      end
 
-        def content_theme_field(options: { include_blank: true }, **)
-          govuk_enum_select(:theme, options:, **)
-        end
+      private
 
-        def content_visible_field(**)
-          govuk_check_box_field(:visible, **)
+      def instantiate_builder(record_name, record_object, options)
+        super.tap do |builder|
+          builder.extend(Katalyst::Content::Form::Builder) unless builder.is_a?(Katalyst::Content::Form::Builder)
         end
       end
 
-      class FormBuilder < ActionView::Helpers::FormBuilder
-        include GOVUKDesignSystemFormBuilder::Builder
-        include Builder
-
-        delegate_missing_to :@template
+      # Provides a compatible formbuilder if the default does not include GovUK
+      # @api internal
+      # @see ActionView::Helpers::FormHelper#default_form_builder_class
+      def default_form_builder_class
+        builder = super
+        builder.include?(GOVUKDesignSystemFormBuilder::Builder) ? builder : FormBuilder
       end
     end
   end

data/app/helpers/katalyst/content/form/builder.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Katalyst
+  module Content
+    module Form
+      module Builder
+        def content_heading_fieldset(legend: {
+          text: I18n.t("activerecord.attributes.katalyst/content/item.heading"),
+        })
+          govuk_fieldset(legend:) do
+            heading = content_heading_field(label: { class: "govuk-visually-hidden" })
+            style   = content_heading_style_field
+            safe_join([heading, style])
+          end
+        end
+
+        def content_heading_field(**)
+          govuk_text_field(:heading, **)
+        end
+
+        def content_heading_style_field(**)
+          govuk_enum_select(:heading_style, **)
+        end
+
+        def content_url_field(**)
+          govuk_text_field(:url, **)
+        end
+
+        def content_http_method_field(**)
+          govuk_enum_select(:http_method, **)
+        end
+
+        def content_target_field(**)
+          govuk_enum_select(:target, **)
+        end
+
+        def content_theme_field(options: { include_blank: true }, **)
+          govuk_enum_select(:theme, options:, **)
+        end
+
+        def content_visible_field(**)
+          govuk_check_box_field(:visible, **)
+        end
+      end
+    end
+  end
+end

data/app/views/katalyst/content/contents/_content.html+form.erb

@@ -1,6 +1,6 @@
 <%# locals: (form:, content:) %>
 
 <%= form.content_heading_fieldset %>
-<%= form.govuk_rich_text_area(:content, **content_editor_rich_text_attributes) %>
+<%= form.govuk_rich_text_area(:content) %>
 <%= form.content_theme_field %>
 <%= form.content_visible_field %>

data/config/ci.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Run using bin/ci
+
+CI.run do
+  step "Style: RuboCop", "bundle exec rake lint"
+  step "Style: ERB", "bundle exec rake erb_lint"
+  step "Style: Prettier", "bundle exec rake prettier"
+  step "Assets: Build", "bundle exec rake build"
+  step "Tests: RSpec", "bundle exec rake spec"
+  step "Security: Brakeman", "bundle exec rake security"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-content
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Katalyst Interactive
@@ -138,6 +138,7 @@ files:
 - app/controllers/katalyst/content/items_controller.rb
 - app/controllers/katalyst/content/tables_controller.rb
 - app/helpers/katalyst/content/editor_helper.rb
+- app/helpers/katalyst/content/form/builder.rb
 - app/helpers/katalyst/content/frontend_helper.rb
 - app/helpers/katalyst/content/table_helper.rb
 - app/javascript/content/application.js
@@ -194,6 +195,7 @@ files:
 - app/views/katalyst/content/tables/_table.html.erb
 - app/views/katalyst/content/tables/update.turbo_stream.erb
 - app/views/layouts/action_text/contents/_content.html.erb
+- config/ci.rb
 - config/importmap.rb
 - config/locales/en.yml
 - config/routes.rb