Merge branch 'master' into SER-868-update-version--view-to-new-UI

Author: coskunaydinoglu

.github/workflows/main.yml

@@ -256,9 +256,9 @@ jobs:
           bash bin/backup/import_events.sh
           bash bin/scripts/countly.prepare.ce.tests.sh
           countly add_user '${{ secrets.CYPRESS_USER_EMAIL }}' '${{ secrets.CYPRESS_USER_PASSWORD }}'
-          mongosh --host mongodb --eval 'db.getSiblingDB("countly").members.updateOne({username: "${{ secrets.CYPRESS_USER_EMAIL }}"}, {$set: {username: "${{ secrets.CYPRESS_USER_USERNAME }}"}});'
+          mongosh --host mongodb --eval 'db.getSiblingDB("countly").members.updateOne({username: "${{ secrets.CYPRESS_USER_EMAIL }}"}, {$set: {username: "${{ secrets.CYPRESS_USER_USERNAME }}", subscribe_newsletter: true}});'
+          mongosh --host mongodb --eval 'db.getSiblingDB("countly").plugins.updateOne({_id: "plugins"}, {$set: {"frontend.countly_tracking": true}});'
           cd ui-tests
-          mkdir cypress/fixtures
           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
@@ -279,7 +279,8 @@ jobs:
         working-directory: /opt/countly/ui-tests/cypress
         run: |
           ARTIFACT_ARCHIVE_NAME="$(date '+%Y%m%d-%H.%M')_${GITHUB_REPOSITORY#*/}_CI#${{ github.run_number }}.tar.gz"
-          tar zcvf "$ARTIFACT_ARCHIVE_NAME" screenshots videos hars
+          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"
 
   notify:

.gitignore

@@ -1,6 +1,12 @@
 api/node_modules/
 .idea
 .vscode
+.cache
+.npm
+.npmrc
+.local
+bin/config/nginx/
+bin/config/supervisord.conf
 *_en.properties
 frontend/express/node_modules/
 api/config.js
@@ -18,6 +24,7 @@ frontend/express/public/sdk/
 **/.DS_Store
 **/node_modules
 bin/scripts/nghttp2
+frontend/express/public/userimages/
 frontend/express/public/images/*/
 !frontend/express/public/images/leaflet/
 !frontend/express/public/images/annotation/
@@ -32,4 +39,7 @@ frontend/express/public/images/*/
 frontend/express/public/stylesheets/styles/manifest.css
 frontend/express/public/stylesheets/vue/clyvue.css
 frontend/express/public/stylesheets/styles/manifest.css.map
-frontend/express/public/stylesheets/vue/clyvue.css.map
+frontend/express/public/stylesheets/vue/clyvue.css.map
+log/
+log/supervisord/
+plugins/plugins.json.*

CHANGELOG.md

@@ -1,3 +1,88 @@
+## Version 23.11
+Features:
+- [apps] App initial as default app image
+- [compliance-hub] Use millisecond timestamp when recording consent
+- [consent] Ask for countly tracking and newsletter subscription
+- [core] Add config for setting maximum upload file size
+- [data_migration] Fixed problem with export
+- [guides] New plugin explaining Countly sections with videos and other content
+- [hooks] Add validation error messages when creating hooks
+- [jobs] Add the ability to pause jobs
+- [license] Check license at render instead of login
+- [onboarding] New onboarding flow when setting up a server
+- [quickstart] Menu to show some actions new users could take
+- [sdks] Add health checks with debug information
+- [sdks] Add queue size metrics
+- [sdks] Add request metrics
+- [server-stats] Record breakdown of internal events of data points
+- [settings] Trim incoming data based on API setting
+- [star-rating] Make comments table serverside 
+- [UI] Loading state fixes to distinguish from no data state
+- [views] Make table column widths adjustable
+
+Enterprise features:
+- [ab-testing] Add user selected minimum improvement rate for the automatic stop option
+- [ab-testing] Add experiment health-check logs for effective sample size and MCMC convergence
+- [auth-plugins] Allow hiding/showing login form
+- [block] Show the last time the filtering rule was triggered
+- [cohorts] Filtering by User Property segmentation in Cohorts using OR operator
+- [cohorts] Improved cohorts nightly job to reduce memory usage
+- [concurrent_users] Switched user sampling to the job so it will run only once per cluster
+- [crash_symbolication] Add instance id to symbolication requests
+- [data-manager] Allow exporting the event schema as a data populator template
+- [drill] Automatically disable estimation correction on slow servers
+- [drill] Delete dashboard widgets if a related Drill query is deleted
+- [drill] Make table column widths adjustable
+- [drill] Table widget for dashboards
+- [drill] Track how many duration updates did the session have in the document
+- [drill] Update user properties on session updates, so the session always gets the latest user properties that changed during the session
+- [drill] Use data snapshots to provide consistent data view between graph, table, and export
+- [ingestion] Fixed some concurrency issues when updating the duration for views or sessions
+- [surveys] Add ability for providing custom segment
+- [surveys] Added global/app/widget level settings
+- [surveys] Fixed export table
+- [users] Make table column widths adjustable
+- [users] New debug dialog for users merging both options
+- [views] Record UTM and Source as segments on drill
+- [white-labeling] Add emailing settings
+
+## Version 23.06.16
+Fixes:
+- [cache] Removing noCursorTimeout from cache cursor
+- [core] fix cursor timeout issue
+- [core] fix for Do not set session cookie on widget load
+- [core] uploadformfile was called even if it was not file upload
+- [core][report-manager] fix for If a report is created for the dashboard widget, viewing leads to the dashboard with that widget.
+- [core][views] Omitting views segments
+- [dependencies] Bump @babel/traverse from 7.22.5 to 7.23.2
+- [dependencies] Bump nodemailer from 6.9.6 to 6.9.7
+- [dependencies]Bump countly-sdk-web from 23.6.0 to 23.6.2
+- [permissions] Add feature check in rights
+- [push] Removing past dates from recurring messages details, fixing tests, sorting trigger dates
+- [ratings] fix for toggle issue in ratings
+- [scripts] fix for new recheck_merges script
+
+Enterprise fixes:
+- [ab-testing] fix for ab_opt_out call when keys not supplied
+- [data-manager] fix for Renamed Segment appearing in All Events
+- [retention_segments] fix cohort queries when selected by breakdown
+- [surveys] fix for disable csrf and session for widgets
+
+## Version 23.06.15
+Fixes:
+- [crashes] Add config for activating custom field cleanup job
+- [data-migration] Fix for upload request
+- [core] Remove sensitive fields from API responses
+- [dashboards] Validating links for note widgets
+- [star-rating] Css changes for ratings comments table
+- [star-rating] Fix for targeting reset on toggle
+- [members] Fix full Name updates in db
+
+Enterprise fixes: 
+- [crash_symbolication] Fix for symbol file upload
+- [data-manager] Fix for disabled input in view transformations
+- [data-manager] Fix for duplicate events being created in event transformation
+
 ## Version 23.06.14
 Fixes:
 - [cache] Fixing initialization race conditions (group store is not initialized)

