jirametrics 2.4 → 2.30

data/lib/jirametrics/github_gateway.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+require 'open3'
+require 'json'
+
+class GithubGateway
+  attr_reader :repo
+
+  def initialize repo:, project_keys:, file_system:, raw_pr_cache: {}
+    @repo = repo
+    @project_keys = project_keys
+    @file_system = file_system
+    @raw_pr_cache = raw_pr_cache
+    @issue_key_pattern = build_issue_key_pattern
+  end
+
+  def fetch_pull_requests since: nil
+    raw_prs = @raw_pr_cache[[@repo, since]] ||= fetch_raw_pull_requests(since: since)
+    raw_prs.filter_map { |pr| build_pr_data(pr) }
+  end
+
+  def fetch_raw_pull_requests since: nil
+    # Note: 'commits' is intentionally excluded — including it triggers GitHub's GraphQL node
+    # limit (authors sub-connection × PRs × commits exceeds 500,000 nodes). Branch name,
+    # title, and body are sufficient for issue key extraction in the vast majority of cases.
+    json_fields = %w[number title body headRefName createdAt closedAt mergedAt
+                     url state reviews additions deletions changedFiles].join(',')
+    args = ['pr', 'list', '--state', 'all', '--limit', '5000', '--json', json_fields]
+    args += ['--repo', @repo]
+    args += ['--search', "updated:>=#{since}"] if since
+
+    @file_system.log "  Downloading pull requests from #{@repo}", also_write_to_stderr: true
+    run_command(args)
+  end
+
+  def build_pr_data raw_pr
+    issue_keys = extract_issue_keys(raw_pr)
+    return nil if issue_keys.empty?
+
+    PullRequest.new(raw: {
+      'number'     => raw_pr['number'],
+      'repo'       => @repo,
+      'url'        => raw_pr['url'],
+      'title'      => raw_pr['title'],
+      'branch'     => raw_pr['headRefName'],
+      'opened_at'  => raw_pr['createdAt'],
+      'closed_at'  => raw_pr['closedAt'],
+      'merged_at'  => raw_pr['mergedAt'],
+      'state'      => raw_pr['state'],
+      'issue_keys'    => issue_keys,
+      'reviews'       => extract_reviews(raw_pr['reviews'] || []),
+      'additions'     => raw_pr['additions'],
+      'deletions'     => raw_pr['deletions'],
+      'changed_files' => raw_pr['changedFiles']
+    })
+  end
+
+  def extract_issue_keys raw_pr
+    return [] if @issue_key_pattern.nil?
+
+    sources = [
+      raw_pr['headRefName'],
+      raw_pr['title'],
+      raw_pr['body']
+    ]
+
+    keys = sources.compact.flat_map { |s| s.scan(@issue_key_pattern) }.uniq
+    return keys unless keys.empty?
+
+    commit_messages_for(raw_pr['number']).flat_map { |msg| msg.scan(@issue_key_pattern) }.uniq
+  end
+
+  def extract_reviews raw_reviews
+    raw_reviews
+      .select { |r| %w[APPROVED CHANGES_REQUESTED].include?(r['state']) }
+      .map do |r|
+        {
+          'author'       => r.dig('author', 'login'),
+          'submitted_at' => r['submittedAt'],
+          'state'        => r['state']
+        }
+      end
+  end
+
+  private
+
+  def commit_messages_for pr_number
+    args = ['pr', 'view', pr_number.to_s, '--json', 'commits', '--repo', @repo]
+    result = run_command(args)
+    (result['commits'] || []).flat_map do |commit|
+      [commit['messageHeadline'], commit['messageBody']].compact
+    end
+  end
+
+  def build_issue_key_pattern
+    return nil if @project_keys.empty?
+
+    keys_pattern = @project_keys.map { |k| Regexp.escape(k) }.join('|')
+    Regexp.new("\\b(?:#{keys_pattern})-\\d+(?![A-Za-z0-9])")
+  end
+
+  def run_command args
+    stdout, stderr, status = Open3.capture3('gh', *args)
+
+    # This extra check seems to only matter on Windows. On the mac, auth failures don't pass status.success?
+    if stderr.include?('SAML enforcement')
+      raise "GitHub CLI is not authorized to access #{@repo}. " \
+            'Run: gh auth refresh -h github.com -s read:org'
+    end
+
+    raise "GitHub CLI command failed for #{@repo}: #{stderr}" unless status.success?
+
+    JSON.parse(stdout)
+  end
+end

data/lib/jirametrics/groupable_issue_chart.rb

@@ -6,9 +6,7 @@ require 'jirametrics/grouping_rules'
 module GroupableIssueChart
   def init_configuration_block user_provided_block, &default_block
     instance_eval(&user_provided_block)
-    return if @group_by_block
-
-    instance_eval(&default_block)
+    instance_eval(&default_block) unless @group_by_block
   end
 
   def grouping_rules &block
