Merge branch 'release.24.10' into release.24.12

ArtursKadikis · ArtursKadikis · commit b5edce1f9f5b · 2025-02-12T18:22:39.000+02:00
# Conflicts:
#	CHANGELOG.md
#	frontend/express/public/stylesheets/vue/clyvue.scss
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,8 +45,21 @@ Dependencies:
 - Bump sass from 1.81.0 to 1.83.3
 - Bump tslib from 2.7.0 to 2.8.1
 
+## Version 24.10.7
+Fixes:
+- [data-manager] Modifying existing values when segment values want to be updated in the Data Manager
+- [drill] Fix for UI error when push plugin is not enabled
+
+Enterprise fixes:
+- [drill] Fixed empty events list in drill section
+
+Features:
+- [core] Add self tracking capability
+- [hooks] Added remote config changes to internal actions
+- [system-utility] New endpoint: /take-heap-snapshot.
+- [system-utility] Using nodejs fs to write profiler files instead of gridfs.
+
 ## Version 24.10.6
-  
 Fixes:
 - [push] Using apns-id header as message result in debug mode
 - [server-stats] Fix data point calculation in job
diff --git a/frontend/express/public/core/date-presets/javascripts/countly.views.js b/frontend/express/public/core/date-presets/javascripts/countly.views.js
@@ -1,4 +1,4 @@
-/*global Vue app, countlyVue, CV, countlyGlobal, groupsModel, _, CountlyHelpers, countlyPresets*/
+/*global Vue app, countlyVue, CV, countlyGlobal, groupsModel, _, CountlyHelpers, countlyPresets, countlyAuth*/
 
 (function() {
 
@@ -459,11 +459,13 @@
         });
     };
 
-    app.route("/manage/date-presets", "date-presets", function() {
-        const PresetManagementView = getManagementView();
-        this.renderWhenReady(PresetManagementView);
-    });
+    if (countlyAuth.validateCreate('core')) {
+        app.route("/manage/date-presets", "date-presets", function() {
+            const PresetManagementView = getManagementView();
+            this.renderWhenReady(PresetManagementView);
+        });
 
-    app.addMenu("management", {code: "presets", permission: "core", url: "#/manage/date-presets", text: "sidebar.management.presets", priority: 30});
+        app.addMenu("management", {code: "presets", permission: "core", url: "#/manage/date-presets", text: "sidebar.management.presets", priority: 30});
+    }
 
 })();
diff --git a/frontend/express/public/javascripts/countly/countly.template.js b/frontend/express/public/javascripts/countly/countly.template.js
@@ -1159,7 +1159,7 @@ var AppRouter = Backbone.Router.extend({
             }
         });
 
