Merge branch 'master' into adding-warning-tags-to-settings

Author: pnrgenc

CHANGELOG.md

@@ -2,9 +2,15 @@
 
 Features:
 - [plugins] Add configuration warning tags to settings UI
+- [white-labeling] Add sidebar footer label setting to white labeling
 
 Fixes:
 - [core] Use correct rights validation for loyality
+- [crashes] Fix free session for home widget
+- [crashes] Use na for free session and free user when there's no data
+
+Enterprise Fixes:
+- [ldap] Error handling in ldap plugin on search error
 
 ## Version 25.03.11
 Fixes:

frontend/express/app.js

@@ -422,6 +422,14 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
         app.loadThemeFiles(curTheme);
         app.dashboard_headers = plugins.getConfig("security").dashboard_additional_headers;
 
+        var overriddenCountlyNamedType = COUNTLY_NAMED_TYPE;
+        var whiteLabelingConfig = plugins.getConfig("white-labeling");
+        if (whiteLabelingConfig && whiteLabelingConfig.footerLabel && whiteLabelingConfig.footerLabel.length) {
+            overriddenCountlyNamedType = whiteLabelingConfig.footerLabel;
+        }
+
+        COUNTLY_NAMED_TYPE = overriddenCountlyNamedType;
+
         if (typeof plugins.getConfig('frontend').countly_tracking !== 'boolean' && plugins.isPluginEnabled('tracker')) {
             plugins.updateConfigs(countlyDb, 'frontend', { countly_tracking: true });
         }
@@ -929,6 +937,12 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
             licenseNotification, licenseError;
         var isLocked = false;
         configs.export_limit = plugins.getConfig("api").export_limit;
