Merge branch 'next' into eslint-remove-no-console

Author: ar2rsawseen

.eslintrc.json

@@ -135,7 +135,7 @@
             },
             "env": {
                 "browser": true,
-                "es6": true
+                "es2020": true
             },
             "rules": {
                 "valid-jsdoc": [
@@ -208,7 +208,7 @@
             ],
             "excludedFiles": "plugins/*/frontend/public/**/*.js",
             "env": {
-                "es6": true,
+                "es2020": true,
                 "node": true
             },
             "parserOptions": {
@@ -285,7 +285,7 @@
             ],
             "excludedFiles": "plugins/*/tests.js",
             "env": {
-                "es6": true,
+                "es2020": true,
                 "node": true
             },
             "parserOptions": {
@@ -302,7 +302,7 @@
                 "plugins/*/tests.js"
             ],
             "env": {
-                "es6": true,
+                "es2020": true,
                 "node": true,
                 "mocha": true
             },
@@ -321,7 +321,7 @@
                 "ui-tests/**/*.js"
             ],
             "env": {
-                "es6": true,
+                "es2020": true,
                 "node": true,
                 "mocha": true
             },

.github/workflows/main.yml

@@ -64,7 +64,7 @@ jobs:
 
     services:
       mongodb:
-        image: mongo:6.0
+        image: mongo:7.0
         options: >-
           --health-cmd mongosh
           --health-interval 10s
@@ -121,7 +121,7 @@ jobs:
 
     services:
       mongodb:
-        image: mongo:6.0
+        image: mongo:7.0
         options: >-
           --health-cmd mongosh
           --health-interval 10s
@@ -168,7 +168,7 @@ jobs:
 
     services:
       mongodb:
-        image: mongo:6.0
+        image: mongo:7.0
         options: >-
           --health-cmd mongosh
           --health-interval 10s
@@ -221,7 +221,7 @@ jobs:
 
     services:
       mongodb:
-        image: mongo:6.0
+        image: mongo:7.0
         options: >-
           --health-cmd mongosh
           --health-interval 10s

CHANGELOG.md

@@ -1,3 +1,56 @@
+## Version 24.05.1
+Fixes:
+- [populator] Bugfix for - Can't edit populator template
+- [surveys] fix nps/survey background color
+- [alerts] fix for old data remains when the alerts metric is updated 
+- [star-rating] tooltips updates  
+- [populator] fix for correctly checking if different plugins enabled
+  
+Enterprise fixes:
+- [formulas] null checks
+- [surveys] survey/nps tooltips updates
+- [surveys] fix for nps/survey color hover
+- [surveys] Fix submit button
+- [users] add hinge back in user
+
+## Version 24.05
+Features:
+- [alerts] Alerts plugin revamp
+- [core] Ensure consistency when deleting dashboard user
+- [crashes] Contains operator for (App Version) filter on the Crash Overview page
+- [crashes] Sort crashes by filtered results
+- [dashboard] Show in UI which values are estimated
+- [dashboards] Improve dashboard list loading time
+- [data-manager] Add option to delete source events when merging
+- [date-picker] Date picker presets
+- [dev] Remote process profiling option
+- [events] Ensure consistency when deleting an event
+- [plugins] Dynamic plugins including docker
+- [populator] Crash and Symbolication examples
+- [populator] New Data Populator
+- [push] Move to new FCM API
+- [versions] View to display history of upgrades for server
+- [views] Visualize omitted views just like we visualize omited events in events section
+
+Enterprise Features:
+- [data-manager] Delete user property value
+- [data-manager] Transformation to copy event segmentation to user custom properties
+- [date-picker] Add "hours" and "minutes" options to "in the last" filtering
+- [flows] Allow disabling flows
+- [flows] Merge Flow plugin collections into single one
+- [license] Improve license emails
+- [surveys] Add "Internal Label" field to Surveys and Ratings
+- [surveys] Add custom properties to surveys
+- [surveys] Add optional ToC and Privacy Policy checkbox with URLs to feedback widgets
+- [surveys] Faster table loading through server side tables
+- [surveys] Removing connect.sid cookie in case of nps
+- [surveys] Responsiveness for survey/NPS/rating widget contents
+- [users] Profile Groups
+- [users] Purging user profiles in bulk
+- [users] Record hinge as user property 
+- [users] Select/deselect users
+- [users] User Profiles widget in dashboards
+
 ## Version 23.11.22
 Features:
 - [views] Added deselect All button

