Merge pull request #6589 from Countly/master-v25.03.17-into-next

Master v25.03.17 into next

Author: gabrieloliveirapinto

.github/workflows/codeql-analysis.yml

@@ -37,7 +37,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/deploy.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Enable command line
         shell: bash
@@ -45,7 +45,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Log in to Docker Hub
         uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1

.github/workflows/docker-image.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set output
         id: vars
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set output
         id: vars
@@ -74,7 +74,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set output
         id: vars
@@ -105,7 +105,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Set output
         id: vars

.github/workflows/main.yml

@@ -26,7 +26,7 @@ jobs:
     # 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@v4
+      - uses: actions/checkout@v5
 
       - name: Copy code
         shell: bash
@@ -96,7 +96,7 @@ jobs:
         COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Copy code
         shell: bash
@@ -153,7 +153,7 @@ jobs:
         COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Prepare tests
         shell: bash
@@ -207,7 +207,7 @@ jobs:
         COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Copy code
         shell: bash
@@ -270,7 +270,7 @@ jobs:
         COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Install Chrome
         shell: bash

.github/workflows/release_notice.yml

@@ -30,7 +30,7 @@ jobs:
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_RELEASE }}
       - name: Send custom JSON data to Discord
-        uses: sarisia/[email protected].3
+        uses: sarisia/[email protected].4
         with:
           webhook: ${{ secrets.DISCORD_WEBHOOK_URL }}
           nodetail: true

.github/workflows/stable-je-deploy.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Deploy server
         shell: bash

CHANGELOG.md

@@ -2,6 +2,14 @@
 Dependencies:
 - Remove SQLite
 
+## Version 25.03.17
+Enterprise Fixes:
+- [ldap] Recursive user search in ldap added
+- [license] Update metric endpoint permission
+  
+Dependencies:
+- Bump puppeteer from 24.16.2 to 24.17.0
+
 ## Version 25.03.16
 Enterprise Fixes:
 - [journeys] Fix for skip threshold check in concurrent requests

package-lock.json

@@ -8,25 +8,23 @@ if (myArgs[0] === "help") {
 }
 pluginManager.dbConnection().then((db) => {
     stats.getTop(db, {}, function(toReturn) {
-        var apps = Object.keys(toReturn);
+        var apps = toReturn.map(o => o.a);
         db.collection("apps").find({_id: {$in: apps.map(id => db.ObjectID(id))}}, {projection: {name: 1}}).toArray(function(err, appResult) {
             if (appResult) {
                 for (let i = 0; i < appResult.length; i++) {
                     appNames[appResult[i]._id] = appResult[i].name;
                 }
             }
             db.close();
-            var res = [];
-            for (let app in toReturn) {
-                if (toReturn[app]) {
-                    toReturn[app].app = stats.getAppName(app, appNames);
-                    res.push(toReturn[app]);
+            for (let i = 0; i < toReturn.length; i++) {
+                if (toReturn[i].a) {
+                    toReturn[i].a = stats.getAppName(toReturn[i].a, appNames);
                 }
             }
-            res.sort(function(a, b) {
-                return b["data-points"] - a["data-points"];
+            toReturn.sort(function(a, b) {
+                return b["v"] - a["v"];
             });
-            console.table(res, ["app", "data-points"]);
+            console.table(toReturn, ["a", "v"]);
         });
     });
-});
+});