+
+        var currentWhiteLabelingConfig = plugins.getConfig("white-labeling");
+        var overriddenCountlyNamedType = COUNTLY_NAMED_TYPE;
+        if (currentWhiteLabelingConfig && currentWhiteLabelingConfig.footerLabel && currentWhiteLabelingConfig.footerLabel.length) {
+            overriddenCountlyNamedType = currentWhiteLabelingConfig.footerLabel;
+        }
         app.loadThemeFiles(configs.theme, async function(theme) {
             if (configs._user.theme) {
                 res.cookie("theme", configs.theme);
@@ -1004,7 +1018,7 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
                     licenseError,
                     ssr: serverSideRendering,
                     timezones: timezones,
-                    countlyTypeName: COUNTLY_NAMED_TYPE,
+                    countlyTypeName: overriddenCountlyNamedType,
                     countlyTypeTrack: COUNTLY_TRACK_TYPE,
                     countlyTypeCE: COUNTLY_TYPE_CE,
                     countly_tracking,
@@ -1037,7 +1051,7 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
                     countlyVersion: req.countly.version,
                     countlyType: COUNTLY_TYPE_CE,
                     countlyTrial: COUNTLY_TRIAL,
-                    countlyTypeName: COUNTLY_NAMED_TYPE,
+                    countlyTypeName: overriddenCountlyNamedType,
                     feedbackLink: COUNTLY_FEEDBACK_LINK,
                     documentationLink: COUNTLY_DOCUMENTATION_LINK,
                     helpCenterLink: COUNTLY_HELPCENTER_LINK,

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

@@ -152,7 +152,10 @@ function transformAppVersion(inpVersion) {
             * @param {bool} isPercent - Flag to just format the metric's total values as percentages.
             */
             function populateMetric(metric, isPercent) {
-                if (dashboard[metric].total !== 0 && dashboard[metric]["prev-total"] !== 0) {
+                if (dashboard[metric].total === 'NA' || dashboard[metric]['prev-total'] === 'NA') {
+                    dashboard[metric].change = 'NA';
+                }
+                else if (dashboard[metric].total !== 0 && dashboard[metric]["prev-total"] !== 0) {
                     if (isPercent) {
                         dashboard[metric].change = (dashboard[metric].total - dashboard[metric]["prev-total"]).toFixed(1) + "%";
                     }
@@ -182,7 +185,9 @@ function transformAppVersion(inpVersion) {
 
                 if (isPercent && ["crses", "crnfses", "crfses", "crau", "craunf", "crauf", 'crinv', 'crfinv', 'crnfinv', 'crauinv', 'craufinv', 'craunfinv'].includes(metric)) {
                     ["total", "prev-total"].forEach(function(prop) {
-                        dashboard[metric][prop] = dashboard[metric][prop].toFixed(2) + '%';
+                        if (dashboard[metric][prop] !== 'NA') {
+                            dashboard[metric][prop] = dashboard[metric][prop].toFixed(2) + '%';
+                        }
                     });
                 }
             }
@@ -219,10 +224,13 @@ function transformAppVersion(inpVersion) {
                 }
 
                 // derive user count from whole users
-                if (dashboard.crau[prop] > dashboard.cr_u[prop] && 'users' in state.rawData) {
+                if (dashboard.crau[prop] > dashboard.cr_u[prop] && 'users' in state.rawData && wholeUsers.total > 0) {
                     dashboard.crauf[prop] = dashboard.cr_u[prop] * ((wholeUsers.fatal / wholeUsers.total) - (dashboard.crf[prop] / dashboard.cr_s[prop]));
+                    dashboard.crauf.isEstimate = true;
                     dashboard.craunf[prop] = dashboard.cr_u[prop] * ((wholeUsers.nonfatal / wholeUsers.total) - (dashboard.crnf[prop] / dashboard.cr_s[prop]));
+                    dashboard.craunf.isEstimate = true;
                     dashboard.crau[prop] = dashboard.crauf[prop] + dashboard.craunf[prop];
+                    dashboard.crau.isEstimate = true;
                 }
 
                 dashboard.crinv[prop] = Math.max(0, dashboard.cr_s[prop] - dashboard.cr[prop]);
@@ -234,9 +242,14 @@ function transformAppVersion(inpVersion) {
                 populateMetric(metric);
             });
 
-            ["crau", "craunf", "crauf"].forEach(function(name) {
-                ["total", "prev-total"].forEach(function(prop) {
-                    dashboard[name][prop] = Math.min(100, (dashboard.cr_u[prop] === 0 || dashboard[name][prop] === 0) ? 100 : (Math.abs(dashboard.cr_u[prop] - dashboard[name][prop]) / dashboard.cr_u[prop] * 100));
+            ['crau', 'craunf', 'crauf'].forEach(function(name) {
+                ['total', 'prev-total'].forEach(function(prop) {
+                    if (dashboard.cr_u[prop] === 0 || !Number.isFinite(dashboard[name][prop])) {
+                        dashboard[name][prop] = 'NA';
+                    }
+                    else {
+                        dashboard[name][prop] = Math.abs(dashboard.cr_u[prop] - dashboard[name][prop]) / dashboard.cr_u[prop] * 100;
+                    }
                 });
                 populateMetric(name, true);
             });
@@ -264,17 +277,13 @@ function transformAppVersion(inpVersion) {
             });
 
             ['crinv', 'crfinv', 'crnfinv'].forEach(function(name) {
-                ["total", "prev-total"].forEach(function(prop) {
-                    var propValue = 0;
-
+                ['total', 'prev-total'].forEach(function(prop) {
                     if (dashboard.cr_s[prop] === 0) {
-                        propValue = 100;
+                        dashboard[name][prop] = 'NA';
                     }
                     else {
-                        propValue = dashboard[name][prop] / dashboard.cr_s[prop] * 100;
+                        dashboard[name][prop] = dashboard[name][prop] / dashboard.cr_s[prop] * 100;
                     }
-
-                    dashboard[name][prop] = Math.min(100, propValue);
                 });
                 populateMetric(name, true);
             });

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

@@ -1338,7 +1338,7 @@
                     {"name": CV.i18n('crashes.unique'), "info": CV.i18n('crashes.home.unique'), "prop": "cru", "r": true},
                     {"name": CV.i18n('crashes.total-per-session'), "info": CV.i18n('crashes.home.per-session'), "prop": "cr-session", "r": true},
                     {"name": CV.i18n('crashes.free-users'), "info": CV.i18n('crashes.help-free-users'), "prop": "crau", "p": true},
-                    {"name": CV.i18n('crashes.free-sessions'), "info": CV.i18n('crashes.help-free-sessions'), "prop": "crses", "p": true}
+                    {"name": CV.i18n('crashes.free-sessions'), "info": CV.i18n('crashes.help-free-sessions'), "prop": "crinv", "p": true}
                 ];
 
                 for (var k = 0; k < getUs.length; k++) {