Skip to content

Commit 9ade301

Browse files
kanwarujjavalkanwarujjaval
authored
Merge branch 'next' into cly-vue-notification-css-issue
2 parents 98c1f08 + 25b371d commit 9ade301

File tree

15 files changed

+223
-225
lines changed

15 files changed

+223
-225
lines changed

‎.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: CI
66
on:
77
# Triggers the workflow on push or pull request events but only for the master branch
88
pull_request:
9-
branches: [ master, next ]
9+
branches: [ master, next, release.24.10 ]
1010

1111
# Allows you to run this workflow manually from the Actions tab
1212
workflow_dispatch:

‎CHANGELOG.md

+38-32
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,41 @@
1+
## Version 24.10.2
2+
Fixes:
3+
- [core] Correct aggregated collection cleanup on event omitting
4+
- [core] Fixed bug where changing passwords results in the loss of the "Global Admin" role
5+
- [core] Fixed bug where exporting incoming data logs could result in "Incorrect parameter \"data\" error
6+
- [core] Removed use of commands which needs admin rights from report manager.
7+
- [crash] Fixed bug in crash ingestion for scenarios where the "app version" is not a string.
8+
- [script] Fixing bug with "delete_old_members" script that led to malformed requests
9+
10+
Enterprise fixes:
11+
- [nps] Fixed bug that showed the wrong nps preview title
12+
113
## Version 24.10.1
2-
Integrating 24.05.16 fixes
14+
Fixes:
15+
- [core] Replaced "Users" with "Sessions" label on technology home widgets
16+
- [push] Improved ability to observe push related errors
17+
- [push] Replaced push plugin with an earlier version of the plugin
18+
19+
Enterprise fixes:
20+
- [cohorts] Fixed issues with nightly cleanup
21+
- [data-manager] Fixed UI bug where rules were not visible when editing "Merge by regex" transformations
22+
- [drill] Fixed wrong pie chart label tooltip in dashboard widget
23+
- [flows] Fixed bug in case of null data in schema
24+
- [license] Fixed bug with MAU type of licenses that would prevent the server from starting
25+
- [nps] Fixed bug in the editor where the "internal name" field was not mandatory
26+
- [nps] Fixed bug where it was possible to submit empty nps surveys
27+
- [ratings] Fixed bug with user consent
28+
- [ratings] Fixed UI bug where "Internal name" was not a mandatory field
29+
30+
Security:
31+
- Bumped cookie-parser from 1.4.6 to 1.4.7
32+
- Bumped express-rate-limit from 7.4.0 to 7.4.1
33+
- Bumped moment-timezone from 0.5.45 to 0.5.46
34+
- Bumped sass from 1.79.3 to 1.79.4
35+
- Fixing minor vulnerability that would allow for unauthorized file upload
36+
37+
Enterprise Features:
38+
- [block] Added a way to filter crashes by their error (stacktrace)
339

440
## Version 24.10
541
Fixes:
@@ -35,39 +71,9 @@ Enterprise Features:
3571
- [users] UI improvements
3672
- [views] Added a quick transition to drill
3773

38-
## Version 24.05.17
39-
Fixes:
40-
- [push] Improved ability to observe push related errors
41-
42-
Enterprise fixes:
43-
- [cohorts] Fixed issues with nightly cleanup
44-
- [data-manager] Fixed UI bug where rules were not visible when editing "Merge by regex" transformations
45-
- [drill] Fixed wrong pie chart label tooltip in dashboard widget
46-
- [flows] Fixed bug in case of null data in schema
47-
- [nps] Fixed bug in the editor where the "internal name" field was not mandatory
48-
- [ratings] Fixed UI bug where "Internal name" was not a mandatory field
49-
50-
Security:
51-
- Fixing minor vulnerability that would allow for unauthorized file upload
52-
53-
## Version 24.05.16
54-
Fixes:
55-
- [core] Replaced "Users" with "Sessions" label on technology home widgets
56-
- [push] Replaced push plugin with an earlier version of the plugin
57-
58-
Enterprise fixes:
59-
- [license] Fixed bug with MAU type of licenses that would prevent the server from starting
60-
- [nps] Fixed bug where it was possible to submit empty nps surveys
61-
- [ratings] Fixed bug with user consent
62-
63-
Security:
64-
- Bumped cookie-parser from 1.4.6 to 1.4.7
65-
- Bumped express-rate-limit from 7.4.0 to 7.4.1
66-
- Bumped moment-timezone from 0.5.45 to 0.5.46
67-
- Bumped sass from 1.79.3 to 1.79.4
68-
6974
## Version 24.05.15
7075
Enterprise fixes:
76+
- [ab-testing] Fixed JSON.parse issue preventing creation of AB tests
7177
- [nps] Fixed UI issues in the widget editor related to the "user consent" section
7278
- [ratings] Fixed rendering issue for escaped values
7379

