Merge branch 'master' into dependabot/npm_and_yarn/ui-tests/systeminformation-5.31.1

Author: can-angun

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 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
@@ -6,6 +11,9 @@ 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:

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

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

@@ -4559,10 +4559,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},
@@ -4571,16 +4572,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);

plugins/views/frontend/public/javascripts/countly.models.js

@@ -63,7 +63,7 @@
             var data = {
                 "app_id": countlyCommon.ACTIVE_APP_ID,
                 "method": "views",
-                "period": countlyCommon.getPeriodForAjax(),
+                "period": countlyCommon.getPeriodAsDateStrings(),
                 "action": "getTotals"
             };
 
@@ -169,7 +169,7 @@
                 method: 'views',
                 action: 'getTable',
                 visibleColumns: JSON.stringify(context.state.params.selectedDynamicCols),
-                period: countlyCommon.getPeriodForAjax(),
+                period: countlyCommon.getPeriodAsDateStrings()
             };
             data = data || {};
             var selectedInfo = context.getters.selectedData;
@@ -710,11 +710,11 @@
     //graphData['appID'][]
     //Public Methods
     countlyViews.initialize = function() {
-        if (_initialized && _period === countlyCommon.getPeriodForAjax() && _activeAppKey === countlyCommon.ACTIVE_APP_KEY) {
+        if (_initialized && _period === countlyCommon.getPeriodAsDateStrings() && _activeAppKey === countlyCommon.ACTIVE_APP_KEY) {
             return this.refresh();
         }
 
-        _period = countlyCommon.getPeriodForAjax();
+        _period = countlyCommon.getPeriodAsDateStrings();
         this.reset();
         if (!countlyCommon.DEBUG) {
             _activeAppKey = countlyCommon.ACTIVE_APP_KEY;
@@ -884,10 +884,10 @@
                 return this.initialize();
             }
             var periodIsOk = true;
-            if (_period !== countlyCommon.getPeriodForAjax()) {
+            if (_period !== countlyCommon.getPeriodAsDateStrings()) {
                 periodIsOk = false;
             }
-            _period = countlyCommon.getPeriodForAjax();
+            _period = countlyCommon.getPeriodAsDateStrings();
 
             var selected = [];
 
@@ -1025,7 +1025,7 @@
     };
 
     countlyViews.loadActionsData = function(view) {
-        _period = countlyCommon.getPeriodForAjax();
+        _period = countlyCommon.getPeriodAsDateStrings();
 
         return $.when(
             $.ajax({

plugins/views/frontend/public/javascripts/countly.views.js

@@ -605,7 +605,7 @@
             getExportQuery: function() {
 
                 // var set = this.dtable.fnSettings();
-                var requestPath = countlyCommon.API_PARTS.data.r + "?method=views&action=getExportQuery" + "&period=" + countlyCommon.getPeriodForAjax() + "&iDisplayStart=0&app_id=" + countlyCommon.ACTIVE_APP_ID + '&api_key=' + countlyGlobal.member.api_key;
+                var requestPath = countlyCommon.API_PARTS.data.r + "?method=views&action=getExportQuery" + "&period=" + countlyCommon.getPeriodAsDateStrings() + "&iDisplayStart=0&app_id=" + countlyCommon.ACTIVE_APP_ID + '&api_key=' + countlyGlobal.member.api_key;
 
 
                 var segment = this.$store.state.countlyViews.selectedSegment;
@@ -654,7 +654,7 @@
             openDrillViewDrawer: function() {
                 let self = this;
                 let args = {
-                    "period": countlyCommon.getPeriod(),
+                    "period": countlyCommon.getPeriodAsDateStrings(),
                     "selectedSegment": this.filter.segment,
                     "selectedSegmentValues": (this.filter.segmentKey && this.filter.segmentKey !== "all") ? [this.filter.segmentKey] : [],
                     "selectedViews": this.$store.state.countlyViews.selectedViews.map(function(id) {