Merge remote-tracking branch 'origin/next' into master-v25.03.26-into-next

Author: gabrieloliveirapinto

.codacy.yml

@@ -7,11 +7,9 @@ exclude_paths:
   - 'frontend/express/public/localization/**'
   - 'frontend/express/public/fonts/**'
   - 'frontend/express/public/images/**'
-  - 'frontend/express/public/stylesheets/amaranjs/**'
   - 'frontend/express/public/stylesheets/font-awesome/**'
   - 'frontend/express/public/stylesheets/ionicons/**'
   - 'frontend/express/public/stylesheets/material/**'
-  - 'frontend/express/public/stylesheets/selectize/**'
   - 'bin/backup/**'
   - 'bin/upgrade/**'
   - 'bin/**'

.github/workflows/main.yml

@@ -161,7 +161,9 @@ jobs:
 
       - name: Copy code
         shell: bash
-        run: cp -rf ./* /opt/countly
+        run: |
+          cp -rf ./* /opt/countly
+          cp ./bin/docker/postinstall.sh /etc/my_init.d
 
       - name: Remove plugin tests
         shell: bash
@@ -287,7 +289,12 @@ jobs:
 
       - name: Copy code
         shell: bash
-        run: cp -rf ./* /opt/countly
+        run: |
+          rm -rf /opt/countly/frontend
+          rm -rf /opt/countly/plugins/old-ui-compatibility
+          cp -rf ./* /opt/countly
+          cp /opt/countly/frontend/express/config.sample.js /opt/countly/frontend/express/config.js
+          cp /opt/countly/frontend/express/public/javascripts/countly/countly.config.sample.js /opt/countly/frontend/express/public/javascripts/countly/countly.config.js
 
       - name: Prepare files to use correct MongoDB host
         shell: bash
@@ -341,3 +348,82 @@ jobs:
           mkdir -p screenshots videos downloads
           tar zcvf "$ARTIFACT_ARCHIVE_NAME" screenshots videos downloads
           curl -o /tmp/uploader.log -u "${{ secrets.BOX_UPLOAD_AUTH }}" ${{ secrets.BOX_UPLOAD_PATH }} -T "$ARTIFACT_ARCHIVE_NAME"
+
+  ui-test-sdk:
+    runs-on: ubuntu-latest
+
+    services:
+      mongodb:
+        image: mongo:8.0
+        options: >-
+          --health-cmd mongosh
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 27017:27017
+
+    container:
+      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
+
+      - name: Install Chrome
+        shell: bash
+        run: |
+          apt update
+          apt install -y libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb wget
+          wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -O /tmp/chrome.deb
+          apt install -y /tmp/chrome.deb
+
+      - name: Copy code
+        shell: bash
+        run: cp -rf ./* /opt/countly
+
+      - name: Prepare files to use correct MongoDB host
+        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
+        run: |
+          sed -i 's/port: 3001,/port: 3001, workers: 1,/' /opt/countly/api/config.js
+          cp "./plugins/plugins.default.json" "/opt/countly/plugins/plugins.json"
+          npm install
+          sudo countly task dist-all
+          bash bin/scripts/countly.prepare.ce.tests.sh
+          cd ui-tests
+          echo '{"username": "${{ secrets.CYPRESS_USER_USERNAME }}","email": "${{ secrets.CYPRESS_USER_EMAIL }}","password": "${{ secrets.CYPRESS_USER_PASSWORD }}"}' > cypress/fixtures/user.json
+          sed -i 's/00000000-0000-0000-0000-000000000000/${{ secrets.CYPRESS_KEY }}/g' package.json
+          cp cypress.config.sample.js cypress.config.js
+          sed -i 's/000000/${{ secrets.CYPRESS_PROJECT_ID }}/g' cypress.config.js
+
+      - name: Run UI tests
+        shell: bash
+        working-directory: /opt/countly
+        run: |
+          /sbin/my_init &
+          cd ui-tests
+          npm install
+          xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
+          npm run cy:run:sdk
+
+      - name: Upload UI tests artifacts
+        if: ${{ failure() }}
+        shell: bash
+        working-directory: /opt/countly/ui-tests/cypress
+        run: |
+          ARTIFACT_ARCHIVE_NAME="$(date '+%Y%m%d-%H.%M')_${GITHUB_REPOSITORY#*/}_CI#${{ github.run_number }}_ui_test_sdk.tar.gz"
+          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"

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 25.xx
+Dependencies:
+- Remove SQLite
+
 ## Version 25.03.26
 Fixes:
 - [push] Fixed timeout setting
@@ -30,7 +34,6 @@ Fixes:
 Enterprise Fixes:
 - [ab-testing] Add script for fixing variant cohort
 - [groups] Fix user permission update after updating user group permission
-
 ## Version 25.03.24
 Fixes:
 - [jobs] Fix condition for scheduling alert job
@@ -63,7 +66,6 @@ Enterprise Fixes:
 - [users] Add survey section to user feedback page
 - [users] Fixed uploading user profile pictures
 
-
 ## Version 25.03.22
 Fixes:
 - [alerts] Fix: Migrate alerts to the new events model
@@ -141,7 +143,6 @@ Enterprise Fixes:
 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
@@ -151,7 +152,6 @@ Dependencies:
 - Bump get-random-values from 3.0.0 to 4.0.0
 - Bump puppeteer from 24.16.1 to 24.16.2
 
-
 ## Version 25.03.15
 Enterprise Fixes:
 - [cohorts] Unescape segmentation properties options to prevent duplicated values
@@ -185,7 +185,6 @@ Enterprise Fixes:
 - [flows] Showing correct state for disabled flows
 - [surveys] Move "not likely" label next to 0 on mobile screens
 