‎api/utils/requestProcessor.js

+2-14
Original file line numberDiff line numberDiff line change
@@ -828,17 +828,6 @@ const processRequest = (params) => {
828828
});
829829
});
830830
break;
831-
case 'stop':
832-
validateUserForWrite(params, () => {
833-
taskmanager.stopTask({
834-
db: common.db,
835-
id: params.qstring.task_id,
836-
op_id: params.qstring.op_id
837-
}, (err, res) => {
838-
common.returnMessage(params, 200, res);
839-
});
840-
});
841-
break;
842831
case 'delete':
843832
validateUserForWrite(params, () => {
844833
taskmanager.deleteResult({
@@ -1183,7 +1172,7 @@ const processRequest = (params) => {
11831172
return new Promise(function(resolve) {
11841173
var collectionNameWoPrefix = common.crypto.createHash('sha1').update(obj.key + params.qstring.app_id).digest('hex');
11851174
//removes all document for current segment
1186-
common.db.collection("events" + collectionNameWoPrefix).remove({"s": {$in: obj.list}}, {multi: true}, function(err3) {
1175+
common.db.collection("events_data").remove({"_id": {"$regex": ("^" + params.qstring.app_id + "_" + collectionNameWoPrefix + "_.*")}, "s": {$in: obj.list}}, {multi: true}, function(err3) {
11871176
if (err3) {
11881177
console.log(err3);
11891178
}
@@ -1198,7 +1187,7 @@ const processRequest = (params) => {
11981187
unsetUs["meta_v2." + obj.list[p]] = "";
11991188
}
12001189
//clears out meta data for segments
1201-
common.db.collection("events" + collectionNameWoPrefix).update({$or: my_query}, {$unset: unsetUs}, {multi: true}, function(err4) {
1190+
common.db.collection("events_data").update({"_id": {"$regex": ("^" + params.qstring.app_id + "_" + collectionNameWoPrefix + "_.*")}, $or: my_query}, {$unset: unsetUs}, {multi: true}, function(err4) {
12021191
if (err4) {
12031192
console.log(err4);
12041193
}
@@ -1242,7 +1231,6 @@ const processRequest = (params) => {
12421231
else {
12431232
resolve();
12441233
}
1245-
12461234
});
12471235
}
12481236
else {

‎api/utils/taskmanager.js

+2-123
Original file line numberDiff line numberDiff line change
@@ -58,88 +58,14 @@ const log = require('./log.js')('core:taskmanager');
5858
* }, outputData:function(err, data){
5959
* common.returnOutput(params, data);
6060
* }
61-
* }));
61+
* }));
6262
*/
6363
taskmanager.longtask = function(options) {
6464
options.db = options.db || common.db;
6565
var exceeds = false;
6666
var start = new Date().getTime();
6767
var timeout;
6868

69-
var saveOpId = async function(comment_id, retryCount) {
70-
common.db.admin().command({ currentOp: 1 }, async function(error, result) {
71-
if (error) {
72-
log.d(error);
73-
return;
74-
}
75-
else {
76-
if (result && result.inprog) {
77-
for (var i = 0; i < result.inprog.length; i++) {
78-
let op = result.inprog[i];
79-
if (!('$truncated' in op.command) && (i !== result.inprog.length - 1)) {
80-
continue;
81-
}
82-
if (!('$truncated' in op.command) && (i === result.inprog.length - 1)) {
83-
if (retryCount < 3) {
84-
setTimeout(() => saveOpId(comment_id, (++retryCount)), 500);
85-
return;
86-
}
87-
else {
88-
log.d(`operation not found for task:${options.id} comment: ${comment_id}`);
89-
break;
90-
}
91-
}
92-
93-
let comment_position = op.command.$truncated.indexOf('$comment');
94-
if (comment_position === -1) {
95-
continue;
96-
}
97-
98-
let substr = op.command.$truncated.substring(comment_position, op.command.$truncated.length) || "";
99-
var comment_val = "";
100-
substr = substr.match(/"(.*?)"/);
101-
if (substr && Array.isArray(substr)) {
102-
comment_val = substr[1];
103-
}
104-
105-
if (comment_val === comment_id) {
106-
var task_id = options.id;
107-
var op_id = op.opid;
108-
await common.db.collection("long_tasks").findOneAndUpdate({ _id: common.db.ObjectID(task_id) }, { $set: { op_id: op_id } });
109-
log.d(`Operation found task: ${task_id} op:${op_id} comment: ${comment_id}`);
110-
break;
111-
}
112-
else if ((comment_val !== comment_id) && (i === (result.inprog.length - 1))) {
113-
if (retryCount < 3) {
114-
setTimeout(() => saveOpId(comment_id, (++retryCount)), 500);
115-
break;
116-
}
117-
else {
118-
log.d(`operation not found for task:${options.id} comment: ${comment_id}`);
119-
break;
120-
}
121-
}
122-
}
123-
}
124-
}
125-
});
126-
};
127-
128-
if (options.comment_id) {
129-
var retryCount = 0;
130-
try {
131-
saveOpId(options.comment_id, retryCount);
132-
}
133-
catch (err) {
134-
if (retryCount < 3) {
135-
setTimeout(() =>saveOpId(options.comment_id, ++retryCount), 500);
136-
}
137-
else {
138-
console.log(err);
139-
}
140-
}
141-
}
142-
14369
/** switching to long task */
14470
function switchToLongTask() {
14571
timeout = null;
@@ -298,9 +224,6 @@ taskmanager.createTask = function(options, callback) {
298224
update.subtask_key = options.subtask_key || "";
299225
update.taskgroup = options.taskgroup || false;
300226
update.linked_to = options.linked_to;
301-
if (options.comment_id) {
302-
update.comment_id = options.comment_id;
303-
}
304227
if (options.subtask && options.subtask !== "") {
305228
update.subtask = options.subtask;
306229
var updateSub = {$set: {}};
@@ -1117,50 +1040,6 @@ taskmanager.rerunTask = function(options, callback) {
11171040
});
11181041
};
11191042

1120-
taskmanager.stopTask = function(options, callback) {
1121-
options.db = options.db || common.db;
1122-
1123-
/**
1124-
* Stop task
1125-
* @param {object} op_id - operation id for mongo process
1126-
* @param {object} options1.db - database connection
1127-
* @param {string} options1.id - id of the task result
1128-
* @param {object} reqData - request data
1129-
* @param {funciton} callback1 - callback for the result
1130-
*/
1131-
function stopTask(op_id) {
1132-
common.db.admin().command({ killOp: 1, op: Number.parseInt(op_id) }, function(error, result) {
1133-
if (result.ok === 1) {
1134-
callback(null, "Success");
1135-
}
1136-
else {
1137-
callback(null, "Operation could not be stopped");
1138-
}
1139-
});
1140-
}
1141-
1142-
options.db.collection("long_tasks").findOne({ _id: options.id }, function(err, res) {
1143-
if (res) {
1144-
if (res.creator) {
1145-
options.db.collection("members").findOne({ _id: common.db.ObjectID(res.creator) }, function(err1, member) {
1146-
if (member) {
1147-
stopTask(res.op_id);
1148-
}
1149-
else {
1150-
callback(null, "No permission to stop this task");
1151-
}
1152-
});
1153-
}
1154-
else {
1155-
stopTask(res.op_id);
1156-
}
1157-
}
1158-
else {
1159-
callback(null, "Task does not exist");
1160-
}
1161-
});
1162-
};
1163-
11641043
/**
11651044
* Create a callback for getting result, including checking gridfs
11661045
* @param {function} callback - callback for the result
@@ -1201,4 +1080,4 @@ function getResult(callback, options) {
12011080
}
12021081
};
12031082
}
1204-
module.exports = taskmanager;
1083+
module.exports = taskmanager;

0 commit comments

Comments
 (0)