Build client url from attributes

galaxyproject · guerler · Nov 14, 2022 · Nov 15, 2022 · Nov 15, 2022 · Nov 15, 2022
commit 984e21390f035ea0058471debd56d04f95b7a518
diff --git a/client/src/components/Visualizations/DisplayApplication.vue b/client/src/components/Visualizations/DisplayApplication.vue
@@ -0,0 +1,29 @@
+<template>
+    <div>
+        {{ appName }}
+        {{ datasetId }}
+        {{ linkName }}
+    </div>
+</template>
+<script>
+import { DatasetProvider } from "components/providers";
+export default {
+    components: {
+        DatasetProvider,
+    },
+    props: {
+        appName: {
+            type: String,
+            required: true,
+        },
+        datasetId: {
+            type: String,
+            required: true,
+        },
+        linkName: {
+            type: String,
+            required: true,
+        },
+    },
+};
+</script>
diff --git a/client/src/components/Visualizations/DisplayApplications.vue b/client/src/components/Visualizations/DisplayApplications.vue
@@ -15,7 +15,7 @@
                             <span class="font-weight-bold">{{ displayApp.label }}</span>
                             <span v-for="(link, linkKey) in displayApp.links" :key="linkKey">
                                 <span v-if="linkKey == 0">(</span>
-                                <b-link :href="link.href" :target="link.target">{{ link.text }}</b-link>
+                                <b-link :href="getUrl(link)" :target="link.target">{{ link.text }}</b-link>
                                 <span v-if="linkKey != displayApp.links.length - 1">, </span>
                                 <span v-else>)</span>
                             </span>
@@ -37,6 +37,7 @@
     </div>
 </template>
 <script>
+import { safePath } from "utils/redirect";
 import { DatasetProvider } from "components/providers";
 export default {
     components: {
@@ -48,5 +49,10 @@ export default {
             required: true,
         },
     },
+    methods: {
+        getUrl(link) {
+            return safePath(`/display_applications/${ this.datasetId }/${ link.app_name }/${ link.link_name }`);
+        },
+    },
 };
 </script>
diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js
@@ -180,7 +180,7 @@ export function getRouter(Galaxy) {
                         component: AvailableDatatypes,
                     },
                     {
-                        path: "display_applications/:datasetId/:appName/:linkName/:userId/:appAction/:actionParam",
+                        path: "display_applications/:datasetId/:appName/:linkName",
                         component: DisplayApplication,
                         props: true,
                         redirect: redirectAnon(),

diff --git a/lib/galaxy/managers/hdas.py b/lib/galaxy/managers/hdas.py
@@ -16,6 +16,8 @@
 
 from sqlalchemy.orm.session import object_session
 
+from urllib.parse import quote_plus
+
 from galaxy import (
     datatypes,
     exceptions,
@@ -488,6 +490,8 @@ def serialize_display_apps(self, item, key, trans=None, **context):
                         "target": link_app.url.get("target_frame", "_blank"),
                         "href": link_app.get_display_url(hda, trans),
                         "text": gettext.gettext(link_app.name),
+                        "app_name": quote_plus(link_app.display_application.id),
+                        "link_name": quote_plus(link_app.id),
                     }
                 )
             if app_links: