Merge branch '6.0/render-dashboard-charts-via-dump-dom' into 6.0-trunk

Author: cbrandtbuffalo

docs/UPGRADING-6.0

@@ -187,9 +187,8 @@ While it has been possible to use JSChart to generate chart images in the RT UI,
 because these images are generated client-side it hasn't been possible to include
 them in dashboard emails.
 
-It is now possible to use the optional Perl module L<WWW::Mechanize::Chrome> and
-a compatible server-side web browser to create images of the JSChart graphs for
-inclusion in emails.
+It is now possible to use a compatible server-side Chrome-based browser to
+create images of the JSChart graphs for inclusion in emails.
 
 This is accomplished by setting C<$EmailDashboardIncludeCharts> to '1' and
 maybe also setting C<$ChromePath> to the path of the executable for your

etc/RT_Config.pm.in

@@ -1041,11 +1041,12 @@ Set($EmailDashboardInlineCSS, 0);
 
 =item C<$EmailDashboardIncludeCharts>
 
-To use the JSChart-generated images in emailed dashboards, install the
-optional module L<WWW::Mechanize::Chrome> and enable this option.
+To include the JSChart-generated images in emailed dashboards, enable this
+option.
 
-You will also need a chrome-based browser installed on the RT server.
-See also C<$ChromePath> and C<@ChromeLaunchArguments>.
+You will need a Chrome-based browser (such as Chromium) installed on the RT
+server; RT renders the charts by running it headless. See also C<$ChromePath>
+and C<@ChromeLaunchArguments>.
 
 =cut
 
@@ -1055,25 +1056,22 @@ Set($EmailDashboardIncludeCharts, @RT_DASHBOARD_CHART_EMAILS@);
 
 This option contains the path for a compatible Chrome-based browser
 executable that will be used to generate static images for JSChart
-graphs for dashboard emails.
-
-See also L<WWW::Mechanize::Chrome/launch_exe>
+graphs for dashboard emails. A bare command name (the default,
+C<chromium>) is looked up in C<PATH>.
 
 =cut
 
 Set($ChromePath, 'chromium');
 
 =item C<@ChromeLaunchArguments>
 
-This option contains the launch arguments when initializing
-L<WWW::Mechanize::Chrome>.
-
-If you need to run L<rt-email-dashboards> as root, you probably need to add
-C<--no-sandbox> to get around Chrome's restriction:
+This option contains extra command-line arguments passed to the
+Chrome-based browser when rendering dashboard charts, for example:
 
     Set(@ChromeLaunchArguments, '--no-sandbox');
 
-See also L<WWW::Mechanize::Chrome/launch_arg>
+When L<rt-email-dashboards> runs as root, C<--no-sandbox> is added
+automatically, since Chrome refuses to run as root otherwise.
 
 =cut
 

etc/cpanfile

@@ -221,7 +221,7 @@ feature 'externalauth' => sub {
 };
 
 feature 'dashboard-chart-emails' => sub {
-    requires 'WWW::Mechanize::Chrome';
+    requires 'File::Which';
 };
 
 # External attachment storage

lib/RT/Config.pm

@@ -2087,15 +2087,22 @@ our %META;
             my $self = shift;
             return unless $self->Get('EmailDashboardIncludeCharts');
 
-            if ( RT::StaticUtil::RequireModule('WWW::Mechanize::Chrome') ) {
-                my $chrome = RT->Config->Get('ChromePath') || 'chromium';
-                if ( !WWW::Mechanize::Chrome->find_executable( $chrome ) ) {
-                    RT->Logger->warning("Can't find chrome executable from \$ChromePath value '$chrome', disabling \$EmailDashboardIncludeCharts");
-                    $self->Set( 'EmailDashboardIncludeCharts', 0 );
-                }
+            my $chrome = $self->Get('ChromePath') || 'chromium';
+            unless ( RT::StaticUtil::RequireModule('File::Which') ) {
+                RT->Logger->warning('File::Which is not installed, disabling $EmailDashboardIncludeCharts');
+                $self->Set( 'EmailDashboardIncludeCharts', 0 );
+                return;
+            }
+
+            if ( my $path = File::Which::which($chrome) ) {
+
+                # Cache the resolved path for the mailer.
+                $self->Set( 'ChromePath', $path );
             }
             else {
-                RT->Logger->warning('WWW::Mechanize::Chrome is not installed, disabling $EmailDashboardIncludeCharts');
+                RT->Logger->warning(
+                    "Can't find a Chrome-based browser from \$ChromePath value '$chrome', disabling \$EmailDashboardIncludeCharts"
+                );
                 $self->Set( 'EmailDashboardIncludeCharts', 0 );
             }
         },