Next

Gruntfile.js

@@ -126,9 +126,10 @@ module.exports = function(grunt) {
                     'frontend/express/public/javascripts/countly/countly.carrier.js',
                     'frontend/express/public/javascripts/countly/countly.total.users.js',
                     'frontend/express/public/javascripts/countly/countly.app.users.js',
-                    'frontend/express/public/javascripts/countly/countly.template.js',
+                    'frontend/express/public/javascripts/countly/countly.view.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',
                     'frontend/express/public/javascripts/countly/vue/helpers.js',
                     'frontend/express/public/javascripts/countly/vue/data/vuex.js',
                     'frontend/express/public/javascripts/countly/countly.task.manager.js',

api/configextender.js

@@ -26,8 +26,81 @@ const OVERRIDES = {
         REPLSETSERVERS: 'replSetServers',
         REPLICANAME: 'replicaName',
         MAX_POOL_SIZE: 'max_pool_size',
-        DBOPTIONS: 'dbOptions',
-        SERVEROPTIONS: 'serverOptions'
+        DBOPTIONS: {
+            __name: "dbOptions",
+            AUTHMECHANISM: 'authMechanism',
+            AUTHMECHANISMPROPERTIES: 'authMechanismProperties',
+            AUTHSOURCE: 'authSource',
+            AUTOENCRYPTION: 'autoEncryption',
+            BSONREGEXP: 'bsonRegExp',
+            CHECKKEYS: 'checkKeys',
+            CHECKSERVERIDENTITY: 'checkServerIdentity',
+            CONNECTTIMEOUTMS: 'connectTimeoutMS',
+            DIRECTCONNECTION: 'directConnection',
+            DRIVERINFO: 'driverInfo',
+            ECDHCURVE: 'ecdhCurve',
+            ENABLEUTF8VALIDATION: 'enableUtf8Validation',
+            FIELDSASRAW: 'fieldsAsRaw',
+            FORCESERVEROBJECTID: 'forceServerObjectId',
+            HEARTBEATFREQUENCYMS: 'heartbeatFrequencyMS',
+            IGNOREUNDEFINED: 'ignoreUndefined',
+            KEEPALIVE: 'keepAlive',
+            KEEPALIVEINITIALDELAY: 'keepAliveInitialDelay',
+            LOADBALANCED: 'loadBalanced',
+            LOCALADDRESS: 'localAddress',
+            LOCALPORT: 'localPort',
+            LOCALTHRESHOLDMS: 'localThresholdMS',
+            LOGGERLEVEL: 'loggerLevel',
+            MAXIDLETIMEMS: 'maxIdleTimeMS',
+            MAXPOOLSIZE: 'maxPoolSize',
+            MAXSTALENESSSECONDS: 'maxStalenessSeconds',
+            MINDHSIZE: 'minDHSize',
+            MINHEARTBEATFREQUENCYMS: 'minHeartbeatFrequencyMS',
+            MINPOOLSIZE: 'minPoolSize',
+            MONITORCOMMANDS: 'monitorCommands',
+            NODELAY: 'noDelay',
+            PKFACTORY: 'pkFactory',
+            PROMISELIBRARY: 'promiseLibrary',
+            PROMOTEBUFFERS: 'promoteBuffers',
+            PROMOTELONGS: 'promoteLongs',
+            PROMOTEVALUES: 'promoteValues',
+            PROXYHOST: 'proxyHost',
+            PROXYPASSWORD: 'proxyPassword',
+            PROXYPORT: 'proxyPort',
+            PROXYUSERNAME: 'proxyUsername',
+            READCONCERN: 'readConcern',
+            READCONCERNLEVEL: 'readConcernLevel',
+            READPREFERENCE: 'readPreference',
+            READPREFERENCETAGS: 'readPreferenceTags',
+            REJECTUNAUTHORIZED: 'rejectUnauthorized',
+            REPLICASET: 'replicaSet',
+            RETRYREADS: 'retryReads',
+            RETRYWRITES: 'retryWrites',
+            SECURECONTEXT: 'secureContext',
+            SECUREPROTOCOL: 'secureProtocol',
+            SERIALIZEFUNCTIONS: 'serializeFunctions',
+            SERVERAPI: 'serverApi',
+            SERVERSELECTIONTIMEOUTMS: 'serverSelectionTimeoutMS',
+            SOCKETTIMEOUTMS: 'socketTimeoutMS',
+            SRVMAXHOSTS: 'srvMaxHosts',
+            SRVSERVICENAME: 'srvServiceName',
+            SSLCA: 'sslCA',
+            SSLCRL: 'sslCRL',
+            SSLCERT: 'sslCert',
+            SSLKEY: 'sslKey',
+            SSLPASS: 'sslPass',
+            SSLVALIDATE: 'sslValidate',
+            TLSALLOWINVALIDCERTIFICATES: 'tlsAllowInvalidCertificates',
+            TLSALLOWINVALIDHOSTNAMES: 'tlsAllowInvalidHostnames',
+            TLSCAFILE: 'tlsCAFile',
+            TLSCERTIFICATEFILE: 'tlsCertificateFile',
+            TLSCERTIFICATEKEYFILE: 'tlsCertificateKeyFile',
+            TLSCERTIFICATEKEYFILEPASSWORD: 'tlsCertificateKeyFilePassword',
+            TLSINSECURE: 'tlsInsecure',
+            WAITQUEUETIMEOUTMS: 'waitQueueTimeoutMS',
+            WTIMEOUTMS: 'wtimeoutMS',
+            ZLIBCOMPRESSIONLEVEL: 'zlibCompressionLevel',
+        },
     },
 
     API: {
@@ -66,6 +139,9 @@ function dig(config, over, name, value) {
                 sub = over[n];
                 over[n] = {};
             }
+            else if (over[n] && over[n].__name) {
+                sub = over[n].__name;
+            }
             else {
                 sub = Object.keys(config).filter(k => k.toUpperCase() === n)[0];
             }

api/parts/data/cache.js

@@ -54,7 +54,7 @@ class DataStore {
     constructor(size, age, dispose, Cls) {
         this.size = size;
         this.age = age;
-        this.lru = new LRU({max: size || Number.MAX_SAFE_INTEGER, maxAge: age || Number.MAX_SAFE_INTEGER, dispose: dispose, noDisposeOnSet: true, updateAgeOnGet: true});
+        this.lru = new LRU({max: size || 10000, ttl: age || Number.MAX_SAFE_INTEGER, dispose: dispose, noDisposeOnSet: true, updateAgeOnGet: true});
         if (Cls) {
             this.Cls = Cls;
             this.Clas = require('../../../' + Cls[0])[Cls[1]];
@@ -588,7 +588,7 @@ class CacheMaster {
         this.operators[group] = {init, Cls, read, write, update, remove};
 
         if (!size && size !== 0) {
-            size = config.api && config.api.cache && config.api.cache[group] && config.api.cache[group].size !== undefined ? config.api.cache[group].size : Number.MAX_SAFE_INTEGER;
+            size = config.api && config.api.cache && config.api.cache[group] && config.api.cache[group].size !== undefined ? config.api.cache[group].size : 10000;
         }
 
         if (!age && age !== 0) {

api/parts/data/fetch.js

@@ -1444,7 +1444,7 @@ fetch.getTotalUsersObjWithOptions = function(metric, params, options, callback)
             }
 
             if (groupBy === "users") {
-                options.db.collection("app_users" + params.app_id).find(match).count(function(error, appUsersDbResult) {
+                options.db.collection("app_users" + params.app_id).count(match, function(error, appUsersDbResult) {
                     if (!error && appUsersDbResult) {
                         callback([{ "_id": "users", "u": appUsersDbResult }]);
                     }
@@ -2045,8 +2045,8 @@ fetch.alljobs = async function(metric, params) {
 fetch.jobDetails = async function(metric, params) {
     const columns = ["schedule", "next", "finished", "status", "data", "duration"];
     let sort = {};
+    const total = await common.db.collection('jobs').count({ name: params.qstring.name });
     const cursor = common.db.collection('jobs').find({ name: params.qstring.name });
-    const total = await cursor.count();
     sort[columns[params.qstring.iSortCol_0 || 0]] = (params.qstring.sSortDir_0 === "asc") ? 1 : -1;
     cursor.sort(sort);
     cursor.skip(Number(params.qstring.iDisplayStart || 0));

api/parts/mgmt/app_users.js

@@ -330,7 +330,7 @@ usersApi.count = function(app_id, query, callback) {
         query: query
     });
 
-    common.db.collection('app_users' + app_id).find(query).count(callback);
+    common.db.collection('app_users' + app_id).count(query, callback);
 };
 
 /**

api/parts/mgmt/users.js

@@ -666,7 +666,7 @@ usersApi.deleteOwnAccount = function(params) {
         verifyMemberArgon2Hash(params.member.email, params.qstring.password, (err, member) => {
             if (member) {
                 if (member.global_admin) {
-                    common.db.collection('members').find({'global_admin': true}).count(function(err2, count) {
+                    common.db.collection('members').count({'global_admin': true}, function(err2, count) {
                         if (err2) {
                             console.log(err2);
                             common.returnMessage(params, 400, 'Mongo error');
@@ -972,7 +972,7 @@ usersApi.fetchNotes = async function(params) {
         log.e(' got error while paring query notes request', e);
     }
     let count = 0;
-    common.db.collection('notes').find(query).count(function(error, noteCount) {
+    common.db.collection('notes').count(query, function(error, noteCount) {
         if (!error && noteCount) {
             count = noteCount;
             common.db.collection('notes').find(query)

api/utils/taskmanager.js

@@ -641,7 +641,7 @@ taskmanager.getTableQueryResult = async function(options, callback) {
     catch (e) {
         log.e(' got error while process task request parse', e);
     }
-    const count = await options.db.collection("long_tasks").find(options.query, options.projection).count();
+    const count = await options.db.collection("long_tasks").count(options.query);
     return options.db.collection("long_tasks").find(options.query, options.projection).sort(sortBy).skip(skip).limit(limit).toArray((err, list) => {
         if (!err) {
             callback(null, {list, count});

frontend/express/app.js

@@ -963,7 +963,6 @@ Promise.all([plugins.dbConnection(countlyConfig), plugins.dbConnection("countly_
                 stylesheets: [],
                 offline_mode: configs.offline_mode || false
             };
-
             // google services cannot work when offline mode enable
             if (toDashboard.offline_mode) {
                 toDashboard.use_google = false;

frontend/express/public/core/device-and-type/stylesheets/_main.scss

@@ -28,9 +28,6 @@
 	}
 }
 
-.technology-analytics-wrapper .technology-pie-graphs .cly-vue-chart-legend__right .cly-vue-chart-legend__secondary .__vuescroll .__view {
-    padding-right:30px;
-}
 .technology-analytics-wrapper .technology-pie-graphs .bu-level .bu-level-right {
     padding-right:5px;
 }

frontend/express/public/core/events/javascripts/countly.overview.models.js

@@ -48,24 +48,18 @@
         },
         getBarData: function(sparklines, eventProperty) {
             var obj = {};
-            var grid = {};
-            var yAxis = {};
-            var legend = {};
-            var tooltip = {};
+            var yAxis = {
+                show: true,
+                splitNumber: 1,
+                minInterval: 1,
+                position: "right"
+            };
             var series = [];
             var ob = {};
             ob.name = eventProperty;
             ob.data = sparklines;
             series.push(ob);
-            grid.height = "100px";
-            grid.top = "-25px";
-            yAxis.show = false;
-            legend.show = false;
-            tooltip.show = false;
-            obj.grid = grid;
             obj.yAxis = yAxis;
-            obj.legend = legend;
-            obj.tooltip = tooltip;
             obj.series = series;
             return obj;
         },

frontend/express/public/core/events/templates/overview.html

@@ -111,7 +111,7 @@ <h3 class="cly-vue-events-overview-subheadings">{{i18n('events.overview.monitor'
 				  <div slot="countValue" class="cly-monitor-events-breakdown-horizontal-tile__overviewvalue">{{item.total}}</div>
 				  <div slot="propertyName" class="cly-monitor-events-breakdown-horizontal-tile__eventproperty">{{item.eventProperty}}</div>
 				  <div slot="barGraph">
-					<cly-chart-bar class="cly-vue-events-overview-monitor-events__charts" :legend="monitorEventsLegend" :height=100 :option="item.barData" :autoresize=false :showZoom=false :showToggle=false :showDownload=false>			
+					<cly-chart-bar class="cly-vue-events-overview-monitor-events__charts" :noEmpty="true" :legend="monitorEventsLegend" :height=130 :option="item.barData" :autoresize=true :showZoom=false :showToggle=false :showDownload=false>
 					</cly-chart-bar>
 				  </div>
 				</monitor-events-breakdown-horizontal-tile>

frontend/express/public/core/session-overview/javascripts/countly.views.js

@@ -240,7 +240,7 @@ var SessionHomeWidget = countlyVue.views.create({
             var series = [];
             if (sessionDP && sessionDP.chartDP && sessionDP.chartDP[0] && sessionDP.chartDP[1]) {
                 series.push({"name": sessionDP.chartDP[1].label, "data": sessionDP.chartDP[1].data});
-                series.push({"name": sessionDP.chartDP[0].label + "(" + CV.i18n('common.previous-period') + ")", "data": sessionDP.chartDP[0].data, "color": "#39C0C8", lineStyle: {"color": "#39C0C8"} });
+                series.push({"name": sessionDP.chartDP[0].label + " (" + CV.i18n('common.previous-period') + ")", "data": sessionDP.chartDP[0].data, "color": "#39C0C8", lineStyle: {"color": "#39C0C8"} });
             }
             if (value === "d" || value === "d-avg") {
                 return {

frontend/express/public/core/session-overview/stylesheets/_main.scss

@@ -9,9 +9,6 @@
 .session-home-widget .el-tabs--card>.el-tabs__header {
 	margin: 0;
 }
-.session-home-widget .cly-vue-chart__echart {
-	padding: 20px 25px 32px 15px;
-}
 
 .session-home-widget .el-tabs__nav-wrap.is-scrollable{
 	border-bottom: 0px;