Merge branch 'next' into SER-1897

Author: Cookiezaurs

CHANGELOG.md

@@ -35,6 +35,18 @@ Enterprise Features:
 - [users] UI improvements
 - [views] Added a quick transition to drill
 
+## Version 24.05.17
+Fixes:
+- [push] Improved ability to observe push related errors
+
+Enterprise fixes:
+- [cohorts] Fixed issues with nightly cleanup
+- [data-manager] Fixed UI bug where rules were not visible when editing "Merge by regex" transformations
+- [drill] Fixed wrong pie chart label  tooltip in dashboard widget
+- [flows] Fixed bug in case of null data in schema
+- [nps] Fixed bug in the editor where the "internal name" field was not mandatory
+- [ratings] Fixed UI bug where "Internal name" was not a mandatory field
+
 ## Version 24.05.16
 Fixes:
 - [core] Replaced "Users" with "Sessions" label on technology home widgets

api/api.js

@@ -313,6 +313,7 @@ plugins.connectToAllDatabases().then(function() {
             jobs.job('api:clearAutoTasks').replace().schedule('every 1 day');
             jobs.job('api:task').replace().schedule('every 5 minutes');
             jobs.job('api:userMerge').replace().schedule('every 10 minutes');
+            jobs.job("api:ttlCleanup").replace().schedule("every 1 minute");
             //jobs.job('api:appExpire').replace().schedule('every 1 day');
         }, 10000);
 

api/jobs/ttlCleanup.js

@@ -0,0 +1,48 @@
+const plugins = require("../../plugins/pluginManager.js");
+const common = require('../utils/common');
+const job = require("../parts/jobs/job.js");
+const log = require("../utils/log.js")("job:ttlCleanup");
+
+/**
+ * Class for job of cleaning expired records inside ttl collections
+ */
+class TTLCleanup extends job.Job {
+    /**
+     * Run the job
+     */
+    async run() {
+        log.d("Started running TTL clean up job");
+        for (let i = 0; i < plugins.ttlCollections.length; i++) {
+            const {
+                db = "countly",
+                collection,
+                property,
+                expireAfterSeconds = 0
+            } = plugins.ttlCollections[i];
+            let dbInstance;
+            switch (db) {
+            case "countly": dbInstance = common.db; break;
+            case "countly_drill": dbInstance = common.drillDb; break;
+            case "countly_out": dbInstance = common.outDb; break;
+            }
+            if (!dbInstance) {
+                log.e("Invalid db selection:", db);
+                continue;
+            }
+
+            log.d("Started cleaning up", collection);
+            const result = await dbInstance.collection(collection).deleteMany({
+                [property]: {
+                    $lte: new Date(Date.now() - expireAfterSeconds * 1000)
+                }
+            });
+            log.d("Finished cleaning up", result.deletedCount, "records from", collection);
+
+            // Sleep 1 second to prevent sending too many deleteMany queries
+            await new Promise(res => setTimeout(res, 1000));
+        }
+        log.d("Finished running TTL clean up job");
+    }
+}
+
+module.exports = TTLCleanup;

bin/scripts/expire-data/delete_custom_events_regex.js

@@ -6,7 +6,6 @@
  */
 
 
-const { ObjectId } = require('mongodb');
 const pluginManager = require('../../../plugins/pluginManager.js');
 const common = require('../../../api/utils/common.js');
 const drillCommon = require('../../../plugins/drill/api/common.js');
