Skip to content

Commit

Permalink
Merge pull request #17415 from guerler/grid_trackster
Browse files Browse the repository at this point in the history
Replaces Trackster Grids with Data Dialog, Removes Phyloviz, Circster and Sweepster
  • Loading branch information
guerler authored Feb 11, 2024
2 parents 91ed390 + 6a944a2 commit e943c17
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 4,209 deletions.
7 changes: 0 additions & 7 deletions client/src/bundleEntries.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import $ from "jquery"; // eslint-disable-line no-unused-vars
import Client from "mvc/visualization/chart/chart-client";
import _ from "underscore"; // eslint-disable-line no-unused-vars
import Circster from "viz/circster";
import { TracksterUIView } from "viz/trackster";

// Previously "chart"
Expand All @@ -22,18 +21,12 @@ export { default as LegacyGridView } from "legacy/grid/grid-view";
export { createTabularDatasetChunkedView } from "mvc/dataset/data";
export { create_chart, create_histogram } from "reports/run_stats";
export { Toast } from "ui/toast"; // TODO: remove when external consumers are updated/gone (IES right now)
export { PhylovizView as phyloviz } from "viz/phyloviz";
export { SweepsterVisualization, SweepsterVisualizationView } from "viz/sweepster";
export { TracksterUI } from "viz/trackster";

export function trackster(options) {
new TracksterUIView(options);
}

export function circster(options) {
new Circster.GalaxyApp(options);
}

// Previously wandering around as window.thing = thing in the onload script
export { hide_modal, Modal, show_in_overlay, show_message, show_modal } from "layout/modal";
export { make_popup_menus, make_popupmenu } from "ui/popupmenu";
Expand Down
6 changes: 5 additions & 1 deletion client/src/components/Grid/configs/visualizations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,11 @@ const fields: FieldArray = [
icon: faEye,
condition: (data: VisualizationEntry) => !data.deleted,
handler: (data: VisualizationEntry) => {
window.location.href = withPrefix(`/plugins/visualizations/${data.type}/saved?id=${data.id}`);
if (data.type === "trackster") {
window.location.href = withPrefix(`/visualization/${data.type}?id=${data.id}`);
} else {
window.location.href = withPrefix(`/plugins/visualizations/${data.type}/saved?id=${data.id}`);
}
},
},
{
Expand Down
Loading

0 comments on commit e943c17

Please sign in to comment.