Move events server side (re #245)

client/app/components/dashboards/widget.js

@@ -66,8 +66,6 @@ function DashboardWidgetCtrl($location, $uibModal, $window, Events, currentUser)
       return;
     }
 
-    Events.record('delete', 'widget', this.widget.id);
-
     this.widget.delete().then(() => {
       if (this.deleted) {
         this.deleted({});

client/app/pages/admin/outdated-queries/index.js

@@ -3,8 +3,7 @@ import moment from 'moment';
 import { Paginator } from '@/lib/pagination';
 import template from './outdated-queries.html';
 
-function OutdatedQueriesCtrl($scope, Events, $http, $timeout) {
-  Events.record('view', 'page', 'admin/outdated_queries');
+function OutdatedQueriesCtrl($scope, $http, $timeout) {
   $scope.autoUpdate = true;
 
   this.queries = new Paginator([], { itemsPerPage: 50 });

client/app/pages/admin/tasks/index.js

@@ -3,8 +3,7 @@ import moment from 'moment';
 import { Paginator } from '@/lib/pagination';
 import template from './tasks.html';
 
-function TasksCtrl($scope, $location, $http, $timeout, Events) {
-  Events.record('view', 'page', 'admin/tasks');
+function TasksCtrl($scope, $location, $http, $timeout) {
   $scope.autoUpdate = true;
 
   $scope.selectedTab = 'in_progress';

client/app/pages/alert/index.js

@@ -6,8 +6,6 @@ function AlertCtrl($routeParams, $location, $sce, toastr, currentUser, Query, Ev
 
   if (this.alertId === 'new') {
     Events.record('view', 'page', 'alerts/new');
-  } else {
-    Events.record('view', 'alert', this.alertId);
   }
 
   this.trustAsHtml = html => $sce.trustAsHtml(html);

client/app/pages/alerts-list/index.js

@@ -8,8 +8,7 @@ const stateClass = {
 };
 
 class AlertsListCtrl {
-  constructor(Events, Alert) {
-    Events.record('view', 'page', 'alerts');
+  constructor(Alert) {
 
     this.showEmptyState = false;
     this.showList = false;

client/app/pages/dashboards/dashboard.js

@@ -179,7 +179,6 @@ function DashboardCtrl(
       (dashboard) => {
         this.dashboard = dashboard;
         this.isDashboardOwner = currentUser.id === dashboard.user.id || currentUser.hasPermission('admin');
-        Events.record('view', 'dashboard', dashboard.id);
         renderDashboard(dashboard, force);
 
         if ($location.search().edit === true) {
@@ -229,7 +228,6 @@ function DashboardCtrl(
 
   this.archiveDashboard = () => {
     const archive = () => {
-      Events.record('archive', 'dashboard', this.dashboard.id);
       this.dashboard.$delete();
     };
 

client/app/pages/data-sources/list.js

@@ -1,9 +1,7 @@
 import settingsMenu from '@/lib/settings-menu';
 import template from './list.html';
 
-function DataSourcesCtrl(Policy, Events, DataSource) {
-  Events.record('view', 'page', 'admin/data_sources');
-
+function DataSourcesCtrl(Policy, DataSource) {
   this.policy = Policy;
   this.dataSources = DataSource.query();
 }

client/app/pages/data-sources/show.js

@@ -6,9 +6,8 @@ const logger = debug('redash:http');
 
 function DataSourceCtrl(
   $scope, $route, $routeParams, $http, $location, toastr,
-  currentUser, AlertDialog, Events, DataSource,
+  currentUser, AlertDialog, DataSource,
 ) {
-  Events.record('view', 'page', 'admin/data_source');
 
   $scope.dataSource = $route.current.locals.dataSource;
   $scope.dataSourceId = $routeParams.dataSourceId;
@@ -45,8 +44,6 @@ function DataSourceCtrl(
 
   function deleteDataSource(callback) {
     const doDelete = () => {
-      Events.record('delete', 'datasource', $scope.dataSource.id);
-
       $scope.dataSource.$delete(() => {
         toastr.success('Data source deleted successfully.');
         $location.path('/data_sources/');
@@ -64,8 +61,6 @@ function DataSourceCtrl(
   }
 
   function testConnection(callback) {
-    Events.record('test', 'datasource', $scope.dataSource.id);
-
     DataSource.test({ id: $scope.dataSource.id }, (httpResponse) => {
       if (httpResponse.ok) {
         toastr.success('Success');
@@ -81,8 +76,6 @@ function DataSourceCtrl(
   }
 
   function getDataSourceVersion(callback) {
-    Events.record('test', 'data_source_version', $scope.dataSource.id);
-
     DataSource.version({ id: $scope.dataSource.id }, (httpResponse) => {
       if (httpResponse.ok) {
         const versionNumber = httpResponse.message;

client/app/pages/destinations/list.js

@@ -1,9 +1,7 @@
 import settingsMenu from '@/lib/settings-menu';
 import template from './list.html';
 
-function DestinationsCtrl($scope, $location, toastr, currentUser, Events, Destination) {
-  Events.record('view', 'page', 'admin/destinations');
-
+function DestinationsCtrl($scope, $location, toastr, currentUser, Destination) {
   $scope.destinations = Destination.query();
 }
 

client/app/pages/destinations/show.js

@@ -6,9 +6,8 @@ const logger = debug('redash:http');
 
 function DestinationCtrl(
   $scope, $route, $routeParams, $http, $location, toastr,
-  currentUser, AlertDialog, Events, Destination,
+  currentUser, AlertDialog, Destination,
 ) {
-  Events.record('view', 'page', 'admin/destination');
 
   $scope.destination = $route.current.locals.destination;
   $scope.destinationId = $routeParams.destinationId;
@@ -34,8 +33,6 @@ function DestinationCtrl(
 
   $scope.delete = () => {
     const doDelete = () => {
-      Events.record('delete', 'destination', $scope.destination.id);
-
       $scope.destination.$delete(() => {
         toastr.success('Destination deleted successfully.');
         $location.path('/destinations/');

client/app/pages/groups/data-sources.js

@@ -1,8 +1,7 @@
 import { includes } from 'lodash';
 import template from './data-sources.html';
 
-function GroupDataSourcesCtrl($scope, $routeParams, $http, Events, Group, DataSource) {
-  Events.record('view', 'group_data_sources', $scope.groupId);
+function GroupDataSourcesCtrl($scope, $routeParams, $http, Group, DataSource) {
   $scope.group = Group.get({ id: $routeParams.groupId });
   $scope.dataSources = Group.dataSources({ id: $routeParams.groupId });
   $scope.newDataSource = {};

client/app/pages/groups/list.js

@@ -2,8 +2,7 @@ import settingsMenu from '@/lib/settings-menu';
 import { Paginator } from '@/lib/pagination';
 import template from './list.html';
 
-function GroupsCtrl($scope, $uibModal, currentUser, Events, Group) {
-  Events.record('view', 'page', 'groups');
+function GroupsCtrl($scope, $uibModal, currentUser, Group) {
   $scope.currentUser = currentUser;
   $scope.groups = new Paginator([], { itemsPerPage: 20 });
   Group.query((groups) => {

client/app/pages/groups/show.js

@@ -1,9 +1,7 @@
 import { includes } from 'lodash';
 import template from './show.html';
 
-function GroupCtrl($scope, $routeParams, $http, currentUser, Events, Group, User) {
-  Events.record('view', 'group', $scope.groupId);
-
+function GroupCtrl($scope, $routeParams, $http, currentUser, Group, User) {
   $scope.currentUser = currentUser;
   $scope.group = Group.get({ id: $routeParams.groupId });
   $scope.members = Group.members({ id: $routeParams.groupId });

client/app/pages/queries-list/index.js

@@ -20,9 +20,7 @@ class QueriesListCtrl {
     this.pageSize = parseInt($location.search().page_size || 20, 10);
     this.pageSizeOptions = [5, 10, 20, 50, 100];
 
-    if (isString(this.term) && this.term !== '') {
-      Events.record('search', 'query', '', { term: this.term });
-    } else {
+    if (!isString(this.term)) {
       this.term = '';
     }
 

client/app/pages/queries/view.js

@@ -136,7 +136,6 @@ function QueryViewCtrl(
     KeyboardShortcuts.unbind(shortcuts);
   });
 
-  Events.record('view', 'query', $scope.query.id);
   if ($scope.query.hasResult() || $scope.query.paramsRequired()) {
     getQueryResult();
   }
@@ -178,8 +177,6 @@ function QueryViewCtrl(
   };
 
   $scope.duplicateQuery = () => {
-    Events.record('fork', 'query', $scope.query.id);
-
     Query.fork({ id: $scope.query.id }, (newQuery) => {
       $location.url(newQuery.getSourceLink()).replace();
     });

client/app/pages/query-snippets/edit.js

@@ -3,7 +3,6 @@ import template from './edit.html';
 
 function SnippetCtrl($routeParams, $http, $location, toastr, currentUser, AlertDialog, Events, QuerySnippet) {
   this.snippetId = $routeParams.snippetId;
-  Events.record('view', 'query_snippet', this.snippetId);
 
   this.editorOptions = {
     mode: 'snippets',

client/app/pages/query-snippets/list.js

@@ -2,9 +2,7 @@ import settingsMenu from '@/lib/settings-menu';
 import { Paginator } from '@/lib/pagination';
 import template from './list.html';
 
-function SnippetsCtrl($location, currentUser, Events, QuerySnippet) {
-  Events.record('view', 'page', 'query_snippets');
-
+function SnippetsCtrl($location, currentUser, QuerySnippet) {
   this.snippets = new Paginator([], { itemsPerPage: 20 });
   QuerySnippet.query((snippets) => {
     this.snippets.updateRows(snippets);

client/app/pages/users/list.js

@@ -3,9 +3,7 @@ import settingsMenu from '@/lib/settings-menu';
 import { LivePaginator } from '@/lib/pagination';
 import template from './list.html';
 
-function UsersCtrl($location, currentUser, Policy, Events, User) {
-  Events.record('view', 'page', 'users');
-
+function UsersCtrl(currentUser, Policy, User) {
   this.currentUser = currentUser;
   if ($location.path() === '/users/disabled') {
     this.currentPage = 'disabled_users';

client/app/pages/users/show.js

@@ -6,7 +6,7 @@ import './settings.less';
 
 function UserCtrl(
   $scope, $routeParams, $http, $location, toastr,
-  clientConfig, currentUser, Events, User,
+  clientConfig, currentUser, User,
 ) {
   $scope.userId = $routeParams.userId;
   $scope.currentUser = currentUser;
@@ -16,7 +16,6 @@ function UserCtrl(
     $scope.userId = currentUser.id;
   }
 
-  Events.record('view', 'user', $scope.userId);
   $scope.canEdit = currentUser.hasPermission('admin') || currentUser.id === parseInt($scope.userId, 10);
   $scope.showSettings = false;
   $scope.showPasswordSettings = false;

redash/handlers/admin.py

@@ -1,10 +1,12 @@
 import json
+import time
 
 from flask import request
-from flask_login import login_required
+from flask_login import current_user, login_required
 from redash import models, redis_connection
+from redash.authentication import current_org
 from redash.handlers import routes
-from redash.handlers.base import json_response
+from redash.handlers.base import json_response, record_event
 from redash.permissions import require_super_admin
 from redash.tasks.queries import QueryTaskTracker
 
@@ -23,6 +25,13 @@ def outdated_queries():
     else:
         outdated_queries = []
 
+    record_event(current_org, current_user, {
+        'action': 'view',
+        'object_type': 'api_call',
+        'object_id': 'admin/outdated_queries',
+        'timestamp': int(time.time()),
+    })
+
     return json_response(
         dict(queries=[q.to_dict(with_stats=True, with_last_modified_by=False)
                       for q in outdated_queries],
@@ -41,6 +50,12 @@ def queries_tasks():
     waiting = QueryTaskTracker.all(QueryTaskTracker.WAITING_LIST, limit=waiting_limit)
     in_progress = QueryTaskTracker.all(QueryTaskTracker.IN_PROGRESS_LIST, limit=progress_limit)
     done = QueryTaskTracker.all(QueryTaskTracker.DONE_LIST, limit=done_limit)
+    record_event(current_org, current_user, {
+        'action': 'view',
+        'object_type': 'api_call',
+        'object_id': 'admin/tasks',
+        'timestamp': int(time.time()),
+    })
 
     response = {
         'waiting': [t.data for t in waiting if t is not None],

redash/handlers/alerts.py

@@ -15,7 +15,14 @@ class AlertResource(BaseResource):
     def get(self, alert_id):
         alert = get_object_or_404(models.Alert.get_by_id_and_org, alert_id, self.current_org)
         require_access(alert.groups, self.current_user, view_only)
+        self.record_event({
+            'action': 'view',
+            'timestamp': int(time.time()),
+            'object_id': alert.id,
+            'object_type': 'alert'
+        })
         return serialize_alert(alert)
+        return alert.to_dict()
 
     def post(self, alert_id):
         req = request.get_json(True)

redash/handlers/dashboards.py

@@ -138,6 +138,12 @@ def get(self, dashboard_slug=None):
 
         response['can_edit'] = can_modify(dashboard, self.current_user)
 
+        self.record_event({
+            'action': 'view',
+            'object_id': dashboard.id,
+            'object_type': 'dashboard',
+        })
+
         return response
 
     @require_permission('edit_dashboard')
@@ -177,6 +183,11 @@ def post(self, dashboard_slug):
             abort(409)
 
         result = serialize_dashboard(dashboard, with_widgets=True, user=self.current_user)
+        self.record_event({
+            'action': 'edit',
+            'object_id': dashboard.id,
+            'object_type': 'dashboard',
+        })
         return result
 
     @require_permission('edit_dashboard')
@@ -194,6 +205,11 @@ def delete(self, dashboard_slug):
         models.db.session.add(dashboard)
         d = serialize_dashboard(dashboard, with_widgets=True, user=self.current_user)
         models.db.session.commit()
+        self.record_event({
+            'action': 'archive',
+            'object_id': dashboard.id,
+            'object_type': 'dashboard',
+        })
         return d