@@ -25,7 +24,7 @@ Promise.all([pluginManager.dbConnection("countly"), pluginManager.dbConnection("
 
     //GET APP
     try {
-        const app = await countlyDb.collection("apps").findOne({_id: ObjectId(APP_ID)}, {_id: 1, name: 1});
+        const app = await countlyDb.collection("apps").findOne({_id: countlyDb.ObjectID(APP_ID)}, {_id: 1, name: 1});
         console.log("App:", app.name);
         //GET EVENTS
         var events = [];
@@ -51,6 +50,27 @@ Promise.all([pluginManager.dbConnection("countly"), pluginManager.dbConnection("
                     }
                 ]).toArray();
                 events = events.length ? events[0].list : [];
+                const metaEvents = await drillDb.collection("drill_meta").aggregate([
+                    {
+                        $match: {
+                            'app_id': app._id + "",
+                            "type": "e",
+                            "e": { $regex: regex, $options: CASE_INSENSITIVE ? "i" : "", $nin: events }
+                        }
+                    },
+                    {
+                        $group: {
+                            _id: "$e"
+                        }
+                    },
+                    {
+                        $project: {
+                            _id: 0,
+                            e: "$_id"
+                        }
+                    }
+                ]).toArray();
+                events = events.concat(metaEvents.map(e => e.e));
             }
             catch (err) {
                 close("Invalid regex");
@@ -86,6 +106,7 @@ Promise.all([pluginManager.dbConnection("countly"), pluginManager.dbConnection("
         close(err);
     }
 
+
     async function deleteDrillEvents(appId, events) {
         for (let i = 0; i < events.length; i++) {
             var collectionName = drillCommon.getCollectionName(events[i], appId);

frontend/express/app.js

@@ -974,6 +974,7 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
                     timezones: timezones,
                     countlyTypeName: COUNTLY_NAMED_TYPE,
                     countlyTypeTrack: COUNTLY_TRACK_TYPE,
+                    countlyTypeCE: COUNTLY_TYPE_CE,
                     countly_tracking,
                     countly_domain,
                     frontend_app: versionInfo.frontend_app || 'e70ec21cbe19e799472dfaee0adb9223516d238f',

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

@@ -392,10 +392,10 @@
                                     label: data.name
                                 });
                                 self.$store.dispatch("countlyCommon/addToAllApps", data);
+                                self.$store.dispatch("countlyCommon/updateActiveApp", data._id + "");
                                 if (self.firstApp) {
                                     countlyCommon.ACTIVE_APP_ID = data._id + "";
                                     app.onAppManagementSwitch(data._id + "", data && data.type || "mobile");
-                                    self.$store.dispatch("countlyCommon/updateActiveApp", data._id + "");
                                     app.initSidebar();
                                 }
                                 self.firstApp = self.checkIfFirst();

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

@@ -742,6 +742,9 @@
                 },
                 helpCenterTarget: function() {
                     return this.enableGuides ? '_self' : "_blank";
+                },
+                isCommunityEdition: function() {
+                    return countlyGlobal.countlyTypeCE;
                 }
             },
             methods: {
@@ -894,6 +897,12 @@
 
                         return menu;
                     });
+                },
+                handleButtonClick: function() {
+                    CountlyHelpers.goTo({
+                        url: "https://flex.countly.com",
+                        isExternalLink: true
+                    });
                 }
             },
             mounted: function() {

frontend/express/public/javascripts/countly/vue/templates/sidebar/sidebar.html

@@ -42,7 +42,18 @@
             <analytics-menu ref="analytics" v-show="visibleSidebarMenu === 'analytics'"></analytics-menu>
             <management-menu ref="management" v-show="visibleSidebarMenu === 'management'" @management-menu-ready="onManagementMenuReady"></management-menu>
             <component :ref="item.name" v-for="item in components" :is="item.component" v-show="visibleSidebarMenu === item.name" :key="item.name"></component>
-            <a :href="countlySidebarVersionPath"><div class="cly-vue-sidebar__version" data-test-id="sidebar-menu-version"> {{versionInfo}} </div></a>
+            <div v-if="isCommunityEdition" class="cly-vue-sidebar__version" data-test-id="sidebar-menu-version">
+                <div class="cly-vue-sidebar__version__banner">
+                    <div class="text">{{i18n('sidebar.banner.text')}}</div>
+                    <div class="text bu-has-text-weight-medium">{{i18n('sidebar.banner.upgrade')}}</div>
+                    <el-button class="button" type="success" @click="handleButtonClick">{{i18n('sidebar.banner.upgrade-button')}}</el-button>
+                </div>
+            </div>
+            <a v-else :href="countlySidebarVersionPath">
+                <div class="cly-vue-sidebar__version" data-test-id="sidebar-menu-version">
+                    {{versionInfo}}
+                </div>
+            </a>
         </div>
     </transition>
 </div>

frontend/express/public/localization/dashboard/dashboard.properties

@@ -440,6 +440,9 @@ sidebar.dashboard-tooltip = Dashboards
 sidebar.main-menu = Main Menu
 sidebar.my-profile = My Profile
 sidebar.copy-api-key-success-message = Api Key has been copied to clipboard!
+sidebar.banner.text = You are using a free plan.
+sidebar.banner.upgrade = Upgrade and get more.
+sidebar.banner.upgrade-button = Manage your plan
 
 #dashboard
 dashboard.apply = Apply

frontend/express/public/stylesheets/styles/blocks/_sidebar.scss

@@ -378,6 +378,26 @@ $bg-color: #24292e;
         width: 224px;
         font-size: 10px;
         background-color: #24292e;
+
+        &__banner {
+            background-color: #191C20;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+            border-radius: 4px;
+            padding: 16px;
+            margin-bottom: 30%;
+            cursor: default;
+            .text {
+                font-size: 14px;
+                color: #fff;
+            }
+            .button {
+                width: 100%;
+                margin-top: 12px;
+            }
+        }
     }
 
     .cly-icon {