Merge branch 'anna/next' of https://github.com/Countly/countly-server into anna/next

Author: Cookiezaurs

.eslintrc.json

@@ -121,6 +121,55 @@
         ]
     },
     "overrides": [
+        {
+            "files": [
+                "plugins/content/frontend/vite.config.js",
+                "plugins/journey_engine/frontend/vite.config.js",
+                "plugins/journey_engine/frontend/vite-manifest.js"
+            ],
+            "rules": {
+                "no-console": "off"
+            },
+            "parserOptions": {
+                "ecmaVersion": 2023,
+                "sourceType": "module"
+            },
+            "env": {
+                "node": true,
+                "es2023": true
+            }
+        },
+        {
+            "files": [
+                "plugins/content/frontend/content-blocks/**/*.js",
+                "plugins/journey_engine/frontend/builder/**/*.js"
+            ],
+            "extends": [
+                "eslint:recommended",
+                "plugin:vue/vue3-essential",
+                "plugin:vue/vue3-strongly-recommended",
+                "plugin:vue/vue3-recommended"
+            ],
+            "rules": {
+                "no-console": ["error"],
+                "@stylistic/quotes": ["error", "single"],
+                "@stylistic/quote-props": ["error", "as-needed"]
+            },
+            "plugins": [
+                "vue",
+                "@stylistic"
+            ],
+            "parserOptions": {
+                "ecmaVersion": 2023,
+                "sourceType": "module",
+                "extraFileExtensions": [".vue"]
+            },
+            "env": {
+                "node": true,
+                "es2023": true,
+                "es6": true
+            }
+        },
         {
             "files": [
                 "frontend/express/public/javascripts/countly/*.js",
@@ -208,7 +257,7 @@
             ],
             "excludedFiles": "plugins/*/frontend/public/**/*.js",
             "env": {
-                "es2020": true,
+                "es2023": true,
                 "node": true
             },
             "parserOptions": {
@@ -285,11 +334,11 @@
             ],
             "excludedFiles": "plugins/*/tests.js",
             "env": {
-                "es2020": true,
+                "es2023": true,
                 "node": true
             },
             "parserOptions": {
-                "ecmaVersion": 2020
+                "ecmaVersion": 2023
             },
             "rules": {
                 "no-console": "off"
@@ -302,13 +351,12 @@
                 "plugins/*/tests.js"
             ],
             "env": {
-                "es2020": true,
+                "es2023": true,
                 "node": true,
                 "mocha": true
             },
             "parserOptions": {
-                "ecmaVersion": 2020,
-                "sourceType": "module"
+                "ecmaVersion": 2023
             },
             "rules": {
                 "no-console": "off",
@@ -321,7 +369,7 @@
                 "ui-tests/**/*.js"
             ],
             "env": {
-                "es2020": true,
+                "es2023": true,
                 "node": true,
                 "mocha": true
             },
@@ -330,7 +378,7 @@
                 "cy": "readonly"
             },
             "parserOptions": {
-                "ecmaVersion": 2020,
+                "ecmaVersion": 2023,
                 "sourceType": "module"
             },
             "rules": {

.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 ]
+    branches: [ master, next, release.24.10 ]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -302,7 +302,7 @@ jobs:
           cd ui-tests
           npm install
           xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
-          npm run cy:run:dashboard --headless --no-sandbox --disable-gpu --disable-dev-shm-usage
+          npm run cy:run:dashboard
 
       - name: Upload UI tests artifacts
         if: ${{ failure() }}
@@ -381,7 +381,7 @@ jobs:
           cd ui-tests
           npm install
           xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
-          npm run cy:run:onboarding --headless --no-sandbox --disable-gpu --disable-dev-shm-usage
+          npm run cy:run:onboarding
 
       - name: Upload UI tests artifacts
         if: ${{ failure() }}

CHANGELOG.md

@@ -1,5 +1,53 @@
+## Version 24.10.3
+Fixes:
+- [dashboards] Fixing issue where dashboard widgets go into single column
+
+Security:
+- Bump puppeteer from 17.1.3 to 23.8.0
+- Bump express from 4.21.0 to 4.21.1 
+- Bump sass from 1.79.4 to 1.81.0
+- Bump express-session from 1.18.0 to 1.18.1
+- Bump cross-spawn from 7.0.3 to 7.0.6 in /ui-tests
+- Bump cross-spawn from 7.0.3 to 7.0.6 in /plugins/hooks
+
+## Version 24.10.2
+Fixes:
+- [core] Correct aggregated collection cleanup on event omitting
+- [core] Fixed bug where changing passwords results in the loss of the "Global Admin" role
+- [core] Fixed bug where exporting incoming data logs could result in "Incorrect parameter \"data\" error
+- [core] Removed use of commands which needs admin rights from report manager.
+- [crash] Fixed bug in crash ingestion for scenarios where the "app version" is not a string.
+- [script] Fixing bug with "delete_old_members" script that led to malformed requests
+
+Enterprise fixes:
+- [nps] Fixed bug that showed the wrong nps preview title
+
 ## Version 24.10.1
-Integrating 24.05.16 fixes
+Fixes:
+- [core] Replaced "Users" with "Sessions" label on technology home widgets
+- [push] Improved ability to observe push related errors
+- [push] Replaced push plugin with an earlier version of the plugin
+
+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
+- [license] Fixed bug with MAU type of licenses that would prevent the server from starting
+- [nps] Fixed bug in the editor where the "internal name" field was not mandatory
+- [nps] Fixed bug where it was possible to submit empty nps surveys
+- [ratings] Fixed bug with user consent
+- [ratings] Fixed UI bug where "Internal name" was not a mandatory field
+
+Security:
+- Bumped cookie-parser from 1.4.6 to 1.4.7
+- Bumped express-rate-limit from 7.4.0 to 7.4.1
+- Bumped moment-timezone from 0.5.45 to 0.5.46
+- Bumped sass from 1.79.3 to 1.79.4
+- Fixing minor vulnerability that would allow for unauthorized file upload
+
+Enterprise Features:
+- [block] Added a way to filter crashes by their error (stacktrace)
 
 ## Version 24.10
 Fixes:
@@ -35,39 +83,9 @@ 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
-
-Security:
-- Fixing minor vulnerability that would allow for unauthorized file upload
-
-## Version 24.05.16
-Fixes:
-- [core] Replaced "Users" with "Sessions" label on technology home widgets
-- [push] Replaced push plugin with an earlier version of the plugin
-
-Enterprise fixes:
-- [license] Fixed bug with MAU type of licenses that would prevent the server from starting
-- [nps] Fixed bug where it was possible to submit empty nps surveys
-- [ratings] Fixed bug with user consent
-
-Security:
-- Bumped cookie-parser from 1.4.6 to 1.4.7
-- Bumped express-rate-limit from 7.4.0 to 7.4.1
-- Bumped moment-timezone from 0.5.45 to 0.5.46
-- Bumped sass from 1.79.3 to 1.79.4
-
 ## Version 24.05.15
 Enterprise fixes:
+- [ab-testing] Fixed JSON.parse issue preventing creation of AB tests
 - [nps] Fixed UI issues in the widget editor related to the "user consent" section
 - [ratings] Fixed rendering issue for escaped values
 

Dockerfile-api

@@ -17,8 +17,9 @@ ENV COUNTLY_CONTAINER="api" \
 	COUNTLY_CONFIG_API_API_WORKERS="1" \
 	COUNTLY_CONFIG_API_API_HOST="0.0.0.0" \
 	NODE_OPTIONS="--max-old-space-size=2048" \
-	TINI_VERSION="0.18.0"
-
+	TINI_VERSION="0.18.0"\
+	PUPPETEER_CACHE_DIR=/opt/countly/.cache/puppeteer
+	
 WORKDIR /opt/countly
 COPY . .
 
@@ -58,7 +59,7 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
 	# cleanup & chown
 	npm remove -y --no-save mocha nyc should supertest && \
 	apt-get remove -y git gcc g++ make automake autoconf libtool pkg-config unzip sqlite3 && \
-	apt-get install -y libgbm-dev libgbm1 gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils && \
+	apt-get install -y libgbm-dev libgbm1 gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils && \
 	apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
 	rm -rf test /tmp/* /tmp/.??* /var/tmp/* /var/tmp/.??* /var/log/* /root/.npm && \
 	\
@@ -75,4 +76,4 @@ USER 1001:0
 
 ENTRYPOINT ["/usr/bin/tini", "-v", "--"]
 
-CMD ["/opt/countly/bin/docker/cmd.sh"]
+CMD ["/opt/countly/bin/docker/cmd.sh"]

api/api.js

@@ -265,7 +265,7 @@ plugins.connectToAllDatabases().then(function() {
     if (cluster.isMaster) {
         plugins.installMissingPlugins(common.db);
         common.runners = require('./parts/jobs/runner');
-        common.cache = new CacheMaster(common.db);
+        common.cache = new CacheMaster();
         common.cache.start().then(() => {
             setImmediate(() => {
                 plugins.dispatch('/cache/init', {});
@@ -334,7 +334,7 @@ plugins.connectToAllDatabases().then(function() {
         console.log("Starting worker", process.pid, "parent:", process.ppid);
         const taskManager = require('./utils/taskmanager.js');
 
-        common.cache = new CacheWorker(common.db);
+        common.cache = new CacheWorker();
         common.cache.start();
 
         //since process restarted mark running tasks as errored