From 09a91e0749c49158e267f507425dee9f7a027f93 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Wed, 22 May 2024 15:06:15 -0500
Subject: [PATCH 1/3] [24.0] Add `GenericItem` error handling

`GenericItem` was missing a `onError` function. Now, it catches backend errors and displays a `Toast` message for any failed operation.
Fixes https://github.com/galaxyproject/galaxy/issues/18176
---
 .../History/Content/GenericItem.vue           | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/client/src/components/History/Content/GenericItem.vue b/client/src/components/History/Content/GenericItem.vue
index d852539f2d15..0669ee3f866d 100644
--- a/client/src/components/History/Content/GenericItem.vue
+++ b/client/src/components/History/Content/GenericItem.vue
@@ -25,12 +25,14 @@
 
 <script>
 import LoadingSpan from "components/LoadingSpan";
+import { Toast } from "composables/toast";
 import { mapActions } from "pinia";
 
 import { deleteContent, updateContentFields } from "@/components/History/model/queries";
 import { DatasetCollectionProvider, DatasetProvider } from "@/components/providers";
 import { DatasetCollectionElementProvider } from "@/components/providers/storeProviders";
 import { useHistoryStore } from "@/stores/historyStore";
+import { errorMessageAsString } from "@/utils/simple-error";
 
 import ContentItem from "./ContentItem";
 import GenericElement from "./GenericElement";
@@ -76,17 +78,38 @@ export default {
     },
     methods: {
         ...mapActions(useHistoryStore, ["applyFilters"]),
-        onDelete(item, recursive = false) {
-            deleteContent(item, { recursive: recursive });
+        async onDelete(item, recursive = false) {
+            try {
+                await deleteContent(item, { recursive: recursive });
+            } catch (error) {
+                this.onError(error);
+            }
         },
-        onUndelete(item) {
-            updateContentFields(item, { deleted: false });
+        onError(e) {
+            const error = errorMessageAsString(e, "Dataset operation failed.");
+            Toast.error(error);
+            console.error(error);
         },
-        onHide(item) {
-            updateContentFields(item, { visible: false });
+        async onUndelete(item) {
+            try {
+                await updateContentFields(item, { deleted: false });
+            } catch (error) {
+                this.onError(error);
+            }
         },
-        onUnhide(item) {
-            updateContentFields(item, { visible: true });
+        async onHide(item) {
+            try {
+                await updateContentFields(item, { visible: false });
+            } catch (error) {
+                this.onError(error);
+            }
+        },
+        async onUnhide(item) {
+            try {
+                await updateContentFields(item, { visible: true });
+            } catch (error) {
+                this.onError(error);
+            }
         },
         async onHighlight(item) {
             const { history_id } = item;

From 1e94915c98bf1bf3af1d14dd357eec619c7839b2 Mon Sep 17 00:00:00 2001
From: Ahmed Awan <qe66653@umbc.edu>
Date: Thu, 23 May 2024 10:34:59 -0500
Subject: [PATCH 2/3] add titles to `Toast`s for `GenericItem`

---
 .../src/components/History/Content/GenericItem.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/src/components/History/Content/GenericItem.vue b/client/src/components/History/Content/GenericItem.vue
index 0669ee3f866d..5ba543ea0b89 100644
--- a/client/src/components/History/Content/GenericItem.vue
+++ b/client/src/components/History/Content/GenericItem.vue
@@ -82,33 +82,33 @@ export default {
             try {
                 await deleteContent(item, { recursive: recursive });
             } catch (error) {
-                this.onError(error);
+                this.onError(error, "Failed to delete item");
             }
         },
-        onError(e) {
+        onError(e, title = "Error") {
             const error = errorMessageAsString(e, "Dataset operation failed.");
-            Toast.error(error);
+            Toast.error(error, title);
             console.error(error);
         },
         async onUndelete(item) {
             try {
                 await updateContentFields(item, { deleted: false });
             } catch (error) {
-                this.onError(error);
+                this.onError(error, "Failed to undelete item");
             }
         },
         async onHide(item) {
             try {
                 await updateContentFields(item, { visible: false });
             } catch (error) {
-                this.onError(error);
+                this.onError(error, "Failed to hide item");
             }
         },
         async onUnhide(item) {
             try {
                 await updateContentFields(item, { visible: true });
             } catch (error) {
-                this.onError(error);
+                this.onError(error, "Failed to unhide item");
             }
         },
         async onHighlight(item) {
@@ -121,7 +121,7 @@ export default {
             try {
                 await this.applyFilters(history_id, filters);
             } catch (error) {
-                this.onError(error);
+                this.onError(error, "Failed to highlight related items");
             }
         },
     },

From cef091bcd129fbb06a0f9e1272c2d1cd9f3ff8f3 Mon Sep 17 00:00:00 2001
From: Ahmed Hamid Awan <qe66653@umbc.edu>
Date: Thu, 23 May 2024 11:00:37 -0500
Subject: [PATCH 3/3] Update
 client/src/components/History/Content/GenericItem.vue

Co-authored-by: Marius van den Beek <m.vandenbeek@gmail.com>
---
 client/src/components/History/Content/GenericItem.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/src/components/History/Content/GenericItem.vue b/client/src/components/History/Content/GenericItem.vue
index 5ba543ea0b89..4a899b495416 100644
--- a/client/src/components/History/Content/GenericItem.vue
+++ b/client/src/components/History/Content/GenericItem.vue
@@ -88,7 +88,6 @@ export default {
         onError(e, title = "Error") {
             const error = errorMessageAsString(e, "Dataset operation failed.");
             Toast.error(error, title);
-            console.error(error);
         },
         async onUndelete(item) {
             try {