From 2a26d857574f2160e3ee5538ad3a84ec47082f86 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 21 Jan 2016 12:14:17 -0500
Subject: Generalize analytics server functions and begin componentizing client
 analytics controls

---
 web/react/utils/client.jsx | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'web/react/utils')

diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index d60fea872..8484f3cce 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -387,7 +387,7 @@ export function getConfig(success, error) {
     });
 }
 
-export function getAnalytics(teamId, name, success, error) {
+export function getTeamAnalytics(teamId, name, success, error) {
     $.ajax({
         url: '/api/v1/admin/analytics/' + teamId + '/' + name,
         dataType: 'json',
@@ -395,7 +395,21 @@ export function getAnalytics(teamId, name, success, error) {
         type: 'GET',
         success,
         error: (xhr, status, err) => {
-            var e = handleError('getAnalytics', xhr, status, err);
+            var e = handleError('getTeamAnalytics', xhr, status, err);
+            error(e);
+        }
+    });
+}
+
+export function getServerAnalytics(name, success, error) {
+    $.ajax({
+        url: '/api/v1/admin/analytics/' + name,
+        dataType: 'json',
+        contentType: 'application/json',
+        type: 'GET',
+        success,
+        error: (xhr, status, err) => {
+            var e = handleError('getServerAnalytics', xhr, status, err);
             error(e);
         }
     });
-- 
cgit v1.2.3-1-g7c22


From cefdad6d8c71ff6adf0ae919bd9f9139e02a6caa Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 21 Jan 2016 12:59:32 -0500
Subject: Add system analytics page

---
 web/react/utils/client.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'web/react/utils')

diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index 8484f3cce..96fa342a3 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -401,7 +401,7 @@ export function getTeamAnalytics(teamId, name, success, error) {
     });
 }
 
-export function getServerAnalytics(name, success, error) {
+export function getSystemAnalytics(name, success, error) {
     $.ajax({
         url: '/api/v1/admin/analytics/' + name,
         dataType: 'json',
@@ -409,7 +409,7 @@ export function getServerAnalytics(name, success, error) {
         type: 'GET',
         success,
         error: (xhr, status, err) => {
-            var e = handleError('getServerAnalytics', xhr, status, err);
+            var e = handleError('getSystemAnalytics', xhr, status, err);
             error(e);
         }
     });
-- 
cgit v1.2.3-1-g7c22