From 33cfbee7f5d26b22e50bcfffb6288b7df187c098 Mon Sep 17 00:00:00 2001 From: Charles Hu Date: Mon, 29 Jul 2024 16:40:26 -0400 Subject: [PATCH] Reworked joint message support on frontend Signed-off-by: Charles Hu --- .../src/components/cards/controltable/ControlRowCol.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/frontend/src/components/cards/controltable/ControlRowCol.vue b/apps/frontend/src/components/cards/controltable/ControlRowCol.vue index 4bcea9a4a4..809ad4d751 100644 --- a/apps/frontend/src/components/cards/controltable/ControlRowCol.vue +++ b/apps/frontend/src/components/cards/controltable/ControlRowCol.vue @@ -76,8 +76,13 @@ export default class ControlRowCol extends mixins(HtmlSanitizeMixin) { } get resultMessage(): string | undefined { + // Check if either `skip_message` or `message` exist + // If one but not the other exists, display the individual message + // Otherwise display both messages in a joint string return this.result.skip_message - ? `-Message-\n${this.result.message}\n-Skip Message-\n${this.result.skip_message}` + ? this.result.message + ? `-Message-\n${this.result.message}\n\n-Skip Message-\n${this.result.skip_message}` + : this.result.skip_message : this.result.message; } }