-        if (countlyAuth.validateRead('core')) {
+        if (countlyAuth.validateCreate('core')) {
             self.addSubMenu("management", {code: "longtasks", permission: "core", url: "#/manage/tasks", text: "sidebar.management.longtasks", priority: 10});
         }
 
diff --git a/frontend/express/public/javascripts/countly/vue/components/helpers.js b/frontend/express/public/javascripts/countly/vue/components/helpers.js
@@ -1,4 +1,4 @@
-/* global Vue, CV, app, countlyEvent, countlyGlobal, countlyAuth, VueJsonPretty, ElementTiptapPlugin, countlyCommon CountlyHelpers*/
+/* global Vue, CV, $, app, countlyEvent, countlyGlobal, countlyAuth, VueJsonPretty, ElementTiptapPlugin, countlyCommon CountlyHelpers*/
 
 (function(countlyVue) {
 
@@ -580,32 +580,36 @@
 
     Vue.component("cly-event-select", countlyBaseComponent.extend({
         mixins: [countlyVue.mixins.i18n],
-        template: '<cly-select-x\
-                    :test-id="testId"\
-                    pop-class="cly-event-select"\
-                    all-placeholder="All Events"\
-                    search-placeholder="Search in Events"\
-                    placeholder="Select Event"\
-                    :disabled="disabled"\
-                    :hide-default-tabs="true"\
-                    :options="availableEvents"\
-                    :hide-all-options-tab="true"\
-                    :single-option-settings="singleOptionSettings"\
-                    :adaptive-length="adaptiveLength"\
-                    :arrow="arrow"\
-                    :width="width"\
-                    v-bind="$attrs"\
-                    v-on="$listeners">\
-                    <template v-slot:header="selectScope">\
-                        <h4 class="color-cool-gray-100 bu-mb-2" v-if="hasTitle">{{title}}</h4>\
-                        <el-radio-group\
-                            :value="selectScope.activeTabId"\
-                            @input="selectScope.updateTab"\
-                            size="small">\
-                            <el-radio-button :test-id="testId + \'-tab-\' + idx" v-for="(tab,idx) in selectScope.tabs" :key="tab.name" :label="tab.name">{{tab.label}}</el-radio-button>\
-                        </el-radio-group>\
-                    </template>\
-                </cly-select-x>',
+        template: '<div class="cly-event-select">\
+                    <cly-select-x\
+                        :test-id="testId"\
+                        pop-class="cly-event-select"\
+                        all-placeholder="All Events"\
+                        search-placeholder="Search in Events"\
+                        placeholder="Select Event"\
+                        :disabled="disabled"\
+                        :hide-default-tabs="true"\
+                        :options="availableEvents"\
+                        :hide-all-options-tab="true"\
+                        :single-option-settings="singleOptionSettings"\
+                        :adaptive-length="adaptiveLength"\
+                        :arrow="arrow"\
+                        :width="width"\
+                        v-bind="$attrs"\
+                        v-if="!isLoading"\
+                        v-on="$listeners">\
+                        <template v-slot:header="selectScope">\
+                            <h4 class="color-cool-gray-100 bu-mb-2" v-if="hasTitle">{{title}}</h4>\
+                            <el-radio-group\
+                                :value="selectScope.activeTabId"\
+                                @input="selectScope.updateTab"\
+                                size="small">\
+                                <el-radio-button :test-id="testId + \'-tab-\' + idx" v-for="(tab,idx) in selectScope.tabs" :key="tab.name" :label="tab.name">{{tab.label}}</el-radio-button>\
+                            </el-radio-group>\
+                        </template>\
+                    </cly-select-x>\
+                    <div v-else class="cly-event-select__loading el-loading-spinner"><i class="el-icon-loading bu-mr-2"></i><p class="el-loading-text">Loading...</p></div>\
+                </div>',
         props: {
             blacklistedEvents: {
                 type: Array,
@@ -626,16 +630,20 @@
                 singleOptionSettings: {
                     autoPick: true,
                     hideList: true
-                }
+                },
+                availableEvents: [],
+                isLoading: false
             };
         },
         computed: {
             hasTitle: function() {
                 return !!this.title;
-            },
-            availableEvents: function() {
+            }
+        },
+        methods: {
+            prepareAvailableEvents: function() {
                 var self = this;
-                var availableEvents = [
+                var preparedEventList = [
                     {
                         "label": this.i18n('sidebar.analytics.sessions'),
                         "name": "[CLY]_session",
@@ -648,7 +656,7 @@
                     }
                 ];
                 if (countlyGlobal.plugins.indexOf('views') !== -1) {
-                    availableEvents.push({
+                    preparedEventList.push({
                         "label": this.i18n('internal-events.[CLY]_view'),
                         "name": "[CLY]_view",
                         "options": [ { label: this.i18n('internal-events.[CLY]_view'), value: '[CLY]_view' } ]
@@ -665,7 +673,7 @@
                     feedbackOptions.push({ label: this.i18n('internal-events.[CLY]_survey'), value: '[CLY]_survey' });
                 }
                 if (feedbackOptions.length > 0) {
-                    availableEvents.push({
+                    preparedEventList.push({
                         "label": this.i18n("sidebar.feedback"),
                         "name": "feedback",
                         "options": feedbackOptions
@@ -674,15 +682,15 @@
 
 
                 if (countlyGlobal.plugins.indexOf('compliance-hub') !== -1) {
-                    availableEvents.push({
+                    preparedEventList.push({
                         "label": this.i18n('internal-events.[CLY]_consent'),
                         "name": "[CLY]_consent",
                         "options": [ { label: this.i18n('internal-events.[CLY]_consent'), value: '[CLY]_consent' } ]
                     });
                 }
 
                 if (countlyGlobal.plugins.indexOf('crashes') !== -1) {
-                    availableEvents.push({
+                    preparedEventList.push({
                         "label": this.i18n('internal-events.[CLY]_crash'),
                         "name": "[CLY]_crash",
                         "options": [ { label: this.i18n('internal-events.[CLY]_crash'), value: '[CLY]_crash' } ]
@@ -697,7 +705,7 @@
                             { label: this.i18n('internal-events.[CLY]_push_sent'), value: '[CLY]_push_sent' }
                         ]
                     });*/
-                    availableEvents.push({
+                    preparedEventList.push({
                         "label": 'Push Actioned',
                         "name": "[CLY]_push_action",
                         "options": [
@@ -712,26 +720,40 @@
                 //     "noChild": true
                 // }
 
-                if (this.selectedApp) {
-                    countlyEvent.getEventsForApps([this.selectedApp], function(eData) {
-                        availableEvents[1].options = eData.map(function(e) {
-                            return {label: countlyCommon.unescapeHtml(e.name), value: e.value};
+                return new Promise(function(resolve) {
+                    if (this.selectedApp) {
+                        self.isLoading = true;
+                        countlyEvent.getEventsForApps([this.selectedApp], function(eData) {
+                            preparedEventList[1].options = eData.map(function(e) {
+                                return {label: countlyCommon.unescapeHtml(e.name), value: e.value};
+                            });
                         });
-                    });
-                }
-                else {
-                    availableEvents[1].options = countlyEvent.getEvents().map(function(event) {
-                        return {label: countlyCommon.unescapeHtml(event.name), value: event.key};
-                    });
-                }
-
-                availableEvents = availableEvents.filter(function(evt) {
-                    return !(self.blacklistedEvents.includes(evt.name));
+                        preparedEventList = preparedEventList.filter(function(evt) {
+                            return !(self.blacklistedEvents.includes(evt.name));
+                        });
+                        self.isLoading = false;
+                        resolve(preparedEventList);
+                    }
+                    else {
+                        self.isLoading = true;
+                        $.when(countlyEvent.refreshEvents()).then(function() {
+                            const events = countlyEvent.getEvents();
+                            preparedEventList[1].options = events.map(function(event) {
+                                return {label: countlyCommon.unescapeHtml(event.name), value: event.key};
+                            });
+                            preparedEventList = preparedEventList.filter(function(evt) {
+                                return !(self.blacklistedEvents.includes(evt.name));
+                            });
+                            self.isLoading = false;
+                            resolve(preparedEventList);
+                        });
+                    }
                 });
-
-                return availableEvents;
             }
         },
+        created: async function() {
+            this.availableEvents = await this.prepareAvailableEvents();
+        }
     }));
 
     Vue.component("cly-paginate", countlyBaseComponent.extend({
diff --git a/frontend/express/public/stylesheets/vue/clyvue.scss b/frontend/express/public/stylesheets/vue/clyvue.scss
@@ -4320,7 +4320,6 @@
     }		
 }
 
-
 .cly-vue-content-builder {
     position: absolute;
     z-index: 2001;
@@ -4898,3 +4897,12 @@
         border-radius: 8px;
     }
 }
+
+.cly-event-select {
+    &__loading {
+        display: flex;
+        margin-top:0;
+        position: unset;
+        top:0;
+    }
+}
diff --git a/plugins/hooks/api/parts/triggers/internal_event.js b/plugins/hooks/api/parts/triggers/internal_event.js
@@ -212,6 +212,19 @@ class InternalEventTrigger {
                 }
                 break;
             }
+            case "/i/remote-config/add-parameter":
+            case "/i/remote-config/update-parameter":
+            case "/i/remote-config/remove-parameter":
+            case "/i/remote-config/add-condition":
+            case "/i/remote-config/update-condition":
+            case "/i/remote-config/remove-condition":
+                utils.updateRuleTriggerTime(rule._id);
+                this.pipeline({
+                    params: ob,
+                    rule: rule,
+                    eventType,
+                });
+                break;
             case "/alerts/trigger": {
                 this.pipeline({
                     params: ob,
@@ -255,4 +268,10 @@ const InternalEvents = [
     "/i/app_users/delete",
     "/hooks/trigger",
     "/alerts/trigger",
-];
+    "/i/remote-config/add-parameter",
+    "/i/remote-config/update-parameter",
+    "/i/remote-config/remove-parameter",
+    "/i/remote-config/add-condition",
+    "/i/remote-config/update-condition",
+    "/i/remote-config/remove-condition",
+];
diff --git a/plugins/hooks/frontend/public/javascripts/countly.views.js b/plugins/hooks/frontend/public/javascripts/countly.views.js
@@ -402,6 +402,12 @@
                     {value: "/systemlogs", label: "/systemlogs"},
                     {value: "/crashes/new", label: "/crashes/new"},
                     {value: "/hooks/trigger", label: "/hooks/trigger"},
+                    {value: "/i/remote-config/add-parameter", label: "/i/remote-config/add-parameter"},
+                    {value: "/i/remote-config/update-parameter", label: "/i/remote-config/update-parameter"},
+                    {value: "/i/remote-config/remove-parameter", label: "/i/remote-config/remove-parameter"},
+                    {value: "/i/remote-config/add-condition", label: "/i/remote-config/add-condition"},
+                    {value: "/i/remote-config/update-condition", label: "/i/remote-config/update-condition"},
+                    {value: "/i/remote-config/remove-condition", label: "/i/remote-config/remove-condition"},
                     {value: "/alerts/trigger", label: "/alerts/trigger"}
                 ],
                 cohortOptions: [],
diff --git a/plugins/remote-config/api/api.js b/plugins/remote-config/api/api.js
@@ -440,6 +440,11 @@ plugins.setConfigs("remote-config", {
                 }
                 return common.returnMessage(params, 500, message);
             }
+
+            plugins.dispatch("/i/remote-config/add-parameter", {
+                params: parameter
+            });
+
             if (params.internal) {
                 return true;
             }
@@ -967,6 +972,10 @@ plugins.setConfigs("remote-config", {
                 return common.returnMessage(params, 500, message);
             }
 
+            plugins.dispatch("/i/remote-config/update-parameter", {
+                params: parameter
+            });
+
             return common.returnMessage(params, 200);
         });
     }
@@ -1089,6 +1098,9 @@ plugins.setConfigs("remote-config", {
                 common.outDb.collection(collectionName).remove({_id: common.outDb.ObjectID(parameterId)}, function(removeErr) {
                     if (!removeErr) {
                         plugins.dispatch("/systemlogs", {params: params, action: "rc_parameter_removed", data: parameter});
+                        plugins.dispatch("/i/remote-config/remove-parameter", {
+                            params: parameter
+                        });
                         return common.returnMessage(params, 200, 'Success');
                     }
 
@@ -1175,6 +1187,9 @@ plugins.setConfigs("remote-config", {
             }
 
             var conditionId = result && result[1] || null;
+            plugins.dispatch("/i/remote-config/add-condition", {
+                params: condition
+            });
             if (params.internal) {
                 return conditionId;
             }
@@ -1353,6 +1368,10 @@ plugins.setConfigs("remote-config", {
                 return common.returnMessage(params, 500, message);
             }
 
+            plugins.dispatch("/i/remote-config/update-condition", {
+                params: condition
+            });
+
             return common.returnMessage(params, 200);
         });
 
@@ -1396,6 +1415,13 @@ plugins.setConfigs("remote-config", {
 
         async.parallel(asyncTasks, function(err) {
             if (!err) {
+                plugins.dispatch("/i/remote-config/remove-condition", {
+                    params: {
+                        conditionId: conditionId,
+                        appId: appId,
+                        ts: Date.now()
+                    }
+                });
                 return common.returnMessage(params, 200, 'Success');
             }
 
diff --git a/plugins/system-utility/api/api.js b/plugins/system-utility/api/api.js
diff --git a/plugins/system-utility/api/system.utility.js b/plugins/system-utility/api/system.utility.js

Original file line number	Diff line number	Diff line change
`@@ -1159,7 +1159,7 @@ var AppRouter = Backbone.Router.extend({`
`1159`	`1159`	`}`
`1160`	`1160`	`});`
`1161`	`1161`
`1162`		`- if (countlyAuth.validateRead('core')) {`
	`1162`	`+ if (countlyAuth.validateCreate('core')) {`
`1163`	`1163`	`self.addSubMenu("management", {code: "longtasks", permission: "core", url: "#/manage/tasks", text: "sidebar.management.longtasks", priority: 10});`
`1164`	`1164`	`}`
`1165`	`1165`
Original file line number	Diff line number	Diff line change
`@@ -4320,7 +4320,6 @@`
`4320`	`4320`	`}`
`4321`	`4321`	`}`
`4322`	`4322`
`4323`		`-`
`4324`	`4323`	`.cly-vue-content-builder {`
`4325`	`4324`	`position: absolute;`
`4326`	`4325`	`z-index: 2001;`
`@@ -4898,3 +4897,12 @@`
`4898`	`4897`	`border-radius: 8px;`
`4899`	`4898`	`}`
`4900`	`4899`	`}`
	`4900`	`+`
	`4901`	`+.cly-event-select {`
	`4902`	`+ &__loading {`
	`4903`	`+ display: flex;`
	`4904`	`+ margin-top:0;`
	`4905`	`+ position: unset;`
	`4906`	`+ top:0;`
	`4907`	`+ }`
	`4908`	`+}`