Reworked joint message support on frontend

Signed-off-by: Charles Hu <[email protected]>
mitre · Jul 29, 2024 · 33cfbee · 33cfbee
1 parent 47ec2a0
commit 33cfbee
Showing 1 changed file with 6 additions and 1 deletion.
diff --git 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;
   }
 }