Merge remote-tracking branch 'origin/release.24.12' into journey+content-main

Author: gabrieloliveirapinto

.github/workflows/main.yml

@@ -6,7 +6,7 @@ name: CI
 on:
   # Triggers the workflow on push or pull request events but only for the master branch
   pull_request:
-    branches: [ master, next, release.24.10, release.24.12 ]
+    branches: [ master, next, release.*, flex ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

README.md

@@ -8,10 +8,10 @@
 ## 🔗 Quick links
 
 * [Countly Website](https://countly.com)
-* [Countly Server installation guide](https://support.count.ly/hc/en-us/articles/360036862332-Installing-the-Countly-Server)
-* [Countly SDKs, download and documentation links](https://support.count.ly/hc/en-us/articles/360037236571-Downloading-and-Installing-SDKs)
+* [Countly Server installation guide](https://support.countly.com/hc/en-us/articles/360036862332-Installing-the-Countly-Server)
+* [Countly SDKs, download and documentation links](https://support.countly.com/hc/en-us/articles/360037236571-Downloading-and-Installing-SDKs)
 * [Countly Community on Discord](https://discord.gg/countly)
-* [User Guides for Countly features](https://support.count.ly/hc/en-us/sections/7039354168729-User-Guides-Countly-22-x)
+* [User Guides for Countly features](https://support.countly.com/hc/en-us/sections/360007405211-User-Guides)
 
 ## 🌟 What is Countly?
 
@@ -53,8 +53,8 @@ This repository includes server-side part of Countly, with the following feature
 
 Countly can collect and visualize data from mobile, web and desktop applications. Using the write-API you can send data into Countly from any source. For more information please check the below resources: 
 
-* [List of Countly SDKs, documentation and download information](https://support.count.ly/hc/en-us/articles/360037236571-Downloading-and-Installing-SDKs)
-* [SDK development guide to build your own SDK](https://support.count.ly/hc/en-us/articles/360037753291-SDK-development-guide)
+* [List of Countly SDKs, documentation and download information](https://support.countly.com/hc/en-us/articles/360037236571-Downloading-and-Installing-SDKs)
+* [SDK development guide to build your own SDK](https://support.countly.com/hc/en-us/articles/360037753291-SDK-development-guide)
 * [Countly Server Write API to send data into Countly from any source](https://api.count.ly/reference/i)
 
 ## 🛠️ Installing and upgrading Countly server
@@ -69,15 +69,15 @@ There are several ways to install Countly:
 
 2. For bash lovers, we provide a beautiful installation script (`bin/countly.install.sh`) in countly-server package which installs everything required to run Countly Server. For this, you need a stable release of this repository [available here](https://github.com/Countly/countly-server/releases).
 
-3. Countly Lite also has Docker support - [see our official Docker repository](https://registry.hub.docker.com/r/countly/countly-server/) and [installation instructions for Docker](https://support.count.ly/hc/en-us/articles/360036862332-Installing-the-Countly-Server).
+3. Countly Lite also has Docker support - [see our official Docker repository](https://registry.hub.docker.com/r/countly/countly-server/) and [installation instructions for Docker](https://support.countly.com/hc/en-us/articles/360036862332-Installing-the-Countly-Server).
 
-If you want to upgrade Countly from a previous version, please take a look at [upgrading documentation](https://support.count.ly/hc/en-us/articles/360037443652-Upgrading-the-Countly-Server).
+If you want to upgrade Countly from a previous version, please take a look at [upgrading documentation](https://support.countly.com/hc/en-us/articles/360037443652-Upgrading-the-Countly-Server).
 
 ## 🧩 API, extensibility and plugins
 
 Countly has a [well-defined API](https://api.count.ly), that reads and writes data from/to the Countly backend. Countly dashboard is built using the read API, so it's possible to fetch any information you see on the dashboard using the API.
 
-Countly is extensible using the plugin architecture. If you would like to modify any exiting feature by extending it or changing it, or if you would like to add completely new capabilities to Countly you can modify existing plugins or create new ones. We suggest [you read this document](https://support.count.ly/hc/en-us/articles/360036862392-Introduction) if you would like to start with plugin development.
+Countly is extensible using the plugin architecture. If you would like to modify any exiting feature by extending it or changing it, or if you would like to add completely new capabilities to Countly you can modify existing plugins or create new ones. We suggest [you read this document](https://support.countly.com/hc/en-us/articles/360036862392-Introduction) if you would like to start with plugin development.
 
 ## 💚 Community
 
@@ -93,7 +93,7 @@ Security is very important to us. If you discover any issue regarding security,
 * **NodeJS** — An open-source, cross-platform JavaScript runtime environment
 * **Linux** — What we all love using ;-)
 
-Plus lots of [open source libraries](https://support.count.ly/hc/en-us/articles/360037092232-Open-source-components)!         
+Plus lots of [open source libraries](https://support.countly.com/hc/en-us/articles/360037092232-Open-source-components)!         
 
 ## 🤝 How can I help you with your efforts?
 

api/jobs/topEvents.js

@@ -19,8 +19,8 @@ class TopEventsJob extends job.Job {
     /**
      * TopEvents initialize function
      */
-    init() {
-        this.getAllApps();
+    async init() {
+        return this.getAllApps();
     }
 
     /**
@@ -144,6 +144,7 @@ class TopEventsJob extends job.Job {
         }
         catch (error) {
             log.e("TopEvents Job has a error: ", error);
+            throw error;
         }
     }
 
@@ -157,7 +158,18 @@ class TopEventsJob extends job.Job {
         const encodedData = this.encodeEvents(data);
         const timeSecond = this.timeSecond();
         const currentPeriood = this.mutatePeriod(period);
-        await new Promise((res, rej) => common.db.collection(TopEventsJob.COLLECTION_NAME).insert({ app_id: _id, ts: timeSecond, period: currentPeriood, data: encodedData, totalCount: totalCount, prevTotalCount: prevTotalCount, totalSum: totalSum, prevTotalSum: prevTotalSum, totalDuration: totalDuration, prevTotalDuration: prevTotalDuration, prevSessionCount: sessionData.prevSessionCount, totalSessionCount: sessionData.totalSessionCount, prevUsersCount: usersData.prevUsersCount, totalUsersCount: usersData.totalUsersCount }, (error, records) => !error && records ? res(records) : rej(error)));
+        await new Promise((res, rej) => common.db.collection(TopEventsJob.COLLECTION_NAME).findOneAndReplace(
+            {
+                app_id: _id, period: currentPeriood,
+            },
+            {
+                app_id: _id, ts: timeSecond, period: currentPeriood, data: encodedData, totalCount: totalCount, prevTotalCount: prevTotalCount, totalSum: totalSum, prevTotalSum: prevTotalSum, totalDuration: totalDuration, prevTotalDuration: prevTotalDuration, prevSessionCount: sessionData.prevSessionCount, totalSessionCount: sessionData.totalSessionCount, prevUsersCount: usersData.prevUsersCount, totalUsersCount: usersData.totalUsersCount
+            },
+            {
+                upsert: true
+            },
+            (error, records) => !error && records ? res(records) : rej(error))
+        );
     }
 
     /**
@@ -169,7 +181,6 @@ class TopEventsJob extends job.Job {
         const getEvents = await new Promise((res, rej) => common.db.collection("events").findOne({ _id: app._id }, (errorEvents, result) => errorEvents ? rej(errorEvents) : res(result)));
         if (getEvents && 'list' in getEvents) {
             const eventMap = this.eventsFilter(getEvents.list);
-            await new Promise((res, rej) => common.db.collection(TopEventsJob.COLLECTION_NAME).remove({ app_id: app._id }, (error, result) => error ? rej(error) : res(result)));
             if (eventMap && eventMap instanceof Array) {
                 for (const period of TopEventsJob.PERIODS) {
                     const data = {};
@@ -211,9 +222,14 @@ class TopEventsJob extends job.Job {
      * @param {Db} db connection
      * @param {done} done callback
      */
-    run(db, done) {
-        this.init();
-        done();
+    async run(db, done) {
+        try {
+            await this.init();
+            done();
+        }
+        catch (error) {
+            done(error);
+        }
     }
 }
 

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

@@ -172,10 +172,12 @@
             },
             prevStep: function() {
                 this.setStep(this.currentStepIndex - 1, 'prev');
+                this.scrollToTop();
             },
             nextStep: function() {
                 this.beforeLeavingStep("onlyCurrent");
                 this.setStep(this.currentStepIndex + 1, 'next', !this.isCurrentStepValid);
+                this.scrollToTop();
             },
             reset: function() {
                 var self = this;
@@ -233,6 +235,12 @@
                         }
                     });
                 }
+            },
+            scrollToTop: function() {
+                var container = this.$el.getElementsByClassName("cly-vue-drawer__steps-container")[0];
+                if (container && container.scrollTop) {
+                    container.scrollTop = 0;
+                }
             }
         }
     };

package-lock.json

@@ -54,7 +54,7 @@
     "express-session": "1.18.1",
     "form-data": "^4.0.0",
     "formidable": "2.1.1",
-    "fs-extra": "11.2.0",
+    "fs-extra": "11.3.0",
     "geoip-lite": "1.4.10",
     "get-random-values": "^3.0.0",
     "grunt": "1.6.1",
@@ -78,7 +78,7 @@
     "moment-timezone": "0.5.46",
     "mongodb": "6.11.0",
     "nginx-conf": "2.1.0",
-    "nodemailer": "6.9.16",
+    "nodemailer": "6.10.0",
     "object-hash": "3.0.0",
     "offline-geocoder": "git+https://github.com/Countly/offline-geocoder.git",
     "properties-parser": "0.6.0",