Merge branch 'release.24.05' into ar2rsawseen/24.05

Author: ar2rsawseen

CHANGELOG.md

@@ -1,12 +1,27 @@
-## Version 24.05.XX
+## Version 24.05.xx
+Enterprise Fixes:
+- [data-manager] Fixed bug when merging events with ampersand symbol in the name
+- [groups] Add logs for user updates
+
+
+## Version 24.05.44
+Enterprise Fixes:
+- [groups] Fix user permission update after updating user group permission
+- [revenue] Card in revenue page are now correctly identified
+
+
+## Version 24.05.43
 Features:
 - [core] Implement go to link in notification
+- [data-manager] Fixed bug preventing transformation of events ending in a dot
 
 Fixes:
 - [dashboard] Allow users to select text inside the widget without dragging it
+- [jobs] Fix condition for scheduling alert job
 
 Enterprise Fixes:
 - [data-manager] Fixed segment data deletion
+- [license] Stop sending metric after license expired
 - [users] Fix add/remove user to profile group
 - [users] Remove link to profile group page after removing user from group
 

api/parts/jobs/job.js

@@ -254,32 +254,33 @@ class Job extends EventEmitter {
 
             this._json.next = next.getTime();
         }
-        if (this.name !== "alerts:monitor") {
-            //check if any job already scheduled or running
-            let query = {
-                status: {"$in": [STATUS.SCHEDULED, STATUS.RUNNING]},
-                name: this.name,
-            };
-            if (this._id) {
-                query._id = {$ne: this._id};
-            }
-            var self = this;
-            return new Promise((resolve, reject) => {
-                Job.findMany(this.db(), query).then(existing => {
-                    if (existing && existing.length) {
-                        log.d('Job already scheduled or running: %j', existing);
-                        this._json.status = STATUS.CANCELLED; //set this as cancelled now as we have other scheduled
-                    }
-                    else {
-                        self._save().then(resolve, reject);
-                    }
 
-                });
-            });
+        //check if any job already scheduled or running
+        let query = {
+            status: {"$in": [STATUS.SCHEDULED, STATUS.RUNNING]},
+            name: this.name,
+        };
+
+        if (this.name === 'alerts:monitor' && this.data && Object.keys(this.data).length) {
+            query.data = this.data;
         }
-        else {
-            return this._save();
+
+        if (this._id) {
+            query._id = {$ne: this._id};
         }
+
+        var self = this;
+        return new Promise((resolve, reject) => {
+            Job.findMany(this.db(), query).then(existing => {
+                if (existing && existing.length) {
+                    log.d('Job already scheduled or running: %j', existing);
+                    this._json.status = STATUS.CANCELLED; //set this as cancelled now as we have other scheduled
+                }
+                else {
+                    self._save().then(resolve, reject);
+                }
+            });
+        });
     }
 
     /**
@@ -1135,4 +1136,4 @@ module.exports = {
     STATUS: STATUS,
     STATUS_MAP: STATUS_MAP,
     debounce: debounce
-};
+};

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

@@ -847,6 +847,7 @@
                 }
             },
             onOpen: function() {
+                this.patchUserPermission();
                 this.changePasswordFlag = false;
                 // types
                 var types = ['c', 'r', 'u', 'd'];
@@ -860,7 +861,7 @@
                 // if it's in edit mode
                 if (this.settings.editMode) {
                     // is user member of a group?
-                    if (this.user.group_id && countlyGlobal.plugins.indexOf('groups') > -1) {
+                    if (this.user.group_id && this.user.group_id.length && countlyGlobal.plugins.indexOf('groups') > -1) {
                         // set groups state
                         if (Array.isArray(this.user.group_id)) {
                             this.groups = this.user.group_id;
@@ -963,7 +964,31 @@
             },
             onRoleChange: function(role) {
                 this.roles[role.name] = role;
-            }
+            },
+            patchUserPermission: function() {
+                if (this.user && this.user.permission && this.user.permission._ && this.user.permission._.u) {
+                    var appIdReducer = function(acc, curr) {
+                        if (curr.length > 0) {
+                            acc.push(curr);
+                        }
+                        return acc;
+                    };
+
+                    var _u = this.user.permission._.u.reduce(function(acc, curr) {
+                        if (curr.length > 0) {
+                            var appIds = curr.reduce(appIdReducer, []);
+
+                            if (appIds.length > 0) {
+                                acc.push(appIds);
+                            }
+                        }
+                        return acc;
+                    }, []);
+
+                    this.user.permission._.u = _u;
+                    this.$refs.userDrawer.editedObject.permission._.u = _u;
+                }
+            },
         },
         watch: {
             'groups': function() {