Make admin graphs cumulative

misago/admin/src/analytics.js

@@ -26,27 +26,29 @@ const getAnalytics = gql`
   query getAnalytics($span: Int!) {
     analytics(span: $span) {
       users {
-        current
-        previous
+        ...data
       }
       threads {
-        current
-        previous
+        ...data
       }
       posts {
-        current
-        previous
+        ...data
       }
       attachments {
-        current
-        previous
+        ...data
       }
       dataDownloads {
-        current
-        previous
+        ...data
       }
     }
   }
+
+  fragment data on AnalyticsData {
+    current
+    currentCumulative
+    previous
+    previousCumulative
+  }
 `
 
 class Analytics extends React.Component {
@@ -152,6 +154,7 @@ const Error = ({ message }) => (
 
 const CURRENT = "C"
 const PREVIOUS = "P"
+const CURRENT_SERIES = 0
 
 const AnalyticsItem = ({ data, legend, name, span }) => {
   const options = {
@@ -188,6 +191,12 @@ const AnalyticsItem = ({ data, legend, name, span }) => {
             now.subtract(span - dataPointIndex - 1, "days")
             return now.format("ll")
           }
+        },
+        formatter: function(value, { dataPointIndex, seriesIndex }) {
+          if (seriesIndex === CURRENT_SERIES) {
+            return data.current[dataPointIndex]
+          }
+          return data.previous[dataPointIndex]
         }
       }
     },
@@ -214,8 +223,8 @@ const AnalyticsItem = ({ data, legend, name, span }) => {
   }
 
   const series = [
-    { name: CURRENT, data: data.current },
-    { name: PREVIOUS, data: data.previous }
+    { name: CURRENT, data: data.currentCumulative },
+    { name: PREVIOUS, data: data.previousCumulative }
   ]
 
   return (

misago/graphql/admin/analytics.py

@@ -76,7 +76,22 @@ def get_data_for_model(self, model, date_attr):
                 data[date] += 1
 
         values = list(data.values())
+        current = list(reversed(values[: self.span]))
+        previous = list(reversed(values[self.span :]))
+
         return {
-            "current": list(reversed(values[: self.span])),
-            "previous": list(reversed(values[self.span :])),
+            "current": current,
+            "currentCumulative": cumulate_data(current),
+            "previous": previous,
+            "previousCumulative": cumulate_data(previous)
         }
+
+
+def cumulate_data(data_series):
+    data = []
+    for v in data_series:
+        if not data:
+            data.append(v)
+        else:
+            data.append(data[-1] + v)
+    return data

misago/graphql/admin/schema.graphql

@@ -19,7 +19,9 @@ type Analytics {
 
 type AnalyticsData {
     current: [Int!]!
+    currentCumulative: [Int!]!
     previous: [Int!]!
+    previousCumulative: [Int!]!
 }
 
 type Version {