Merge branch 'master' into ar2rsawseen/master2

Author: ar2rsawseen

CHANGELOG.md

@@ -3,18 +3,28 @@ Fixes:
 - [crashes] Fixed resolving audit log recording
 - [location] Fixed updating none gps coordinate location after gps location was used
 
+Enterprise Fixes:
+- [ab-testing] Add script for fixing variant cohort
+- [groups] Fix user permission update after updating user group permission
+
+
+## Version 25.03.24
+Fixes:
+- [jobs] Fix condition for scheduling alert job
+
 Enterprise Fixes:
 - [compliance-hub] Fixed query patterns
-- [data-manager] Fixed segment data deletion
 - [data-manager] Fixed bug preventing transformation of events ending in a dot
+- [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
 
 Dependencies
-- Bump lint-staged from 16.2.3 to 16.2.4
 - Bump @faker-js/faker from 10.0.0 to 10.1.0 in /ui-tests
-- Bump puppeteer from 24.23.0 to 24.24.1
 - Bump countly-sdk-nodejs from 24.10.2 to 24.10.3
+- Bump lint-staged from 16.2.3 to 16.2.4
+- Bump puppeteer from 24.23.0 to 24.24.1
 
 ## Version 25.03.23
 Fixes:

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);
+                }
+            });
+        });
     }
 
     /**
@@ -1142,4 +1143,4 @@ module.exports = {
     STATUS: STATUS,
     STATUS_MAP: STATUS_MAP,
     debounce: debounce
-};
+};

bin/scripts/fix-data/recalculate_ab_test_cohorts.js

@@ -0,0 +1,74 @@
+/*
+ *  Sends recalculate request for all ab testing experiment variant cohorts
+ *  Server: countly
+ *  Path: $(countly dir)/bin/scripts/fix-data
+ *  Command: node recalculate_ab_test_cohorts.js
+ */
+
+// API key here with permission to update cohorts
+const API_KEY = '';
+// Countly app id, if not specified will do nothing
+const APP_ID = '';
+// ab test experiment id, will do nothing if not specified
+const EXPERIMENT_ID = '';
+// countly instance public url, something like 'https://name.count.ly'
+const SERVER_URL = '';
+
+const pluginManager = require('../../../plugins/pluginManager.js');
+const request = require('countly-request')(pluginManager.getConfig('security'));
+
+if (API_KEY.length === 0) {
+    console.warn('Please provide an API_KEY');
+    process.exit(1);
+}
+
+pluginManager.dbConnection('countly_out').then(async(db) => {
+    let urlObj = {};
+    try {
+        urlObj = new URL(SERVER_URL);
+    }
+    catch (err) {
+        urlObj = new URL((process.env.COUNTLY_CONFIG_PROTOCOL || "http") + "://" + (process.env.COUNTLY_CONFIG_HOSTNAME || "localhost"));
+    }
+    urlObj.pathname = 'i/cohorts/recalculate';
+    urlObj.searchParams.append('api_key', API_KEY);
+    urlObj.searchParams.append('app_id', APP_ID);
+
+    console.log(`Finding ab test experiment ${EXPERIMENT_ID} in app ${APP_ID}`);
+
+    const experimentCollectionName = `ab_testing_experiments${APP_ID}`;
+    const experiment = await db.collection(experimentCollectionName).findOne({ _id: db.ObjectID(EXPERIMENT_ID) });
+
+    if (experiment?.variants?.length > 0) {
+        for (let varIdx = 0; varIdx < experiment.variants.length; varIdx += 1) {
+            const variant = experiment.variants[varIdx];
+
+            if (variant?.cohorts && Object.keys(variant.cohorts).length > 0) {
+                for (let cohIdx = 0; cohIdx < Object.keys(variant.cohorts).length; cohIdx += 1) {
+                    const cohortId = variant.cohorts[Object.keys(variant.cohorts)[cohIdx]];
+                    console.log(`Sending recalculate request for variant ${variant.name}, cohort ${cohortId}`);
+
+                    urlObj.searchParams.delete('cohort_id');
+                    urlObj.searchParams.append('cohort_id', cohortId);
+
+                    await new Promise((resolve) => {
+                        request.get(urlObj.href, (err, _, body) => {
+                            if (err) {
+                                console.warn('Request failed ', JSON.stringify(cohortId), err);
+                            }
+                            else {
+                                console.log('Request finished ', JSON.stringify(cohortId), body);
+                            }
+                            resolve();
+                        });
+                    });
+                }
+            }
+        }
+    }
+    else {
+        console.warn(`Experiments ${EXPERIMENT_ID} not found in app ${APP_ID}`);
+    }
+
+    db.close();
+});

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

@@ -866,6 +866,7 @@
                 }
             },
             onOpen: function() {
+                this.patchUserPermission();
                 this.changePasswordFlag = false;
                 // types
                 var types = ['c', 'r', 'u', 'd'];
@@ -879,7 +880,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;
@@ -982,7 +983,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() {