Skip to content

Commit 4608a6a

Browse files
authored
Merge pull request #20974 from guerler/remove_trackster
Remove Trackster
2 parents f2d1c4c + 78673c1 commit 4608a6a

File tree

51 files changed

+35
-12477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+35
-12477
lines changed

client/src/bundleEntries.js

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
11
/**
2-
* The big list of horrible globals we expose on window.bundleEntries.
2+
* The list of horrible globals we expose on window.bundleEntries.
33
*
44
* Everything that is exposed on this global variable is something that the python templates
55
* require for their hardcoded initializations. These objects are going to have to continue
66
* to exist until such time as we replace the overall application with a Vue component which
77
* will handle initializations for components individually.
8+
*
9+
* legacy/grid_base.mako: window.bundleEntries.LegacyGridView
10+
* webapps/galaxy/dataset/tabular_chunked.mako: window.bundleEntries.createTabularDatasetChunkedView
11+
* webapps/galaxy/dataset/display.mako: window.bundleEntries.createTabularDatasetChunkedView
12+
* webapps/reports/run_stats.mako: window.bundleEntries.create_chart
13+
* webapps/reports/run_stats.mako: window.bundleEntries.create_histogram
14+
* tagging_common.mako: show_in_overlay
815
*/
916

1017
/* jquery and _ are exposed via expose-loader while several external plugins rely on these */
1118
import $ from "jquery"; // eslint-disable-line no-unused-vars
1219
import _ from "underscore"; // eslint-disable-line no-unused-vars
13-
import { TracksterUIView } from "viz/trackster";
1420

1521
export { getGalaxyInstance, setGalaxyInstance } from "app";
1622
export { default as LegacyGridView } from "legacy/grid/grid-view";
1723
export { createTabularDatasetChunkedView } from "mvc/dataset/data";
1824
export { create_chart, create_histogram } from "reports/run_stats";
1925
export { Toast } from "ui/toast"; // TODO: remove when external consumers are updated/gone (IES right now)
20-
export { TracksterUI } from "viz/trackster";
21-
22-
export function trackster(options) {
23-
new TracksterUIView(options);
24-
}
2526

2627
// Previously wandering around as window.thing = thing in the onload script
27-
export { hide_modal, Modal, show_in_overlay, show_message, show_modal } from "layout/modal";
28-
export { make_popup_menus, make_popupmenu } from "ui/popupmenu";
29-
export { default as async_save_text } from "utils/async-save-text";
28+
export { show_in_overlay } from "layout/modal";
3029

3130
// Used in common.mako
3231
export { default as store } from "storemodern";

client/src/components/Grid/configs/visualizationsPublished.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { useEventBus } from "@vueuse/core";
33

44
import { GalaxyApi } from "@/api";
55
import Filtering, { contains, expandNameTag, type ValidFilter } from "@/utils/filtering";
6-
import { withPrefix } from "@/utils/redirect";
76
import { rethrowSimple } from "@/utils/simple-error";
87

98
import type { FieldArray, GridConfig } from "./types";
@@ -57,13 +56,9 @@ const fields: FieldArray = [
5756
title: "View",
5857
icon: faEye,
5958
handler: (data: VisualizationEntry) => {
60-
if (data.type === "trackster") {
61-
window.location.href = withPrefix(`/visualization/${data.type}?id=${data.id}`);
62-
} else {
63-
emit(`/visualizations/display?visualization=${data.type}&visualization_id=${data.id}`, {
64-
title: data.title,
65-
});
66-
}
59+
emit(`/visualizations/display?visualization=${data.type}&visualization_id=${data.id}`, {
60+
title: data.title,
61+
});
6762
},
6863
},
6964
],

client/src/components/Grid/configs/visualizationsShared.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { useEventBus } from "@vueuse/core";
33

44
import { GalaxyApi } from "@/api";
55
import Filtering, { contains, expandNameTag, type ValidFilter } from "@/utils/filtering";
6-
import { withPrefix } from "@/utils/redirect";
76
import { rethrowSimple } from "@/utils/simple-error";
87

98
import type { FieldArray, GridConfig } from "./types";
@@ -57,13 +56,9 @@ const fields: FieldArray = [
5756
title: "View",
5857
icon: faEye,
5958
handler: (data: VisualizationEntry) => {
60-
if (data.type === "trackster") {
61-
window.location.href = withPrefix(`/visualization/${data.type}?id=${data.id}`);
62-
} else {
63-
emit(`/visualizations/display?visualization=${data.type}&visualization_id=${data.id}`, {
64-
title: data.title,
65-
});
66-
}
59+
emit(`/visualizations/display?visualization=${data.type}&visualization_id=${data.id}`, {
60+
title: data.title,
61+
});
6762
},
6863
},
6964
],

client/src/components/User/CustomBuilds.vue

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,6 @@ chr3 159599783
134134
chr4 155630120
135135
chr5 152537259</pre
136136
>
137-
<p class="card-text">
138-
Trackster uses this information to populate the select box for chrom/contig, andto set the
139-
maximum basepair of the track browser. You may either upload a .len fileof this format (Len File
140-
option), or directly enter the information into the box (Len Entry option).
141-
</p>
142137
</b-card>
143138
</b-col>
144139
</b-row>

client/src/components/Visualizations/VisualizationFrame.vue

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,12 @@ const iframeRef = ref<HTMLIFrameElement | null>(null);
2222
2323
const srcWithRoot = computed(() => {
2424
let url = "";
25-
if (props.visualization === "trackster") {
26-
if (props.visualizationId) {
27-
url = `/visualization/trackster?id=${props.visualizationId}`;
28-
} else {
29-
url = `/visualization/trackster?dataset_id=${props.datasetId}`;
30-
}
25+
if (props.visualizationId) {
26+
url = `/plugins/visualizations/${props.visualization}/saved?id=${props.visualizationId}`;
3127
} else {
32-
if (props.visualizationId) {
33-
url = `/plugins/visualizations/${props.visualization}/saved?id=${props.visualizationId}`;
34-
} else {
35-
const query = props.datasetId ? `?dataset_id=${props.datasetId}` : "";
36-
url = `/plugins/visualizations/${props.visualization}/show${query}`;
37-
}
28+
const query = props.datasetId ? `?dataset_id=${props.datasetId}` : "";
29+
url = `/plugins/visualizations/${props.visualization}/show${query}`;
3830
}
39-
4031
return withPrefix(url);
4132
});
4233

client/src/onload/globalInits/index.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
* will more properly be run inside a lifecycle handler inside of a component.
88
*/
99

10-
import { make_popup_menus } from "ui/popupmenu";
1110
import { monitorInit } from "utils/installMonitor";
1211

1312
import { prependInitialization } from "../initQueue";
@@ -30,7 +29,6 @@ export function globalInits() {
3029
initTooltips,
3130
init_refresh_on_change,
3231
() => replace_big_select_inputs(20, 1500),
33-
make_popup_menus,
3432
onloadWebhooks,
3533
);
3634
}

client/src/style/scss/base.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ $fa-font-path: "../../../node_modules/@fortawesome/fontawesome-free/webfonts/";
2929
@import "upload.scss";
3030
@import "ui.scss";
3131
@import "library.scss";
32-
@import "trackster.scss";
3332
@import "toastr.scss";
3433
@import "tour.scss";
3534
@import "flex.scss";

0 commit comments

Comments
 (0)