From 59618ccfbff019d9cb1a46b78a8fd1351647b970 Mon Sep 17 00:00:00 2001
From: Joe Knapper <jaknapper@hotmail.com>
Date: Tue, 30 Jun 2026 13:03:00 +0100
Subject: [PATCH 1/2] Action button notification only includes name if given

---
 .../src/components/labThingsComponents/actionButton.vue   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/webapp/src/components/labThingsComponents/actionButton.vue b/webapp/src/components/labThingsComponents/actionButton.vue
index 6f1df1a9..746d88a9 100644
--- a/webapp/src/components/labThingsComponents/actionButton.vue
+++ b/webapp/src/components/labThingsComponents/actionButton.vue
@@ -349,7 +349,13 @@ export default {
           this.$emit("completed", response.data.output);
         } else if (response.data.status == "cancelled") {
           this.$emit("cancelled", response.data);
-          this.modalNotify(`The action '${this.submitLabel}' was cancelled.`);
+          let cancelMessage;
+          if (this.submitLabel != "") {
+            cancelMessage = ` "${this.submitLabel}" `;
+          } else {
+            cancelMessage = " ";
+          }
+          this.modalNotify(`The action ${cancelMessage} was cancelled.`);
         } else if (response.data.status == "error") {
           const err_msg = this.log?.[0]?.message ?? "Unknown error";
           this.$emit("error", err_msg);

From 0eea10f2b013be53317b3128f77589d6432bf39f Mon Sep 17 00:00:00 2001
From: Julian Stirling <julian@julianstirling.co.uk>
Date: Tue, 30 Jun 2026 17:20:14 +0000
Subject: [PATCH 2/2] Stop showing cancel modals on action button my default

---
 webapp/src/components/labThingsComponents/actionButton.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/webapp/src/components/labThingsComponents/actionButton.vue b/webapp/src/components/labThingsComponents/actionButton.vue
index 746d88a9..a33319fb 100644
--- a/webapp/src/components/labThingsComponents/actionButton.vue
+++ b/webapp/src/components/labThingsComponents/actionButton.vue
@@ -349,13 +349,6 @@ export default {
           this.$emit("completed", response.data.output);
         } else if (response.data.status == "cancelled") {
           this.$emit("cancelled", response.data);
-          let cancelMessage;
-          if (this.submitLabel != "") {
-            cancelMessage = ` "${this.submitLabel}" `;
-          } else {
-            cancelMessage = " ";
-          }
-          this.modalNotify(`The action ${cancelMessage} was cancelled.`);
         } else if (response.data.status == "error") {
           const err_msg = this.log?.[0]?.message ?? "Unknown error";
           this.$emit("error", err_msg);