Merge branch 'master' into anna/master

Author: Cookiezaurs

CHANGELOG.md

@@ -1,7 +1,13 @@
-## Version 25.03.X
+## Version 25.03.28
+Fixes:
+- [alerts] Add alert interval validation in the frontend
+- [events] Correctly navigate to event groupmin events menu
+
 Enterprise Fixes:
+- [applications] Ensure application management list reorders after create/update
 - [concurrent_users] Fix email check for alert
-
+- [dashboards] Keep dashboard sidebar sorted alphabetically after additions
+- [data-manager] Correctly show last triggered for events if data masking is enabled
 
 ## Version 25.03.27
 Fixes:

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

@@ -59,13 +59,12 @@
                     value: id
                 };
             });
-            if (countlyGlobal.member.appSortList) {
-                appList = this.sortBy(appList, countlyGlobal.member.appSortList);
+            var sortList = (countlyGlobal.member && countlyGlobal.member.appSortList) || [];
+            if (sortList.length) {
+                appList = this.sortBy(appList, sortList);
             }
             else {
-                appList.sort(function(a, b) {
-                    return a.label > b.label && 1 || -1;
-                });
+                appList.sort(this.sortAppOptionsAlphabetically);
             }
             var app_id = this.$route.params.app_id || countlyCommon.ACTIVE_APP_ID;
             return {
@@ -340,6 +339,56 @@
                     }
                 }
             },
+            getAppListItemId: function(option) {
+                if (!option) {
+                    return "";
+                }
+
+                return (option._id || option.value || option.id || option.app_id || "") + "";
+            },
+            sortAppOptionsAlphabetically: function(optionA, optionB) {
+                var labelA = (optionA.label || "").toLowerCase();
+                var labelB = (optionB.label || "").toLowerCase();
+
+                if (labelA < labelB) {
+                    return -1;
+                }
+
+                if (labelA > labelB) {
+                    return 1;
+                }
+
+                var valueA = (optionA.value || "").toLowerCase();
+                var valueB = (optionB.value || "").toLowerCase();
+
+                if (valueA < valueB) {
+                    return -1;
+                }
+
+                if (valueA > valueB) {
+                    return 1;
+                }
+
+                return 0;
+            },
+            applyAppListOrdering: function() {
+                if (!Array.isArray(this.appList)) {
+                    return;
+                }
+
+                var sortList = (countlyGlobal.member && countlyGlobal.member.appSortList) || [];
+                var currentList = this.appList.slice();
+                var orderedList;
+
+                if (sortList.length) {
+                    orderedList = this.sortBy(currentList, sortList);
+                }
+                else {
+                    orderedList = currentList.sort(this.sortAppOptionsAlphabetically);
+                }
+
+                this.appList = orderedList;
+            },
             sortBy: function(arrayToSort, sortList) {
                 if (!sortList.length) {
                     return arrayToSort;
@@ -349,9 +398,10 @@
                     retArr = [];
                 var i;
                 for (i = 0; i < arrayToSort.length; i++) {
-                    var objId = arrayToSort[i]._id + "";
-                    if (sortList.indexOf(objId) !== -1) {
-                        tmpArr[sortList.indexOf(objId)] = arrayToSort[i];
+                    var objId = this.getAppListItemId(arrayToSort[i]);
+                    var desiredIndex = sortList.indexOf(objId);
+                    if (desiredIndex !== -1) {
+                        tmpArr[desiredIndex] = arrayToSort[i];
                     }
                 }
 
@@ -392,6 +442,7 @@
                                     value: data._id + "",
                                     label: data.name
                                 });
+                                self.applyAppListOrdering();
                                 self.$store.dispatch("countlyCommon/addToAllApps", data);
                                 self.$store.dispatch("countlyCommon/updateActiveApp", data._id + "");
                                 countlyCommon.setActiveApp(data._id);
@@ -459,6 +510,7 @@
                                 break;
                             }
                         }
+                        self.applyAppListOrdering();
                         self.discardForm();
                         CountlyHelpers.notify({
                             title: jQuery.i18n.map["configs.changed"],

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

@@ -7,13 +7,29 @@
     countlyCommon,
     app,
     countlyAuth,
+    countlyPlugins,
     CV,
     groupsModel,
     _,
+    VeeValidate,
  */
 (function() {
     var ALERTS_FEATURE_NAME = "alerts";
 
+    VeeValidate.extend('alert_interval', function(inpValue, args) {
+        var min = parseInt(args[0] || 0, 10);
+        var max = parseInt(args[1] || 60, 10);
+        var valid = parseInt(inpValue, 10) >= min && inpValue <= max;
+
+        if (valid) {
+            return {
+                valid: valid,
+            };
+        }
+
+        return 'Alert interval has to be between ' + min + ' and ' + max;
+    });
+
     var AlertDrawer = countlyVue.views.BaseView.extend({
         template: "#alert-drawer",
         mixins: [
@@ -418,7 +434,20 @@
                     );
                 }
                 return this.emailOptions;
-            }
+            },
+            alertIntervalValidationRules: function() {
+                var rule = 'required';
+
+                if (this.$refs.drawerData.editedObject.alertDataType === 'onlineUsers') {
+                    var concurrentUserConfig = countlyPlugins.getConfigsData().concurrent_users || {};
+                    var concurrentAlertIntervalMin = concurrentUserConfig.alert_interval || 3;
+                    var concurrentAlertIntervalMax = Math.min(concurrentAlertIntervalMin + 60, 90);
+
+                    rule += '|alert_interval:' + concurrentAlertIntervalMin + ',' + concurrentAlertIntervalMax;
+                }
+
+                return rule;
+            },
         },
         props: {
             placeholder: { type: String, default: "Select" },

plugins/alerts/frontend/public/stylesheets/vue-main.scss

@@ -143,6 +143,12 @@
     .alert-drawer-trigger-input {
         width: 48px;
     }
+
+    .is-error {
+        .alert-drawer-trigger-input {
+            background-color: #FBECE5 !important;
+        }
+    }
 
     .no-spinner::-webkit-inner-spin-button,
     .no-spinner::-webkit-outer-spin-button {
@@ -335,4 +341,4 @@
     border-radius: 4px;
     background-position: center;
     display: inline-block;
-}
+}