Merge pull request #4455 from Countly/master

Master -> Next

CHANGELOG.md

@@ -1,3 +1,24 @@
+## Version 23.06.8
+Fixes:
+- [core] Automatic license management installation script
+- [core] Fixes for meta merging script
+- [core] Adding automation tests to base code
+- [core] Improvements for views to correctly count unique user count for one view if multiple views with the same name are sent in a single request.
+- [crashes] Fix query builder option source
+- [dbviewer] Fixed bug with  the filter being ignored on export if any value is null in the filter.
+
+Enterprise fixes:
+- [cohorts] Fixed pipeline for the top metric calculation to return only top 3 values, not all possible.
+- [cohorts] Fixes for data fetching upon loading cohorts table
+- [data-manager] Fixed a typo in the import schema function
+- [data-manager] Fixes to prevent Duplicate Events due to Transform Merge
+- [drill] Drill meta document conversion to type string on overflow based on document size
+- [funnels] Funnel edit form does not decode funnel name on open
+- [push] Fixing drill query by push token
+- [push] User Profiles querying by push tokens & messages
+- [push] User details rendering of push tokens present in a profile
+
+
 ## Version 23.06.7
 Fixes:
 - [consent] Fixes for user consent table

api/utils/common.js

@@ -2744,7 +2744,10 @@ common.p = f => {
 * @returns {vary} modified value, if it had revivable data
 */
 common.reviver = (key, value) => {
-    if (value.toString().indexOf("__REGEXP ") === 0) {
+    if (value === null) {
+        return value;
+    }
+    else if (value.toString().indexOf("__REGEXP ") === 0) {
         const m = value.split("__REGEXP ")[1].match(/\/(.*)\/(.*)?/);
         return new RegExp(m[1], m[2] || "");
     }

frontend/express/version.info.js

@@ -1,5 +1,5 @@
 var versionInfo = {
-    version: "23.06.7",
+    version: "23.06.8",
     type: "777a2bf527a18e0fffe22fb5b3e322e68d9c07a6"
 };
 try {

plugins/views/api/api.js

@@ -2077,8 +2077,12 @@ const escapedViewSegments = { "name": true, "segment": true, "height": true, "wi
                     if (lastViewTimestamp < (params.time.timestamp - secInYear)) {
                         tmpTimeObjZero['d.' + escapedMetricVal + common.dbMap.unique] = 1;
                     }
+                    if (params.time.timestamp > lastViewTimestamp) {
+                        view[viewName] = params.time.timestamp;
+                    }
                 }
                 else {
+                    view[viewName] = params.time.timestamp;
                     common.fillTimeObjectZero({"time": {"weekly": params.time.weeklyISO || params.time.weekly, "yearly": params.time.yearly, "month": params.time.month }}, tmpTimeObjZero, escapedMetricVal + common.dbMap.unique);
                     common.fillTimeObjectMonth(params, tmpTimeObjMonth, escapedMetricVal + common.dbMap.unique, 1, true);
                 }