From 3f1f1727c63c682ff959e5e5ee2f32f92e52fe31 Mon Sep 17 00:00:00 2001
From: Dannon Baker <dannon.baker@gmail.com>
Date: Mon, 18 Dec 2017 11:08:46 -0500
Subject: [PATCH] Swap reports run_stats to extended bundle entrypoint.

---
 client/galaxy/scripts/apps/extended.js   |  5 ++++-
 templates/webapps/reports/run_stats.mako | 14 +++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/client/galaxy/scripts/apps/extended.js b/client/galaxy/scripts/apps/extended.js
index 7d5f2f8bf8c..0675f4b6c68 100644
--- a/client/galaxy/scripts/apps/extended.js
+++ b/client/galaxy/scripts/apps/extended.js
@@ -24,6 +24,7 @@ import HDAListItemEdit from "mvc/history/hda-li-edit";
 import HDAModel from "mvc/history/hda-model";
 import addLogging from "utils/add-logging";
 import LegacyGridView from "legacy/grid/grid-view";
+import * as run_stats from "reports/run_stats";
 
 if (window.Galaxy && window.Galaxy.debug === undefined) {
     //TODO: (kind of a temporary hack?) Must have Galaxy.logging for some of the imports
@@ -165,6 +166,7 @@ export function multiHistoryEntry(options) {
     });
 }
 
+console.debug(run_stats);
 export const bundleEntries = {
     library: libraryEntry,
     masthead: mastheadEntry,
@@ -188,7 +190,8 @@ export const bundleEntries = {
     HDAListItemEdit,
     HDAModel,
     GalaxyApp,
-    LegacyGridView
+    LegacyGridView,
+    run_stats
 };
 
 window.bundleEntries = bundleEntries;
diff --git a/templates/webapps/reports/run_stats.mako b/templates/webapps/reports/run_stats.mako
index 711707a2d57..879290ac8a8 100644
--- a/templates/webapps/reports/run_stats.mako
+++ b/templates/webapps/reports/run_stats.mako
@@ -5,13 +5,13 @@
 ${parent.javascripts()}
 
 <script type="text/javascript">
-require(['reports/run_stats'], function(run_stats){
-    run_stats.create_chart(${jf_hr_data}, "jf_hr_chart", "hours", "Jobs Finished per Hour");
-    run_stats.create_chart(${jf_dy_data}, "jf_dy_chart", "days", "Jobs Finished per Day");
-    run_stats.create_chart(${jc_hr_data}, "jc_hr_chart", "hours", "Jobs Created per Hour");
-    run_stats.create_chart(${jc_dy_data}, "jc_dy_chart", "days", "Jobs Created per Day");
-    run_stats.create_histogram(${et_hr_data}, "et_hr_chart", "Job Run Times (past day)");
-    run_stats.create_histogram(${et_dy_data}, "et_dy_chart", "Job Run Time (past 30 days)");
+$(function(){
+    window.bundleEntries.run_stats.create_chart(${jf_hr_data}, "jf_hr_chart", "hours", "Jobs Finished per Hour");
+    window.bundleEntries.run_stats.create_chart(${jf_dy_data}, "jf_dy_chart", "days", "Jobs Finished per Day");
+    window.bundleEntries.run_stats.create_chart(${jc_hr_data}, "jc_hr_chart", "hours", "Jobs Created per Hour");
+    window.bundleEntries.run_stats.create_chart(${jc_dy_data}, "jc_dy_chart", "days", "Jobs Created per Day");
+    window.bundleEntries.run_stats.create_histogram(${et_hr_data}, "et_hr_chart", "Job Run Times (past day)");
+    window.bundleEntries.run_stats.create_histogram(${et_dy_data}, "et_dy_chart", "Job Run Time (past 30 days)");
 });
 </script>
 </%def>