Merge branch 'master' into dependabot/npm_and_yarn/mongodb-6.15.0

Author: ar2rsawseen

.github/workflows/main.yml

@@ -21,20 +21,29 @@ jobs:
   # This workflow contains a single job called "build"
   install:
     # The type of runner that the job will run on
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
       - uses: actions/checkout@v3
 
+      - name: Copy code
+        shell: bash
+        run: |
+          sudo mkdir -p /opt/countly
+          touch log/countly-dashboard.log
+          touch log/countly-api.log
+          cp -rf ./* /opt/countly
+        
       - name: Github Actions Azure connection fix
         run: |
           # Workaround for https://github.com/actions/runner-images/issues/675#issuecomment-1381389712
           sudo sed -i 's/azure/us/g' /etc/apt/sources.list
-
+        
       - name: Installing Countly
         shell: bash
+        working-directory: /opt/countly
         run: sudo bash ./bin/countly.install.sh
 
       - name: NodeJS version
@@ -50,10 +59,12 @@ jobs:
         run: mongosh --version
 
       - name: Output API Logs
+        working-directory: /opt/countly
         if: ${{ always() }}
         run: cat log/countly-api.log
 
       - name: Output Dashboard Logs
+        working-directory: /opt/countly
         if: ${{ always() }}
         run: cat log/countly-dashboard.log
 

CHANGELOG.md

@@ -1,14 +1,27 @@
-## Version 25.03.x
-
+## Version 25.03.4
 Features:
 - Add ability to allow multiple CORS per app for web apps
 - Add app id and name as view segment for self-tracking
+- [dashboards] Added the option to set a refresh rate for dashboards, allowing data to update more frequently for selected dashboards
 
 Enterprise Features:
 - [license] Update locking conditions for expired license and over limit usage
 - [license] Enable force locking with remote config
 - [license] Update dashboard lock with redirection to home page for non admin user
 
+Fixes:
+- [core] Allow downloading data also from other databases in dbviewer
+- [crashes] Fix unescaped SDK logs
+- [crash_symbolication] Symbolication server api end point test fix
+- [star-rating] Added missing columns to Rating Widgets table edit
+- [ui] Fix alignment of drawers title and close icon
+- [push] Fixed push notifications title and content text and variables combination
+- [reports] Correctly match event for email report if event key contains '.'
+
+Enterprise Fixes:
+- [cohorts] Fixed issue with combining multiple cohorts
+- [drill] Do not recheck old collections on app_user data deletion if querying from old collections is disabled
+
 Dependencies:
 - Bump body-parser from 1.20.3 to 2.2.0
 - Bump moment-timezone from 0.5.47 to 0.5.48

Gruntfile.js

@@ -483,7 +483,7 @@ module.exports = function(grunt) {
             name = name.replace('.properties', '');
             if (name.indexOf('_') !== -1) {
                 lang = name.split('_').pop();
-                if (lang.length > 3 || lang === "en") {
+                if (lang.length > 2 || lang === "en") {
                     lang = '';
                 }
             }

api/jobs/topEvents.js

@@ -138,14 +138,19 @@ class TopEventsJob extends job.Job {
      * The errors of all functions will be caught here.
      */
     async getAllApps() {
+        log.d("Fetching all apps");
         try {
             const getAllApps = await new Promise((res, rej) => common.db.collection("apps").find({}, { _id: 1, timezone: 1 }).toArray((err, apps) => err ? rej(err) : res(apps)));
-            await Promise.all(getAllApps.map((app) => this.getAppEvents(app)));
+            for (var z = 0; z < getAllApps.length; z++) {
+                //Calculating for each app serially.
+                await this.getAppEvents(getAllApps[z]);
+            }
         }
         catch (error) {
             log.e("TopEvents Job has a error: ", error);
             throw error;
         }
+        log.d("Finished processing");
     }
 
     /**
@@ -178,6 +183,7 @@ class TopEventsJob extends job.Job {
      * @param {Object} app - saveAppEvents object
      */
     async getAppEvents(app) {
+        log.d(app._id + ": Fetching app events");
         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);
@@ -199,6 +205,7 @@ class TopEventsJob extends job.Job {
                     let totalDuration = 0;
                     let prevTotalDuration = 0;
                     for (const event of eventMap) {
+                        log.d("    getting event data for event: " + event + " (" + period + ")");
                         const collectionNameEvents = this.eventsCollentions({ event, id: app._id });
                         await this.getEventsCount({ collectionNameEvents, ob, data, event });
                         totalCount += data[event].data.count.total;
@@ -208,11 +215,16 @@ class TopEventsJob extends job.Job {
                         totalDuration += data[event].data.duration.total;
                         prevTotalDuration += data[event].data.duration["prev-total"];
                     }
+                    log.d("    getting session count (" + period + ")");
                     await this.getSessionCount({ ob, sessionData, usersData, usersCollectionName });
+                    log.d("    saving data (" + period + ")");
                     await this.saveAppEvents({ app, data, sessionData, usersData, period, totalCount, prevTotalCount, totalSum, prevTotalSum, totalDuration, prevTotalDuration });
                 }
             }
         }
