From fee17d9f4dd20a1eb688b70e764c7b2f9f3c08e6 Mon Sep 17 00:00:00 2001 From: Apply55gx Date: Thu, 19 Oct 2017 11:30:42 +0200 Subject: [PATCH 1/4] remove version metrics query --- server/src/pages/metrics/model.js | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/server/src/pages/metrics/model.js b/server/src/pages/metrics/model.js index 4fbe6fb4d9..eec6e40ae1 100644 --- a/server/src/pages/metrics/model.js +++ b/server/src/pages/metrics/model.js @@ -117,25 +117,6 @@ const queries = { {title: "Number of users", name: "user_count"}, {title: "Days the user has been creating shots", name: "days_plus_1"} ] - }, - - addonVersion: { - title: "Add-on Version", - description: "The version of the add-on used during login, in the last 14 days", - sql: ` - SELECT COUNT(DISTINCT devices.id) AS count, devices.last_addon_version, last_login_day - FROM devices, date_trunc('day', last_login) AS last_login_day - WHERE CURRENT_TIMESTAMP - devices.last_login < INTERVAL '14 days' - GROUP BY devices.last_addon_version, last_login_day - ORDER BY devices.last_addon_version DESC, last_login_day DESC; - `, - columns: [ - {title: "Number of users logging in", name: "count"}, - {title: "Add-on version", name: "last_addon_version"}, - {title: "Day", type: "date", name: "last_login_day"} - ] - } - }; function executeQuery(query) { From 7218fea133badbf2d9a85fe9b2826a0e1ff123c5 Mon Sep 17 00:00:00 2001 From: Apply55gx Date: Thu, 19 Oct 2017 11:31:55 +0200 Subject: [PATCH 2/4] remove version table --- server/src/pages/metrics/view.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/src/pages/metrics/view.js b/server/src/pages/metrics/view.js index 0fc708cdac..3afe6ff589 100644 --- a/server/src/pages/metrics/view.js +++ b/server/src/pages/metrics/view.js @@ -38,8 +38,6 @@ class Body extends React.Component { - - ); } From 816f9fa5047f7c079076627d9a7d4612fbd904c3 Mon Sep 17 00:00:00 2001 From: Apply55gx Date: Thu, 19 Oct 2017 11:43:36 +0200 Subject: [PATCH 3/4] bug fix (Unexpected token) --- server/src/pages/metrics/model.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/src/pages/metrics/model.js b/server/src/pages/metrics/model.js index eec6e40ae1..d88073ffc0 100644 --- a/server/src/pages/metrics/model.js +++ b/server/src/pages/metrics/model.js @@ -117,6 +117,8 @@ const queries = { {title: "Number of users", name: "user_count"}, {title: "Days the user has been creating shots", name: "days_plus_1"} ] + }, + }; function executeQuery(query) { From 8204af2f449401f6ca09e38ddfe557c2fc160330 Mon Sep 17 00:00:00 2001 From: Apply55gx Date: Thu, 19 Oct 2017 12:38:58 +0200 Subject: [PATCH 4/4] Update model.js --- server/src/pages/metrics/model.js | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/pages/metrics/model.js b/server/src/pages/metrics/model.js index d88073ffc0..a2a5000f99 100644 --- a/server/src/pages/metrics/model.js +++ b/server/src/pages/metrics/model.js @@ -118,7 +118,6 @@ const queries = { {title: "Days the user has been creating shots", name: "days_plus_1"} ] }, - }; function executeQuery(query) {