Merge branch 'master' into dependabot/npm_and_yarn/sass-1.98.0

Author: can-angun

CHANGELOG.md

@@ -1,3 +1,11 @@
+## Version 25.03.X
+Fixes:
+- [dashboards] Unescape event segment values in meta
+
+Enterprise fixes:
+- [data-manager] Fix validation approval button label
+- [data-manager] Fix validation table column names
+
 ## Version 25.03.38
 Fixes:
 - [push] Fixed the property name by changing it from link to url for message buttons for Huawei messages

plugins/dashboards/api/parts/dashboards.js

@@ -1213,6 +1213,14 @@ function getEventsModel(params, apps, appId, collection, segment, event, widget)
         }
 
         fn(function(data) {
+            if (data.meta && data.meta.segments) {
+                data.meta.segments.forEach((sg) => {
+                    if (data.meta[sg] && data.meta[sg].length > 0) {
+                        data.meta[sg] = data.meta[sg].map((item) => common.decode_html(item));
+                    }
+                });
+            }
+
             countlyCommon.setPeriod(paramsObj.qstring.period);
 
             var model = countlyModel.load("event");
@@ -1315,4 +1323,4 @@ function getCrashModel(params, apps, appId, collection, widget) {
     });
 }
 
-module.exports = dashboard;
+module.exports = dashboard;

plugins/data-manager/frontend/public/localization/data-manager.properties

@@ -259,6 +259,7 @@ data-manager.related-property = Related Property
 data-manager.delete-transformation-permanently = Delete Transformation permanently?
 data-manager.delete-transformation = Delete Transformation
 data-manager.error = Error
+data-manager.error-type = Error Type
 data-manager.error-last-triggered = Error Last Triggered
 data-manager.occurence-count = Occurences
 data-manager.approve = Approve
@@ -381,4 +382,4 @@ data-manager.copy-to-user-custom.type = Custom User Property Type
 data-manager.copy-to-user-custom.existing= Existing
 data-manager.copy-to-user-custom.new = New
 data-manager.copy-to-user-custom.select-type = Existing Custom User Property
-data-manager.copy-to-user-custom.new-type = New Custom User Property
+data-manager.copy-to-user-custom.new-type = New Custom User Property

plugins/push/api/send/data/message.js

@@ -382,19 +382,22 @@ class Message extends Mongoable {
 
     /**
      * Filter contents for given lang-platform combination
-     * 
+     *
      * @param {Content[]|object[]} contents array of contents to filter
      * @param {string} p platform key
      * @param {string} la language key
      * @returns {Content[]} array of contents which are applicable for this p/l case
      */
     static filterContents(contents, p, la) {
-        return (contents || []).filter(c => (!p || (!c.p || c.p === p)) && (!la || (!c.la || c.la === la)));
+        return (contents || []).filter(
+            c => (!p || (!c.p || c.p === p || (c.p === "a" && p === "h")))
+                && (!la || (!c.la || c.la === la))
+        );
     }
 
     /**
      * Get Content instance by p & l given. `content()` returns default content.
-     * 
+     *
      * @param {string} p platform key
      * @param {string} la language key
      * @returns {Content|undefined} Content instance if one with given p & l exists or undefined

ui-tests/cypress/e2e/dashboard/manage/apps/apps.cy.js

@@ -100,6 +100,5 @@ describe('Create apps with different types such as Desktop, Mobile, and Web. ',
         navigationHelpers.goToApplicationsPage();
         appHelper.searchApp(app.appName);
         appHelper.verifyAppShouldBeDeleted();
-
     });
 });