Merge branch 'release.24.05' into ar2rsawseen/24.05

Author: ar2rsawseen

CHANGELOG.md

@@ -1,3 +1,88 @@
+## Version 24.05.41
+Enterprise Fixes:
+- [cohorts] Fix query transformation for profile group
+- [users] Fix condition for custom property update
+- [users] Update user custom field number formatting
+
+
+## Version 24.05.40
+Fixes:
+- [populator] Fix NPS generator
+
+
+## Version 24.05.39
+Features:
+- [remote-config] Enable comparing newer/older app version in conditions
+
+Fixes:
+- [remote-config] Fix condition matching with compound conditions
+
+
+## Version 24.05.38
+Enterprise Fixes:
+- [home] Fix home download render issue
+
+## Version 24.05.37
+Enterprise Fixes:
+- [license] Update license metric endpoint permission
+
+
+## Version 24.05.36
+Features:
+- [plugins] Add configuration warning tags to settings UI
+
+## Version 24.05.35
+Fixes:
+- [core] Fix mongo connection url parsing
+- [dashboards] Delete associated widgets and reports when a dashboard is removed
+
+Enterprise Fixes:
+- [flows] Null checks on $size when calculating flows.
+
+## Version 24.05.34
+Enterprise Fixes:
+- [drill] Fixed typo issue while getting segment values in drill widgets
+
+## Version 24.05.33
+Fixes:
+- [emails] [puppeteer] [fix] Allow chrome to launch multiple instances
+
+
+## Version 24.05.32
+Enterprise Fixes:
+- [active-users] Fixed bug related to selecting calculation ranges. As a result, some dates were previously calculated on incomplete data set.
+
+
+## Version 24.05.31
+Fixes:
+- [feedback] Uniformize drawer internal name input texts
+- [feedback] Uniformize feedback widgets status tag
+- [star-rating] Allow bulk update of widget status
+- [star-rating] Fix rating score and responses table sorting
+- [UI] Remove white background from input character amount suffix
+
+Enterprise Fixes:
+ -  [retention] Fixed report loading 
+
+
+## Version 24.05.30
+Features:
+- [crashed] Fix unescaped SDK logs
+- [dashboards] Added the option to set a refresh rate for dashboards, allowing data to update more frequently for selected dashboards
+- [star-rating] Added missing columns to Rating Widgets table edit
+- [ui] Fix alignment of drawers title and close icon
+
+## Version 24.05.29
+Fixes:
+- [core] Allow downloading data also from other databases in dbviewer
+- [crash_symbolication] Symbolication server api end point test fix
+- [push] Fixed push notifications title and content text and variables combination
+- [reports] Correctly match event for email report if event key contains '.'
+
+## Version 24.05.28
+Enterprise Fixes:
+- [cohorts] Fixed issue with combining multiple cohorts
+
 ## Version 24.05.27
 Fixes:
 - [crashes] Remove memory addresses from stack trace grouping
@@ -57,7 +142,7 @@ Enterprise fixes:
 - [drill] [license] Update license loader to enable supplying db client
 - [users] Format data points displayed in user sidebar
 - [cohorts] Unescape drill texts in cohort component
-   
+
 Dependencies:
 - Bump fs-extra from 11.2.0 to 11.3.0
 - Bump nodemailer from 6.9.16 to 6.10.0
@@ -4495,4 +4580,3 @@ This version provides several features and bugfixes to both server and SDKs. The
     A user of an application can only view analytics for that application 
     and cannot edit its settings.
   * Added csfr protection to all methods provided through app.js.
-

api/utils/render.js

@@ -25,6 +25,7 @@ var chromePath = "";
 var countlyFs = require('./countlyFs');
 var log = require('./log.js')('core:render');
 var countlyConfig = require('./../config', 'dont-enclose');
+var fs = require('fs');
 
 
 /**
@@ -69,7 +70,7 @@ exports.renderView = function(options, cb) {
                 },
                 args: ['--no-sandbox', '--disable-setuid-sandbox', '--ignore-certificate-errors'],
                 ignoreHTTPSErrors: true,
-                userDataDir: pathModule.resolve(__dirname, "../../dump/chrome")
+                userDataDir: pathModule.resolve(__dirname, "../../dump/chrome/" + Date.now())
             };
 
             if (chromePath) {
@@ -251,6 +252,9 @@ exports.renderView = function(options, cb) {
                 await bodyHandle.dispose();
                 await browser.close();
 
+                // Remove user data directory after use
+                fs.rmSync(settings.userDataDir, { recursive: true, force: true });
+
                 var imageData = {
                     image: image,
                     path: path
@@ -261,6 +265,8 @@ exports.renderView = function(options, cb) {
             catch (e) {
                 log.e("Headless chrome browser error", e);
                 await browser.close();
+                // Remove user data directory after use
+                fs.rmSync(settings.userDataDir, { recursive: true, force: true });
                 return cb(e);
             }
         }

api/utils/requestProcessor.js

@@ -24,6 +24,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;
 
@@ -466,6 +467,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': {
@@ -2130,8 +2170,16 @@ const processRequest = (params) => {
 
                         dbUserHasAccessToCollection(params, params.qstring.collection, (hasAccess) => {
                             if (hasAccess) {
+                                var dbs = { countly: common.db, countly_drill: common.drillDb, countly_out: common.outDb, countly_fs: countlyFs.gridfs.getHandler() };
+                                var db = "";
+                                if (params.qstring.db && dbs[params.qstring.db]) {
+                                    db = dbs[params.qstring.db];
+                                }
+                                else {
+                                    db = common.db;
+                                }
                                 countlyApi.data.exports.fromDatabase({
-                                    db: (params.qstring.db === "countly_drill") ? common.drillDb : (params.qstring.dbs === "countly_drill") ? common.drillDb : common.db,
+                                    db: db,
                                     params: params,
                                     collection: params.qstring.collection,
                                     query: params.qstring.query,

api/utils/taskmanager.js

@@ -972,7 +972,13 @@ taskmanager.rerunTask = function(options, callback) {
         });
     }
 
-    options.db.collection("long_tasks").findOne({_id: options.id}, function(err, res) {
+    var qq = {_id: options.id};
+    if (options.additionalQuery) {
+        qq = options.additionalQuery;
+        qq._id = options.id;
+    }
+    log.d("Fetching from long_tasks to rerun: " + JSON.stringify(qq));
+    options.db.collection("long_tasks").findOne(qq, function(err, res) {
         if (!err && res && res.request) {
             var reqData = {};
             try {
@@ -982,6 +988,7 @@ taskmanager.rerunTask = function(options, callback) {
                 reqData = {};
             }
             if (reqData.uri) {
+                reqData.json = reqData.json || {};
                 reqData.json.task_id = options.id;
                 reqData.strictSSL = false;
                 if (reqData.json && reqData.json.period && Array.isArray(reqData.json.period)) {