Merge branch 'master' into anna/master

Author: Cookiezaurs

CHANGELOG.md

@@ -13,13 +13,15 @@ Fixes:
 
 Enterprise Fixes:
 - [ldap] Error handling in ldap plugin on search error
+- [license] Display notification for non global admin user
 - [users] Load table data from report if user table calculation goes to report manager
 
 Dependencies:
 - Bump puppeteer from 24.14.0 to 24.15.0
 - Bump mongodb from 6.17.0 to 6.18.0
 - Bump supertest from 7.1.3 to 7.1.4
 
+
 ## Version 25.03.11
 Fixes:
 - [core] Fix mongo connection url parsing

plugins/plugins/frontend/public/templates/configurations.html

@@ -51,11 +51,13 @@ <h3 v-if="predefinedStructure[selectedConfig].groups.length > 1 || group.label"
                                     v-for="key in group.list" :key="key" 
                                     class="bu-columns bu-is-vcentered bu-p-5 config-section">
                                     <div class="bu-column bu-is-7">
-                                        <div class="bu-has-text-weight-medium bu-is-flex bu-is-align-items-center config-section__header" :data-test-id="'settings-title-label-' + key.toLowerCase().replaceAll('_', '-')">
+                                        <div class="bu-has-text-weight-medium bu-is-flex bu-is-align-items-center config-section__header">
                                             <div>
-                                                <span class="bu-mr-2"> {{ getLabelName(key) }} </span>
+                                                <span class="bu-mr-2" :data-test-id="'settings-title-label-' + key.toLowerCase().replaceAll('_', '-')"> {{ getLabelName(key) }} </span>
                                             </div>
-                                            <div class="bu-is-flex bu-is-align-items-center">
+                                            <div 
+                                                class="bu-is-flex bu-is-align-items-center"
+                                            >
                                                 <div
                                                     v-for="(tag, index) in getWarningTags(selectedConfig, key)"
                                                     :key="index"

ui-tests/cypress/lib/dashboard/manage/configurations/configurations.js

@@ -179,13 +179,13 @@ const verifyPageElements = () => {
         attrText: "100"
     });
 
+    cy.scrollPageToCenter();
+
     cy.verifyElement({
         labelElement: configurationsListBoxElements({subFeature: SETTINGS.API.DATA_LIMITS.EVENT_SEGMENTATION_VALUE_LIMIT}).SELECTED_SUBFEATURE_TITLE,
         labelText: "Max unique values in each segmentation",
     });
 
-    cy.scrollPageToCenter();
-
     cy.verifyElement({
         labelElement: configurationsListBoxElements({subFeature: SETTINGS.API.DATA_LIMITS.EVENT_SEGMENTATION_VALUE_LIMIT}).SELECTED_SUBFEATURE_DESCRIPTION,
         labelText: "Maximum number of unique values in each segmentation. Increasing this number may affect your server performance.",