Merge pull request #92 from center-for-threat-informed-defense/AF-127…

…_text_trimming AF-127 Text Trimming
center-for-threat-informed-defense · Jul 28, 2023 · 733996d · 733996d
2 parents 17bcc8f + 4197076
commit 733996d
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/src/attack_flow_builder/src/assets/builder.config.publisher.ts b/src/attack_flow_builder/src/assets/builder.config.publisher.ts
@@ -11,7 +11,8 @@ import {
     Property,
     PropertyType,
     RawEntries,
-    SemanticAnalyzer
+    SemanticAnalyzer,
+    StringProperty
 } from "./scripts/BlockDiagram";
 
 
@@ -206,6 +207,11 @@ class AttackFlowPublisher extends DiagramPublisher {
                         node[key] = prop.toRawValue();
                     }
             }
+
+            // Remove trailing whitespace on StringProperties
+            if (prop instanceof StringProperty && prop.isDefined()) {
+                node[key] = prop.toString().trim();
+            }
         }
     }
 
@@ -239,6 +245,11 @@ class AttackFlowPublisher extends DiagramPublisher {
                         this.mergeBasicListProperty(node, key, prop as ListProperty);
                     }
                     break;
+                case PropertyType.String: // Remove trailing whitespace on StringProperties
+                    if (prop.isDefined()) {
+                        node[key] = prop.toString().trim();
+                    }
+                    break;
                 default:
                     if(prop.isDefined()) {
                         node[key] = prop.toRawValue();
@@ -267,6 +278,11 @@ class AttackFlowPublisher extends DiagramPublisher {
                     throw new Error("Basic lists cannot contain lists.");
                 case PropertyType.Enum:
                     throw new Error("Basic lists cannot contain enums.");
+                case PropertyType.String: // Remove trailing whitespace on StringProperties
+                    if(prop.isDefined()) {
+                        node[key].push(prop.toString().trim());
+                    }
+                    break;
                 default:
                     if(prop.isDefined()) {
                         node[key].push(prop.toRawValue());
@@ -689,6 +705,7 @@ class AttackFlowPublisher extends DiagramPublisher {
                     flow[key] = prop
                         .toReferenceValue()!
                         .toString()
+                        .trim()
                         .toLocaleLowerCase();
                     break;
                 default:
@@ -818,11 +835,12 @@ class AttackFlowPublisher extends DiagramPublisher {
                         author[key] = prop
                             .toReferenceValue()!
                             .toString()
+                            .trim()
                             .toLocaleLowerCase();
                         break;
                     default:
                         if(prop.isDefined()) {
-                            author[key] = prop.toRawValue()
+                            author[key] = prop.toString().trim();
                         }
                         break;
                 }