Merge branch 'master' into dependabot/npm_and_yarn/mongodb-6.19.0

ar2rsawseen · web-flow · commit d2e81505203e · 2025-09-06T14:55:41.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,28 @@
+## Version 25.03.XX
+Enterprise Fixes
+- [journeys] Fix for handling the skip threshold value when saving the journey
+- [journeys] Performance improvement on journey stat user list & UI bugfixes
+
+## Version 25.03.18
+Fixes:
+- [server-stats] Add new events to breakdown
+- [server-stats] Fix breakdown event calculation
+
+Enterprise Fixes:
+- [journeys] Fix for clearing content queue when journey is paused
+- [journeys] Fix for content shown event handling
+- [journeys] Fix for performance issues when huge number of journey instances created
+- [journeys] Update skip threshold when journeys are paused
+
+Dependencies:
+- Bump get-random-values from 3.0.0 to 4.0.0
+- Bump puppeteer from 24.16.1 to 24.16.2
+
 ## Version 25.03.17
 Enterprise Fixes:
 - [ldap] Recursive user search in ldap added
 - [license] Update metric endpoint permission
-  
+
 Dependencies:
 - Bump puppeteer from 24.16.2 to 24.17.0
 
diff --git a/api/utils/requestProcessor.js b/api/utils/requestProcessor.js
@@ -29,6 +29,7 @@ const validateUserForGlobalAdmin = validateGlobalAdmin;
 const validateUserForMgmtReadAPI = validateUser;
 const request = require('countly-request')(plugins.getConfig("security"));
 const Handle = require('../../api/parts/jobs/index.js');
+const render = require('../../api/utils/render.js');
 
 var loaded_configs_time = 0;
 
@@ -362,6 +363,45 @@ const processRequest = (params) => {
                 }
                 break;
             }
+            case '/o/render': {
+                validateUserForRead(params, function() {
+                    var options = {};
+                    var view = params.qstring.view || "";
+                    var route = params.qstring.route || "";
+                    var id = params.qstring.id || "";
+
+                    options.view = view + "#" + route;
+                    options.id = id ? "#" + id : "";
+
+                    var imageName = "screenshot_" + common.crypto.randomBytes(16).toString("hex") + ".png";
+
+                    options.savePath = path.resolve(__dirname, "../../frontend/express/public/images/screenshots/" + imageName);
+                    options.source = "core";
+
+                    authorize.save({
+                        db: common.db,
+                        multi: false,
+                        owner: params.member._id,
+                        ttl: 300,
+                        purpose: "LoginAuthToken",
+                        callback: function(err2, token) {
+                            if (err2) {
+                                common.returnMessage(params, 400, 'Error creating token: ' + err2);
+                                return false;
+                            }
+                            options.token = token;
+                            render.renderView(options, function(err3) {
+                                if (err3) {
+                                    common.returnMessage(params, 400, 'Error creating screenshot: ' + err3);
+                                    return false;
+                                }
+                                common.returnOutput(params, {path: common.config.path + "/images/screenshots/" + imageName});
+                            });
+                        }
+                    });
+                });
+                break;
+            }
             case '/i/app_users': {
                 switch (paths[3]) {
                 case 'create': {
diff --git a/frontend/express/app.js b/frontend/express/app.js
@@ -67,7 +67,6 @@ var versionInfo = require('./version.info'),
     url = require('url'),
     authorize = require('../../api/utils/authorizer.js'), //for token validations
     languages = require('../../frontend/express/locale.conf'),
-    render = require('../../api/utils/render.js'),
     rateLimit = require("express-rate-limit"),
     membersUtility = require("./libs/members.js"),
     argon2 = require('argon2'),
@@ -1877,48 +1876,6 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
         }
     });
 
