Fix #4278, remove uninteresting and long tables from /metrics

Also fix #3069, remove controller.js for /metrics

Makefile

@@ -182,10 +182,6 @@ homepage_dependencies := $(shell ./bin/build-scripts/bundle_dependencies homepag
 build/server/static/js/homepage-bundle.js: $(homepage_dependencies)
 	./bin/build-scripts/bundle_dependencies homepage build ./build/server/pages/homepage/controller.js
 
-metrics_dependencies := $(shell ./bin/build-scripts/bundle_dependencies metrics getdeps "$(server_dest)")
-build/server/static/js/metrics-bundle.js: $(metrics_dependencies)
-	./bin/build-scripts/bundle_dependencies metrics build ./build/server/pages/metrics/controller.js
-
 shotindex_dependencies := $(shell ./bin/build-scripts/bundle_dependencies shotindex getdeps "$(server_dest)")
 build/server/static/js/shotindex-bundle.js: $(shotindex_dependencies)
 	./bin/build-scripts/bundle_dependencies shotindex build ./build/server/pages/shotindex/controller.js
@@ -216,7 +212,7 @@ build/server/static/locales: $(wildcard locales/**/server.ftl)
 	./bin/build-scripts/ftl-to-js.js $@ $^
 
 .PHONY: server
-server: npm build/server/build-time.js build/server/package.json build/server/static/js/shot-bundle.js build/server/static/js/homepage-bundle.js build/server/static/js/metrics-bundle.js build/server/static/js/shotindex-bundle.js build/server/static/js/leave-bundle.js build/server/static/js/creating-bundle.js build/server/static/js/settings-bundle.js build/server/static/locales
+server: npm build/server/build-time.js build/server/package.json build/server/static/js/shot-bundle.js build/server/static/js/homepage-bundle.js build/server/static/js/shotindex-bundle.js build/server/static/js/leave-bundle.js build/server/static/js/creating-bundle.js build/server/static/js/settings-bundle.js build/server/static/locales
 
 ## Homepage related rules:
 

server/src/pages/metrics/model.js

@@ -70,54 +70,6 @@ const queries = {
     ]
   },
 
-  retention: {
-    title: "Retention By Week",
-    description: "Length of time users have been creating shots, grouped by week",
-    sql: `
-    SELECT COUNT(age.days)::INTEGER AS user_count, (age.days + 1) AS days_plus_1, age.first_created_week
-    FROM
-        (SELECT
-          EXTRACT(EPOCH FROM AGE(span.last_created, span.first_created)) / 86400 AS days,
-          span.first_created_week
-         FROM
-             (SELECT
-                  date_trunc('week', MIN(created)) AS first_created_week,
-                  date_trunc('day', MIN(created)) AS first_created,
-                  date_trunc('day', MAX(created)) AS last_created
-              FROM data
-              GROUP BY deviceid) AS span) AS age
-    GROUP BY age.days, age.first_created_week
-    ORDER BY age.first_created_week DESC, age.days;
-    `,
-    columns: [
-      {title: "Number of users", name: "user_count"},
-      {title: "Days the user has been creating shots", name: "days_plus_1"},
-      {title: "Week the user started using Screenshots", type: "date", name: "first_created_week"}
-    ]
-  },
-
-  retentionTotal: {
-    title: "Total Retention",
-    description: "Length of time users have been creating shots, grouped by week",
-    sql: `
-    SELECT COUNT(age.days)::INTEGER AS user_count, (age.days + 1) AS days_plus_1
-    FROM
-        (SELECT
-          EXTRACT(EPOCH FROM AGE(span.last_created, span.first_created)) / 86400 AS days
-         FROM
-             (SELECT
-                  date_trunc('day', MIN(created)) AS first_created,
-                  date_trunc('day', MAX(created)) AS last_created
-              FROM data
-              GROUP BY deviceid) AS span) AS age
-    GROUP BY age.days
-    ORDER BY age.days;
-    `,
-    columns: [
-      {title: "Number of users", name: "user_count"},
-      {title: "Days the user has been creating shots", name: "days_plus_1"}
-    ]
-  },
 };
 
 function executeQuery(query) {

server/src/pages/metrics/page.js

@@ -2,5 +2,6 @@ const { Page } = require("../../reactruntime");
 
 exports.page = new Page({
   dir: __dirname,
-  viewModule: require("./view.js")
+  viewModule: require("./view.js"),
+  noBrowserJavascript: true
 });

server/src/pages/metrics/view.js

@@ -8,7 +8,6 @@ class Head extends React.Component {
   render() {
     return (
       <reactruntime.HeadTemplate {...this.props}>
-        <script src={this.props.staticLink("/static/js/metrics-bundle.js")} async></script>
         <link rel="stylesheet" href={this.props.staticLink("/static/css/metrics.css")} />
       </reactruntime.HeadTemplate>
     );
@@ -39,10 +38,6 @@ class Body extends React.Component {
         <GenericTable data={this.props.data.usersByDay} />
 
         <GenericTable data={this.props.data.shotsByUserHistogram} />
-
-        <GenericTable data={this.props.data.retention} />
-
-        <GenericTable data={this.props.data.retentionTotal} />
       </reactruntime.BodyTemplate>
     );
   }