Merge branch 'anna/master' of https://github.com/Countly/countly-server into anna/master

Author: Cookiezaurs

CHANGELOG.md

@@ -1,3 +1,8 @@
+## Version 24.05.15
+Enterprise fixes:
+- [nps] Fixed UI issues in the widget editor related to the "user consent" section
+- [ratings] Fixed rendering issue for escaped values
+
 ## Version 24.05.14
 Fixes:
 - [code] Added better handling for countly servers while deployed using subdirectory

frontend/express/public/javascripts/countly/vue/components/input.js

@@ -302,7 +302,7 @@
                                                 <slot name="option-prefix" v-bind="option"></slot>\
                                             </div>\
                                             <slot name="option-label" v-bind="option">\
-                                              <div :data-test-id="testId + \'-item-\' + (option.label ? option.label.replaceAll(\' \', \'-\').toLowerCase() : \' \')" class="cly-vue-listbox__item-label" v-tooltip="option.label">{{decodeHtml(option.label)}}</div>\
+                                              <div :data-test-id="testId + \'-item-\' + (option.label ? option.label.replaceAll(\' \', \'-\').toLowerCase() : \' \')" class="cly-vue-listbox__item-label" v-tooltip="decodeHtml(option.label)">{{decodeHtml(option.label)}}</div>\
                                             </slot>\
                                         </div>\
                                         <div class="bu-level-right" v-if="hasRemovableOptions || !!$scopedSlots[\'option-suffix\']">\

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

@@ -1145,7 +1145,7 @@
                         steps: null
                     };
                 }
-                if (Array.isArray(this.widget.links)) {
+                if (Array.isArray(this.widget.links) && this.widget.links.length) {
                     this.widget.links.forEach(function(link) {
                         if (link.linkValue.indexOf('term')) {
                             link.text = "Terms and Conditions";
@@ -1162,8 +1162,9 @@
                         link.linkValue = link.linkValue.replace(new RegExp('[?&]' + CLY_X_INT + '=[^&]*'), '').replace(/[?&]$/, '');
                     });
                     this.widget.links = {"link": this.widget.links, "finalText": this.widget.finalText};
+                    this.widget.consent = true;
                 }
-                if (!this.widget.links) {
+                else {
                     this.widget.links = {
                         "link": [
                             {
@@ -1182,6 +1183,7 @@
                         "finalText": "I agree to the Terms and Conditions and Privacy Policy."
 
                     };
+                    this.widget.consent = false;
                 }
                 if (!this.widget.rating_symbol) {
                     this.widget.rating_symbol = "emojis";

ui-tests/cypress/e2e/dashboard/feedback/ratings/widgets.cy.js

@@ -16,7 +16,7 @@ describe('Create New Widget', () => {
         navigationHelpers.goToFeedbackRatingsWidgetsPage();
     });
 
-    it('Verify default values of page and create a widget with that values and then update the widget data', function() {
+    it.skip('Verify default values of page and create a widget with that values and then update the widget data', function() {
         widgetsHelpers.clickAddNewWidgetButton();
         widgetsHelpers.verifySettingsPageDefaultElements();
         widgetsHelpers.typeWidgetName("My New Widget");
@@ -222,6 +222,7 @@ describe('Create New Widget', () => {
             contactViaCheckboxLabelText: widget.contactViaCheckboxLabelText,
             contactEmail: widgetRate.contactEmail,
             submitButtonText: widget.submitButtonText,
+            hasAggrementCheckbox: true,
             selectedMainColor: widget.mainColor,
             selectedFontColor: widget.FontColor,
             hasPoweredByLogo: true,

ui-tests/cypress/lib/dashboard/feedback/ratings/demoWidgetPage.js

@@ -54,6 +54,7 @@ const verifyDemoPageElementsAndRate = ({
     submitButtonText,
     submitButtonColor,
     submitButtonFontColor,
+    hasAggrementCheckbox = false,
     hasPoweredByLogo = true,
     thankYouMessageText,
     successIconColor
@@ -132,6 +133,12 @@ const verifyDemoPageElementsAndRate = ({
         cy.shouldNotExist(demoPageElements.LOGO_IMAGE);
     }
 
+    if (hasAggrementCheckbox) {
+        cy.contains('label', 'I agree to the terms and conditions and privacy policy')
+            .find('input[type="checkbox"]')
+            .click();
+    }
+
     cy.clickElement(demoPageElements.SUBMIT_BUTTON);
 
     // cy.window().then((win) => {