@@ -17,14 +15,24 @@ module GroupableIssueChart
 
   def group_issues completed_issues
     result = {}
+    ignored_issues = []
+    @issue_hints = {}
+    @issue_periods = {}
     completed_issues.each do |issue|
       rules = GroupingRules.new
       @group_by_block.call(issue, rules)
-      next if rules.ignored?
+      if rules.ignored?
+        ignored_issues << issue
+        next
+      end
 
+      @issue_hints[issue] = rules.issue_hint
+      @issue_periods[issue] = rules.last_day_of_period
       (result[rules] ||= []) << issue
     end
 
+    completed_issues.reject! { |issue| ignored_issues.include? issue }
+
     result.each_key do |rules|
       rules.color = random_color if rules.color.nil?
     end

data/lib/jirametrics/grouping_rules.rb

@@ -1,8 +1,12 @@
 # frozen_string_literal: true
 
 class GroupingRules < Rules
-  attr_accessor :label
-  attr_reader :color
+  attr_accessor :label, :issue_hint, :label_hint
+  attr_reader :color, :last_day_of_period
+
+  def last_day_of_period= value
+    @last_day_of_period = value.is_a?(String) ? Date.parse(value) : value
+  end
 
   def eql? other
     other.label == @label && other.color == @color
@@ -13,7 +17,25 @@ class GroupingRules < Rules
   end
 
   def color= color
-    color = CssVariable[color] unless color.is_a?(CssVariable)
-    @color = color
+    if color.is_a?(Array)
+      raise ArgumentError, 'Color pair must have exactly two elements: [light_color, dark_color]' unless color.size == 2
+      raise ArgumentError, 'Color pair elements must be strings' unless color.all?(String)
+
+      if color.any? { |c| c.start_with?('--') }
+        raise ArgumentError,
+          'CSS variable references are not supported as color pair elements; use a literal color value instead'
+      end
+
+      light, dark = color
+      @color = RawJavascript.new(
+        "(document.documentElement.dataset.theme === 'dark' || " \
+        '(!document.documentElement.dataset.theme && ' \
+        "window.matchMedia('(prefers-color-scheme: dark)').matches)) " \
+        "? #{dark.to_json} : #{light.to_json}"
+      )
+    else
+      color = CssVariable[color] unless color.is_a?(CssVariable)
+      @color = color
+    end
   end
 end

data/lib/jirametrics/html/aging_work_bar_chart.erb

@@ -1,3 +1,4 @@
+<%= seam_start %>
 <div class="chart">
   <canvas id="<%= chart_id %>" width="<%= canvas_width %>" height="<%= canvas_height %>"></canvas>
 </div>
