jirametrics 3.3 → 3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25832ca03b7dcdc188d741171ee47d3f463551d1893257e39a9b52c0fb45dd83
-  data.tar.gz: a4d1b9ce7039e568e8c1a614862688887bc4e188c3b24af646922983eb859b9f
+  metadata.gz: 1f7292394330330ca10f89a28f02fab3e95cff385736c423ca3602c23551e4ca
+  data.tar.gz: 4690b5ce8cc47d3e980ee026e68f6f245e564ec51aa914914dd7a0db32f3c0b2
 SHA512:
-  metadata.gz: cdbfed22a95da07665930c339330d1f6def0f3ce36118fa68fd249295bbb7386d1a85bd0fe4301de8c5fc35d94e1a98bdee22f81daf9fc59db8095ea02000cec
-  data.tar.gz: 9122e7aa6cfb881723e7acc7b20df65a12ba372ab0736e94fe2e92e6e5206f69c342b94242e5f7e67d43135a426dab7c82b01d8e57fd5f33ee2a2227b0302445
+  metadata.gz: 6f32fbe86ecfb9ecc5ce7ace7d0a2971b6777c7a61e4513d41d2444a976699487ba4da415b6e84484cad72a45ee6af4a822f14da430018e6b40b39bb48046a70
+  data.tar.gz: 2b4af2fe6c95834710901e3aacccc1d260ceb7c28020a853f1a643be1faf3c48a0663488839c522249e2a14a2d3c6e4665425a3c7bf5175354a0311493679ee6

data/lib/jirametrics/aging_work_bar_chart.rb

@@ -14,6 +14,7 @@ class AgingWorkBarChart < ChartBase
     @percentage_lines = [] # Populated by run; the description reads it, so it must never be nil.
     percentiles [85]
     header_text 'Aging Work Bar Chart'
+    no_data_text '<%= render_header %><p>There is no aging work</p>'
     # div class="p" throughout rather than <p>: color_block emits a div and the list below is an
     # ol, neither of which is legal inside a paragraph. A browser closes the p at the first one,
     # which strands the rest of the text outside it. This is what the other charts use.
@@ -69,10 +70,7 @@ class AgingWorkBarChart < ChartBase
       { percentile: percentile, days: days, x: date_range.end - days, id: "percentile_#{percentile}" }
     end
 
-    if aging_issues.empty?
-      @description_text = '<p>There is no aging work</p>'
-      return render_top_text(binding)
-    end
+    return render_no_data if aging_issues.empty?
 
     wrap_and_render(binding, __FILE__)
   end

data/lib/jirametrics/aging_work_in_progress_chart.rb

@@ -12,7 +12,7 @@ class AgingWorkInProgressChart < ChartBase
 
   def initialize block
     super()
-    header_text 'Aging Work in Progress'
+    header_text 'Aging Work in Progress on board: <%= current_board.name %>'
     # div class="p" rather than <p>: the notes below are a ul, which is block level and not legal
     # inside a paragraph, so a browser closes the p early. Harmless while the list is the last
     # thing in the block, but it breaks the moment any text follows it.
@@ -59,7 +59,6 @@ class AgingWorkInProgressChart < ChartBase
   def run
     determine_board_columns
 
-    @header_text += " on board: #{current_board.name}"
     data_sets = make_data_sets
 
     adjust_visibility_of_unmapped_status_column data_sets: data_sets
@@ -91,17 +90,27 @@ class AgingWorkInProgressChart < ChartBase
 
     rules_to_issues = group_issues aging_issues
     data_sets = rules_to_issues.keys.collect { |rules| line_data_set(rules, rules_to_issues[rules]) }
-    # The y-axis is scaled to the oldest item, but never shorter than 20 days.
-    @max_age = data_sets.flat_map { |set| set['data'].collect { |point| point['y'] } }.push(20).max
 
     calculator = BoardMovementCalculator.new board: @all_boards[@board_id], issues: issues, today: date_range.end
     column_indexes_to_remove = trim_board_columns data_sets: data_sets, calculator: calculator
-    @row_index_offset = data_sets.size
 
     append_bar_data_sets data_sets, calculator, column_indexes_to_remove
+    @max_age = highest_plotted_age data_sets
     data_sets
   end
 
+  # The y-axis ceiling is set a little above this so you can see that the tallest thing on the chart
+  # really does stop where it stops, rather than being clipped by the top of the plot. Bands count as
+  # much as dots do. Never shorter than 20 days.
+  # Called after the columns have been trimmed, so a column nobody can see can't push the ceiling up
+  # and leave unexplained space at the top.
+  def highest_plotted_age data_sets
+    data_sets.flat_map do |set|
+      # A dot is {x:, y:, title:}. A band is a floating bar, [bottom, top].
+      set['data'].collect { |point| point.is_a?(Hash) ? point['y'] : point.last }
+    end.push(20).max
+  end
+
   def aging_issue_on_board? issue
     issue.board.id == @board_id && issue.board.cycletime.in_progress?(issue)
   end
@@ -128,32 +137,23 @@ class AgingWorkInProgressChart < ChartBase
     end
   end
 
+  # Each band is a floating bar running from the previous percentile's age up to its own, so it
+  # carries its own absolute position. Asking Chart.js to stack the bands instead hands it the
+  # positioning of every dataset on the chart, and it will stack the aging dots right along with them.
   def append_bar_data_sets data_sets, calculator, column_indexes_to_remove
-    bar_data = []
-    calculator.stacked_age_data_for(percentages: @percentiles.keys).each do |percentage, data|
-      column_indexes_to_remove.reverse_each { |index| data.delete_at index }
+    previous_ages = []
+
+    @percentiles.keys.sort.each do |percentage|
+      ages = calculator.age_data_for percentage: percentage
+      column_indexes_to_remove.reverse_each { |index| ages.delete_at index }
+
       data_sets << {
         'type' => 'bar', 'label' => "#{percentage}%", 'barPercentage' => 1.0, 'categoryPercentage' => 1.0,
-        'backgroundColor' => @percentiles[percentage], 'data' => data
+        'backgroundColor' => @percentiles[percentage],
+        'data' => ages.each_with_index.collect { |age, index| [previous_ages[index] || 0, age] }
       }
-      bar_data << data
+      previous_ages = ages
     end
-    @bar_data = adjust_bar_data bar_data
-  end
-
-  def adjust_bar_data input
-    return [] if input.empty?
-
-    row_size = input.first.size
-
-    output = []
-    output << input.first
-    input.drop(1).each do |row|
-      previous_row = output.last
-      output << 0.upto(row_size - 1).collect { |i| row[i] + previous_row[i] }
-    end
-
-    output
   end
 
   def indexes_of_leading_and_trailing_zeros list

data/lib/jirametrics/atlassian_document_format.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'cgi'
+
 class AtlassianDocumentFormat
   attr_reader :users
 
@@ -10,7 +12,7 @@ class AtlassianDocumentFormat
 
   def to_html input
     if input.is_a? String
