Merge branch 'master' into release

i1skn · Jul 18, 2019 · 5b24ca0 · 5b24ca0
2 parents ec9475f + da9f795
commit 5b24ca0
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 20 deletions.
diff --git a/api/parts/data/events.js b/api/parts/data/events.js
@@ -50,7 +50,7 @@ countlyEvents.processEvents = function(params) {
                 var currEvent = params.qstring.events[i],
                     shortEventName = "",
                     eventCollectionName = "";
-                if (!currEvent.key || !currEvent.count || !common.isNumber(currEvent.count) || (currEvent.key.indexOf('[CLY]_') === 0 && plugins.internalEvents.indexOf(currEvent.key) === -1)) {
+                if (!currEvent.key || !currEvent.count || !common.isNumber(currEvent.count) || (currEvent.key && currEvent.key.indexOf('[CLY]_') === 0 && plugins.internalEvents.indexOf(currEvent.key) === -1)) {
                     continue;
                 }
 

diff --git a/api/parts/mgmt/apps.js b/api/parts/mgmt/apps.js
@@ -669,7 +669,9 @@ function deleteAppData(appId, fromAppDelete, params, app) {
 * @param {object} app - app document
 **/
 function deleteAllAppData(appId, fromAppDelete, params, app) {
-    common.db.collection('apps').update({'_id': common.db.ObjectID(appId)}, {$set: {seq: 0}}, function() {});
+    if (!fromAppDelete) {
+        common.db.collection('apps').update({'_id': common.db.ObjectID(appId)}, {$set: {seq: 0}}, function() {});
+    }
     common.db.collection('users').remove({'_id': {$regex: appId + ".*"}}, function() {});
     common.db.collection('carriers').remove({'_id': {$regex: appId + ".*"}}, function() {});
     common.db.collection('devices').remove({'_id': {$regex: appId + ".*"}}, function() {});
@@ -688,7 +690,7 @@ function deleteAllAppData(appId, fromAppDelete, params, app) {
                     var collectionNameWoPrefix = crypto.createHash('sha1').update(events.list[i] + appId).digest('hex');
                     common.db.collection("events" + collectionNameWoPrefix).drop(function() {});
                 }
-                if (params.qstring.args.period === "reset") {
+                if (fromAppDelete || params.qstring.args.period === "reset") {
                     common.db.collection('events').remove({'_id': common.db.ObjectID(appId)}, function() {});
                 }
             }
@@ -698,6 +700,7 @@ function deleteAllAppData(appId, fromAppDelete, params, app) {
         if (!fromAppDelete) {
             common.db.collection('metric_changes' + appId).drop(function() {
                 common.db.collection('metric_changes' + appId).ensureIndex({ts: -1}, { background: true }, function() {});
+                common.db.collection('metric_changes' + appId).ensureIndex({ts: 1, "cc.o": 1}, { background: true }, function() {});
                 common.db.collection('metric_changes' + appId).ensureIndex({uid: 1}, { background: true }, function() {});
             });
             common.db.collection('app_user_merges' + appId).drop(function() {

diff --git a/bin/config/countly_user.sh b/bin/config/countly_user.sh
@@ -24,7 +24,7 @@ if [ `getent passwd countly`x == 'x' ]; then
     useradd -r -M -U -d $COUNTLY_DIR -s /bin/false countly
 
     #countly process should be able to restart itself
-    echo "countly ALL=(ALL) NOPASSWD: /usr/bin/countly start, /usr/bin/countly stop, /usr/bin/countly restart, /usr/bin/countly upgrade" >> /etc/sudoers.d/countly
+    echo "countly ALL=(ALL) NOPASSWD: /usr/bin/countly start, /usr/bin/countly stop, /usr/bin/countly restart, /usr/bin/countly upgrade, /usr/bin/npm *" >> /etc/sudoers.d/countly
 fi
 
 #change permission of countly directory

diff --git a/frontend/express/public/javascripts/countly/countly.task.manager.js b/frontend/express/public/javascripts/countly/countly.task.manager.js
@@ -21,11 +21,8 @@
             success: function(json) {
                 _resultData = json;
                 for (var i = 0; i < json.length; i++) {
-                    if (json[i].meta) {
-                        json[i].meta = countlyCommon.decodeHtml(json[i].meta);
-                    }
                     if (json[i].request) {
-                        json[i].request = JSON.parse(countlyCommon.decodeHtml(json[i].request));
+                        json[i].request = JSON.parse(json[i].request);
                     }
                     _resultObj[json[i]._id] = json[i];
                 }
@@ -45,13 +42,10 @@
             dataType: "json",
             success: function(json) {
                 if (json.data) {
-                    json.data = JSON.parse(countlyCommon.decodeHtml(json.data));
-                }
-                if (json.meta) {
-                    json.meta = countlyCommon.decodeHtml(json.meta);
+                    json.data = JSON.parse(json.data);
                 }
                 if (json.request) {
-                    json.request = JSON.parse(countlyCommon.decodeHtml(json.request));
+                    json.request = JSON.parse(json.request);
                 }
                 _data[id] = json;
                 if (callback) {

diff --git a/frontend/express/public/stylesheets/main.css b/frontend/express/public/stylesheets/main.css
@@ -94,7 +94,7 @@
        url('../fonts/Oswald-700/Oswald-700.ttf') format('truetype'),
        url('../fonts/Oswald-700/Oswald-700.svg#Oswald') format('svg');
 }
-
+* { outline:none; }
 html { height: 100%; }
 body { margin:0; padding:0; overflow:auto; background-color:#F9F9F9; user-select:text; font-family: Ubuntu,Helvetica,sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; }
 #content-container { margin-left:224px; min-width:768px; min-height: 400px; padding:78px 16px 35px 16px; transition: margin-left 0.55s; will-change: margin-left; }

diff --git a/plugins/assistant/api/assistant.js b/plugins/assistant/api/assistant.js
@@ -121,7 +121,7 @@ const _ = require('underscore');
 
         db.collection('apps').findOne({_id: db.ObjectID(app_id)}, {type: 1}, function(err, document) {
             //todo handle null case
-            const isMobile = document.type === "mobile";//check if app type is mobile or web
+            const isMobile = document && document.type === "mobile";//check if app type is mobile or web
 
             //get global unsaved notifications for this app
             db.collection(db_name_notifs).find({app_id: app_id}, {}).toArray(function(err1, notifs) {

diff --git a/plugins/pluginManager.js b/plugins/pluginManager.js
@@ -750,7 +750,7 @@ var pluginManager = function pluginManager() {
             return callback(errors);
         }
         var cwd = eplugin ? eplugin.rfs : path.join(__dirname, plugin);
-        exec('npm install --unsafe-perm', {cwd: cwd}, function(error) {
+        exec('sudo npm install --unsafe-perm', {cwd: cwd}, function(error) {
             if (error) {
                 errors = true;
                 console.log('error: %j', error);
@@ -785,7 +785,7 @@ var pluginManager = function pluginManager() {
             return callback(errors);
         }
         var cwd = eplugin ? eplugin.rfs : path.join(__dirname, plugin);
-        exec('npm update --unsafe-perm', {cwd: cwd}, function(error) {
+        exec('sudo npm update --unsafe-perm', {cwd: cwd}, function(error) {
             if (error) {
                 errors = true;
                 console.log('error: %j', error);
@@ -1109,7 +1109,7 @@ var pluginManager = function pluginManager() {
                     return mongo.ObjectID(id);
                 }
                 catch (ex) {
-                    console.log("Incorrect Object ID", ex);
+                    logDbRead.i("Incorrect Object ID %j", ex);
                     return id;
                 }
             };

diff --git a/plugins/views/api/api.js b/plugins/views/api/api.js
@@ -634,6 +634,21 @@ const escapedViewSegments = { "name": true, "segment": true, "height": true, "wi
                         });
                     }
                 }
+                else if (params.qstring.action === "get_view_count") {
+                    if (params.app_id && params.app_id !== "") {
+                        common.db.collection("app_viewsmeta" + params.app_id).estimatedDocumentCount(function(err, count) {
+                            if (err) {
+                                common.returnMessage(params, 200, 0);
+                            }
+                            else {
+                                common.returnMessage(params, 200, count || 0);
+                            }
+                        });
+                    }
+                    else {
+                        common.returnMessage(params, 400, "Missing request parameter: app_id");
+                    }
+                }
                 else {
                     var retData = {};
                     colName = "app_viewdata" + crypto.createHash('sha1').update(segment + params.app_id).digest('hex');

diff --git a/plugins/views/frontend/public/javascripts/countly.models.js b/plugins/views/frontend/public/javascripts/countly.models.js
@@ -16,7 +16,8 @@
         _period = null,
         _tableData = [],
         _selectedViews = [],
-        _graphDataObj = {};
+        _graphDataObj = {},
+        _viewsCount = 0;
 
     //graphData['appID'][]
     //Public Methods
@@ -56,6 +57,21 @@
                             _domains = json.domains;
                         }
                     }
+                }),
+                $.ajax({
+                    type: "GET",
+                    url: countlyCommon.API_PARTS.data.r,
+                    data: {
+                        "app_id": countlyCommon.ACTIVE_APP_ID,
+                        "method": "views",
+                        "action": "get_view_count"
+                    },
+                    dataType: "json",
+                    success: function(json) {
+                        if (json && json.result) {
+                            _viewsCount = json.result;
+                        }
+                    }
                 })
             ).then(//on initialize load only after getting list of selected
                 function() {
@@ -86,7 +102,24 @@
             return true;
         }
     };
-
+    countlyViews.loadViewCount = function() {
+        return $.when($.ajax({
+            type: "GET",
+            url: countlyCommon.API_PARTS.data.r,
+            data: {
+                "app_id": countlyCommon.ACTIVE_APP_ID,
+                "method": "views",
+                "action": "get_view_count"
+            },
+            dataType: "json",
+            success: function(json) {
+                if (json && json.result) {
+                    _viewsCount = json.result;
+                }
+            }
+        })
+        );
+    };
     countlyViews.refresh = function() {
         if (!countlyCommon.DEBUG) {
 
@@ -208,6 +241,10 @@
         return _segments;
     };
 
+    countlyViews.getViewsCount = function() {
+        return _viewsCount;
+    };
+
     countlyViews.getSegmentKeys = function() {
         var segments = [];
         for (var key in _segments) {