Merge branch 'next' into QT-162v2

Author: can-angun

.editorconfig

@@ -4,6 +4,6 @@ root = true
 end_of_line = lf
 insert_final_newline = false
 
-[*.{js,html}]
+[*.{js,html,scss,json}]
 indent_style = space
 indent_size = 4

.eslintrc.json

@@ -135,7 +135,7 @@
             },
             "env": {
                 "browser": true,
-                "es6": true
+                "es2020": true
             },
             "rules": {
                 "valid-jsdoc": [
@@ -208,11 +208,11 @@
             ],
             "excludedFiles": "plugins/*/frontend/public/**/*.js",
             "env": {
-                "es6": true,
+                "es2020": true,
                 "node": true
             },
             "parserOptions": {
-                "ecmaVersion": 2020
+                "ecmaVersion": 2023
             },
             "rules": {
                 "no-console": "off",
@@ -237,9 +237,6 @@
                 "for-direction": [
                     "off"
                 ],
-                "no-console": [
-                    "off"
-                ],
                 "no-control-regex": [
                     "off"
                 ],
@@ -288,7 +285,7 @@
             ],
             "excludedFiles": "plugins/*/tests.js",
             "env": {
-                "es6": true,
+                "es2020": true,
                 "node": true
             },
             "parserOptions": {
@@ -305,7 +302,7 @@
                 "plugins/*/tests.js"
             ],
             "env": {
-                "es6": true,
+                "es2020": true,
                 "node": true,
                 "mocha": true
             },
@@ -324,7 +321,7 @@
                 "ui-tests/**/*.js"
             ],
             "env": {
-                "es6": true,
+                "es2020": true,
                 "node": true,
                 "mocha": true
             },
@@ -343,4 +340,4 @@
             }
         }
     ]
-}
+}

.github/dependabot.yml

@@ -202,9 +202,9 @@ updates:
     interval: daily
   open-pull-requests-limit: 10
   reviewers:
-  - iartem
+  - cihadtekin
   assignees:
-  - iartem
+  - cihadtekin
   labels:
   - dependencies
   versioning-strategy: increase-if-necessary

.github/workflows/deploy.yml

@@ -40,3 +40,22 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: bash ./bin/scripts/generateDocs.sh
+  push_all:
+    name: Push Countly Test Image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v2
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          push: true
+          file: ./Dockerfile-core
+          tags: countly/countly-core:pipelines-${{ github.base_ref || github.ref_name }}

.github/workflows/docker-image.yml

@@ -129,4 +129,4 @@ jobs:
         with:
           push: true
           file: ./Dockerfile-core
-          tags: countly/countly-core:latest,countly/countly-core:${{ steps.vars.outputs.tag }}
+          tags: countly/countly-core:latest,countly/countly-core:${{ steps.vars.outputs.tag }},countly/countly-core:pipelines-${{ github.base_ref || github.ref_name }}

.github/workflows/main.yml

@@ -10,6 +10,11 @@ on:
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
+    inputs:
+      custom_tag:
+        description: 'Custom Docker tag (optional)'
+        required: false
+        default: ''
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
@@ -64,7 +69,7 @@ jobs:
 
     services:
       mongodb:
-        image: mongo:6.0
+        image: mongo:8.0
         options: >-
           --health-cmd mongosh
           --health-interval 10s
@@ -74,9 +79,10 @@ jobs:
           - 27017:27017
 
     container:
-      image: countly/countly-core:latest
+      image: countly/countly-core:pipelines-${{ inputs.custom_tag || github.base_ref || github.ref_name  }}
       env:
         COUNTLY_CONFIG__MONGODB_HOST: mongodb
+        COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
       - uses: actions/checkout@v3
@@ -99,7 +105,7 @@ jobs:
       - name: ESLint
         shell: bash
         run: |
-         npm install eslint
+         npm install eslint@8.57.0
          npx eslint .
 
       - name: NPM install
@@ -120,7 +126,7 @@ jobs:
 
     services:
       mongodb:
-        image: mongo:6.0
+        image: mongo:8.0
         options: >-
           --health-cmd mongosh
           --health-interval 10s
@@ -130,9 +136,10 @@ jobs:
           - 27017:27017
 
     container:
-      image: countly/countly-core:latest
+      image: countly/countly-core:pipelines-${{ inputs.custom_tag || github.base_ref || github.ref_name }}
       env:
         COUNTLY_CONFIG__MONGODB_HOST: mongodb
+        COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
       - uses: actions/checkout@v3
@@ -153,6 +160,11 @@ jobs:
         shell: bash
         run: "sed -i 's/port: 3001,/port: 3001, workers: 1,/' /opt/countly/api/config.js"
 
+      - name: NPM install
+        shell: bash
+        working-directory: /opt/countly
+        run: npm install
+
       - name: Run tests
         shell: bash
         working-directory: /opt/countly
