Merge branch 'master' into tsconfig_types

Author: ArtursKadikis

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 Features:
 - Add ability to allow multiple CORS per app for web apps
+- Add app id and name as view segment for self-tracking
 
 Dependencies:
 - Bump body-parser from 1.20.3 to 2.2.0

frontend/express/views/dashboard.html

@@ -2043,10 +2043,10 @@ <h4><a href="#/analytics/events/key/{{encodeURIComponent this.name}}">{{this.nam
             Countly2.track_sessions();
 
             //track pageviews automatically
-            Countly2.track_pageview(Countly.getViewName());
+            Countly2.track_pageview(Countly.getViewName(), null, {app_id:countlyCommon.ACTIVE_APP_ID, app_name:countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID]?.name});
 
             $(window).on('hashchange', function() {
-                Countly2.track_pageview(Countly.getViewName());
+                Countly2.track_pageview(Countly.getViewName(), null, {app_id:countlyCommon.ACTIVE_APP_ID, app_name:countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID]?.name});
             });
 
             //display in app messages