Swap reports run_stats to extended bundle entrypoint.

This commit is contained in:
Dannon Baker
2017-12-18 11:08:46 -05:00
parent 4ef30c89f4
commit 3f1f1727c6
2 changed files with 11 additions and 8 deletions
+4 -1
View File
@@ -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;
+7 -7
View File
@@ -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>