Merge pull request #5900 from Countly/SER-2264-cannot-load-event-data…

…-when-theres-an-escaped-character-in-all-events-list [SER-2264] Cannot load event data when there's an escaped character in all events list
Countly · Jan 10, 2025 · f47b7f7 · f47b7f7
2 parents 827069e + 678496e
commit f47b7f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Version xx.xx.xx
 
 Fixes:
+- [core] Fixed a bug causing events to not being loaded when there's an escaped character in the event name
 - [gridfs] fixes for moving to Promises
 
 Dependencies:

diff --git a/frontend/express/public/core/events/javascripts/countly.details.models.js b/frontend/express/public/core/events/javascripts/countly.details.models.js
@@ -886,6 +886,9 @@
                 return countlyAllEvents.service.fetchAllEventsData(context, period)
                     .then(function(res) {
                         if (res) {
+                            if (Array.isArray(res.list)) {
+                                res.list = res.list.map(eventName => countlyCommon.unescapeHtml(eventName));
+                            }
                             context.commit("setAllEventsData", res);
                             if ((!context.state.selectedEventName) || (res.map && res.map[context.state.selectedEventName] && !res.map[context.state.selectedEventName].is_visible) || (res.list && res.list.indexOf(context.state.selectedEventName) === -1)) {
                                 var appId = countlyCommon.ACTIVE_APP_ID;