cleaned up message code

Signed-off-by: Amndeep Singh Mann <[email protected]>
mitre · Jul 30, 2024 · b60ba86 · b60ba86
1 parent 921b62d
commit b60ba86
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/apps/frontend/src/components/cards/controltable/ControlRowCol.vue b/apps/frontend/src/components/cards/controltable/ControlRowCol.vue
@@ -79,13 +79,9 @@ export default class ControlRowCol extends mixins(HtmlSanitizeMixin) {
     // 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
-    if (this.result.skip_message) {
-      return this.result.message
-        ? `-Message-\n${this.result.message}\n\n-Skip Message-\n${this.result.skip_message}`
-        : this.result.skip_message;
-    } else {
-      return this.result.message;
-    }
+    return this.result.skip_message && this.result.message
+      ? `-Message-\n${this.result.message}\n\n-Skip Message-\n${this.result.skip_message}`
+      : this.result.message || this.result.skip_message;
   }
 }
 </script>