-
 ## Version 25.03.12
 Features:
 - [plugins] Add configuration warning tags to settings UI
@@ -208,7 +207,6 @@ Dependencies:
 - Bump puppeteer from 24.14.0 to 24.15.0
 - Bump supertest from 7.1.3 to 7.1.4
 
-
 ## Version 25.03.11
 Fixes:
 - [core] Fix mongo connection url parsing
@@ -304,7 +302,6 @@ Fixes:
 - [hooks] Added null check for incoming data
 - [push] Fix external drawer initialization
 - [times-of-day] Fix chart component
-
 Enterprise Fixes:
 - [content] Asset URL was wrongly constructed when user switches between apps
 - [ab-testing] Updates

Dockerfile-api

@@ -49,7 +49,6 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
 	dpkg -i /tmp/tini.deb && \
 	\
 	# modify standard distribution
-	apt-get update && apt-get install -y sqlite3 && \
 	./bin/docker/modify.sh && \
 	\
 	# preinstall

Dockerfile-centos-api

@@ -51,7 +51,7 @@ RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/downlo
 	yum install -y epel-release && \
 	yum install -y pango.x86_64 libXcomposite.x86_64 libXcursor.x86_64 libXdamage.x86_64 libXext.x86_64 libXi.x86_64 libXtst.x86_64 cups-libs.x86_64 libXScrnSaver.x86_64 libXrandr.x86_64 GConf2.x86_64 alsa-lib.x86_64 atk.x86_64 gtk3.x86_64 xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc && \
 	yum install -y https://pkgs.sysadmins.ws/el8/base/x86_64/raven-release-1.0-2.el8.noarch.rpm && \
-	yum install -y wget openssl-devel make git libsqlite* sqlite unzip bzip2 && \
+	yum install -y wget openssl-devel make git unzip bzip2 && \
 	# modify standard distribution
 	./bin/docker/modify.sh && \
 	\

Dockerfile-centos-frontend

@@ -49,7 +49,7 @@ RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/downlo
         yum install -y epel-release && \
         yum install -y pango.x86_64 libXcomposite.x86_64 libXcursor.x86_64 libXdamage.x86_64 libXext.x86_64 libXi.x86_64 libXtst.x86_64 cups-libs.x86_64 libXScrnSaver.x86_64 libXrandr.x86_64 GConf2.x86_64 alsa-lib.x86_64 atk.x86_64 gtk3.x86_64 xorg-x11-fonts-100dpi xorg-x11-fonts-75dpi xorg-x11-utils xorg-x11-fonts-cyrillic xorg-x11-fonts-Type1 xorg-x11-fonts-misc && \
 	      yum install -y https://pkgs.sysadmins.ws/el8/base/x86_64/raven-release-1.0-2.el8.noarch.rpm && \
-        yum install -y wget openssl-devel make git sqlite libsqlite* unzip bzip2 && \
+        yum install -y wget openssl-devel make git unzip bzip2 && \
         # modify standard distribution
         ./bin/docker/modify.sh && \
         \

Dockerfile-core

@@ -1,4 +1,4 @@
-FROM phusion/baseimage:focal-1.2.0
+FROM phusion/baseimage:jammy-1.0.4
 
 ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,logger,systemlogs,populator,reports,crashes,push,star-rating,slipping-away-users,compare,server-stats,dbviewer,times-of-day,compliance-hub,alerts,onboarding,consolidate,remote-config,hooks,dashboards,sdk,data-manager,guides
 # Countly Enterprise:
@@ -29,7 +29,7 @@ RUN useradd -r -M -U -d /opt/countly -s /bin/false countly && \
     apt-get update && \
     apt-get install -y \
         # standard
-        build-essential libkrb5-dev git sqlite3 wget sudo \
+        build-essential libkrb5-dev git wget sudo \
         # nginx
         nginx \
         # puppeteer
@@ -38,7 +38,7 @@ RUN useradd -r -M -U -d /opt/countly -s /bin/false countly && \
         libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils \
         # push / nghttp2
         gcc g++ make binutils autoconf automake autotools-dev libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev \
-        libevent-dev libjansson-dev libjemalloc-dev cython python3-dev python-setuptools && \
+        libevent-dev libjansson-dev libjemalloc-dev python3-dev python-setuptools && \
     # node
     wget -qO- https://deb.nodesource.com/setup_20.x | bash - && \
     # data_migration (mongo clients)
@@ -76,8 +76,8 @@ RUN useradd -r -M -U -d /opt/countly -s /bin/false countly && \
     chown -R countly:countly /opt/countly && \
     # cleanup
     npm remove -y --no-save mocha nyc should supertest && \
-    apt-get remove -y build-essential libkrb5-dev sqlite3 wget \
-        gcc g++ make binutils autoconf automake autotools-dev libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev libevent-dev libjansson-dev libjemalloc-dev cython python3-dev python-setuptools && \
+    apt-get remove -y build-essential libkrb5-dev wget \
+        gcc g++ make binutils autoconf automake autotools-dev libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev libev-dev libevent-dev libjansson-dev libjemalloc-dev python3-dev python-setuptools && \
     apt-get install -y 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 clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /tmp/.??* /var/tmp/* /var/tmp/.??* ~/.npm ~/.cache && \

Dockerfile-frontend

@@ -46,7 +46,6 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
 	dpkg -i /tmp/tini.deb && \
 	\
 	# modify standard distribution
-	apt-get update && apt-get install -y sqlite3 && \
 	./bin/docker/modify.sh && \
 	\
 	# preinstall