diff --git a/client/src/components/History/Content/ContentItem.vue b/client/src/components/History/Content/ContentItem.vue index f8b4f8bc533..ba7a9be6227 100644 --- a/client/src/components/History/Content/ContentItem.vue +++ b/client/src/components/History/Content/ContentItem.vue @@ -101,12 +101,9 @@ import { JobStateSummary } from "./Collection/JobStateSummary"; import { library } from "@fortawesome/fontawesome-svg-core"; import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; import { faArrowCircleUp, faMinusCircle, faCheckCircle } from "@fortawesome/free-solid-svg-icons"; -import { getAppRoot } from "onload/loadConfig"; library.add(faArrowCircleUp, faMinusCircle, faCheckCircle); -const root = getAppRoot(); - export default { components: { CollectionDescription, @@ -173,19 +170,20 @@ export default { isCollection() { return "collection_type" in this.item; }, + /** Relative URLs for history item actions */ itemUrls() { const id = this.item.id; if (this.isCollection) { return { - edit: `${root}collection/edit/${id}`, + edit: `collection/edit/${id}`, }; } return { - display: `${root}datasets/${id}/display/?preview=True`, - edit: `${root}datasets/edit?dataset_id=${id}`, - showDetails: `${root}datasets/${id}/details`, - reportError: `${root}datasets/error?dataset_id=${id}`, - rerun: `${root}tool_runner/rerun?id=${id}`, + display: `datasets/${id}/display/?preview=True`, + edit: `datasets/edit?dataset_id=${id}`, + showDetails: `datasets/${id}/details`, + reportError: `datasets/error?dataset_id=${id}`, + rerun: `tool_runner/rerun?id=${id}`, visualize: `visualizations?dataset_id=${id}`, }; }, diff --git a/client/src/components/History/Content/ContentOptions.vue b/client/src/components/History/Content/ContentOptions.vue index 52be3890cb9..4c708261858 100644 --- a/client/src/components/History/Content/ContentOptions.vue +++ b/client/src/components/History/Content/ContentOptions.vue @@ -7,7 +7,7 @@ class="display-btn px-1" size="sm" variant="link" - :href="itemUrls.display" + :href="displayUrl" @click.prevent.stop="$emit('display')"> @@ -18,7 +18,7 @@ class="edit-btn px-1" size="sm" variant="link" - :href="itemUrls.edit" + :href="editUrl" @click.prevent.stop="$emit('edit')"> @@ -53,6 +53,7 @@ diff --git a/client/src/components/History/Content/Dataset/DatasetActions.vue b/client/src/components/History/Content/Dataset/DatasetActions.vue index a140fae183f..95dd7f7f86c 100644 --- a/client/src/components/History/Content/Dataset/DatasetActions.vue +++ b/client/src/components/History/Content/Dataset/DatasetActions.vue @@ -8,7 +8,7 @@ title="Error" size="sm" variant="link" - :href="itemUrls.reportError" + :href="reportErrorUrl" @click.prevent.stop="onError"> @@ -28,7 +28,7 @@ title="Dataset Details" size="sm" variant="link" - :href="itemUrls.showDetails" + :href="showDetailsUrl" @click.prevent.stop="onInfo"> @@ -38,7 +38,7 @@ title="Run Job Again" size="sm" variant="link" - :href="itemUrls.rerun" + :href="rerunUrl" @click.prevent.stop="onRerun"> @@ -48,7 +48,7 @@ title="Visualize" size="sm" variant="link" - :href="itemUrls.visualize" + :href="visualizeUrl" @click.prevent.stop="onVisualize"> @@ -72,7 +72,7 @@