Dockerfile

@@ -1,8 +1,8 @@
 FROM phusion/baseimage:focal-1.2.0
 
-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
+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
 # Enterprise Edition:
-#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk
+#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk,guides
 
 ARG COUNTLY_CONFIG_API_MONGODB_HOST=localhost
 ARG COUNTLY_CONFIG_FRONTEND_MONGODB_HOST=localhost

Dockerfile-api

@@ -1,8 +1,8 @@
 FROM node:hydrogen-bullseye-slim
 
-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
+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
 # Enterprise Edition:
-#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk
+#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk,guides
 
 ARG GEOIP=empty
 EXPOSE 3001

Dockerfile-centos-api

@@ -1,8 +1,8 @@
 FROM centos:8
 
-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
+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
 # Enterprise Edition:
-#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk
+#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk,guides
 
 ARG GEOIP=empty
 EXPOSE 3001

Dockerfile-centos-frontend

@@ -1,8 +1,8 @@
 FROM centos:8
 
-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
+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
 # Enterprise Edition:
-#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk
+#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk,guides
 
 EXPOSE 6001
 HEALTHCHECK --start-period=400s CMD curl --fail http://localhost:6001/ping || exit 1

Dockerfile-core

@@ -1,8 +1,8 @@
 FROM phusion/baseimage:focal-1.2.0
 
-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
+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
 # Enterprise Edition:
-#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk
+#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk,guides
 
 ARG COUNTLY_CONFIG_API_MONGODB_HOST=localhost
 ARG COUNTLY_CONFIG_FRONTEND_MONGODB_HOST=localhost

Dockerfile-frontend

@@ -1,8 +1,8 @@
 FROM node:hydrogen-bullseye-slim
 
-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
+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
 # Enterprise Edition:
-#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk
+#ARG COUNTLY_PLUGINS=mobile,web,desktop,plugins,density,locale,browser,sources,views,license,drill,funnels,retention_segments,flows,cohorts,surveys,remote-config,ab-testing,formulas,activity-map,concurrent_users,revenue,logger,systemlogs,populator,reports,crashes,push,geo,block,users,star-rating,slipping-away-users,compare,server-stats,dbviewer,crash_symbolication,crashes-jira,groups,white-labeling,alerts,times-of-day,compliance-hub,onboarding,active_users,performance-monitoring,config-transfer,consolidate,data-manager,hooks,dashboards,heatmaps,sdk,guides
 
 EXPOSE 6001
 HEALTHCHECK --start-period=400s CMD curl --fail http://localhost:6001/ping || exit 1

Gruntfile.js

@@ -130,6 +130,7 @@ module.exports = function(grunt) {
                     'frontend/express/public/javascripts/countly/countly.total.users.js',
                     'frontend/express/public/javascripts/countly/countly.app.users.js',
                     'frontend/express/public/javascripts/countly/countly.view.js',
+                    'frontend/express/public/javascripts/countly/countly.cms.js',
                     'frontend/express/public/javascripts/countly/vue/core.js',
                     'frontend/express/public/javascripts/countly/vue/container.js',
                     'frontend/express/public/javascripts/countly/countly.template.js',
@@ -195,7 +196,9 @@ module.exports = function(grunt) {
                     'frontend/express/public/core/home/javascripts/countly.models.js',
                     'frontend/express/public/core/home/javascripts/countly.views.js',
                     'frontend/express/public/core/notes/javascripts/countly.views.js',
-                    'frontend/express/public/core/version-history/javascripts/countly.views.js'
+                    'frontend/express/public/core/version-history/javascripts/countly.views.js',
+                    'frontend/express/public/core/onboarding/javascripts/countly.models.js',
+                    'frontend/express/public/core/onboarding/javascripts/countly.views.js'
                 ],
                 dest: 'frontend/express/public/javascripts/min/countly.lib.concat.js'
             }