Merge pull request #4427 from alphagov/chart-fix-minimal

Fix chart minimal option
alphagov · Nov 22, 2024 · ab86cf2 · ab86cf2
2 parents a140afd + d3e41e1
commit ab86cf2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/app/views/govuk_publishing_components/components/_chart.html.erb b/app/views/govuk_publishing_components/components/_chart.html.erb
@@ -13,7 +13,6 @@
   chart_type ||= "line"
   minimal ||= false
   hide_heading ||= minimal
-  hide_legend ||= minimal
   link ||= false
   padding ||= false
 

diff --git a/lib/govuk_publishing_components/presenters/chart_helper.rb b/lib/govuk_publishing_components/presenters/chart_helper.rb
@@ -5,9 +5,12 @@ def initialize(options)
         @rows = options[:rows]
         @keys = options[:keys]
         @minimal = options[:minimal]
+        @enable_interactivity = false
         @enable_interactivity = true unless @minimal
         @hide_legend = options[:hide_legend]
+        @hide_legend = true if @minimal
         @point_size = options[:point_size] ||= 10
+        @point_size = 0 if @minimal
         @height = options[:height] || 400
         @h_axis_title = options[:h_axis_title]
         @v_axis_title = options[:v_axis_title]

diff --git a/spec/lib/govuk_publishing_components/components/chart_helper_spec.rb b/spec/lib/govuk_publishing_components/components/chart_helper_spec.rb
@@ -50,9 +50,11 @@
 
     it "returns expected chart options when minimal is true" do
       required_params[:minimal] = true
-      expected[:enableInteractivity] = nil
+      expected[:enableInteractivity] = false
       expected[:hAxis][:textPosition] = "none"
       expected[:vAxis][:textPosition] = "none"
+      expected[:legend] = "none"
+      expected[:pointSize] = 0
 
       chart_helper = GovukPublishingComponents::Presenters::ChartHelper.new(required_params)
       options = chart_helper.chart_options