Merge branch 'master' into next

Author: ar2rsawseen

CHANGELOG.md

@@ -1,6 +1,38 @@
-## Version 25.03.X
+## Version 25.03.36
+Enterprise fixes:
+- [journey] Workflow fixes
+- [users] UI events table fixes
+
+## Version 25.03.35
+Fixes:
+- [core] Fixes for search bar in standart table component
+
+Enterprise fixes:
+- [journeys] Fixes for journey data updates on incoming data.
+- [surveys] Return error message if invalid widget_id passed on template loading
+- [users] Show content and journey events in user profile
+- [users] Display profile group name in table column
+- [users] When exporting user profiles, replace user name with device id if user name does not exist
+- [users] Use user profile endpoint for exporting data instead of the generic export endpoint
+
+## Version 25.03.34
 Fixes:
 - [core] Fix period calculation
+- [dashboards] Update dialog button color when deleting dashboard/widget
+- [star-rating] Fix rating number when exporting data
+
+Enterprise Fixes:
+- [content] Uniform journey and content block actions
+- [content] Fix overflow and missing translations in content blocks
+- [content] Fix button management when creating fullscreen content blocks
+- [crash_symbolication] Use countlyfs for JavaScript symbolication
+- [funnels] Fix funnel name tooltip content
+- [surveys] Allow surveys to resize and reposition when user rotates devices or adjust browser window
+- [nps] Allow nps to resize and reposition when user rotates devices or adjust browser window
+- [groups] Dealing with invalid values for group permission
+- [geo] Update table row cursor to indicate that it's clickable
+- [users] Change table column min-width to width so it can be resized even smaller
+- [users] Display filtered user count instead of all user count in the table summary
 
 ## Version 25.03.33
 Fixes:

api/parts/data/exports.js

@@ -285,6 +285,9 @@ function transformValuesInObject(doc, mapper) {
     }
     return doc;
 }
+
+exports.transformValuesInObject = transformValuesInObject;
+
 /**
 * function to collect calues in order based on current order.
 * @param {array} values - arary to collect values

api/utils/common.js

@@ -3258,7 +3258,9 @@ class DataTable {
      */
     _getSearchField() {
         if (this.searchStrategy === "regex") {
-            return {$regex: this.searchTerm, $options: 'i'};
+            const term = String(this.searchTerm);
+            const escaped = term.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            return ({$regex: escaped, $options: 'i'});
         }
         return this.searchTerm;
     }

bin/commands/countly.sh

@@ -121,6 +121,8 @@ countly_upgrade (){
         fi
 
         (cd "$DIR/../.." ;
+        echo "Installing plugins...";
+        node "$DIR/../scripts/install_plugins.js" --skip-production;
         echo "Preparing production files...";
         countly task dist-all;
         echo "Restarting Countly...";

bin/config/nginx.server.block.conf

@@ -71,6 +71,8 @@ server {
     # /at/*
     # /campaign/*
     # /dashboards/images/screenshots/screenshot_*.png
+    # /_external/content/ --> for content blocks
+    # /_external/content/asset/ --> for content block images
 
     location ~ (/pixel.png|/images/pre-login/countly-logo-dark.svg|/images/pre-login/countly-logo.svg|/images/dashboard/countly_logo.svg|/sdk/web/countly.min.js|/views/heatmap.js|/views/javascripts/simpleheat.js|/views/stylesheets/heatmap.css|/stylesheets/font-awesome/css/*|/stylesheets/font-awesome/fonts/*|/fonts/*|/surveys/*|/stylesheets/ionicons/*|/feedback|/feedback/*|/star-rating/stylesheets/countly-feedback-web.css|/star-rating/stylesheets/countly-feedback.css|/star-rating/javascripts/tippy.all.min.js|/star-rating/images/star-rating/*|/javascripts/dom/jquery/*|/stylesheets/font-awesome/css/*|/stylesheets/font-awesome/fonts/*|/fonts/*|/stylesheets/ionicons/*|/at/*|/campaign/*|/images/dashboard/logo.png|/appimages/*.png|/dashboards/images/screenshots/screenshot_*.png) {
         if ($http_content_type = "text/ping") {

frontend/express/libs/members.js

@@ -761,6 +761,10 @@ membersUtility.reset = function(req, callback) {
             var secret = membersUtility.countlyConfig.passwordSecret || "";
             argon2Hash(req.body.password + secret).then(password => {
                 membersUtility.db.collection('password_reset').findOne({ prid: req.body.prid }, function(err, passwordReset) {
+                    if (err || !passwordReset || !passwordReset.user_id) {
+                        callback(false, undefined);
+                        return;
+                    }
                     membersUtility.db.collection('members').findAndModify({ _id: passwordReset.user_id }, {}, { '$set': { "password": password } }, function(err2, member) {
                         member = member && member.ok ? member.value : null;
                         killOtherSessionsForUser(passwordReset.user_id + "", null, null, membersUtility.db);

frontend/express/public/javascripts/countly/countly.common.js

@@ -3239,10 +3239,11 @@
         * @memberof countlyCommon
         * @param {number} second  number
         * @param {number} [trimTo=5]  number [1,5]
+        * @param {number} [digitsAfterComma=1]  number of digits after comma for seconds, default is 1, if seconds is less than 0.1 it will be shown as 0
         * @returns {string} return format "Xh Xm Xs", if trimTo is specified the length of the result is trimmed
         * @example trimTo = 2, "Xh Xm Xs" result will be trimmed to "Xh Xm"
         */
-        countlyCommon.formatSecond = function(second, trimTo = 5) {
+        countlyCommon.formatSecond = function(second, trimTo = 5, digitsAfterComma = 1) {
             var timeLeft = parseFloat(second);
             var dict = [
                 {k: 'year', v: 31536000},
@@ -3251,16 +3252,15 @@
                 {k: 'minute', v: 60},
                 {k: 'second', v: 1}
             ];
+            if (digitsAfterComma < 0 || digitsAfterComma > 10) {
+                digitsAfterComma = 0;
+            }
             var result = {year: 0, day: 0, hour: 0, minute: 0, second: 0};
             var resultStrings = [];
             for (var i = 0; i < dict.length && resultStrings.length < 3; i++) {
                 if (dict[i].k === "second") {
-                    if (timeLeft < 0.1) {
-                        result.second = 0;
-                    }
-                    else {
-                        result.second = Math.round(timeLeft * 10) / 10;
-                    }
+
+                    result.second = parseFloat(timeLeft.toFixed(digitsAfterComma));
                 }
                 else {
                     result[dict[i].k] = Math.floor(timeLeft / dict[i].v);

package-lock.json

@@ -88,7 +88,7 @@
     "moment-timezone": "0.6.0",
     "mongodb": "6.20.0",
     "nginx-conf": "2.1.0",
-    "nodemailer": "7.0.12",
+    "nodemailer": "7.0.13",
     "object-hash": "3.0.0",
     "properties-parser": "0.6.0",
     "puppeteer": "^24.6.1",

package.json

@@ -2088,11 +2088,11 @@ plugins.setConfigs("dashboards", {
     });
 
     plugins.register("/import", async function({params, importData}) {
-        if (importData.name === 'dashboards') {
+        if (importData && importData.name === 'dashboards') {
             await importDashboard(params, importData);
             return true;
         }
-        else if (importData.name === 'dashboard.widgets') {
+        else if (importData && importData.name === 'dashboard.widgets') {
             await importWidgets(params, importData);
             return true;
         }