Skip to content

Commit

Permalink
Revise shared utilities
Browse files Browse the repository at this point in the history
  • Loading branch information
guerler committed Feb 11, 2018
1 parent de7cac9 commit 00a105e
Show file tree
Hide file tree
Showing 6 changed files with 95 additions and 326 deletions.
6 changes: 3 additions & 3 deletions client/galaxy/scripts/apps/chart.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as _ from "libs/underscore";
import Client from "mvc/visualization/chart/chart-client";
import Datasets from "mvc/visualization/chart/utilities/datasets";
import Helpers from "mvc/visualization/chart/utilities/helpers";
import Series from "mvc/visualization/chart/utilities/series";
import Jobs from "mvc/visualization/chart/utilities/jobs";

window.bundleEntries = window.bundleEntries || {};
Expand All @@ -12,8 +12,8 @@ export const bundleEntries = {
},
chartUtilities: {
Datasets: Datasets,
Helpers: Helpers,
Jobs: Jobs
Jobs: Jobs,
Series: Series
}
};

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,50 @@
/** This class handles, formats and caches datasets. */
import Utils from "utils/utils";

/** Assists in assigning the viewport panels */
var requestPanels = function(options) {
var self = this;
var process = options.process;
var chart = options.chart;
var render = options.render;
var targets = options.targets;
var dataset_id = options.dataset_id || options.chart.get("dataset_id");
var dataset_groups = options.dataset_groups || options.chart.groups;
request({
chart: chart,
dataset_id: dataset_id,
dataset_groups: dataset_groups,
success: function(result) {
try {
if (targets.length == result.length) {
var valid = true;
for (var group_index in result) {
var group = result[group_index];
if (!render(targets[group_index], [group])) {
valid = false;
break;
}
}
if (valid) {
chart.state("ok", "Multi-panel chart drawn.");
}
} else if (targets.length == 1) {
if (render(targets[0], result)) {
chart.state("ok", "Chart drawn.");
}
} else {
chart.state("failed", "Invalid panel count.");
}
process.resolve();
} catch (err) {
console.debug("FAILED: tabular-utilities::panelHelper() - " + err);
chart.state("failed", err);
process.reject();
}
}
});
}

/** Fills request dictionary with data from cache/response */
var _cache = {};
var request = function(options) {
Expand Down Expand Up @@ -124,4 +168,4 @@ var _block_id = function(dataset_id, column) {
return dataset_id + "_" + "_" + column;
};

export default { request: request };
export default { request: request, requestPanels: requestPanels };
310 changes: 0 additions & 310 deletions client/galaxy/scripts/mvc/visualization/chart/utilities/helpers.js

This file was deleted.

0 comments on commit 00a105e

Please sign in to comment.