Merge branch 'release.24.05' into ar2rsawseen/24.05

Author: ar2rsawseen

CHANGELOG.md

@@ -1,6 +1,10 @@
-## Version 24.05.XX
+## Version 24.05.27
 Fixes:
 - [crashes] Remove memory addresses from stack trace grouping
+- [user-management] Prevent global admin from self-revoke and self-delete
+
+Enterprise Fixes:
+- [cohorts] Fixed issue with combining multiple cohorts
 
 ## Version 24.05.26
 Enterprise fixes:

frontend/express/public/core/user-management/javascripts/countly.views.js

@@ -118,6 +118,16 @@
                 switch (command) {
                 case "delete-user":
                     var self = this;
+
+                    // Check if user is trying to delete themselves
+                    if (index === countlyGlobal.member._id) {
+                        CountlyHelpers.notify({
+                            type: 'error',
+                            message: CV.i18n('management-users.cannot-delete-own-account')
+                        });
+                        return;
+                    }
+
                     CountlyHelpers.confirm(CV.i18n('management-users.this-will-delete-user'), "red", function(result) {
                         if (!result) {
                             CountlyHelpers.notify({
@@ -693,6 +703,15 @@
             // drawer event handlers
             onClose: function() {},
             onSubmit: function(submitted, done) {
+                if (submitted._id === countlyGlobal.member._id && countlyGlobal.member.global_admin && !submitted.global_admin) {
+                    CountlyHelpers.notify({
+                        message: CV.i18n('management-users.cannot-revoke-own-admin'),
+                        type: 'error'
+                    });
+                    done(CV.i18n('management-users.cannot-revoke-own-admin'));
+                    return;
+                }
+
                 var atLeastOneAppSelected = false;
 
                 for (var i = 0; i < submitted.permission._.u.length; i++) {

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

@@ -956,6 +956,7 @@
                         },
                         animation: false
                     },
+                    symbol: 'none'
                 },
                 mergedNotes: [],
             };

frontend/express/public/javascripts/countly/vue/templates/drawer.html

@@ -89,8 +89,8 @@ <h3>{{title}}</h3>
                     <div class="cly-vue-drawer__buttons is-multi-step is-single-step bu-is-justify-content-flex-end bu-is-flex" v-if="isMultiStep">
                         <el-button :data-test-id="testId + '-cancel-button'" type="secondary" @click="doClose" size="small" v-if="currentStepIndex === 0 && hasCancelButton" :disabled="isSubmitPending">{{cancelButtonLabel}}</el-button>
                         <el-button :data-test-id="testId + '-previous-step-button'" type="secondary" @click="prevStep" size="small" v-if="currentStepIndex > 0" :disabled="isSubmitPending">{{i18n('common.drawer.previous-step')}}</el-button>
-                        <el-button :data-test-id="testId + '-next-step-button'" type="success" @click="nextStep" size="small" v-if="!isLastStep" :class="{'is-disabled':!isCurrentStepValid}" :disabled="isSubmitPending">{{i18n('common.drawer.next-step')}}</el-button>
-                        <el-button :data-test-id="testId + '-save-button'" type="success" @click="submit" :loading="isSubmitPending" size="small" v-if="isLastStep" :class="{'is-disabled':!isSubmissionAllowed}" :disabled="isSubmitPending">{{saveButtonLabel}}</el-button>
+                        <el-button :data-test-id="testId + '-next-step-button'" type="success" :key="isLastStep" @click="nextStep" size="small" v-if="!isLastStep" :class="{'is-disabled':!isCurrentStepValid}" :disabled="isSubmitPending">{{i18n('common.drawer.next-step')}}</el-button>
+                        <el-button :data-test-id="testId + '-save-button'" type="success" :key="isLastStep" @click="submit" :loading="isSubmitPending" size="small" v-if="isLastStep" :class="{'is-disabled':!isSubmissionAllowed}" :disabled="isSubmitPending">{{saveButtonLabel}}</el-button>
                     </div>
                     <div class="cly-vue-drawer__buttons is-single-step is-single-step bu-is-justify-content-flex-end bu-is-flex" v-if="!isMultiStep">
                         <el-button :data-test-id="testId + '-cancel-button'" type="secondary" @click="doClose" size="small" v-if="hasCancelButton" :disabled="isSubmitPending">{{cancelButtonLabel}}</el-button>

frontend/express/public/localization/dashboard/dashboard.properties

@@ -946,6 +946,8 @@ management-users.search-placeholder = Search in Features
 management-users.reset-failed-logins = Reset failed logins
 management-users.reset-failed-logins-success = Failed logins reset successfully\!
 management-users.reset-failed-logins-failed = Failed to reset logins\!
+management-users.cannot-delete-own-account = You can not delete your own account
+management-users.cannot-revoke-own-admin = You can not revoke your own global admin privileges
 
 #date-preset
 management.preset = Date presets

plugins/star-rating/frontend/public/templates/star-consent-link.html

@@ -1,7 +1,7 @@
 <div class="bu-py-1 bu-px-4 cly-vue-drawer-step__section-group--filled">
   <div class="cly-vue-drawer-step__section">
     <div class="text-small text-heading bu-pb-1">{{i18n('rating.drawer.consent.text')}}</div>
-    <validation-provider name="value.consent" rules="required|max:93" v-slot="v">
+    <validation-provider name="value.consent" rules="required|max:94" v-slot="v">
       <el-input
         :class="{'is-error': v.errors.length > 0}"
         :placeholder="i18n('rating.drawer.consent.placeholder')"