Merge branch 'master' into dependabot/npm_and_yarn/ui-tests/faker-js/faker-10.3.0

Author: can-angun

CHANGELOG.md

@@ -1,14 +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/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/dashboards/frontend/public/javascripts/countly.views.js

@@ -512,12 +512,9 @@
                 ];
 
                 var allowPublicDashboards = countlyGlobal.allow_public_dashboards !== false;
-                var sharingOptions = allowPublicDashboards ? allSharingOptions : allSharingOptions.filter(function(option) {
-                    return option.value !== "all-users";
-                });
-
                 return {
-                    sharingOptions: sharingOptions
+                    sharingOptions: allSharingOptions,
+                    isPublicDisabled: !allowPublicDashboards
                 };
             },
             canShare: function() {
@@ -666,6 +663,14 @@
                         doc.share_with = "none";
                     }
                 }
+                else {
+                    var allowPublicDashboards = countlyGlobal.allow_public_dashboards !== false;
+                    if (!allowPublicDashboards &&
+                        (doc.__action === "create" || doc.__action === "duplicate") &&
+                        doc.share_with === "all-users") {
+                        doc.share_with = "";
+                    }
+                }
             },
             onClose: function() {
                 this.$store.dispatch("countlyDashboards/requests/drawerOpenStatus", false);
@@ -986,7 +991,7 @@
 
                 case "delete":
                     d.__action = "delete";
-                    CountlyHelpers.confirm(this.i18nM("dashboards.delete-widget-text"), "popStyleGreen", function(result) {
+                    CountlyHelpers.confirm(this.i18nM("dashboards.delete-widget-text"), "danger", function(result) {
                         if (!result) {
                             return false;
                         }
@@ -1579,7 +1584,7 @@
 
                 case "delete":
                     d.__action = "delete";
-                    CountlyHelpers.confirm(this.i18n("dashboards.delete-dashboard-text", d.name), "popStyleGreen", function(result) {
+                    CountlyHelpers.confirm(this.i18n("dashboards.delete-dashboard-text", d.name), "danger", function(result) {
                         if (!result) {
                             return false;
                         }

plugins/dashboards/frontend/public/localization/dashboards.properties

@@ -51,6 +51,7 @@ dashboards.access-denied = This dashboard is no longer shared with you or an err
 dashbaords.access-denied-title = Access Denied
 dashboards.edit-access-denied = You don't have the edit permission for this dashboard. Please ask your global administrator if you think this is due to an issue.
 dashboards.sharing-denied = Dashboard sharing has been disabled. Please ask your global administrator if you think this is due to an issue.
+dashboards.public-dashboards-disabled-info = Public dashboards are disabled. Contact an administrator to enable this option.
 dashboards.widget-warning.time = This widget has data for {0} to {1}. Please select a date range in this period.
 
 systemlogs.action.widget_added = Widget Added

plugins/dashboards/frontend/public/templates/dashboards-drawer.html

@@ -19,6 +19,9 @@
                 {{i18n('dashboards.share-with')}}
                 <cly-tooltip-icon :tooltip="i18n('dashboards.share-with-tooltip-content')" data-test-id="dashboard-visibility-tooltip"></cly-tooltip-icon>
             </div>
+            <div v-if="constants.isPublicDisabled" class="text-small color-cool-gray-50 bu-mb-2">
+                {{i18n('dashboards.public-dashboards-disabled-info')}}
+            </div>
             <cly-form-field name="share_with" rules="required">
                 <el-radio-group :disabled="!canShare" v-model="drawerScope.editedObject.share_with" style="width: 100%;">
                     <el-radio
@@ -27,9 +30,14 @@
                         :test-id="'dashboard-visibility-option-' + item.value"
                         v-for="(item) in constants.sharingOptions"
                         :label="item.value"
-                        :key="item.value">
+                        :key="item.value"
+                        :disabled="constants.isPublicDisabled && item.value === 'all-users'">
                         <div>
                             {{item.name}}
+                            <cly-tooltip-icon
+                                v-if="constants.isPublicDisabled && item.value === 'all-users'"
+                                :tooltip="i18n('dashboards.share.all-users.description') + ' ' + i18n('dashboards.public-dashboards-disabled-info')">
+                            </cly-tooltip-icon>
                         </div>
                         <div class="text-small color-cool-gray-50">
                             {{item.description}}

plugins/star-rating/frontend/public/javascripts/countly.views.js

@@ -393,8 +393,10 @@
         computed: {
             preparedRows: function() {
                 return this.ratings.map(function(rating) {
-                    rating.percentage = parseFloat(rating.percent) || 0;
-                    return rating;
+                    return Object.assign({}, rating, {
+                        rating: (Number(rating.rating) || 0) + 1,
+                        percentage: Number.parseFloat(rating.percent) || 0,
+                    });
                 });
             }
         },