Merge remote-tracking branch 'origin/release.24.05' into fix-allow-user-selection-on-dashboard-widgets-content

Author: gabrieloliveirapinto

CHANGELOG.md

@@ -1,9 +1,14 @@
 ## Version 24.05.XX
+Features:
+- [core] Implement go to link in notification
+
 Fixes:
 - [dashboard] Allow users to select text inside the widget without dragging it
 
 Enterprise Fixes:
 - [data-manager] Fixed segment data deletion
+- [users] Fix add/remove user to profile group
+- [users] Remove link to profile group page after removing user from group
 
 ## Version 24.05.42
 Fixes:

frontend/express/public/javascripts/countly/countly.helpers.js

@@ -346,6 +346,7 @@
         payload.autoHide = !msg.sticky;
         payload.id = msg.id;
         payload.width = msg.width;
+        payload.goTo = msg.goTo;
         var colorToUse;
 
         if (countlyGlobal.ssr) {
@@ -398,9 +399,14 @@
      * title is the text that will be dispalyed for the backlink url. 
      */
     CountlyHelpers.goTo = function(options) {
-        app.backlinkUrl = options.from;
-        app.backlinkTitle = options.title;
-        window.location.hash = options.url;
+        if (options.url && options.url.startsWith('https://')) {
+            window.open(options.url, '_blank', 'noopener,noreferrer');
+        }
+        else {
+            app.backlinkUrl = options.from;
+            app.backlinkTitle = options.title;
+            window.location.hash = options.url;
+        }
     };
 
     /**

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

@@ -1036,11 +1036,13 @@
     Vue.component("cly-notification", countlyBaseComponent.extend({
         template: '<div v-if="isModalVisible===true" :class="dynamicClasses" class="cly-vue-notification__alert-box">\n' +
                         '<div class="bu-is-flex bu-is-justify-content-space-between bu-p-3">\n' +
-                            '<div class="bu-is-flex">\n' +
+                            '<div class="bu-is-flex" style="width:100%">\n' +
                                 '<img data-test-id="cly-notification-img" :src="image" class="alert-image bu-mr-3">\n' +
-                                '<slot><span class="alert-text" data-test-id="cly-notification-text" style="margin-block:auto" v-html="innerText">{{text}}</span></slot>\n' +
+                                '<div :style="dynamicStyle">\n' +
+                                    '<slot><span class="alert-text" data-test-id="cly-notification-text" style="margin-block:auto" v-html="innerText">{{text}}</span></slot>\n' +
+                                    '<div v-if="goTo.title" class="bu-is-flex cursor-pointer"><a class="bu-level-item bu-has-text-link bu-has-text-weight-medium" @click="goToUrl">{{goTo.title}}</a></div>' +
+                                '</div>\n' +
                             '</div>\n' +
-                            '<div v-if="goTo.title" class="bu-is-flex bu-ml-auto"><a class="bu-level-item bu-has-text-link bu-has-text-weight-medium" @click="goToUrl">{{goTo.title}}</a></div>' +
                             '<div v-if="closable"  class="" >\n' +
                                 '<div v-if="size==\'full\'" @click="closeModal" class=" bu-ml-2" >\n' +
                                     '<slot name="close"><i data-test-id="cly-notification-full-size-close-icon" class="el-icon-close"></i></slot>\n' +
@@ -1069,6 +1071,7 @@
                 type: Object
             },
             customWidth: { default: "", type: String },
+            toast: { default: false, type: Boolean },
         },
         data: function() {
             return {
@@ -1115,6 +1118,20 @@
                     return this.text;
                 }
                 return "";
+            },
+            dynamicStyle: function() {
+                let style = {
+                    display: 'flex',
+                    'flex-direction': this.toast ? 'column' : 'row',
+                    width: '100%'
+                };
+                if (this.toast) {
+                    style.gap = '5px';
+                }
+                else {
+                    style['justify-content'] = 'space-between';
+                }
+                return style;
             }
         },
         methods: {

frontend/express/public/javascripts/countly/vue/core.js

@@ -688,7 +688,7 @@
 
     var NotificationToastsView = {
         template: '<div class="notification-toasts"> \
-                        <cly-notification v-for="(toast) in notificationToasts" :key="toast.id" :id="toast.id" :text="toast.text" :autoHide="toast.autoHide" :color="toast.color" :closable="true" :customWidth="toast.width" @close="onClose" class="notification-toasts__item"></cly-notification>\
+                        <cly-notification v-for="(toast) in notificationToasts" :key="toast.id" v-bind="toast" closable :customWidth="toast.width" toast @close="onClose" class="notification-toasts__item"></cly-notification>\
                     </div>',
         store: _vuex.getGlobalStore(),
         computed: {