Skip to content

Commit 59616b4

Browse files
committedJan 14, 2025·
Merge branch 'release.24.10' into release.24.12
# Conflicts: # CHANGELOG.md
2 parents 9f7f5bd + 7fe75a3 commit 59616b4

File tree

6 files changed

+30
-16
lines changed

6 files changed

+30
-16
lines changed
 

‎CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,17 @@ Features:
88
- [user-management] Global admins can now disable 2FA for individual users
99

1010
Fixes:
11+
- [core] Fixed a bug causing events to not being loaded when there's an escaped character in the event name
1112
- [gridfs] fixes for moving to Promises
13+
- [reports] Fixes report generation failure due to SSL error
14+
- [surveys] "Select one" text in the widget can be edited now
15+
- [system-utility] Fixed: Mongo error (code: 26) in some Countly instances when the profiler gets run for the first time
16+
1217

1318
Dependencies:
1419
- Bump express from 4.21.1 to 4.21.2
20+
- Bump sass from 1.81.0 to 1.83.3
1521
- Bump mocha from 10.2.0 to 10.8.2
16-
- Bump sass from 1.81.0 to 1.83.1
1722
- Bump countly-sdk-nodejs from 24.10.0 to 24.10.1
1823
- Bump countly-sdk-web from 24.11.2 to 24.11.3
1924
- Bump express-rate-limit from 7.4.1 to 7.5.0

‎api/utils/render.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ exports.renderView = function(options, cb) {
6767
XDG_CONFIG_HOME: pathModule.resolve(__dirname, "../../.cache/chrome/tmp/.chromium"),
6868
XDG_CACHE_HOME: pathModule.resolve(__dirname, "../../.cache/chrome/tmp/.chromium")
6969
},
70-
args: ['--no-sandbox', '--disable-setuid-sandbox'],
70+
args: ['--no-sandbox', '--disable-setuid-sandbox', '--ignore-certificate-errors'],
7171
ignoreHTTPSErrors: true,
7272
userDataDir: pathModule.resolve(__dirname, "../../dump/chrome")
7373
};

‎frontend/express/public/core/events/javascripts/countly.details.models.js

+3
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,9 @@
895895
return countlyAllEvents.service.fetchAllEventsData(context, period)
896896
.then(function(res) {
897897
if (res) {
898+
if (Array.isArray(res.list)) {
899+
res.list = res.list.map(eventName => countlyCommon.unescapeHtml(eventName));
900+
}
898901
context.commit("setAllEventsData", res);
899902
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)) {
900903
var appId = countlyCommon.ACTIVE_APP_ID;

‎package-lock.json

+8-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
"offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
8484
"properties-parser": "0.6.0",
8585
"puppeteer": "^23.8.0",
86-
"sass": "1.83.1",
86+
"sass": "1.83.3",
8787
"sqlite3": "^5.1.7",
8888
"tslib": "^2.6.3",
8989
"uglify-js": "3.19.3",

‎plugins/system-utility/api/api.js

+11-6
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,17 @@ function stopWithTimeout(type, fromTimeout = false) {
209209
validate(params, async() => {
210210
try {
211211
const tarStream = await systemUtility.profilerFilesTarStream();
212-
params.res.writeHead(200, {
213-
"Content-Type": "plain/text; charset=utf-8",
214-
"Content-Disposition": "attachment; filename=profiler.tar"
215-
});
216-
tarStream.on("end", () => params.res.end());
217-
tarStream.pipe(params.res);
212+
if (tarStream === null) {
213+
common.returnMessage(params, 404, "Profiler files not found");
214+
}
215+
else {
216+
params.res.writeHead(200, {
217+
"Content-Type": "plain/text; charset=utf-8",
218+
"Content-Disposition": "attachment; filename=profiler.tar"
219+
});
220+
tarStream.on("end", () => params.res.end());
221+
tarStream.pipe(params.res);
222+
}
218223
}
219224
catch (err) {
220225
log.e(err);

0 commit comments

Comments
 (0)
Please sign in to comment.