Merge pull request #2747 from GreenAsJade/zoom_in_cm_stats_graph

Display only 120 days of CM voting graph
online-go · Jul 8, 2024 · d54edb8 · d54edb8
2 parents 095bf2b + 3a8aea7
commit d54edb8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -110,6 +110,7 @@
         "@types/sanitize-html": "^1.22.0",
         "array-move": "^2.2.1",
         "d3": "^7.6.1",
+        "date-fns": "^3.6.0",
         "eventemitter3": "^5.0.0",
         "howler": "^2.2.1",
         "jquery": "^3.6.0",

diff --git a/src/views/ReportsCenter/ReportsCenterCMInfo.tsx b/src/views/ReportsCenter/ReportsCenterCMInfo.tsx
@@ -16,7 +16,10 @@
  */
 
 import React, { useEffect } from "react";
+import { format, subDays, startOfWeek as startOfWeekDateFns } from "date-fns";
+
 import { get } from "requests";
+
 import * as data from "data";
 
 import { ResponsiveLine } from "@nivo/line";
@@ -188,7 +191,11 @@ const CMVoteActivityGraph = ({ vote_data }: VoteActivityGraphProps) => {
                     xFormat="time:%Y-%m-%d"
                     xScale={{
                         type: "time",
-                        min: "2023-12-31",
+                        min: format(
+                            startOfWeekDateFns(subDays(new Date(), 120), { weekStartsOn: 1 }),
+
+                            "yyyy-MM-dd",
+                        ),
                         format: "%Y-%m-%d",
                         useUTC: false,
                         precision: "day",
@@ -224,7 +231,11 @@ const CMVoteActivityGraph = ({ vote_data }: VoteActivityGraphProps) => {
                     xFormat="time:%Y-%m-%d"
                     xScale={{
                         type: "time",
-                        min: "2023-12-31",
+                        min: format(
+                            startOfWeekDateFns(subDays(new Date(), 120), { weekStartsOn: 1 }),
+
+                            "yyyy-MM-dd",
+                        ),
                         format: "%Y-%m-%d",
                         useUTC: false,
                         precision: "day",

diff --git a/yarn.lock b/yarn.lock
@@ -4262,6 +4262,11 @@ data-view-byte-offset@^1.0.0:
     es-errors "^1.3.0"
     is-data-view "^1.0.1"
 
+date-fns@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-3.6.0.tgz#f20ca4fe94f8b754951b24240676e8618c0206bf"
+  integrity sha512-fRHTG8g/Gif+kSh50gaGEdToemgfj74aRX3swtiouboip5JDLAyDE9F11nHMIcvOaXeOC6D7SpNhi7uFyB7Uww==
+
 debounce@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.1.tgz#38881d8f4166a5c5848020c11827b834bcb3e0a5"