Merge branch 'master' into dependabot/npm_and_yarn/bin/scripts/device_list/csvtojson-2.0.13

Author: ar2rsawseen

CHANGELOG.md

@@ -1,3 +1,13 @@
+## Version 25.03.25
+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

api/parts/data/usage.js

@@ -1030,7 +1030,7 @@ plugins.register("/sdk/user_properties", async function(ob) {
 
                 if (plugins.getConfig('api', params.app && params.app.plugins, true).city_data === true && !userProps.loc && typeof data.lat !== "undefined" && typeof data.lon !== "undefined") {
                     // only override lat/lon if no recent gps location exists in user document
-                    if (!params.app_user.loc || (params.app_user.loc.gps && params.time.mstimestamp - params.app_user.loc.date > 7 * 24 * 3600)) {
+                    if (!params.app_user.loc || !params.app_user.loc.gps || params.time.mstimestamp - params.app_user.loc.date > 7 * 24 * 3600) {
                         userProps.loc = {
                             gps: false,
                             geo: {
@@ -1061,7 +1061,7 @@ plugins.register("/sdk/user_properties", async function(ob) {
 
                     if (plugins.getConfig('api', params.app && params.app.plugins, true).city_data === true && !userProps.loc && data.ll && typeof data.ll[0] !== "undefined" && typeof data.ll[1] !== "undefined") {
                         // only override lat/lon if no recent gps location exists in user document
-                        if (!params.app_user.loc || (params.app_user.loc.gps && params.time.mstimestamp - params.app_user.loc.date > 7 * 24 * 3600)) {
+                        if (!params.app_user.loc || !params.app_user.loc.gps || params.time.mstimestamp - params.app_user.loc.date > 7 * 24 * 3600) {
                             userProps.loc = {
                                 gps: false,
                                 geo: {

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() {

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

@@ -774,6 +774,8 @@
         template: CV.T('/javascripts/countly/vue/templates/content/UI/content-sidebar-input.html')
     }));
 
+    const DEFAULT_LIST_BLOCK_IMAGE_PLACEHOLDER_URL = '/content/images/fullscreenPlaceholderImage.png';
+
     Vue.component('cly-content-block-list-input', countlyVue.components.create({
         props: {
             blockInputs: {
@@ -788,6 +790,19 @@
             'input'
         ],
 
+        computed: {
+            mappedBlockInputs() {
+                return this.blockInputs.map(block => {
+                    return block.map(blockInput => ({
+                        ...blockInput,
+                        ...(blockInput.id.includes('image') && !blockInput.value) && {
+                            value: DEFAULT_LIST_BLOCK_IMAGE_PLACEHOLDER_URL
+                        }
+                    }));
+                });
+            }
+        },
+
         methods: {
             onAddAsset(payload) {
                 this.$emit('add-asset', payload);

frontend/express/public/javascripts/countly/vue/templates/UI/color-picker.html

@@ -62,6 +62,7 @@
         <el-input
           v-model="hexColor"
           class="cly-vue-color-picker__color-input cly-vue-color-picker__color-input--hex"
+          :test-id="testId + '-hex-input'"
         >
           <template #prepend>
             <span>#</span>

frontend/express/public/javascripts/countly/vue/templates/content/UI/content-block-list-input.html

@@ -1,7 +1,6 @@
 <div class="cly-content-block-list-input">
-  <!-- v-tooltip.right="step.componentTooltip" -->
   <el-collapse
-    v-for="(block, blockIndex) in blockInputs"
+    v-for="(block, blockIndex) in mappedBlockInputs"
     :key="`list-block-${blockIndex}`"
     class="cly-content-block-list-input__list-block"
   >
@@ -12,7 +11,7 @@
               <img
                   class="cly-content-block-list-input__list-block-header-display-icon"
                   :data-test-id="'fullscreen-blocks-icon-block-' + blockIndex"
-                  :src="block[0].value || '/content/images/fullscreenPlaceholderImage.png'"
+                  :src="block[0].value"
               >
               <p
                   class="cly-content-block-list-input__list-block-header-display-title"

package-lock.json

@@ -87,7 +87,7 @@
     "moment-timezone": "0.6.0",
     "mongodb": "6.20.0",
     "nginx-conf": "2.1.0",
-    "nodemailer": "7.0.9",
+    "nodemailer": "7.0.10",
     "object-hash": "3.0.0",
     "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
     "properties-parser": "0.6.0",

package.json

@@ -1487,7 +1487,7 @@ plugins.setConfigs("crashes", {
                 var crashes = params.qstring.args.crashes || [params.qstring.args.crash_id];
                 common.db.collection('app_crashgroups' + params.qstring.app_id).update({'_id': {$in: crashes} }, {"$set": {is_resolving: true}}, {multi: true}, function() {
                     for (var i = 0; i < crashes.length; i++) {
-                        plugins.dispatch("/systemlogs", {params: params, action: "crash_shown", data: {app_id: params.qstring.app_id, crash_id: params.qstring.args.crash_id}});
+                        plugins.dispatch("/systemlogs", {params: params, action: "crash_resolving", data: {app_id: params.qstring.app_id, crash_id: params.qstring.args.crash_id}});
                     }
                     common.returnMessage(params, 200, 'Success');
                     return true;