Merge branch 'master' into next

ar2rsawseen · ar2rsawseen · commit c6f48f7e3482 · 2021-05-26T16:10:48.000+03:00
diff --git a/api/parts/mgmt/apps.js b/api/parts/mgmt/apps.js
@@ -141,7 +141,8 @@ appsApi.getAppsDetails = function(params) {
                                 created_at: params.app.created_at || 0,
                                 edited_at: params.app.edited_at || 0,
                                 plugins: params.app.plugins,
-                                last_data: (typeof last !== "undefined" && last.length) ? last[0].lac : 0,
+                                last_data: params.app.last_data,
+                                last_data_users: (typeof last !== "undefined" && last.length) ? last[0].lac : 0,
                             },
                             global_admin: global_admins || [],
                             admin: admins || [],
diff --git a/api/utils/requestProcessor.js b/api/utils/requestProcessor.js
@@ -2506,6 +2506,19 @@ const validateAppForWriteAPI = (params, done, try_times) => {
         params.app = app;
         params.time = common.initTimeObj(params.appTimezone, params.qstring.timestamp);
 
+
+        var time = Date.now().valueOf();
+        time = Math.round((time || 0) / 1000);
+        if (params.app && (!params.app.last_data || params.app.last_data < time - 60 * 60 * 24)) { //update if more than day passed
+            //set new value
+            common.db.collection("apps").update({"_id": common.db.ObjectID(params.app._id)}, {"$set": {"last_data": time}}, function(err1) {
+                if (err1) {
+                    console.log("Failed to update apps collection " + err1);
+                }
+                common.readBatcher.invalidate("apps", {"key": params.app.key}, {}, false); //because we load app by key  on incoming requests. so invalidate also by key
+            });
+        }
+
         if (!checksumSaltVerification(params)) {
             return done ? done() : false;
         }
diff --git a/frontend/express/public/javascripts/countly/countly.views.js b/frontend/express/public/javascripts/countly/countly.views.js
@@ -2448,7 +2448,13 @@ window.ManageAppsView = countlyView.extend({
                             table += "<tr><td>" + jQuery.i18n.map["management-applications.app-creator"] + "</td><td class='details-value' colspan='2'>" + ((result.app.owner === "" || result.app.owner_id === "") ? jQuery.i18n.map["common.unknown"] : "<a href='#/manage/users/" + result.app.owner_id + "' class='table-link-user green'>" + result.app.owner + "</a>") + "</td></tr>";
                             table += "<tr><td>" + jQuery.i18n.map["management-applications.app-created-at"] + "</td><td class='details-value' colspan='2'>" + ((parseInt(result.app.created_at) === 0) ? jQuery.i18n.map["common.unknown"] : countlyCommon.formatTimeAgo(result.app.created_at)) + "</td></tr>";
                             table += "<tr><td>" + jQuery.i18n.map["management-applications.app-edited-at"] + "</td><td class='details-value' colspan='2'>" + ((parseInt(result.app.edited_at) === 0) ? jQuery.i18n.map["common.unknown"] : countlyCommon.formatTimeAgo(result.app.edited_at)) + "</td></tr>";
-                            table += "<tr><td>" + jQuery.i18n.map["management-applications.app-last-data"] + "</td><td class='details-value' colspan='2'>" + ((parseInt(result.app.last_data) === 0) ? jQuery.i18n.map["common.unknown"] : countlyCommon.formatTimeAgo(result.app.last_data)) + "</td></tr>";
+
+                            var ts = result.app.last_data;
+                            if (Math.round(ts).toString().length === 10) {
+                                ts *= 1000;
+                            }
+
+                            table += "<tr><td>" + jQuery.i18n.map["management-applications.app-last-data"] + "</td><td class='details-value' colspan='2'>" + ((parseInt(result.app.last_data) === 0) ? jQuery.i18n.map["common.unknown"] : moment(new Date(ts)).format("ddd, D MMM YYYY")) + "</td></tr>";
                             table += "<tr><td rowspan='3'>" + jQuery.i18n.map["management-applications.app-users"] + "</td>";
                             table += "<td class='second-header'>" + jQuery.i18n.map["management-applications.global_admins"] + " (" + result.global_admin.length + ")</td><td class='details-value'>" + joinUsers(result.global_admin) + "</td></tr>";
                             table += "<tr><td class='second-header'>" + jQuery.i18n.map["management-applications.admins"] + " (" + result.admin.length + ")</td><td class='details-value'>" + joinUsers(result.admin) + "</td></tr>";
diff --git a/plugins/push/api/parts/endpoints.js b/plugins/push/api/parts/endpoints.js
@@ -1207,7 +1207,7 @@ function cachedData(note) {
             return common.returnMessage(params, 403, 'Only app / global admins are allowed to delete');
         }
 
-        await note.update(common.db, {$bit: {'result.status': {or: N.Status.Deleted}}});
+        await note.update(common.db, {$bit: {'result.status': {or: N.Status.Deleted}}}).catch(log.w.bind(log, 'Error during message deletion'));
         api.cache.remove(_id);
         note.result.status |= N.Status.Deleted;
 
diff --git a/plugins/push/frontend/public/javascripts/component.push.js b/plugins/push/frontend/public/javascripts/component.push.js
@@ -100,7 +100,7 @@ window.component('push', function(push) {
         this.sent = m.prop(data.sent);
         this.sound = vprop(data.sound, function(v){ return !!v; }, t('pu.po.tab2.extras.sound.invalid'));
         this.badge = vprop(data.badge, function(v){ return v === undefined || ((v + '') === (parseInt(v) + '') && parseInt(v) >= 0); }, t('pu.po.tab2.extras.badge.invalid'));
-        this.url = vprop(data.url, function(v){ return v && URL_REGEXP.test(v); }, t('pu.po.tab2.extras.url.invalid'));
+        this.url = vprop(data.url, function(v){ return v && URL_REGEXP.test(v) && v[0] !== ' ' && v[v.length - 1] !== ' '; }, t('pu.po.tab2.extras.url.invalid'));
         this.data = vprop(typeof data.data === 'object' ? JSON.stringify(data.data) : data.data, function(v){
             try {
                 var o = window.jsonlite.parse(v);
@@ -224,6 +224,9 @@ window.component('push', function(push) {
             var prop = m.prop(),
                 f = function(){
                     if (arguments.length) {
+                        if (arguments[0]) {
+                            arguments[0] = arguments[0].trim();
+                        }
                         f.valid = false;
                         prop(arguments[0]);
 						
@@ -403,9 +406,15 @@ window.component('push', function(push) {
                 obj.sound = this.sound();
                 obj.badge = this.badge();
                 obj.url = this.url();
+                if (obj.url) {
+                    obj.url = obj.url.trim();
+                }
                 obj.source = 'dash';
                 obj.buttons = parseInt(this.buttons());
                 obj.media = this.media();
+                if (obj.media) {
+                    obj.media = obj.media.trim();
+                }
                 obj.autoOnEntry = this.autoOnEntry();
                 obj.autoCancelTrigger = this.autoCancelTrigger();
                 obj.autoCohorts = this.autoCohorts();
diff --git a/plugins/push/frontend/public/javascripts/component.push.popup.js b/plugins/push/frontend/public/javascripts/component.push.popup.js
@@ -367,6 +367,9 @@ window.component('push.popup', function(popup) {
                 k = (locale || activeLocale()) + (index === undefined ? (push.C.S + key) : (push.C.S + index + push.C.S + key));
 
                 if (arguments.length) {
+                    if (v && key === 'l') {
+                        v = v.trim();
+                    }
                     message.messagePerLocale()[k] = v;
                 }
 
@@ -786,10 +789,18 @@ window.component('push.popup', function(popup) {
                             { value: true, title: t('pu.po.tab1.trigger-type.entry'), desc: t('pu.po.tab1.cohort-entry-desc') },
                             { value: false, title: t('pu.po.tab1.trigger-type.exit'), desc: t('pu.po.tab1.cohort-exit-desc') },
                             { value: 'events', title: t('pu.po.tab1.trigger-type.event'), desc: t('pu.po.tab1.cohort-event-desc') },
-                        ], value: message.autoOnEntry, onchange: function(){
-                            message.autoEvents([]);
-                            message.autoCohorts([]);
-                        }
+                        ], value: message.autoOnEntry, onchange: function(neo, old){
+                            neo = typeof neo === 'boolean';
+                            old = typeof old === 'boolean';
+                            if (neo ^ old) {
+                                message.autoEvents([]);
+                                message.autoCohorts([]);
+                                cohorts.forEach(function(c){ c.selected(false); });
+                                events.forEach(function(c){ c.selected(false); });
+                                this.selectCohorts.value([]);
+                                this.selectEvents.value([]);
+                            }
+                        }.bind(this)
                     });
                     this.selectEvents = new C.multiselect.controller({
                         placeholder: t('pu.po.tab1.select-event-placeholder'),
diff --git a/plugins/push/frontend/public/javascripts/component.radio.js b/plugins/push/frontend/public/javascripts/component.radio.js
@@ -17,7 +17,7 @@ window.component('radio', function(radio) {
         this.value = function(){
             if (arguments.length) {
                 if (opts.onchange) {
-                    opts.onchange(arguments[0]);
+                    opts.onchange(arguments[0], val());
                 }
                 val(arguments[0]);
             }
diff --git a/plugins/views/frontend/public/heatmap.js b/plugins/views/frontend/public/heatmap.js
@@ -6,9 +6,11 @@
         showHeatMap = Countly.passed_data.showHeatMap == false ? false : true,
         clickMap,
         scrollMap;
+        
+    Countly.passed_data.url = Countly.passed_data.url || Countly.url;
 
-    Countly._internals.loadCSS(Countly.url + "/stylesheets/ionicons/css/ionicons.min.css", function() {
-        Countly._internals.loadCSS(Countly.url + "/views/stylesheets/heatmap.css", function() {
+    Countly._internals.loadCSS(Countly.passed_data.url + "/stylesheets/ionicons/css/ionicons.min.css", function() {
+        Countly._internals.loadCSS(Countly.passed_data.url + "/views/stylesheets/heatmap.css", function() {
             document.body.style.position = "relative";
             var origtop = document.body.style.top;
             var toppx = 59;
@@ -122,7 +124,7 @@
 
             //TOPBAR IMAGE
             var img = document.createElement('img');
-            img.src = Countly.url + "/images/dashboard/countly_logo.svg";
+            img.src = Countly.passed_data.url + "/images/dashboard/countly_logo.svg";
             img.setAttribute('class', 'cly-heatmap-logo');
             topbar.appendChild(img);
 
@@ -509,7 +511,7 @@
             period = Countly.passed_data.period || "30days",
             dataCache = {};
 
-        Countly._internals.loadJS(Countly.url + "/views/javascripts/simpleheat.js", function() {
+        Countly._internals.loadJS(Countly.passed_data.url + "/views/javascripts/simpleheat.js", function() {
             map = simpleheat("cly-heatmap-canvas-map");
             return cb(function(eventType, pageWidth, pageHeight, currentDevice, showHeatMap) {
                 map.resize();
@@ -573,7 +575,7 @@
             period = Countly.passed_data.period || "30days",
             dataCache = {};
 
-        Countly._internals.loadJS(Countly.url + "/views/javascripts/simpleheat.js", function() {
+        Countly._internals.loadJS(Countly.passed_data.url + "/views/javascripts/simpleheat.js", function() {
             map = simpleheat("cly-heatmap-canvas-map");
             return cb(function(eventType, pageWidth, pageHeight, currentDevice, showHeatMap) {
                 map.resize();
@@ -741,10 +743,10 @@
             }
 
             if (method === "GET") {
-                xhr.open('GET', Countly.url + apiPath + "?" + data, true);
+                xhr.open('GET', Countly.passed_data.url + apiPath + "?" + data, true);
             }
             else {
-                xhr.open('POST', Countly.url + apiPath, true);
+                xhr.open('POST', Countly.passed_data.url + apiPath, true);
                 xhr.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
             }
             xhr.setRequestHeader("countly-token", Countly._internals.getToken());
diff --git a/plugins/views/frontend/public/javascripts/countly.views.js b/plugins/views/frontend/public/javascripts/countly.views.js
@@ -421,7 +421,7 @@ window.ViewsView = countlyView.extend({
                         countlyTokenManager.createToken("View heatmap", "/o/actions", true, countlyCommon.ACTIVE_APP_ID, 1800, function(err, token) {
                             self.token = token && token.result;
                             if (self.token) {
-                                newWindow.name = "cly:" + JSON.stringify({"token": self.token, "purpose": "heatmap", period: countlyCommon.getPeriodForAjax(), showHeatMap: true, app_key: countlyCommon.ACTIVE_APP_KEY});
+                                newWindow.name = "cly:" + JSON.stringify({"token": self.token, "purpose": "heatmap", period: countlyCommon.getPeriodForAjax(), showHeatMap: true, app_key: countlyCommon.ACTIVE_APP_KEY, url: window.location.protocol + "//" + window.location.host});
                                 newWindow.location.href = url;
                             }
                         });

Original file line number	Diff line number	Diff line change
`@@ -1207,7 +1207,7 @@ function cachedData(note) {`
`1207`	`1207`	`return common.returnMessage(params, 403, 'Only app / global admins are allowed to delete');`
`1208`	`1208`	`}`
`1209`	`1209`
`1210`		`- await note.update(common.db, {$bit: {'result.status': {or: N.Status.Deleted}}});`
	`1210`	`+ await note.update(common.db, {$bit: {'result.status': {or: N.Status.Deleted}}}).catch(log.w.bind(log, 'Error during message deletion'));`
`1211`	`1211`	`api.cache.remove(_id);`
`1212`	`1212`	`note.result.status \|= N.Status.Deleted;`
`1213`	`1213`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ window.component('radio', function(radio) {`
`17`	`17`	`this.value = function(){`
`18`	`18`	`if (arguments.length) {`
`19`	`19`	`if (opts.onchange) {`
`20`		`- opts.onchange(arguments[0]);`
	`20`	`+ opts.onchange(arguments[0], val());`
`21`	`21`	`}`
`22`	`22`	`val(arguments[0]);`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ window.ViewsView = countlyView.extend({`
`421`	`421`	`countlyTokenManager.createToken("View heatmap", "/o/actions", true, countlyCommon.ACTIVE_APP_ID, 1800, function(err, token) {`
`422`	`422`	`self.token = token && token.result;`
`423`	`423`	`if (self.token) {`
`424`		`- newWindow.name = "cly:" + JSON.stringify({"token": self.token, "purpose": "heatmap", period: countlyCommon.getPeriodForAjax(), showHeatMap: true, app_key: countlyCommon.ACTIVE_APP_KEY});`
	`424`	`+ newWindow.name = "cly:" + JSON.stringify({"token": self.token, "purpose": "heatmap", period: countlyCommon.getPeriodForAjax(), showHeatMap: true, app_key: countlyCommon.ACTIVE_APP_KEY, url: window.location.protocol + "//" + window.location.host});`
`425`	`425`	`newWindow.location.href = url;`
`426`	`426`	`}`
`427`	`427`	`});`