From c0134f97d683122da3406d992b474d58f2459be0 Mon Sep 17 00:00:00 2001
From: davelopez <46503462+davelopez@users.noreply.github.com>
Date: Mon, 13 Dec 2021 12:58:25 +0100
Subject: [PATCH] Fix broken library datasets links

- Some links to library elements were not replaced with the new library router paths.
- Fix undeleted dataset link in toast message.
---
 .../Libraries/LibraryFolder/LibraryFolder.vue        | 12 ++++++------
 .../LibraryFolderDatasetPermissions.vue              |  2 +-
 config/plugins/webhooks/demo/search/script.js        |  2 +-
 .../galaxy/controllers/_create_history_template.py   |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
index 6980f474ec6..d7f21090617 100644
--- a/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
+++ b/client/src/components/Libraries/LibraryFolder/LibraryFolder.vue
@@ -217,7 +217,7 @@
                             Manage
                         </b-button>
                         <button
-                            @click="undelete(row.item)"
+                            @click="undelete(row.item, folder_id)"
                             v-if="row.item.deleted"
                             :title="'Undelete ' + row.item.name"
                             class="lib-btn primary-button btn-sm undelete_dataset_btn"
@@ -544,7 +544,7 @@ export default {
                 );
             }
         },
-        undelete: function (element) {
+        undelete: function (element, parent_folder) {
             const onError = (response) => {
                 const message = `${element.type === "folder" ? "Folder" : "Dataset"}`;
                 if (typeof response.responseJSON !== "undefined") {
@@ -569,11 +569,11 @@ export default {
                     (response) => {
                         element.deleted = response.deleted;
                         this.refreshTable();
-                        Toast.success("Dataset undeleted. Click this to see it.", "", {
+                        Toast.success("Dataset undeleted. Click here to see it.", "", {
                             onclick: function () {
-                                window.location = `${getAppRoot()}library/list#folders/${
-                                    this.current_folder_id
-                                }/datasets/${element.id}`;
+                                window.location = `${getAppRoot()}libraries/folders/${parent_folder}/dataset/${
+                                    element.id
+                                }`;
                             },
                         });
                     },
diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderDatasetPermissions.vue b/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderDatasetPermissions.vue
index 5fd0434160e..4a594b95f00 100644
--- a/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderDatasetPermissions.vue
+++ b/client/src/components/Libraries/LibraryFolder/LibraryFolderPermissions/LibraryFolderDatasetPermissions.vue
@@ -24,7 +24,7 @@
                             title="Go to Dataset Details"
                             variant="secondary"
                             type="button"
-                            :href="`${root}library/list#folders/${folder_id}/datasets/${dataset_id}`">
+                            :href="`${root}libraries/folders/${folder_id}/dataset/${dataset_id}`">
                             <font-awesome-icon :icon="['far', 'file']" />
                             &nbsp;Dataset Details
                         </b-button>
diff --git a/config/plugins/webhooks/demo/search/script.js b/config/plugins/webhooks/demo/search/script.js
index 9037c43da8e..f49c0b8083d 100644
--- a/config/plugins/webhooks/demo/search/script.js
+++ b/config/plugins/webhooks/demo/search/script.js
@@ -878,7 +878,7 @@ $(document).ready(function() {
                             target = 'galaxy_main';
                             break;
                         case "data library":
-                            link = Galaxy.root + "library/list#folders/" + item.root_folder_id;
+                            link = Galaxy.root + "libraries/folders/" + item.root_folder_id;
                             break;
                         case "workflow":
                             link = Galaxy.root + "workflow/editor?id=" + item.id;
diff --git a/lib/galaxy/webapps/galaxy/controllers/_create_history_template.py b/lib/galaxy/webapps/galaxy/controllers/_create_history_template.py
index 2f9e9a14bc9..0c405f1b646 100644
--- a/lib/galaxy/webapps/galaxy/controllers/_create_history_template.py
+++ b/lib/galaxy/webapps/galaxy/controllers/_create_history_template.py
@@ -64,7 +64,7 @@ def render_hda_copied_from_library(trans, hda, children):
     id = trans.security.encode_id(hda.id)
     folder = hda.copied_from_library_dataset_dataset_association.library_dataset.folder
     folder_id = f"F{trans.security.encode_id(folder.id)}"
-    url = url_for(f"/library/list#folders/{folder_id}")
+    url = url_for(f"/libraries/folders/{folder_id}")
     template = '<div class="copied-from">'
     template += '<div class="header">'
     template += '<div>'