@@ -15,11 +16,9 @@ new Chart(document.getElementById('<%= chart_id %>').getContext('2d'),
       x: {
         type: 'time',
         min: '<%= @date_range.begin.to_s %>',
-        max: '<%= (@date_range.end ).to_s %>',
+        max: '<%= (@date_range.end + 1).to_s %>',
         stacked: false,
-        title: {
-          display: false
-        },
+        <%= render_axis_title :x %>
         grid: {
           color: <%= CssVariable['--grid-line-color'].to_json %>
         },
@@ -30,6 +29,7 @@ new Chart(document.getElementById('<%= chart_id %>').getContext('2d'),
         ticks: {
           display: true
         },
+        <%= render_axis_title :y %>
         grid: {
           color: <%= CssVariable['--grid-line-color'].to_json %>
         },
@@ -38,22 +38,13 @@ new Chart(document.getElementById('<%= chart_id %>').getContext('2d'),
     plugins: {
       annotation: {
         annotations: {
-          <% holidays.each_with_index do |range, index| %>
-          holiday<%= index %>: {
-            drawTime: 'beforeDraw',
-            type: 'box',
-            xMin: '<%= range.begin %>T00:00:00',
-            xMax: '<%= range.end %>T23:59:59',
-            backgroundColor: <%= CssVariable.new('--non-working-days-color').to_json %>,
-            borderColor: <%= CssVariable.new('--non-working-days-color').to_json %>
-          },
-          <% end %>
+          <%= working_days_annotation %>
 
           <% if percentage_line_x %>
           line: {
             type: 'line',
-            xMin: '<%= percentage_line_x %>',
-            xMax: '<%= percentage_line_x %>',
+            scaleID: 'x',
+            value: '<%= percentage_line_x %>',
             borderColor: <%= CssVariable.new('--aging-work-bar-chart-percentage-line-color').to_json %>,
             borderWidth: 1,
             drawTime: 'afterDraw'
@@ -75,4 +66,4 @@ new Chart(document.getElementById('<%= chart_id %>').getContext('2d'),
   }
 });
 </script>
-
+<%= seam_end %>

data/lib/jirametrics/html/aging_work_in_progress_chart.erb

@@ -1,3 +1,4 @@
+<%= seam_start %>
 <div class="chart">
   <canvas id="<%= chart_id %>" width="<%= canvas_width %>" height="<%= canvas_height %>"></canvas>
 </div>
@@ -6,7 +7,7 @@ new Chart(document.getElementById(<%= chart_id.inspect %>).getContext('2d'),
 {
   type: 'bar',
   data: {
-    labels: [<%= column_headings.collect(&:inspect).join(',') %>],
+    labels: [<%= @board_columns.collect { |c| c.name.inspect }.join(',') %>],
     datasets: <%= JSON.generate(data_sets) %>
   },
   options: {
@@ -22,8 +23,10 @@ new Chart(document.getElementById(<%= chart_id.inspect %>).getContext('2d'),
           labelString: 'Date Completed'
         },
         grid: {
-          color: <%= CssVariable['--grid-line-color'].to_json %>
+          color: <%= CssVariable['--grid-line-color'].to_json %>,
+          z: 1 // draw the grid lines on top of the bars
         },
+        stacked: true
       },
       y: {
         scaleLabel: {
@@ -35,8 +38,11 @@ new Chart(document.getElementById(<%= chart_id.inspect %>).getContext('2d'),
           text: 'Age in days'
         },
         grid: {
-          color: <%= CssVariable['--grid-line-color'].to_json %>
+          color: <%= CssVariable['--grid-line-color'].to_json %>,
+          z: 1 // draw the grid lines on top of the bars
         },
+        stacked: false,
+        max: <%= (@max_age * 1.1).to_i %>
       }
     },
     plugins: {
@@ -44,15 +50,28 @@ new Chart(document.getElementById(<%= chart_id.inspect %>).getContext('2d'),
         callbacks: {
           label: function(context) {
             if( typeof(context.dataset.data[context.dataIndex]) == "number" ) {
-              return "85% of the issues, leave this column in "+context.dataset.data[context.dataIndex]+" days";
+              let full_data = <%= @bar_data.inspect %>;
+              let columnIndex = context.dataIndex;
+              let rowIndex = context.datasetIndex - <%= @row_index_offset %>;
+              return context.dataset.label + " of completed work items left this column in " +full_data[rowIndex][columnIndex] + " days or less";
             }
             else {
-              return context.dataset.data[context.dataIndex].title
+              return context.dataset.data[context.dataIndex].title;
             }
           }
         }
+      },
+      legend: {
+        labels: {
+          filter: function(item, chart) {
+            // Logic to remove a particular legend item goes here
+            return !item.text.includes('%');
+          }
+        }
       }
+
     }
   }
 });
 </script>
+<%= seam_end %>

data/lib/jirametrics/html/aging_work_table.erb

@@ -1,11 +1,14 @@
+<%= seam_start %>
 <table class='standard'>
   <thead>
     <tr>
-      <th>Age (days)</th>
-      <th>E</th>
-      <th>B</th>
+      <th title="Age in days">Age</th>
+      <th title="Expedited">E</th>
+      <th title="Blocked / Stalled">B/S</th>
+      <th title="Priority">P</th>
       <th>Issue</th>
       <th>Status</th>
+      <th>Forecast</th>
       <th>Fix versions</th>
       <% if any_scrum_boards %>
         <th>Sprints</th>
@@ -28,6 +31,7 @@
         <td style="text-align: right;"><%= issue_age || 'Not started' %></td>
         <td><%= expedited_text(issue) %></td>
         <td><%= blocked_text(issue) %></td>
+        <td><%= priority_text(issue) %></td>
         <td>
           <% parent_hierarchy(issue).each_with_index do |parent, index| %>
             <% color = parent != issue ? "var(--hierarchy-table-inactive-item-text-color)" : 'var(--default-text-color)' %>
@@ -37,10 +41,14 @@
                 <%= link_to_issue parent, style: "color: #{color}" %>
               </span>
               <i><%= parent.summary.strip.inspect %></i>
+              <% if parent == issue && (text = not_visible_text(issue)) %>
+                <br /><%= text %>
+              <% end %>
             </div>
           <% end %>
         </td>
-        <td><%= format_status issue.status.name, board: issue.board %></td>
+        <td><%= format_status issue.status, board: issue.board %></td>
+        <td><%= dates_text(issue) %></td>
         <td><%= fix_versions_text(issue) %></td>
         <% if any_scrum_boards %>
           <td><%= sprints_text(issue) %></td>
@@ -50,3 +58,4 @@
     <% end %>
   </tbody>
 </table>
+<%= seam_end %>

data/lib/jirametrics/html/collapsible_issues_panel.erb

@@ -1,5 +1,5 @@
-[<a id='<%= link_id %>' href="#" onclick='expand_collapse("<%= link_id %>", "<%= issues_id %>"); return false;'>Show details</a>]
-<table class='standard' id='<%= issues_id %>' style='display: none;'>
+<div class='foldable startFolded'>Show details</div>
+<table class='standard' id='<%= issues_id %>'>
   <thead>
     <tr>
       <th>Issue</th>