Gruntfile.js

@@ -327,7 +327,16 @@ module.exports = function(grunt) {
     grunt.registerTask('dist', ['sass', 'concat', 'uglify', 'cssmin']);
 
     grunt.registerTask('plugins', 'Minify plugin JS / CSS files and copy images', function() {
-        var plugins = require('./plugins/plugins.json'), js = [], css = [], img = [], fs = require('fs'), path = require('path');
+        var js = [], css = [], img = [], fs = require('fs'), path = require('path');
+
+        var pluginFolderPath = path.join(__dirname, 'plugins');
+        //read all folder names
+        var plugins = fs.readdirSync(pluginFolderPath);
+        //filter out only folders
+        plugins = plugins.filter(function(file) {
+            return fs.statSync(path.join(pluginFolderPath, file)).isDirectory();
+        });
+
         console.log('Preparing production files for following plugins: %j', plugins);
 
         if (plugins.indexOf('drill') !== -1 && plugins.indexOf('users') !== -1 && plugins.indexOf('push') !== -1) {
@@ -438,7 +447,16 @@ module.exports = function(grunt) {
     });
 
     grunt.registerTask('locales', 'Concat all locale files into one', function() {
-        var plugins = require('./plugins/plugins.json'), locales = {}, fs = require('fs'), path = require('path');
+        var locales = {}, fs = require('fs'), path = require('path');
+
+        var pluginFolderPath = path.join(__dirname, 'plugins');
+        //read all folder names
+        var plugins = fs.readdirSync(pluginFolderPath);
+        //filter out only folders
+        plugins = plugins.filter(function(file) {
+            return fs.statSync(path.join(pluginFolderPath, file)).isDirectory();
+        });
+
         console.log('Preparing locale files for core & plugins: %j', plugins);
 
         var pushLocaleFile = function(name, path) {

api/api.js

@@ -156,9 +156,9 @@ plugins.connectToAllDatabases().then(function() {
             console.log("Successfully stored batch state");
         }
         catch (ex) {
-            console.log("Could not store batch state");
+            console.log("Could not store batch state", ex);
         }
-        process.exit(code);
+        process.exit(typeof code === "number" ? code : 1);
     }
 
     /**

api/parts/data/usage.js

@@ -545,7 +545,7 @@ function processUserSession(dbAppUser, params, done) {
             uniqueLevelsMonth.push(params.time.day);
         }
 
-        if (userLastSeenDate.year() === params.time.yearly &&
+        if ((userLastSeenDate.year() + "") === (params.time.yearly + "") &&
                 Math.ceil(userLastSeenDate.format("DDD") / 7) < params.time.weekly) {
             uniqueLevels[uniqueLevels.length] = params.time.yearly + ".w" + params.time.weekly;
             uniqueLevelsZero.push("w" + params.time.weekly);

api/utils/common.js

@@ -2773,13 +2773,19 @@ common.updateAppUser = function(params, update, no_meta, callback) {
 * @param {object} metrics - metrics object from SDK request
 */
 common.processCarrier = function(metrics) {
-    if (metrics && metrics._carrier) {
+    // Initialize metrics if undefined
+    metrics = metrics || {};
+    if (metrics._carrier) {
         var carrier = metrics._carrier + "";
 
         //random hash without spaces
-        if (carrier.length === 16 && carrier.indexOf(" ") === -1) {
+        if ((carrier.length === 16 && carrier.indexOf(" ") === -1)) {
+            delete metrics._carrier;
+        }
+
+        // Since iOS 16.04 carrier returns value "--", interpret as Unknown by deleting
+        if (carrier === "--") {
             delete metrics._carrier;
-            return;
         }
 
         //random code
@@ -2791,15 +2797,16 @@ common.processCarrier = function(metrics) {
             }
             else {
                 delete metrics._carrier;
-                return;
             }
         }
 
         carrier = carrier.replace(/\w\S*/g, function(txt) {
             return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase();
         });
+
         metrics._carrier = carrier;
     }
+    metrics._carrier = metrics._carrier ? metrics._carrier : "Unknown";
 };
 
 /**
@@ -3817,4 +3824,4 @@ common.trimWhitespaceStartEnd = function(value) {
     return value;
 };
 
-module.exports = common;
+module.exports = common;

api/utils/taskmanager.js

@@ -956,15 +956,19 @@ taskmanager.rerunTask = function(options, callback) {
                                 errored: true,
                                 request: reqData
                             }, body);
-
                         }
                     }
+                    if (options.autoUpdate) { //as it is auto from task, do callback only after finishing calculations.
+                        callback1(null, "Success");
+                    }
                 }
             };
             if (common.processRequest) {
                 common.processRequest(params);
             }
-            callback1(null, "Success");
+            if (!options.autoUpdate) {
+                callback1(null, "Success");
+            }
         });
     }
 

bin/commands/countly.sh

@@ -111,7 +111,7 @@ countly_upgrade (){
     countly_root ;
     if [ $# -eq 0 ]
     then
-        INOFFLINEMODE=$(countly config 'api.offline_mode' | awk -F'= ' '{print $2}')
+        INOFFLINEMODE=$(countly config 'api.offline_mode' | awk '/=/{print $NF}')
 
         if [ "$INOFFLINEMODE" == "false" ]
         then

bin/countly.install_rhel.sh

@@ -60,7 +60,7 @@ sudo dnf install -y alsa-lib.x86_64 atk.x86_64 cups-libs.x86_64 gtk3.x86_64 libX
 sudo dnf update -y nss
 
 #install nodejs
-sudo dnf module install -y nodejs:18/common
+sudo dnf module install -y nodejs:20/common
 
 set +e
 NODE_JS_CMD=$(which nodejs)
@@ -87,7 +87,7 @@ sudo systemctl start sendmail > /dev/null || echo "sendmail service does not exi
 
 #install npm modules
 npm config set prefix "$DIR/../.local/"
-( cd "$DIR/.."; npm install -g [email protected]; npm install sqlite3 --build-from-source; npm install; npm install argon2 --build-from-source; )
+( cd "$DIR/.."; npm install argon2; npm install sqlite3 --build-from-source; npm install; )
 
 #install numactl
 sudo dnf install -y numactl

bin/countly.install_ubuntu.sh

@@ -58,7 +58,7 @@ sudo apt-get update
 sudo apt-get install -y ca-certificates curl gnupg
 sudo mkdir -p /etc/apt/keyrings
 curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-NODE_MAJOR=18
+NODE_MAJOR=20
 echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
 sudo apt-get update
 sudo apt-get install nodejs -y
@@ -91,7 +91,7 @@ sudo apt-get install -y sendmail
 
 #install npm modules
 npm config set prefix "$DIR/../.local/"
-( cd "$DIR/.."; npm install -g [email protected]; npm install sqlite3 --build-from-source; npm install; npm install argon2 --build-from-source; )
+( cd "$DIR/.."; npm install argon2; npm install sqlite3 --build-from-source; npm install; )
 
 #install mongodb
 if ! command -v mongod &> /dev/null; then

bin/scripts/fix-data/reports_snapshot_flag.js

@@ -0,0 +1,62 @@
+/**
+ *  Script to add no_snapshots flag to drill reports
+ *  Server: countly
+ *  Path: $(countly dir)/bin/scripts/reports_snapshot_flag.js
+ *  Command: node fix_null_uids.js
+ */
+const pluginManager = require('../../../plugins/pluginManager.js');
+var Promise = require("bluebird");
+
+console.log('looking for byval reports');
+
+
+Promise.all([pluginManager.dbConnection("countly")]).then(async function([countlyDb]) {
+    countlyDb.collection('long_tasks').find({"type": "drill", "linked_to._issuer": "wqm:drill", "manually_create": true}).toArray(function(err, reports) {
+        if (err) {
+            console.log('Error while fetching reports', err);
+            countlyDb.close();
+            return;
+        }
+        else {
+            console.log("checking reports");
+            reports = reports || [];
+            Promise.each(reports, function(report) {
+                return new Promise(function(resolve, reject) {
+
+                    try {
+                        report.request = JSON.parse(report.request);
+                        if (report.request && report.request.json && report.request.json.method === "segmentation" && report.request.json.projectionKey && !report.request.json.no_snapshots) {
+                            report.request.json.no_snapshots = true;
+                            countlyDb.collection('long_tasks').updateOne({_id: report._id}, {$set: {"request": JSON.stringify(report.request)}}, function(err) {
+                                if (err) {
+                                    console.log('Error while updating report', report._id);
+                                    reject();
+                                }
+                                else {
+                                    console.log('report updated', report._id);
+                                    resolve();
+                                }
+                            });
+                        }
+                        else {
+                            resolve();
+                        }
+                    }
+                    catch (e) {
+                        console.log('Error while parsing report', report._id);
+                        console.log(e);
+                        resolve();
+                    }
+                });
+            }).then(function() {
+                console.log('Finished');
+                countlyDb.close();
+                process.exit();
+            }).catch(function(err) {
+                console.log('Error', err);
+                countlyDb.close();
+                process.exit();
+            });
+        }
+    });
+});

bin/scripts/mongodb.install.sh

@@ -341,12 +341,12 @@ if [ $# -eq 0 ]; then
             exit 1
         fi
 
-        echo "[mongodb-org-6.0]
+        echo "[mongodb-org-7.0]
 name=MongoDB Repository
-baseurl=https://repo.mongodb.org/yum/redhat/${CENTOS_MAJOR}/mongodb-org/6.0/x86_64/
+baseurl=https://repo.mongodb.org/yum/redhat/${CENTOS_MAJOR}/mongodb-org/7.0/x86_64/
 gpgcheck=1
 enabled=1
-gpgkey=https://www.mongodb.org/static/pgp/server-6.0.asc" > /etc/yum.repos.d/mongodb-org-6.0.repo
+gpgkey=https://www.mongodb.org/static/pgp/server-7.0.asc" > /etc/yum.repos.d/mongodb-org-7.0.repo
 
         yum install -y mongodb-org
     elif [ -f /etc/lsb-release ]; then
@@ -359,8 +359,8 @@ gpgkey=https://www.mongodb.org/static/pgp/server-6.0.asc" > /etc/yum.repos.d/mon
             exit 1
         fi
 
-        wget -qO - https://www.mongodb.org/static/pgp/server-6.0.asc | sudo apt-key add -
-        echo "deb [ arch=amd64,arm64 ] http://repo.mongodb.org/apt/ubuntu ${UBUNTU_RELEASE}/mongodb-org/6.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-6.0.list ;
+        wget -qO - https://www.mongodb.org/static/pgp/server-7.0.asc | sudo apt-key add -
+        echo "deb [ arch=amd64,arm64 ] http://repo.mongodb.org/apt/ubuntu ${UBUNTU_RELEASE}/mongodb-org/7.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-7.0.list ;
         apt-get update
         DEBIAN_FRONTEND="noninteractive" apt-get install -y mongodb-org || (echo "Failed to install mongodb." ; exit)
     else