-    app.get(countlyConfig.path + '/render', function(req, res) {
-        if (!req.session.uid) {
-            return res.redirect(countlyConfig.path + '/login');
-        }
-
-        var options = {};
-        var view = req.query.view || "";
-        var route = req.query.route || "";
-        var id = req.query.id || "";
-
-        options.view = view + "#" + route;
-        options.id = id ? "#" + id : "";
-
-        var randomString = (+new Date()).toString() + (Math.random()).toString();
-        var imageName = "screenshot_" + sha1Hash(randomString) + ".png";
-
-        options.savePath = path.resolve(__dirname, "./public/images/screenshots/" + imageName);
-        options.source = "core";
-
-        authorize.save({
-            db: countlyDb,
-            multi: false,
-            owner: req.session.uid,
-            ttl: 300,
-            purpose: "LoginAuthToken",
-            callback: function(err2, token) {
-                if (err2) {
-                    console.log(err2);
-                    return res.send(false);
-                }
-                options.token = token;
-                render.renderView(options, function(err3) {
-                    if (err3) {
-                        return res.send(false);
-                    }
-
-                    return res.send({path: countlyConfig.path + "/images/screenshots/" + imageName});
-                });
-            }
-        });
-    });
-
     app.get(countlyConfig.path + '/login/token/:token', function(req, res) {
         membersUtility.loginWithToken(req, function(member) {
             if (member) {
diff --git a/frontend/express/public/core/home/javascripts/countly.models.js b/frontend/express/public/core/home/javascripts/countly.models.js
@@ -1,4 +1,4 @@
-/* global countlyVue,CV,countlyCommon*/
+/* global countlyVue,CV,countlyCommon,countlyGlobal*/
 
 (function(countlyHomeView) {
     countlyHomeView.getVuexModule = function() {
@@ -12,11 +12,12 @@
         var HomeViewActions = {
             downloadScreen: function(context) {
                 return CV.$.ajax({
-                    type: "GET",
-                    url: "/render?view=/dashboard&route=/" + countlyCommon.ACTIVE_APP_ID + "/",
+                    type: "POST",
+                    url: "/o/render?view=/dashboard&route=/" + countlyCommon.ACTIVE_APP_ID + "/",
                     data: {
                         app_id: countlyCommon.ACTIVE_APP_ID,
                         "id": "main_home_view",
+                        api_key: countlyGlobal.member.api_key,
                         options: JSON.stringify({"dimensions": {"width": 2000, "padding": 25}})
                     },
                     dataType: "json"
diff --git a/frontend/express/public/core/home/javascripts/countly.views.js b/frontend/express/public/core/home/javascripts/countly.views.js
@@ -222,7 +222,7 @@ var HomeViewView = countlyVue.views.create({
                 CountlyHelpers.notify({type: "ok", title: jQuery.i18n.map["common.success"], message: jQuery.i18n.map["home.download.starting"], sticky: true, clearAll: true});
                 this.$store.dispatch("countlyHomeView/downloadScreen").then(function() {
                     if (self.$store.state.countlyHomeView.image) {
-                        CountlyHelpers.notify({type: "ok", title: jQuery.i18n.map["common.success"], message: "<a href='" + self.$store.state.countlyHomeView.image + "'>" + jQuery.i18n.map["common.download"] + "</a>", sticky: true, clearAll: true});
+                        CountlyHelpers.notify({type: "ok", title: jQuery.i18n.map["common.success"], message: "<a href='" + self.$store.state.countlyHomeView.image + "' target='_blank'>" + jQuery.i18n.map["common.download"] + "</a>", sticky: true, clearAll: true, html: true});
                     }
                     else {
                         CountlyHelpers.notify({type: "error", title: jQuery.i18n.map["common.error"], message: jQuery.i18n.map["common.error"], sticky: false, clearAll: true});
diff --git a/frontend/express/public/javascripts/countly/countly.helpers.js b/frontend/express/public/javascripts/countly/countly.helpers.js
@@ -337,7 +337,12 @@
         }
         var payload = {};
         var persistent = msg.persistent;
-        payload.text = countlyCommon.encodeHtml(msg.message);
+        if (msg.html) {
+            payload.text = msg.message;
+        }
+        else {
+            payload.text = countlyCommon.encodeHtml(msg.message);
+        }
         payload.autoHide = !msg.sticky;
         payload.id = msg.id;
         payload.width = msg.width;
diff --git a/plugins/dashboards/frontend/public/templates/email.html b/plugins/dashboards/frontend/public/templates/email.html
@@ -80,7 +80,7 @@
                     <td style="padding: 30px 0px 30px 0px;" class="logo" align="center">
                         <table border="0" cellpadding="0" cellspacing="0" width="100%" >
                             <tr>
-                                <td bgcolor="#ffffff" width="100" align="left"><a href="<%= version.page %>" target="_blank"><img alt="Logo" src="<%= typeof localhost !== 'undefined' ? localhost : host %>/images/pre-login/countly-logo-dark.png" width="150" style="display: block; font-family: Helvetica, Arial, sans-serif; color: #666666; font-size: 16px;" border="0"></a></td>
+                                <td bgcolor="#ffffff" width="100" align="left"><a href="<%= version.page %>" target="_blank"><img alt="Logo" src="<%= typeof localhost !== 'undefined' ? localhost : host %>/images/pre-login/countly-logo-dark.png" width="150" style="display: block; font-family: Helvetica, Arial, sans-serif; color: #666666; font-size: 16px;" border="0" data-test-id="countly-logo"></a></td>
                             </tr>
                         </table>
                     </td>
@@ -99,7 +99,7 @@
                     <td>
                         <table width="100%" align="center" border="0" cellspacing="0" cellpadding="0">
                             <tr>
-                                <td align="center" style="padding-top: 0px;" ><img alt="Dashboard" src="<%= typeof localhost !== 'undefined' ? localhost : host %>/dashboards/images/screenshots/<%= image.name %>" width="750" style="display: block;" border="0"></img></td>
+                                <td align="center" style="padding-top: 0px;" ><img alt="Dashboard" src="<%= typeof localhost !== 'undefined' ? localhost : host %>/dashboards/images/screenshots/<%= image.name %>" width="750" style="display: block;" border="0" data-test-id="dashboard-image"></img></td>
                             </tr>
                         </table>
                     </td>
@@ -142,4 +142,4 @@
 <!-- /Gmail hack -->
 
 </body>
-</html>
+</html>
diff --git a/plugins/server-stats/api/parts/stats.js b/plugins/server-stats/api/parts/stats.js
@@ -128,8 +128,10 @@ function increaseDataPoints(object, data) {
     object.ratings += (data.str || 0);
     object.apm += (data.apm || 0);
     object.custom += (data.ce || 0);
-    object.cs = (data.cs || 0);
-    object.ps = (data.ps || 0);
+    object.cs += (data.cs || 0);
+    object.ps += (data.ps || 0);
+    object.llm += (data.llm || 0);
+    object.aclk += (data.aclk || 0);
     if (data.dp) {
         object.dp += data.dp;
     }
@@ -241,7 +243,7 @@ function fetchDatapoints(db, filter, options, callback) {
     options.dateObjPrev = options.dateObjPrev || {};
     db.collection("server_stats_data_points").find(filter, {}).toArray(function(err, result) {
         var toReturn = {
-            "all-apps": {"events": 0, "sessions": 0, "push": 0, "dp": 0, "change": 0, "crash": 0, "views": 0, "actions": 0, "nps": 0, "surveys": 0, "ratings": 0, "apm": 0, "custom": 0},
+            "all-apps": {"events": 0, "sessions": 0, "push": 0, "dp": 0, "change": 0, "crash": 0, "views": 0, "actions": 0, "nps": 0, "surveys": 0, "ratings": 0, "apm": 0, "custom": 0, cs: 0, ps: 0, llm: 0, aclk: 0},
         };
 
         if (err || !result) {
@@ -280,7 +282,7 @@ function fetchDatapoints(db, filter, options, callback) {
 
         for (let i = 0; i < result.length; i++) {
             if (!toReturn[result[i].a]) {
-                toReturn[result[i].a] = {"events": 0, "sessions": 0, "push": 0, "dp": 0, "change": 0, "crash": 0, "views": 0, "actions": 0, "nps": 0, "surveys": 0, "ratings": 0, "apm": 0, "custom": 0};
+                toReturn[result[i].a] = {"events": 0, "sessions": 0, "push": 0, "dp": 0, "change": 0, "crash": 0, "views": 0, "actions": 0, "nps": 0, "surveys": 0, "ratings": 0, "apm": 0, "custom": 0, cs: 0, ps: 0, llm: 0, aclk: 0};
             }
             const dates = result[i].d;
             if (options.dateObj[result[i].m]) {
diff --git a/plugins/server-stats/frontend/public/javascripts/countly.models.js b/plugins/server-stats/frontend/public/javascripts/countly.models.js
@@ -122,6 +122,8 @@
                 "ps": periodData.ps,
                 "cs": periodData.cs,
                 "custom": periodData.custom,
+                llm: periodData.llm,
+                aclk: periodData.aclk,
             };
             let sortable = [];
             for (var event in brokendownEvents) {
@@ -152,7 +154,10 @@
                     "ps": periodData.ps,
                     "cs": periodData.cs,
                     "custom": periodData.custom,
+                    llm: periodData.llm,
+                    aclk: periodData.aclk,
                 },
+
                 "sorted_breakdown": sortable,
             });
         }
@@ -195,4 +200,4 @@
         }
     }
 
-})(window.countlyDataPoints = window.countlyDataPoints || {}, jQuery);
+})(window.countlyDataPoints = window.countlyDataPoints || {}, jQuery);
diff --git a/plugins/server-stats/frontend/public/javascripts/countly.views.js b/plugins/server-stats/frontend/public/javascripts/countly.views.js
@@ -55,7 +55,9 @@ var DataPointsView = countlyVue.views.create({
                 "custom": CV.i18n('server-stats.custom'),
                 "cs": CV.i18n('server-stats.cs'),
                 "ps": CV.i18n('server-stats.ps'),
-                "push": CV.i18n('server-stats.push')
+                "push": CV.i18n('server-stats.push'),
+                llm: CV.i18n('server-stats.llm'),
+                aclk: CV.i18n('server-stats.aclk'),
             };
             return eventsBreakdownEnum[key];
         },
@@ -310,9 +312,11 @@ var DataPointsView = countlyVue.views.create({
                 item[CV.i18n('server-stats.events') + ": " + CV.i18n('server-stats.ratings')] = dataPoints[k].events_breakdown.ratings;
                 item[CV.i18n('server-stats.events') + ": " + CV.i18n('server-stats.apm')] = dataPoints[k].events_breakdown.apm;
                 item[CV.i18n('server-stats.events') + ": " + CV.i18n('server-stats.custom')] = dataPoints[k].events_breakdown.custom;
-                item[CV.i18n('server-stats.push')] = dataPoints[k].events_breakdown.push;
-                item[CV.i18n('server-stats.ps')] = dataPoints[k].events_breakdown.ps;
-                item[CV.i18n('server-stats.cs')] = dataPoints[k].events_breakdown.cs;
+                item[CV.i18n('server-stats.events') + ": " + CV.i18n('server-stats.push')] = dataPoints[k].events_breakdown.push;
+                item[CV.i18n('server-stats.events') + ": " + CV.i18n('server-stats.ps')] = dataPoints[k].events_breakdown.ps;
+                item[CV.i18n('server-stats.events') + ": " + CV.i18n('server-stats.cs')] = dataPoints[k].events_breakdown.cs;
+                item[CV.i18n('server-stats.events') + ": " + CV.i18n('server-stats.llm')] = dataPoints[k].events_breakdown.llm;
+                item[CV.i18n('server-stats.events') + ": " + CV.i18n('server-stats.aclk')] = dataPoints[k].events_breakdown.aclk;
                 item[CV.i18n('server-stats.data-points')] = dataPoints[k]['data-points'];
                 item[CV.i18n('server-stats.datapoint-change')] = dataPoints[k].change;
                 table.push(item);
@@ -346,4 +350,4 @@ app.route("/manage/data-points/*id", 'data-points', function(id) {
     this.renderWhenReady(this.dataPointsView);
 });
 
-app.addMenu("management", {code: "data-point", permission: "server-stats", url: "#/manage/data-points", text: "server-stats.data-points", priority: 40});
+app.addMenu("management", {code: "data-point", permission: "server-stats", url: "#/manage/data-points", text: "server-stats.data-points", priority: 40});
diff --git a/plugins/server-stats/frontend/public/localization/server-stats.properties b/plugins/server-stats/frontend/public/localization/server-stats.properties
@@ -28,3 +28,5 @@ server-stats.custom = Custom Events
 server-stats.cs = Consent event
 server-stats.ps = Push Sent event
 server-stats.push = Push Action event
+server-stats.llm = Countly AI event
+server-stats.aclk = Campaign event
diff --git a/ui-tests/package-lock.json b/ui-tests/package-lock.json
diff --git a/ui-tests/package.json b/ui-tests/package.json

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ var HomeViewView = countlyVue.views.create({`
`222`	`222`	`CountlyHelpers.notify({type: "ok", title: jQuery.i18n.map["common.success"], message: jQuery.i18n.map["home.download.starting"], sticky: true, clearAll: true});`
`223`	`223`	`this.$store.dispatch("countlyHomeView/downloadScreen").then(function() {`
`224`	`224`	`if (self.$store.state.countlyHomeView.image) {`
`225`		`- CountlyHelpers.notify({type: "ok", title: jQuery.i18n.map["common.success"], message: "<a href='" + self.$store.state.countlyHomeView.image + "'>" + jQuery.i18n.map["common.download"] + "</a>", sticky: true, clearAll: true});`
	`225`	`+ CountlyHelpers.notify({type: "ok", title: jQuery.i18n.map["common.success"], message: "<a href='" + self.$store.state.countlyHomeView.image + "' target='_blank'>" + jQuery.i18n.map["common.download"] + "</a>", sticky: true, clearAll: true, html: true});`
`226`	`226`	`}`
`227`	`227`	`else {`
`228`	`228`	`CountlyHelpers.notify({type: "error", title: jQuery.i18n.map["common.error"], message: jQuery.i18n.map["common.error"], sticky: false, clearAll: true});`