Added debug option to see the graph text; Added mermaid_quote functio…

…n for quoting special characters

Bugzilla/Util.pm

@@ -29,7 +29,7 @@ use base qw(Exporter);
   get_text template_var disable_utf8
   enable_utf8 detect_encoding email_filter
   round extract_nicks fetch_product_versions mojo_user_agent
-  is_fake_recipient_address);
+  is_fake_recipient_address mermaid_quote);
 use Bugzilla::Logging;
 use Bugzilla::Constants;
 use Bugzilla::RNG qw(irand);
@@ -1052,6 +1052,16 @@ sub is_fake_recipient_address {
   return 0;
 }
 
+# We need to escape ([ and ]) characters for the mermaid summaries
+sub mermaid_quote {
+  my $text = shift;
+  $text =~ s/[(]/#40;/g;
+  $text =~ s/[)]/#41;/g;
+  $text =~ s/\[/#91;/g;
+  $text =~ s/\]/#93;/g;
+  return $text;
+}
+
 1;
 
 __END__

showdependencygraph.cgi

@@ -16,7 +16,7 @@ use Bugzilla;
 use Bugzilla::Bug;
 use Bugzilla::Constants;
 use Bugzilla::Error;
-use Bugzilla::Util qw(detaint_natural);
+use Bugzilla::Util qw(detaint_natural mermaid_quote);
 
 use List::Util qw(none);
 
@@ -79,6 +79,7 @@ my $add_link = sub {
     $link_text .= "$dependson";
 
     if ($show_summary && $user->can_see_bug($dependson)) {
+      $dependson_summary = mermaid_quote($dependson_summary);
       $link_text .= "<br>$dependson_status $dependson_resolution $dependson_summary";
     }
 
@@ -91,6 +92,7 @@ my $add_link = sub {
     $link_text .= "$blocked";
 
     if ($show_summary && $user->can_see_bug($blocked)) {
+      $blocked_summary = mermaid_quote($blocked_summary);
       $link_text .= "<br>$blocked_status $blocked_resolution $blocked_summary";
     }
 
@@ -197,6 +199,7 @@ $vars->{'multiple_bugs'} = ($cgi->param('id') =~ /[ ,]/);
 $vars->{'display'}       = $display;
 $vars->{'rankdir'}       = $rankdir;
 $vars->{'showsummary'}   = $cgi->param('showsummary');
+$vars->{'debug'}         = ($cgi->param('debug') ? 1 : 0);
 
 # Generate and return the UI (HTML page) from the appropriate template.
 print $cgi->header();

template/en/default/bug/dependency-graph.html.tmpl

@@ -47,8 +47,14 @@
   Green circles represent open [% terms.bugs %].
 </p>
 
+[% IF debug %]
+  <pre>
+    [% graph_data FILTER html %]
+  </pre>
+[% END %]
+
 <pre class="mermaid">
-  [% graph_data FILTER none %]
+  [% graph_data FILTER html %]
 </pre>
 
 <script [% script_nonce FILTER none %]>