-      input
+      escape(input)
         .gsub(/{color:(#\w{6})}([^{]+){color}/, '<span style="color: \1">\2</span>') # Colours
         # rubocop:disable Style/PerlBackrefs -- in a gsub block $1 reads cleaner than Regexp.last_match[:...]
         .gsub(/\[~accountid:([^\]]+)\]/) { expand_account_id $1 } # Tagged people
@@ -52,22 +54,22 @@ class AtlassianDocumentFormat
         [Time.at(node_attrs['timestamp'].to_i / 1000, in: @timezone_offset).to_date.to_s, nil]
       when 'decisionItem', 'listItem'  then ['<li>', '</li>']
       when 'decisionList'              then ['<div>Decisions<ul>', '</ul></div>']
-      when 'emoji', 'status'           then [node_attrs['text'], nil]
-      when 'expand'                    then ["<div>#{node_attrs['title']}</div>", nil]
+      when 'emoji', 'status'           then [escape(node_attrs['text']), nil]
+      when 'expand'                    then ["<div>#{escape node_attrs['title']}</div>", nil]
       when 'hardBreak'                 then ['<br />', nil]
       when 'heading'
         level = node_attrs['level']
         ["<h#{level}>", "</h#{level}>"]
       when 'inlineCard'
-        url = node_attrs['url']
+        url = escape node_attrs['url']
         ["[Inline card]: <a href='#{url}'>#{url}</a>", nil]
       when 'media'
-        text = node_attrs['alt'] || node_attrs['id']
+        text = escape(node_attrs['alt'] || node_attrs['id'])
         ["Media: #{text}", nil]
       when 'mediaSingle', 'mediaGroup' then ['<div>', '</div>']
-      when 'mention'                   then ["<b>#{node_attrs['text']}</b>", nil]
+      when 'mention'                   then ["<b>#{escape node_attrs['text']}</b>", nil]
       when 'orderedList'               then ['<ol>', '</ol>']
-      when 'panel'                     then ["<div>#{node_attrs['panelType'].upcase}</div>", nil]
+      when 'panel'                     then ["<div>#{escape node_attrs['panelType'].upcase}</div>", nil]
       when 'paragraph'                 then ['<p>', '</p>']
       when 'rule'                      then ['<hr />', nil]
       when 'table'                     then ['<table>', '</table>']
@@ -76,13 +78,13 @@ class AtlassianDocumentFormat
       when 'tableRow'                  then ['<tr>', '</tr>']
       when 'text'
         marks = adf_marks_to_html(n['marks'])
-        [marks.collect(&:first).join + n['text'], marks.collect(&:last).join]
+        [marks.collect(&:first).join + escape(n['text']), marks.collect(&:last).join]
       when 'taskItem'
         state = node_attrs['state'] == 'TODO' ? '☐' : '☑'
         ["<li>#{state} ", '</li>']
       when 'taskList' then ["<ul class='taskList'>", '</ul>']
       else
-        ["<p>Unparseable section: #{n['type']}</p>", nil]
+        ["<p>Unparseable section: #{escape n['type']}</p>", nil]
       end
     end
   end
@@ -135,11 +137,11 @@ class AtlassianDocumentFormat
     list.filter_map do |mark|
       type = mark['type']
       if type == 'textColor'
-        color = mark['attrs']['color']
+        color = escape mark['attrs']['color']
         ["<span style='color: #{color}'>", '</span>']
       elsif type == 'link'
-        href = mark['attrs']['href']
-        title = mark['attrs']['title']
+        href = escape mark['attrs']['href']
+        title = escape mark['attrs']['title']
         ["<a href='#{href}' title='#{title}'>", '</a>']
       else
         line = mappings.find { |key, _open, _close| key == type }
@@ -150,13 +152,19 @@ class AtlassianDocumentFormat
 
   def expand_account_id account_id
     user = @users.find { |u| u.account_id == account_id }
-    text = account_id
-    text = "@#{user.display_name}" if user
+    text = escape account_id
+    text = "@#{escape user.display_name}" if user
     "<span class='account_id'>#{text}</span>"
   end
 
   private
 
+  # The only markup in the output should be markup this class generated. Everything that comes out
+  # of the document is data written by whoever raised the issue, so it gets escaped on the way past.
+  def escape value
+    CGI.escapeHTML value.to_s
+  end
+
   def adf_node_render node, &render_node
     prefix, suffix = yield(node)
     result = +(prefix || '')

data/lib/jirametrics/board_movement_calculator.rb

@@ -22,29 +22,6 @@ class BoardMovementCalculator
     columns.each_cons(2).any? { |previous, current| current < previous }
   end
 
-  def stacked_age_data_for percentages:
-    data_list = percentages.sort.collect do |percentage|
-      [percentage, age_data_for(percentage: percentage)]
-    end
-
-    stack_data data_list
-  end
-
-  def stack_data data_list
-    remainder = nil
-    data_list.collect do |percentage, data|
-      unless remainder.nil?
-        data = (0...data.length).collect do |i|
-          data[i] - remainder[i]
-        end
-
-      end
-      remainder = data
-
-      [percentage, data]
-    end
-  end
-
   def age_data_for percentage:
     data = []
     board.visible_columns.each_with_index do |_column, column_index|

data/lib/jirametrics/change_item.rb

@@ -37,13 +37,10 @@ class ChangeItem
     raw_value.to_s.split(', ').collect(&:to_i)
   end
 
-  def author
-    @author_raw&.[]('displayName') || @author_raw&.[]('name') || 'Unknown author'
-  end
+  # It should be impossible to have no author at all, but we've seen it in production.
+  def author = User.from_raw(@author_raw)&.display_name || 'Unknown author'
 
-  def author_icon_url
-    @author_raw&.[]('avatarUrls')&.[]('16x16')
-  end
+  def author_icon_url = User.from_raw(@author_raw)&.avatar_url
 
   def artificial? = @artificial
   def assignee? = (field == 'assignee')
@@ -129,8 +126,7 @@ class ChangeItem
   private
 
   def time_to_s time
-    # MRI and JRuby return different strings for to_s() so we have to explicitly provide a full
-    # format so that tests work under both environments.
+    # Not all ruby versions return the same string for to_s so we force to a known format.
     time.strftime '%Y-%m-%d %H:%M:%S %z'
   end
 end

data/lib/jirametrics/chart_base.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 
+# require_all cannot resolve an include the way it resolves a superclass, and chart_format.rb
+# sorts after this file, so name it explicitly.
+require_relative 'chart_format'
+
 class ChartBase
+  include ChartFormat
+
   # Okabe-Ito palette - perceptually distinct under the most common forms of colour blindness.
   # Ordered from most- to least-commonly useful for chart series.
   OKABE_ITO_PALETTE = %w[
@@ -63,17 +69,44 @@ class ChartBase
     erb.result(caller_binding)
   end
 
-  def render_top_text caller_binding
-    result = +''
-    result << "<h1 class='foldable'>#{@header_text}</h1>" if @header_text
-    result << ERB.new(@description_text).result(caller_binding) if @description_text
+  # A fresh scope for every template expansion. self is still the chart, so instance variables and
+  # methods are reachable from a template, but the caller's local variables are not. That is the
+  # point: ERB#result assigns its output buffer into whatever binding you hand it, so two templates
+  # sharing one scope silently discard each other's output when one renders the other.
+  def render_binding = binding
+
+  def expand_template text
+    ERB.new(text).result(render_binding)
+  end
+
+  # The header as the reader sees it. Stitch configs match on this through grab_by_title, so it has
+  # to be the expanded text rather than the template.
+  def expanded_header_text = @header_text.nil? ? '' : expand_template(@header_text)
+
+  def render_header
+    return '' unless @header_text
+
+    "<h1 class='foldable'>#{expanded_header_text}</h1>"
+  end
+
+  def render_top_text
+    result = +render_header
+    result << expand_template(@description_text) if @description_text
     result
   end
 
+  # What a chart shows when it has nothing to show. Empty means show nothing at all, not even the
+  # header, which is what a chart that simply does not apply to this board wants.
+  def render_no_data
+    return '' if @no_data_text.nil? || @no_data_text.empty?
+
+    expand_template @no_data_text
+  end
+
   # Render the file and then wrap it with standard headers and quality checks.
   def wrap_and_render caller_binding, file
     result = +''
-    result << render_top_text(caller_binding)
+    result << render_top_text
     result << render(caller_binding, file)
     result
   end
@@ -240,20 +273,16 @@ class ChartBase
     end
   end
 
-  def chart_format object
-    if object.is_a? Time
-      # "2022-04-09T11:38:30-07:00"
-      object.strftime '%Y-%m-%dT%H:%M:%S%z'
-    else
-      object.to_s
-    end
-  end
-
   def header_text text = :none
     @header_text = text unless text == :none
     @header_text
   end
 
+  def no_data_text text = :none
+    @no_data_text = text unless text == :none
+    @no_data_text
+  end
+
   def description_text text = :none
     @description_text = text unless text == :none
     @description_text
@@ -412,7 +441,7 @@ class ChartBase
   # reassemble the report. Generated because only the start/end word differs.
   %w[start end].each do |position|
     define_method "seam_#{position}" do |type = 'chart'|
-      "\n<!-- seam-#{position} | chart#{@@chart_counter} | #{self.class} | #{header_text} | #{type} -->\n"
+      "\n<!-- seam-#{position} | chart#{@@chart_counter} | #{self.class} | #{expanded_header_text} | #{type} -->\n"
     end
   end
 

data/lib/jirametrics/chart_format.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+# Formats values for a Chart.js axis. Included by ChartBase and by the specs, which build the same
+# strings to assert against.
+module ChartFormat
+  def chart_format object
+    # Not all ruby versions return the same string for to_s so we force to a known format.
+
+    if object.is_a? Time
+      object.strftime '%Y-%m-%dT%H:%M:%S%z' # => 2022-04-09T11:38:30-0700
+    else
+      object.to_s
+    end
+  end
+end

data/lib/jirametrics/daily_view.rb

@@ -7,9 +7,10 @@ class DailyView < ChartBase
     super()
 
     header_text 'Daily View'
+    no_data_text '<%= render_header %><div>There are no items currently in progress</div>'
     description_text <<-HTML
       <div class="p">
-        This view shows all the items (<%= aging_issues.count %>) you'll want to discuss during your daily
+        This view shows all the items (<%= @aging_issues.count %>) you'll want to discuss during your daily
         coordination meeting
         (aka daily scrum, standup), in the order that you should be discussing them. The most important
         items are at the top, and the least at the bottom.
@@ -22,15 +23,13 @@ class DailyView < ChartBase
   end
 
   def run
-    aging_issues = select_aging_issues
+    @aging_issues = select_aging_issues
 
-    if aging_issues.empty?
-      return "<h1 class='foldable'>#{@header_text}</h1><div>There are no items currently in progress</div>"
-    end
+    return render_no_data if @aging_issues.empty?
 
     result = +''
-    result << render_top_text(binding)
-    aging_issues.each do |issue|
+    result << render_top_text
+    @aging_issues.each do |issue|
       result << render_issue(issue, child: false)
     end
     result

data/lib/jirametrics/daily_wip_by_parent_chart.rb

@@ -14,7 +14,7 @@ class DailyWipByParentChart < DailyWipChart
         indication of how focused we are on higher level objectives. If there are many parent
         tickets in progress at the same time, either this team has their focus scattered or we
         aren't doing a good job of
-        <a href="https://improvingflow.com/2024/02/21/slicing-epics.html">splitting those parent
+        <a href="https://blog.mikebowler.ca/2024/02/21/slicing-epics/">splitting those parent
         tickets</a>. Neither of those is desirable.
       </div>
       <div class="p">

data/lib/jirametrics/data_quality_report.rb

@@ -63,11 +63,10 @@ class DataQualityReport < ChartBase
     scan_for_issues_on_multiple_boards entries: @entries
 
     entries_with_problems = entries_with_problems()
-    return '' if entries_with_problems.empty?
+    return render_no_data if entries_with_problems.empty?
 
-    caller_binding = binding
     result = +''
-    result << render_top_text(caller_binding)
+    result << render_top_text
 
     result << '<ul class="quality_report">'
     result << render_problem_type(:discarded_changes)
@@ -111,6 +110,7 @@ class DataQualityReport < ChartBase
 
   # Return a format that's easier to assert against
   def testable_entries
+    # Not all ruby versions return the same string for to_s so we force to a known format.
     formatter = ->(time) { time&.strftime('%Y-%m-%d %H:%M:%S %z') || '' }
     @entries.collect do |entry|
       [

data/lib/jirametrics/dependency_chart.rb

@@ -32,10 +32,42 @@ class DependencyChart < ChartBase
     attr_accessor :color, :label
   end
 
+  # A fill and the label colour that goes on top of it, kept together because they are not
+  # independent choices: some of these fills are light and take black text, others are dark and
+  # take white, and a node that took its fill from one and its label from another would be
+  # unreadable. Always hand them out as a pair.
+  Palette = Struct.new :fill, :label
+
+  def self.palette_entry name
+    Palette.new CssVariable["--dependency-chart-#{name}-color"],
+      CssVariable["--dependency-chart-#{name}-label-color"]
+  end
+
+  PALETTE = {
+    story: palette_entry('story'),
+    task: palette_entry('task'),
+    bug: palette_entry('bug'),
+    epic: palette_entry('epic'),
+    spike: palette_entry('spike')
+  }.freeze
+
   def initialize rules_block
     super()
 
+    # Not the inherited type colours, because these are fills with label text sitting on top of
+    # them and those are line colours, judged against the page rather than against the text. See
+    # index.css for which colours these are and why.
+    @palette_by_type = {
+      'Story' => PALETTE[:story],
+      'Task' => PALETTE[:task],
+      'Bug' => PALETTE[:bug],
+      'Defect' => PALETTE[:bug],
+      'Epic' => PALETTE[:epic],
+      'Spike' => PALETTE[:spike]
+    }
+
     header_text 'Dependencies'
+    no_data_text '<%= render_header %><div>No data matched the selected criteria. Nothing to show.</div>'
     description_text <<-HTML
       <p>
         These are all the "linked issues" as defined in Jira
@@ -52,13 +84,10 @@ class DependencyChart < ChartBase
     instance_eval(&@rules_block) if @rules_block
 
     dot_graph = build_dot_graph
-    if dot_graph.nil?
-      return "<h1 class='foldable'>#{@header_text}</h1>" \
-        '<div>No data matched the selected criteria. Nothing to show.</div>'
-    end
+    return render_no_data if dot_graph.nil?
 
-    svg = execute_graphviz(dot_graph.join("\n"))
-    "<h1 class='foldable'>#{@header_text}</h1><div>#{@description_text}#{shrink_svg svg}</div>"
+    svg = restore_css_variables execute_graphviz(dot_graph.join("\n"))
+    "#{render_top_text}<div>#{shrink_svg svg}</div>"
   end
 
   def link_rules &block
@@ -77,6 +106,42 @@ class DependencyChart < ChartBase
     result
   end
 
+  # Graphviz has never heard of CSS variables. Handed one it emits a warning nobody sees and
+  # falls back to black, which is how a node ends up as black text on a black background. So a
+  # variable is swapped for a placeholder colour here and mapped back to the variable in the
+  # generated SVG, by #restore_css_variables. Anything that isn't a variable is left alone.
+  #
+  # The placeholders only need to be colours that nobody would ever choose deliberately, so that
+  # the CSS selectors matching them in the SVG cannot hit anything else.
+  def graphviz_color color
+    return color unless color.is_a? CssVariable
+
+    css_variable_placeholders[color.name] ||= format '#fe00%02x', css_variable_placeholders.size + 1
+  end
+
+  def css_variable_placeholders
+    @css_variable_placeholders ||= {}
+  end
+
+  # Turns the placeholders from #graphviz_color back into the variables they stood for, by way of
+  # a stylesheet that selects on the placeholder value. Rewriting the attributes in place would be
+  # the obvious move, but var() is only legal in a CSS value and not in an SVG presentation
+  # attribute, so the colour has to arrive as a real CSS rule. Author rules beat presentation
+  # attributes, so the placeholder never wins.
+  #
+  # fillcolor and fontcolor come out of graphviz as fill and color comes out as stroke, and an
+  # arrowhead uses both, so every placeholder gets a rule for each.
+  def restore_css_variables svg
+    return svg if css_variable_placeholders.empty?
+
+    rules = css_variable_placeholders.map do |name, placeholder|
+      %([fill="#{placeholder}"]{fill:var(#{name})}[stroke="#{placeholder}"]{stroke:var(#{name})})
+    end
+    svg.sub(/(?<opening_tag><svg\b[^>]*>)/) do
+      "#{Regexp.last_match[:opening_tag]}<style>#{rules.join}</style>"
+    end
+  end
+
   def make_dot_link issue_link:, link_rules:
     result = +''
     result << issue_link.origin.key.inspect
@@ -84,8 +149,9 @@ class DependencyChart < ChartBase
     result << issue_link.other_issue.key.inspect
     result << '['
     result << 'label=' << (link_rules.label || issue_link.label).inspect
-    result << ',color=' << (link_rules.line_color || 'gray').inspect
-    result << ',fontcolor=' << (link_rules.line_color || 'gray').inspect
+    line_color = graphviz_color(link_rules.line_color || default_link_color)
+    result << ',color=' << line_color.inspect
+    result << ',fontcolor=' << line_color.inspect
     result << ',dir=both' if link_rules.bidirectional_arrows?
     result << '];'
     result
@@ -102,24 +168,47 @@ class DependencyChart < ChartBase
     tooltip = "#{issue.key}: #{issue.summary}"
     result << ",tooltip=#{tooltip[0..80].inspect}"
     unless issue_rules.color == :none
-      result << %(,style=filled,fillcolor="#{issue_rules.color || color_for(type: issue.type)}")
+      fill_color = graphviz_color(issue_rules.color || color_for(type: issue.type))
+      result << %(,style=filled,fillcolor="#{fill_color}")
     end
+    result << %(,fontcolor="#{graphviz_color label_color(issue: issue, issue_rules: issue_rules)}")
     result << ']'
     result
   end
 
-  # This used to pull colours from chart_base but the migration to CSS colours kept breaking
-  # this chart so we moved it here, until we're finished with the rest. TODO: Revisit whether
-  # this can also use customizable CSS colours
+  # A filled node is its own background, so its label is measured against the fill rather than
+  # against the page.
+  def label_color issue:, issue_rules:
+    return CssVariable['--default-text-color'] if issue_rules.color == :none
+
+    # A colour somebody configured is one we know nothing about, so guessing that a particular
+    # type's label would suit it is worse than falling back to the general one.
+    return CssVariable['--dependency-chart-label-color'] if issue_rules.color
+
+    palette_for(issue.type).label
+  end
+
   def color_for type:
-    @chart_colors = {
-      'Story' => '#90EE90',
-      'Task' => '#87CEFA',
-      'Bug' => '#ffdab9',
-      'Defect' => '#ffdab9',
-      'Epic' => '#fafad2',
-      'Spike' => '#DDA0DD' # light purple
-    }[type] ||= next_palette_color
+    palette_for(type).fill
+  end
+
+  def palette_for type
+    @palette_by_type[type] ||= next_palette_entry
+  end
+
+  def default_link_color
+    CssVariable['--dependency-chart-link-color']
+  end
+
+  # An issue type we have no colour for cannot come from the shared palette, the way it does on
+  # every other chart. That palette holds line colours, judged against the page, and its first slot
+  # is Okabe-Ito blue, which leaves black label text at 4.05:1 once it becomes the fill behind it.
+  # These rotate this chart's own entries, which are all known to be comfortable. Two unknown types
+  # can therefore land on the same colour as each other or as a known type, which costs little:
+  # every node already names its type in the label.
+  def next_palette_entry
+    @fallback_color_index = (@fallback_color_index || -1) + 1
+    PALETTE.values[@fallback_color_index % PALETTE.size]
   end
 
   def build_dot_graph