Merge pull request #6166 from Countly/24.10->master

Release.24.10->master

Author: Cookiezaurs

CHANGELOG.md

@@ -1,4 +1,10 @@
+
 ## Version 25.03.x
+Fixes:
+- [feedback] Uniformize drawer internal name input texts
+- [star-rating] Added missing columns to Rating Widgets table edit
+- [star-rating] Fix rating score and responses table sorting
+- [ui] Fix alignment of drawers title and close icon
 
 Dependencies:
 - Bump countly-sdk-web from 25.1.0 to 25.4.0

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

@@ -227,6 +227,17 @@
                     ret.segments = eventData.segments;
                 }
             }
+            for (var key in ret.segments) {
+                //Copy all containing : to . This is hotfix for cases when we have '.' in key. Will not distinguish in case there is '.' and ":" in same structure key.
+                if (key.indexOf(":") > -1) {
+                    //replace all : with .
+                    var key2 = key.replace(/:/g, ".");
+                    ret.segments[key2] = [];
+                    for (var k = 0; k < ret.segments[key].length; k++) {
+                        ret.segments[key2].push(ret.segments[key][k]);
+                    }
+                }
+            }
             callback(ret);
         });
     };

plugins/star-rating/frontend/public/localization/star-rating.properties

@@ -113,8 +113,8 @@ feedback.where-to-collect-feedback = Where to collect ratings?
 feedback.all-pages = On all pages
 feedback.selected-pages = On selected pages
 feedback.internalName = Internal Name
-feedback.internalName.placeholder = Widget Name
-feedback.internalName.description = Name survey for internal purposes. It is not going to be shown on survey.
+feedback.internalName.placeholder = Enter a internal Name
+feedback.internalName.description = This name is internal and will not be shown to your end user.
 feedback.consent = Add user consent
 feedback.question = Question
 feedback.rating-symbol = Rating Symbol
@@ -207,4 +207,4 @@ rating.drawer.consent.text = Text
 rating.drawer.consent.placeholder = I agree to terms & conditions and privacy policy
 rating.drawer.consent.links = Link(s)
 rating.drawer.consent.add.link = + Add link
-rating.drawer.links.tooltip = Matching link texts inside the consent text are modified to be links
+rating.drawer.links.tooltip = Matching link texts inside the consent text are modified to be links

plugins/star-rating/frontend/public/templates/widgets-table.html

@@ -98,7 +98,7 @@
         column-key="ratingsCount"
         :label="i18n('feedback.responses')"
         min-width="130"
-        prop="responses"
+        prop="ratingsCount"
         sortable="true"
       >
         <template
@@ -119,7 +119,7 @@
         column-key="ratingScore"
         :label="i18n('feedback.rating-score')"
         min-width="150"
-        prop="rating_score"
+        prop="ratingScore"
         sortable="true"
       >
         <template