Merge branch 'master' into SER-1918-push-proxy-agent-doesnt-work-with-firebase-admin-versions-after-12-3

Author: Cihad Tekin

CHANGELOG.md

@@ -1,3 +1,18 @@
+## Version 24.05.11
+Fixes:
+- [cache] Use a cursor without timeout
+
+## Version 24.05.10
+Fixes:
+- [alerts] Alerts improvements
+- [core] Various fixes for frontend to support running countly from subdirectory
+- [logs]  Show collected problems on logger
+
+Enterprise fixes:
+- [data-manager] Fixes n UI to allow events starting with "/"
+- [flows] Fixes for flows step generation
+- [surveys] Other is not allowed as a valid answer for required questions
+
 ## Version 24.05.9
 Fixes:
 - [crashes] Fix crashes template paths and add data check

api/config.sample.js

@@ -99,6 +99,7 @@ var countlyConfig = {
     * @property {string} algorithm - name of the algorithm to use for encryption. The algorithm is dependent on OpenSSL, examples are 'aes192', etc. On recent OpenSSL releases, openssl list-cipher-algorithms will display the available cipher algorithms. Default value is aes-256-cbc
     * @property {string} input_encoding - how encryption input is encoded. Used as output for decrypting. Default utf-8.
     * @property {string} output_encoding - how encryption output is encoded. Used as input for decrypting. Default hex.
+    * @property {string} reports_key - key used for encryption of reports links
     */
     encryption: {},
 

api/parts/data/cache.js

@@ -971,7 +971,7 @@ class StreamedCollection {
             let [col, last] = await createCollection(this.db, this.name, 1e7);
 
             this.col = col;
-            this.stream = col.find({_id: {$gt: last}}, {tailable: true, awaitData: true, numberOfRetries: -1}).stream();
+            this.stream = col.find({_id: {$gt: last}}, {tailable: true, awaitData: true, noCursorTimeout: true, numberOfRetries: -1}).stream();
 
             this.stream.on('data', doc => {
                 if (this.inserts.indexOf(doc._id.toString()) !== -1) {

api/parts/data/fetch.js

@@ -1589,7 +1589,7 @@ function fetchTimeObj(collection, params, isCustomEvent, options, callback) {
         options = {};
     }
 
-    if (typeof options === "undefined") {
+    if (!options) {
         options = {};
     }
 
@@ -1679,7 +1679,7 @@ function fetchTimeObj(collection, params, isCustomEvent, options, callback) {
 
         var zeroDocs = [zeroIdToFetch];
         var monthDocs = [monthIdToFetch];
-        if (!(options && options.dontBreak)) {
+        if (!options.dontBreak) {
             for (let i = 0; i < common.base64.length; i++) {
                 zeroDocs.push(zeroIdToFetch + "_" + common.base64[i]);
                 monthDocs.push(monthIdToFetch + "_" + common.base64[i]);

bin/scripts/expire-data/countly_single_app_expireDataBatches.js

@@ -209,7 +209,7 @@ function processDrillCollection(collection, seconds, callback) {
 
     function generateIterationList(z) {
         z = (start === 0 && z) ? z : start;
-        if (timeSpan === 0 && start === 0) {
+        if (timeSpan === 0 && z === 0) {
             listed.push({"collection": collection.collection, "db": collection.db, "start": 0, "end": end, "query": {"ts": {"$lt": end}}});
         }
         else if (timeSpan === 0) {

frontend/express/public/core/events/javascripts/countly.details.views.js

@@ -1,4 +1,4 @@
-/* global countlyVue, countlyGlobal, countlyAllEvents, countlyCommon, CV,app*/
+/* global countlyVue, countlyGlobal, countlyAllEvents, countlyCommon, CountlyHelpers, CV,app*/
 (function() {
     var EventsTable = countlyVue.views.create({
         template: CV.T("/core/events/templates/eventsTable.html"),
@@ -400,9 +400,10 @@
             clyModel: countlyAllEvents
         }],
     });
-    app.route("/analytics/events/key/:eventKey", "events", function(eventKey) {
+    app.route("/analytics/events/key/*eventKey", "events", function(query) {
+        var queryUrlParameter = query && CountlyHelpers.isJSON(query) ? JSON.parse(query) : query;
         var params = {
-            eventKey: eventKey
+            eventKey: queryUrlParameter
         };
         var eventsViewWrapper = getAllEventsView();
         eventsViewWrapper.params = params;

frontend/express/public/core/events/javascripts/countly.overview.views.js

@@ -12,7 +12,7 @@
         },
         methods: {
             onRowClick: function(params) {
-                app.navigate("#/analytics/events/key/" + params.key, true);
+                app.navigate("#/analytics/events/key/" + JSON.stringify(params.key), true);
             },
             formatNumber: function(val) {
                 return countlyCommon.formatNumber(val);
@@ -243,7 +243,7 @@
                 this.$store.dispatch('countlyEventsOverview/fetchMonitorEvents');
             },
             onMetricClick: function(params) {
-                app.navigate("#/analytics/events/key/" + params.key, true);
+                app.navigate("#/analytics/events/key/" + JSON.stringify(params.key), true);
             },
             durCheck: function(item) {
                 var eventMapKey = item.eventKey;

frontend/express/public/core/events/templates/overview.html

@@ -65,7 +65,7 @@ <h3 class="cly-vue-events-overview-subheadings" data-test-id="events-overview-su
 			<detail-tables></detail-tables>
 		  </cly-section>
 		  <div class="bu-is-flex bu-mb-4">
-			<h3 data-test-id="events-overview-subheading-monitor-events-label" class="cly-vue-events-overview-subheadings" data-test-id="events-overview-subheading-monitor-events-label">{{i18n('events.overview.monitor')}} </h3>
+			<h3 data-test-id="events-overview-subheading-monitor-events-label" class="cly-vue-events-overview-subheadings">{{i18n('events.overview.monitor')}} </h3>
 			<cly-tooltip-icon :tooltip="i18n('events.overview.event.monitor.events')" class="cly-vue-events-overview-subheadings--tooltip" icon="ion-help-circled" data-test-id="events-overview-subheading-monitor-events-tooltip"></cly-tooltip-icon>
 			<div class="cly-vue-events-overview-monitor-events__configure--position">
 				<el-button @click="configureOverview" size="small" data-test-id="events-overview-configure-events-button">{{i18n('events.overview.events.configure.events')}}