@@ -166,7 +178,7 @@ jobs:
 
     services:
       mongodb:
-        image: mongo:6.0
+        image: mongo:8.0
         options: >-
           --health-cmd mongosh
           --health-interval 10s
@@ -176,9 +188,10 @@ jobs:
           - 27017:27017
 
     container:
-      image: countly/countly-core:latest
+      image: countly/countly-core:pipelines-${{ inputs.custom_tag || github.base_ref || github.ref_name }}
       env:
         COUNTLY_CONFIG__MONGODB_HOST: mongodb
+        COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
       - uses: actions/checkout@v3
@@ -199,6 +212,11 @@ jobs:
         shell: bash
         run: "sed -i 's/port: 3001,/port: 3001, workers: 1,/' /opt/countly/api/config.js"
 
+      - name: NPM install
+        shell: bash
+        working-directory: /opt/countly
+        run: npm install
+
       - name: Install plugins
         shell: bash
         run: |
@@ -212,13 +230,13 @@ jobs:
           npm install
           /sbin/my_init &
           node bin/scripts/test.connection.js
-          npx grunt mochaTest
+          npx grunt mochaTest       
   ui-test-dashboard:
     runs-on: ubuntu-latest
 
     services:
       mongodb:
-        image: mongo:6.0
+        image: mongo:8.0
         options: >-
           --health-cmd mongosh
           --health-interval 10s
@@ -228,9 +246,10 @@ jobs:
           - 27017:27017
 
     container:
-      image: countly/countly-core:latest
+      image: countly/countly-core:pipelines-${{ inputs.custom_tag || github.base_ref || github.ref_name }}
       env:
         COUNTLY_CONFIG__MONGODB_HOST: mongodb
+        COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
       - uses: actions/checkout@v2
@@ -251,6 +270,11 @@ jobs:
         shell: bash
         run: "sed -i 's/mongosh --quiet/mongosh --host mongodb --quiet/' /opt/countly/bin/backup/import_events.sh && sed -i 's/mongoimport --db/mongoimport --host mongodb --db/' /opt/countly/bin/backup/import_events.sh"
 
+      - name: NPM install
+        shell: bash
+        working-directory: /opt/countly
+        run: npm install
+
       - name: Prepare environment
         shell: bash
         working-directory: /opt/countly
@@ -277,7 +301,8 @@ jobs:
           /sbin/my_init &
           cd ui-tests
           npm install
-          npm run cy:run:dashboard
+          xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
+          npm run cy:run:dashboard --headless --no-sandbox --disable-gpu --disable-dev-shm-usage
 
       - name: Upload UI tests artifacts
         if: ${{ failure() }}
@@ -288,13 +313,13 @@ jobs:
           mkdir -p screenshots videos
           tar zcvf "$ARTIFACT_ARCHIVE_NAME" screenshots videos
           curl -o /tmp/uploader.log -u "${{ secrets.BOX_UPLOAD_AUTH }}" ${{ secrets.BOX_UPLOAD_PATH }} -T "$ARTIFACT_ARCHIVE_NAME"
-  
+
   ui-test-onboarding:
     runs-on: ubuntu-latest
 
     services:
       mongodb:
-        image: mongo:6.0
+        image: mongo:8.0
         options: >-
           --health-cmd mongosh
           --health-interval 10s
@@ -304,9 +329,10 @@ jobs:
           - 27017:27017
 
     container:
-      image: countly/countly-core:latest
+      image: countly/countly-core:pipelines-${{ inputs.custom_tag || github.base_ref || github.ref_name }}
       env:
         COUNTLY_CONFIG__MONGODB_HOST: mongodb
+        COUNTLY_CONFIG_API_PREVENT_JOBS: true
 
     steps:
       - uses: actions/checkout@v2
@@ -327,6 +353,11 @@ jobs:
         shell: bash
         run: "sed -i 's/mongosh --quiet/mongosh --host mongodb --quiet/' /opt/countly/bin/backup/import_events.sh && sed -i 's/mongoimport --db/mongoimport --host mongodb --db/' /opt/countly/bin/backup/import_events.sh"
 
+      - name: NPM install
+        shell: bash
+        working-directory: /opt/countly
+        run: npm install
+
       - name: Prepare environment
         shell: bash
         working-directory: /opt/countly
@@ -349,7 +380,8 @@ jobs:
           /sbin/my_init &
           cd ui-tests
           npm install
-          npm run cy:run:onboarding
+          xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
+          npm run cy:run:onboarding --headless --no-sandbox --disable-gpu --disable-dev-shm-usage
 
       - name: Upload UI tests artifacts
         if: ${{ failure() }}

.gitignore

@@ -42,4 +42,5 @@ frontend/express/public/stylesheets/styles/manifest.css.map
 frontend/express/public/stylesheets/vue/clyvue.css.map
 log/
 log/supervisord/
-plugins/plugins.json.*
+plugins/plugins.json.*
+.sdk