Skip to content

Commit 9971e74

Browse files
gabrieloliveirapintogabrieloliveirapinto
committed
Merge remote-tracking branch 'origin/next' into master-v25.03.12-into-next
2 parents d2bfc1a + 17e44ee commit 9971e74

File tree

210 files changed

+3609
-86337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

210 files changed

+3609
-86337
lines changed

‎.codacy.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@ exclude_paths:
77
- 'frontend/express/public/localization/**'
88
- 'frontend/express/public/fonts/**'
99
- 'frontend/express/public/images/**'
10-
- 'frontend/express/public/stylesheets/amaranjs/**'
1110
- 'frontend/express/public/stylesheets/font-awesome/**'
1211
- 'frontend/express/public/stylesheets/ionicons/**'
1312
- 'frontend/express/public/stylesheets/material/**'
14-
- 'frontend/express/public/stylesheets/selectize/**'
1513
- 'bin/backup/**'
1614
- 'bin/upgrade/**'
1715
- 'bin/**'

‎.github/workflows/main.yml‎

Lines changed: 78 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ jobs:
161161

162162
- name: Copy code
163163
shell: bash
164-
run: cp -rf ./* /opt/countly
164+
run: |
165+
cp -rf ./* /opt/countly
166+
cp ./bin/docker/postinstall.sh /etc/my_init.d
165167
166168
- name: Remove plugin tests
167169
shell: bash
@@ -280,7 +282,12 @@ jobs:
280282
281283
- name: Copy code
282284
shell: bash
283-
run: cp -rf ./* /opt/countly
285+
run: |
286+
rm -rf /opt/countly/frontend
287+
rm -rf /opt/countly/plugins/old-ui-compatibility
288+
cp -rf ./* /opt/countly
289+
cp /opt/countly/frontend/express/config.sample.js /opt/countly/frontend/express/config.js
290+
cp /opt/countly/frontend/express/public/javascripts/countly/countly.config.sample.js /opt/countly/frontend/express/public/javascripts/countly/countly.config.js
284291
285292
- name: Prepare files to use correct MongoDB host
286293
shell: bash
@@ -334,3 +341,72 @@ jobs:
334341
mkdir -p screenshots videos
335342
tar zcvf "$ARTIFACT_ARCHIVE_NAME" screenshots videos
336343
curl -o /tmp/uploader.log -u "${{ secrets.BOX_UPLOAD_AUTH }}" ${{ secrets.BOX_UPLOAD_PATH }} -T "$ARTIFACT_ARCHIVE_NAME"
344+
345+
ui-test-sdk:
346+
runs-on: ubuntu-latest
347+
348+
services:
349+
mongodb:
350+
image: mongo:8.0
351+
options: >-
352+
--health-cmd mongosh
353+
--health-interval 10s
354+
--health-timeout 5s
355+
--health-retries 5
356+
ports:
357+
- 27017:27017
358+
359+
container:
360+
image: countly/countly-core:pipelines-${{ inputs.custom_tag || github.base_ref || github.ref_name }}
361+
env:
362+
COUNTLY_CONFIG__MONGODB_HOST: mongodb
363+
COUNTLY_CONFIG_API_PREVENT_JOBS: true
364+
365+
steps:
366+
- uses: actions/checkout@v2
367+
368+
- name: Install Chrome
369+
shell: bash
370+
run: |
371+
apt update
372+
apt install -y libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb wget
373+
wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -O /tmp/chrome.deb
374+
apt install -y /tmp/chrome.deb
375+
376+
- name: Copy code
377+
shell: bash
378+
run: cp -rf ./* /opt/countly
379+
380+
- name: Prepare files to use correct MongoDB host
381+
shell: bash
382+
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"
383+
384+
- name: NPM install
385+
shell: bash
386+
working-directory: /opt/countly
387+
run: npm install
388+
389+
- name: Prepare environment
390+
shell: bash
391+
working-directory: /opt/countly
392+
run: |
393+
sed -i 's/port: 3001,/port: 3001, workers: 1,/' /opt/countly/api/config.js
394+
cp "./plugins/plugins.default.json" "/opt/countly/plugins/plugins.json"
395+
npm install
396+
sudo countly task dist-all
397+
bash bin/scripts/countly.prepare.ce.tests.sh
398+
cd ui-tests
399+
echo '{"username": "${{ secrets.CYPRESS_USER_USERNAME }}","email": "${{ secrets.CYPRESS_USER_EMAIL }}","password": "${{ secrets.CYPRESS_USER_PASSWORD }}"}' > cypress/fixtures/user.json
400+
sed -i 's/00000000-0000-0000-0000-000000000000/${{ secrets.CYPRESS_KEY }}/g' package.json
401+
cp cypress.config.sample.js cypress.config.js
402+
sed -i 's/000000/${{ secrets.CYPRESS_PROJECT_ID }}/g' cypress.config.js
403+
404+
- name: Run UI tests
405+
shell: bash
406+
working-directory: /opt/countly
407+
run: |
408+
/sbin/my_init &
409+
cd ui-tests
410+
npm install
411+
xvfb-run --auto-servernum --server-args="-screen 0 1280x1024x24" \
412+
npm run cy:run:sdk

‎CHANGELOG.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 25.xx
2+
Dependencies:
3+
- Remove SQLite
4+
15
## Version 25.03.12
26
Features:
37
- [plugins] Add configuration warning tags to settings UI
@@ -20,7 +24,6 @@ Dependencies:
2024
- Bump puppeteer from 24.14.0 to 24.15.0
2125
- Bump supertest from 7.1.3 to 7.1.4
2226

23-
2427
## Version 25.03.11
2528
Fixes:
2629
- [core] Fix mongo connection url parsing
@@ -116,7 +119,6 @@ Fixes:
116119
- [hooks] Added null check for incoming data
117120
- [push] Fix external drawer initialization
118121
- [times-of-day] Fix chart component
119-
120122
Enterprise Fixes:
121123
- [content] Asset URL was wrongly constructed when user switches between apps
122124
- [ab-testing] Updates

‎Dockerfile-api‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
4949
dpkg -i /tmp/tini.deb && \
5050
\
5151
# modify standard distribution
52-
apt-get update && apt-get install -y sqlite3 && \
5352
./bin/docker/modify.sh && \
5453
\
5554
# preinstall

‎Dockerfile-centos-api‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/downlo
5151
yum install -y epel-release && \
5252
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 && \
5353
yum install -y https://pkgs.sysadmins.ws/el8/base/x86_64/raven-release-1.0-2.el8.noarch.rpm && \
54-
yum install -y wget openssl-devel make git libsqlite* sqlite unzip bzip2 && \
54+
yum install -y wget openssl-devel make git unzip bzip2 && \
5555
# modify standard distribution
5656
./bin/docker/modify.sh && \
5757
\

‎Dockerfile-centos-frontend‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ RUN curl -s -L -o /tmp/tini.rpm "https://github.com/krallin/tini/releases/downlo
4949
yum install -y epel-release && \
5050
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 && \
5151
yum install -y https://pkgs.sysadmins.ws/el8/base/x86_64/raven-release-1.0-2.el8.noarch.rpm && \
52-
yum install -y wget openssl-devel make git sqlite libsqlite* unzip bzip2 && \
52+
yum install -y wget openssl-devel make git unzip bzip2 && \
5353
# modify standard distribution
5454
./bin/docker/modify.sh && \
5555
\

‎Dockerfile-core‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ RUN useradd -r -M -U -d /opt/countly -s /bin/false countly && \
2929
apt-get update && \
3030
apt-get install -y \
3131
# standard
32-
build-essential libkrb5-dev git sqlite3 wget sudo \
32+
build-essential libkrb5-dev git wget sudo \
3333
# nginx
3434
nginx \
3535
# puppeteer
@@ -76,7 +76,7 @@ RUN useradd -r -M -U -d /opt/countly -s /bin/false countly && \
7676
chown -R countly:countly /opt/countly && \
7777
# cleanup
7878
npm remove -y --no-save mocha nyc should supertest && \
79-
apt-get remove -y build-essential libkrb5-dev sqlite3 wget \
79+
apt-get remove -y build-essential libkrb5-dev wget \
8080
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 && \
8181
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 && \
8282
apt-get clean && \

‎Dockerfile-frontend‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ RUN curl -s -L -o /tmp/tini.deb "https://github.com/krallin/tini/releases/downlo
4646
dpkg -i /tmp/tini.deb && \
4747
\
4848
# modify standard distribution
49-
apt-get update && apt-get install -y sqlite3 && \
5049
./bin/docker/modify.sh && \
5150
\
5251
# preinstall

‎Gruntfile.js‎

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,8 @@ module.exports = function(grunt) {
1414
dom: {
1515
src: [
1616
'frontend/express/public/javascripts/dom/jquery/jquery.js',
17-
'frontend/express/public/javascripts/dom/jquery.form.js',
18-
'frontend/express/public/javascripts/dom/tipsy/jquery.tipsy.js',
19-
'frontend/express/public/javascripts/dom/jquery.noisy.min.js',
20-
'frontend/express/public/javascripts/dom/jquery.sticky.headers.js',
21-
'frontend/express/public/javascripts/dom/jqueryui/jquery-ui.js',
22-
'frontend/express/public/javascripts/dom/jqueryui/jquery-ui-i18n.js',
2317
'frontend/express/public/javascripts/dom/gridstack/gridstack-h5.js',
24-
'frontend/express/public/javascripts/dom/slimScroll.min.js',
25-
'frontend/express/public/javascripts/dom/jquery.easing.1.3.js',
26-
'frontend/express/public/javascripts/dom/dataTables/js/jquery.dataTables.js',
27-
'frontend/express/public/javascripts/dom/dataTables/js/ZeroClipboard.js',
28-
'frontend/express/public/javascripts/dom/dataTables/js/TableTools.js',
2918
'frontend/express/public/javascripts/dom/pace/pace.min.js',
30-
'frontend/express/public/javascripts/dom/drop/tether.min.js',
31-
'frontend/express/public/javascripts/dom/drop/drop.min.js'
3219
],
3320
dest: 'frontend/express/public/javascripts/min/countly.dom.concat.js'
3421
},
@@ -39,22 +26,13 @@ module.exports = function(grunt) {
3926
'frontend/express/public/javascripts/utils/lodash.merge.js',
4027
'frontend/express/public/javascripts/utils/prefixfree.min.js',
4128
'frontend/express/public/javascripts/utils/moment/moment-with-locales.min.js',
42-
'frontend/express/public/javascripts/utils/handlebars.js',
4329
'frontend/express/public/javascripts/utils/backbone-min.js',
4430
'frontend/express/public/javascripts/utils/jquery.i18n.properties.js',
45-
'frontend/express/public/javascripts/utils/jstz.min.js',
4631
'frontend/express/public/javascripts/utils/store+json2.min.js',
4732
'frontend/express/public/javascripts/utils/jquery.idle-timer.js',
48-
'frontend/express/public/javascripts/utils/textcounter.min.js',
4933
'frontend/express/public/javascripts/utils/initialAvatar.js',
50-
'frontend/express/public/javascripts/utils/jquery.amaran.min.js',
51-
'frontend/express/public/javascripts/utils/jquery.titlealert.js',
52-
'frontend/express/public/javascripts/utils/jquery.hoverIntent.minified.js',
53-
'frontend/express/public/javascripts/utils/tooltipster/tooltipster.bundle.min.js',
5434
'frontend/express/public/javascripts/utils/highlight/highlight.pack.js',
55-
'frontend/express/public/javascripts/utils/dropzone.js',
5635
'frontend/express/public/javascripts/utils/webfont.js',
57-
'frontend/express/public/javascripts/utils/selectize.min.js',
5836
'frontend/express/public/javascripts/utils/leaflet.js',
5937
'frontend/express/public/javascripts/utils/js-deep-equals.unsorted.min.js',
6038
'frontend/express/public/javascripts/utils/polyfill/es6-promise.auto.min.js',
@@ -77,38 +55,15 @@ module.exports = function(grunt) {
7755
'frontend/express/public/javascripts/utils/vue/vue-json-pretty.min.js',
7856
'frontend/express/public/javascripts/utils/jquery.xss.js',
7957
'frontend/express/public/javascripts/countly/countly.common.js',
80-
'frontend/express/public/javascripts/utils/simpleUpload.min.js',
81-
'frontend/express/public/javascripts/utils/jsoneditor/codemirror.js',
82-
'frontend/express/public/javascripts/utils/jsoneditor/javascript.min.js',
83-
'frontend/express/public/javascripts/utils/jsoneditor/json2.js',
84-
'frontend/express/public/javascripts/utils/jsoneditor/jsonlint.js',
85-
'frontend/express/public/javascripts/utils/jsoneditor/minify.json.js',
86-
'frontend/express/public/javascripts/utils/jsoneditor/jsoneditor.js',
8758
'frontend/express/public/javascripts/utils/Sortable.min.js',
8859
'frontend/express/public/javascripts/utils/vue/vuedraggable.umd.min.js',
89-
'frontend/express/public/javascripts/utils/countly.checkbox.js',
9060
'frontend/express/public/javascripts/utils/lodash.mergeWith.js',
9161
'frontend/express/public/javascripts/utils/element-tiptap.umd.min.js'
9262
],
9363
dest: 'frontend/express/public/javascripts/min/countly.utils.concat.js'
9464
},
9565
visualization: {
9666
src: [
97-
'frontend/express/public/javascripts/visualization/jquery.peity.min.js',
98-
'frontend/express/public/javascripts/visualization/jquery.sparkline.js',
99-
'frontend/express/public/javascripts/visualization/flot/jquery.flot.js',
100-
'frontend/express/public/javascripts/visualization/flot/jquery.flot.tickrotor.js',
101-
'frontend/express/public/javascripts/visualization/flot/jquery.flot.pie.js',
102-
'frontend/express/public/javascripts/visualization/flot/jquery.flot.resize.js',
103-
'frontend/express/public/javascripts/visualization/flot/jquery.flot.stack.js',
104-
'frontend/express/public/javascripts/visualization/flot/jquery.flot.spline.js',
105-
'frontend/express/public/javascripts/visualization/flot/jquery.flot.crosshair.js',
106-
'frontend/express/public/javascripts/visualization/flot/jquery.flot.orderBars.js',
107-
'frontend/express/public/javascripts/visualization/flot/jquery.flot.navigate.js',
108-
'frontend/express/public/javascripts/visualization/gauge.min.js',
109-
'frontend/express/public/javascripts/visualization/d3/d3.min.js',
110-
'frontend/express/public/javascripts/visualization/rickshaw/rickshaw.min.js',
111-
'frontend/express/public/javascripts/visualization/rickshaw/rickshaw.x.axis.js'
11267
],
11368
dest: 'frontend/express/public/javascripts/min/countly.visualization.concat.js'
11469
},
@@ -159,7 +114,6 @@ module.exports = function(grunt) {
159114
'frontend/express/public/javascripts/countly/vue/components/progress.js',
160115
'frontend/express/public/javascripts/countly/vue/directives/scroll-shadow.js',
161116
'frontend/express/public/javascripts/countly/vue/legacy.js',
162-
'frontend/express/public/javascripts/countly/countly.vue.legacy.js',
163117
'frontend/express/public/javascripts/countly/countly.token.manager.js',
164118
'frontend/express/public/javascripts/countly/countly.version.history.js',
165119
'frontend/express/public/javascripts/countly/countly.analytics.js',
@@ -229,18 +183,10 @@ module.exports = function(grunt) {
229183
'frontend/express/public/stylesheets/main.min.css': [
230184
'frontend/express/public/stylesheets/main.css',
231185
'frontend/express/public/stylesheets/vue/clyvue.css',
232-
'frontend/express/public/stylesheets/vue/vue-json-pretty.css',
233-
'frontend/express/public/stylesheets/amaranjs/amaran.min.css',
234-
'frontend/express/public/stylesheets/selectize/selectize.css',
235186
'frontend/express/public/stylesheets/leaflet/leaflet.css',
236-
'frontend/express/public/stylesheets/jsoneditor/codemirror.css',
237-
'frontend/express/public/stylesheets/countly-checkbox/countly.checkbox.css',
238-
'frontend/express/public/javascripts/dom/tipsy/tipsy.css',
187+
'frontend/express/public/stylesheets/vue/vue-json-pretty.css',
239188
'frontend/express/public/javascripts/dom/gridstack/gridstack.css',
240-
'frontend/express/public/javascripts/visualization/rickshaw/rickshaw.min.css',
241189
'frontend/express/public/javascripts/dom/pace/pace-theme-flash.css',
242-
'frontend/express/public/javascripts/dom/drop/drop-theme-countly.min.css',
243-
'frontend/express/public/javascripts/utils/tooltipster/tooltipster.bundle.min.css',
244190
'frontend/express/public/stylesheets/bulma/bulma-custom.css',
245191
'frontend/express/public/stylesheets/styles/manifest2.css',
246192
'frontend/express/public/stylesheets/vue/element-tiptap.css',

‎api/parts/data/usage.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
var usage = {},
88
common = require('./../../utils/common.js'),
99
geoip = require('geoip-lite'),
10-
geocoder = require('offline-geocoder')(),
10+
geocoder = require('./../../../bin/offline-geocoder/src/index.js')(),
1111
log = require('../../utils/log.js')('api:usage'),
1212
async = require('async'),
1313
plugins = require('../../../plugins/pluginManager.js'),

0 commit comments

Comments
 (0)