+        else {
+            log.d("    No events found for app");
+        }
 
     }
 

api/utils/taskmanager.js

@@ -984,7 +984,13 @@ taskmanager.rerunTask = function(options, callback) {
         });
     }
 
-    options.db.collection("long_tasks").findOne({_id: options.id}, function(err, res) {
+    var qq = {_id: options.id};
+    if (options.additionalQuery) {
+        qq = options.additionalQuery;
+        qq._id = options.id;
+    }
+    log.d("Fetching from long_tasks to rerun: " + JSON.stringify(qq));
+    options.db.collection("long_tasks").findOne(qq, function(err, res) {
         if (!err && res && res.request) {
             var reqData = {};
             try {

bin/countly.install_ubuntu.sh

@@ -6,7 +6,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 UBUNTU_YEAR="$(lsb_release -sr | cut -d '.' -f 1)";
 
-if [[ "$UBUNTU_YEAR" != "20" && "$UBUNTU_YEAR" != "22" ]]; then
+if [[ "$UBUNTU_YEAR" != "20" && "$UBUNTU_YEAR" != "22" && "$UBUNTU_YEAR" != "24" ]]; then
     echo "Unsupported OS version, only support Ubuntu 20 and 22."
     exit 1
 fi

bin/scripts/expire-data/delete_empty_collections.js

@@ -0,0 +1,59 @@
+/**
+ *  Description: Deletes empty collections from database.By default it checks to delete from drill database. You can further tweak it to delete from countly database by changing drill to db in parameters passed
+ *  Server: countly
+ *  Path: $(countly dir)/bin/scripts/expire-data
+ *  Command: node delete_empty_collections.js
+ */
+var plugins = require("../../../plugins/pluginManager");
+var Promise = require("bluebird");
+var DRY_RUN = true; // Set this to false to perform actual drop
+Promise.all([plugins.dbConnection("countly"), plugins.dbConnection("countly_drill")]).spread(function(db, drill) {
+    function dropCollections(database, collections, dryRun) {
+        collections.forEach(function(collection) {
+            if (database.collection(collection)) {
+                console.log((dryRun ? "[DRY RUN] " : "") + "Dropping collection: " + collection);
+                if (!dryRun) {
+                    database.collection(collection).drop(function(err, delOK) {
+                        if (err) {
+                            console.log("Error dropping collection: " + collection, err);
+                        }
+                        else if (delOK) {
+                            console.log("Collection dropped: " + collection);
+                        }
+                        else {
+                            console.log("Failed to drop collection: " + collection);
+                        }
+                    });
+                }
+            }
+            else {
+                console.log("Collection not found: " + collection);
+            }
+        });
+        console.log("Collection drop process completed.");
+    }
+    // Fetch empty collections from countly_drill
+    let emptyCollections = [];
+    drill.listCollections().toArray(function(err, collections) {
+        if (err) {
+            console.log("Error fetching collections:", err);
+        }
+        else {
+            collections.forEach(function(collection) {
+                drill.collection(collection.name).countDocuments({}, function(err, count) {
+                    if (!err && count === 0) {
+                        console.log("Empty Collection: " + collection.name);
+                        emptyCollections.push(collection.name);
+                    }
+                });
+            });
+            // Once empty collections are identified, proceed with dropping
+            setTimeout(() => {
+                console.log("\nDropping empty collections from countly_drill...");
+                dropCollections(drill, emptyCollections, DRY_RUN);
+                db.close();
+                drill.close();
+            }, 5000); // Delay to ensure collections are logged before drop
+        }
+    });
+});

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

@@ -62,6 +62,7 @@
                         'is-open': this.isOpened,
                         'has-sidecars': this.hasSidecars
                     };
+                    // NOTE: currentScreenMode variable seems to be not defined it should be defined or removed
                     classes["cly-vue-drawer--" + this.currentScreenMode + "-screen"] = true;
                     if (this.currentScreenMode === 'half') {
                         classes["cly-vue-drawer--half-screen-" + this.size] = true;

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

@@ -20,25 +20,35 @@
                 </div>
                 <div class="cly-vue-drawer__header" :class="{ 'is-full-screen': currentScreenMode === 'full'}">
                     <div class="cly-vue-drawer__title">
-                        <div v-if="currentScreenMode !== 'full'">
-                            <div v-if="hasBackLink" class="cly-vue-drawer__title-container bu-is-flex bu-is-justify-content-space-between">
-                                <div class="bu-is-flex bu-is-flex-direction-column bu-is-justify-content-center bu-p-1 bu-ml-5 bu-mt-5">
-                                    <a style="cursor: pointer;" @click="doClose" :data-test-id="testId + '-drawer-back-link'">
-                                        <span class="text-medium bu-is-capitalized"><i class="fas fa-arrow-left bu-pr-3"></i>{{i18n('plugins.back')}}</span>
-                                    </a>
-                                </div>
-                                <div class="bu-is-flex" :style="hasBackLink.style" :class="{ 'bu-is-justify-content-flex-start': hasBackLink, 'bu-is-justify-content-center': !hasBackLink }">
-                                    <h3 :data-test-id="testId + '-header-title'" class="cly-vue-drawer__title-header">{{title}}</h3>
-                                </div>
-                                <span :data-test-id="testId + '-close-button'" class="cly-vue-drawer__close-button bu-p-1 bu-mr-5" v-on:click="doClose">
-                                    <i class="ion-ios-close-empty"></i>
-                                </span>
-                            </div>
-                            <div v-else class="cly-vue-drawer__title-container bu-is-flex bu-is-justify-content-space-between">
-                                <h3 :data-test-id="testId + '-header-title'" class="cly-vue-drawer__title-header">{{title}}</h3>
-                                <span :data-test-id="testId + '-close-button'" class="cly-vue-drawer__close-button" v-on:click="doClose">
-                                    <i class="ion-ios-close-empty"></i>
+                        <div
+                            v-if="currentScreenMode !== 'full'"
+                            class="cly-vue-drawer__title-container bu-is-flex bu-is-justify-content-space-between"
+                            :class="{ 'bu-is-align-items-center': !hasBackLink }"
+                        >
+                            <a
+                                v-if="hasBackLink"
+                                :data-test-id="testId + '-drawer-back-link'"
+                                style="cursor: pointer;"
+                                @click="doClose"
+                            >
+                                <span class="text-medium bu-is-capitalized">
+                                    <i class="fas fa-arrow-left bu-pr-3" />
+                                    {{ i18n('plugins.back') }}
                                 </span>
+                            </a>
+                            <h3
+                                class="cly-vue-drawer__title-header"
+                                :data-test-id="testId + '-header-title'"
+                                :style="hasBackLink.style"
+                            >
+                                {{ title }}
+                            </h3>
+                            <div
+                                class="cly-vue-drawer__close-button"
+                                :data-test-id="testId + '-close-button'"
+                                @click="doClose"
+                            >
+                                <i class="ion-ios-close-empty" />
                             </div>
                         </div>
                         <div v-if="isMultiStep" class="bu-columns bu-is-gapless bu-is-mobile cly-vue-drawer__subtitle">
@@ -51,7 +61,7 @@ <h3 :data-test-id="testId + '-header-title'" class="cly-vue-drawer__title-header
                                                     <span class="index text-small" :data-test-id="testId + '-current-step-index-' + (i + 1)" :class="{'color-white': i === currentStepIndex}">{{i + 1}}</span>
                                                     <span class="done-icon text-small color-white bu-pt-0" :data-test-id="testId + '-current-step-index-img-container' + (i + 1)">
                                                         <img :data-test-id="testId + '-step-' + (i + 1)" src="images/icons/check-icon.svg">
-                                                    </span>                                                     
+                                                    </span>
                                                 </div>
                                                 <div :data-test-id="testId + '-' + (currentContent && currentContent.name ? currentContent.name.toLowerCase().replaceAll(/[\s&]+/g, '-') + '-label' : 'content-label')" class="cly-vue-drawer__step-title text-small font-weight-bold color-cool-gray-40">{{currentContent.name}}</div>
                                             </div>

frontend/express/public/stylesheets/vue/clyvue.scss

@@ -1899,31 +1899,29 @@
             box-sizing: border-box;
         }
 
+        // .cly-vue-drawer__title-container
         &__title-container {
-            width: 100%; 
-            margin-bottom: 24px;
-        }
-
-        &__title-header {
-            margin-top: 24px; 
-            margin-left: 32px;
+            margin: 24px 32px;
         }
 
         &__subtitle {
             margin-left: 32px !important;
             margin-bottom: 24px !important;
         }
 
+        // .cly-vue-drawer__close-button
         &__close-button {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+
             font-size: 30px;
             color: #81868D;
             transition: color 1s;
             cursor: pointer;
-            //width: 30px;
-            height: 15px;
-            //margin-block: auto;
-            margin-right: 32px;
-            margin-top: 24px;
+            height: 20px;
+
+            // .cly-vue-drawer__close-button:hover
             &:hover {
                 color: #333;
                 transition: color 1s;