Handle root consistently within api interface

galaxyproject · Nov 2, 2024 · 39586df · 39586df
1 parent 21dc854
commit 39586df
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/src/api/datasets.js b/src/api/datasets.js
@@ -1,4 +1,5 @@
 import { fetchApi } from "@/api/client";
+import { useConfigStore } from "@/store/configStore";
 
 export async function datasetsGetColumns(datasetId, columnList) {
     try {
@@ -29,5 +30,6 @@ export async function datasetsGetColumns(datasetId, columnList) {
 }
 
 export function datasetsGetUrl(datasetId) {
-    return `/api/datasets/${datasetId}/display`;
+    const configStore = useConfigStore();
+    return `${configStore.getRoot()}api/datasets/${datasetId}/display`;
 }
diff --git a/src/api/visualizations.js b/src/api/visualizations.js
@@ -1,8 +1,11 @@
 import axios from "axios";
 import { rethrowSimple } from "@/utilities/simpleError";
-export async function visualizationsCreate(root, type, title, config) {
+import { useConfigStore } from "@/store/configStore";
+
+export async function visualizationsCreate(type, title, config) {
+    const configStore = useConfigStore();
     try {
-        const { data } = await axios.post(`${root}api/visualizations`, {
+        const { data } = await axios.post(`${configStore.getRoot()}api/visualizations`, {
             type,
             title,
             config,
@@ -13,9 +16,10 @@ export async function visualizationsCreate(root, type, title, config) {
     }
 }
 
-export async function visualizationsSave(root, id, title, config) {
+export async function visualizationsSave(id, title, config) {
+    const configStore = useConfigStore();
     try {
-        const response = await axios.put(`${root}api/visualizations/${id}`, {
+        const response = await axios.put(`${configStore.getRoot()}api/visualizations/${id}`, {
             title,
             config,
         });

diff --git a/src/components/GalaxyCharts.vue b/src/components/GalaxyCharts.vue
@@ -62,13 +62,13 @@ parsePlugin(props.xml, visualizationPlugin, visualizationConfig).then(({ plugin,
 const datasetId = visualizationConfig.dataset_id;
 if (visualizationConfig.dataset_url) {
     datasetUrl.value = visualizationConfig.dataset_url;
-    console.debug(`ViewPort: Evaluating dataset url: ${datasetUrl.value}.`);
+    console.debug(`GalaxyCharts: Evaluating dataset url: ${datasetUrl.value}.`);
 } else {
     if (!datasetId) {
         errorMessage.value = "Visualization requires `dataset_id` or `dataset_url`.";
     } else {
         datasetUrl.value = datasetsGetUrl(datasetId);
-        console.debug(`ViewPort: Built dataset url from dataset id: ${datasetUrl.value}.`);
+        console.debug(`GalaxyCharts: Built dataset url from dataset id: ${datasetUrl.value}.`);
     }
 }
 

diff --git a/src/components/SidePanel.vue b/src/components/SidePanel.vue
@@ -82,14 +82,14 @@ const emit = defineEmits(["update:tracks", "update:settings", "toggle"]);
 async function onSave() {
     try {
         if (currentVisualizationId.value) {
-            await visualizationsSave(props.root, currentVisualizationId.value, currentTitle.value, {
+            await visualizationsSave(currentVisualizationId.value, currentTitle.value, {
                 dataset_id: props.datasetId,
                 settings: props.values,
             });
             message.value = "Successfully saved.";
             messageType.value = "success";
         } else {
-            currentVisualizationId.value = await visualizationsCreate(props.root, props.name, currentTitle.value, {
+            currentVisualizationId.value = await visualizationsCreate(props.name, currentTitle.value, {
                 dataset_id: props.datasetId,
                 settings: props.values,
             });