From 26555f11f7a29009b0a3fa7bd0d733d0bbbda250 Mon Sep 17 00:00:00 2001
From: Jay Allen <107942890+jallentxbiomed@users.noreply.github.com>
Date: Wed, 13 Aug 2025 10:19:00 -0500
Subject: [PATCH] trim spaces on eventDataNarrative attribute brackets (#1010)

---
 snd/src/org/labkey/snd/SNDManager.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/snd/src/org/labkey/snd/SNDManager.java b/snd/src/org/labkey/snd/SNDManager.java
index d04bd0cc8..124b16018 100644
--- a/snd/src/org/labkey/snd/SNDManager.java
+++ b/snd/src/org/labkey/snd/SNDManager.java
@@ -3457,7 +3457,12 @@ private String generateEventDataNarrative(Container c, User u, Event event, Even
                         value = "<span class='" + AttributeData.ATTRIBUTE_DATA_CSS_CLASS + "'>" + value + "</span>";
                     }
 
-                    eventDataNarrative = new StringBuilder(eventDataNarrative.toString().replace("{" + pd.getName() + "}", value));
+                    // Trim any spaces immediately inside '{' and '}' to make tokens like "{ route 2}" -> "{route 2}"
+                    String normalized = eventDataNarrative.toString()
+                            .replaceAll("\\{\\s+", "{")
+                            .replaceAll("\\s+\\}", "}");
+
+                    eventDataNarrative = new StringBuilder(normalized.replace("{" + pd.getName() + "}", value));
                 }
             }