Merge branch 'release.24.10' into release.24.12

# Conflicts: # CHANGELOG.md
Countly · Jan 14, 2025 · 59616b4 · 59616b4
2 parents 9f7f5bd + 7fe75a3
commit 59616b4
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,12 +8,17 @@ Features:
 - [user-management] Global admins can now disable 2FA for individual users
 
 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
+- [reports] Fixes report generation failure due to SSL error
+- [surveys] "Select one" text in the widget can be edited now
+- [system-utility] Fixed: Mongo error (code: 26) in some Countly instances when the profiler gets run for the first time
+
 
 Dependencies:
 - Bump express from 4.21.1 to 4.21.2
+- Bump sass from 1.81.0 to 1.83.3
 - Bump mocha from 10.2.0 to 10.8.2
-- Bump sass from 1.81.0 to 1.83.1
 - Bump countly-sdk-nodejs from 24.10.0 to 24.10.1
 - Bump countly-sdk-web from 24.11.2 to 24.11.3
 - Bump express-rate-limit from 7.4.1 to 7.5.0

diff --git a/api/utils/render.js b/api/utils/render.js
@@ -67,7 +67,7 @@ exports.renderView = function(options, cb) {
                     XDG_CONFIG_HOME: pathModule.resolve(__dirname, "../../.cache/chrome/tmp/.chromium"),
                     XDG_CACHE_HOME: pathModule.resolve(__dirname, "../../.cache/chrome/tmp/.chromium")
                 },
-                args: ['--no-sandbox', '--disable-setuid-sandbox'],
+                args: ['--no-sandbox', '--disable-setuid-sandbox', '--ignore-certificate-errors'],
                 ignoreHTTPSErrors: true,
                 userDataDir: pathModule.resolve(__dirname, "../../dump/chrome")
             };

diff --git a/frontend/express/public/core/events/javascripts/countly.details.models.js b/frontend/express/public/core/events/javascripts/countly.details.models.js
@@ -895,6 +895,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;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -83,7 +83,7 @@
     "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
     "properties-parser": "0.6.0",
     "puppeteer": "^23.8.0",
-    "sass": "1.83.1",
+    "sass": "1.83.3",
     "sqlite3": "^5.1.7",
     "tslib": "^2.6.3",
     "uglify-js": "3.19.3",

diff --git a/plugins/system-utility/api/api.js b/plugins/system-utility/api/api.js
@@ -209,12 +209,17 @@ function stopWithTimeout(type, fromTimeout = false) {
             validate(params, async() => {
                 try {
                     const tarStream = await systemUtility.profilerFilesTarStream();
-                    params.res.writeHead(200, {
-                        "Content-Type": "plain/text; charset=utf-8",
-                        "Content-Disposition": "attachment; filename=profiler.tar"
-                    });
-                    tarStream.on("end", () => params.res.end());
-                    tarStream.pipe(params.res);
+                    if (tarStream === null) {
+                        common.returnMessage(params, 404, "Profiler files not found");
+                    }
+                    else {
+                        params.res.writeHead(200, {
+                            "Content-Type": "plain/text; charset=utf-8",
+                            "Content-Disposition": "attachment; filename=profiler.tar"
+                        });
+                        tarStream.on("end", () => params.res.end());
+                        tarStream.pipe(params.res);
+                    }
                 }
                 catch (err) {
                     log.e(err);