Merge pull request #6620 from Countly/master-v25.03.18-into-next

Master v25.03.18 into next

Author: gabrieloliveirapinto

CHANGELOG.md

@@ -2,11 +2,26 @@
 Dependencies:
 - Remove SQLite
 
+## 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
 

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]) {

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);

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});

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

ui-tests/package-lock.json

@@ -10,7 +10,7 @@
   },
   "license": "ISC",
   "dependencies": {
-    "@faker-js/faker": "^9.7.0",
+    "@faker-js/faker": "^10.0.0",
     "base-64": "^1.0.0",
     "chai": "^5.1.1",
     "cypress-file-upload": "^5.0.8",