Merge branch 'master' into ar2rsawseen/master2

Author: ar2rsawseen

CHANGELOG.md

@@ -1,8 +1,8 @@
 ## Version 25.03.XX
-
 Fixes:
 - [crashes] Derive crash name from crash stracktrace for drill event
 - [data-manager] Fix frontend component attribute name
+- [star-rating] Fix rating not appearing when app version contains space ' '
 
 ## Version 25.03.7
 Enterprise Features:

plugins/star-rating/api/api.js

@@ -904,7 +904,7 @@ function uploadFile(myfile, id, callback) {
                         "contact_me": currEvent.segmentation.contactMe,
                         "rating": currEvent.segmentation.rating,
                         "platform": currEvent.segmentation.platform,
-                        "app_version": currEvent.segmentation.app_version,
+                        "app_version": currEvent.segmentation.app_version.trim(),
                         "widget_id": currEvent.segmentation.widget_id
                     }, function(err) {
                         if (err) {

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

@@ -622,7 +622,7 @@
                     regexString += this.activeFilter.platform.toString().toUpperCase() + '(\\*\\*)';
                 }
                 if (this.activeFilter.version === '') {
-                    regexString += '(\\w+)(\\S*)(\\w*)(\\*\\*)[1-5]';
+                    regexString += '(.*)(\\*\\*)[1-5]';
                 }
                 else {
                     regexString += this.activeFilter.version.toString() + '(\\*\\*)[1-5]';
@@ -1281,7 +1281,7 @@
                     regexString += this.activeFilter.platform.toString().toUpperCase() + '(\\*\\*)';
                 }
                 if (this.activeFilter.version === '') {
-                    regexString += '(\\w+)(\\S*)(\\w*)(\\*\\*)[1-5]';
+                    regexString += '(.*)(\\*\\*)[1-5]';
                 }
                 else {
                     regexString += this.activeFilter.version.toString() + '(\\*\\*)[1-5]';