Merge remote-tracking branch 'upstream/pull/5814'

[rails.git] / app / assets / javascripts / heatmap.js

diff --git a/app/assets/javascripts/heatmap.js b/app/assets/javascripts/heatmap.js
index 058f71cfe4b88c05e8f23c27af657ce9ec550b90..09013ae5a10303d7a0136ce13c04f7ffd5b8f713 100644 (file)
--- a/app/assets/javascripts/heatmap.js
+++ b/app/assets/javascripts/heatmap.js
@@ -12,6 +12,7 @@ document.addEventListener("DOMContentLoaded", () => {
   }
 
   const heatmapData = heatmapElement.dataset.heatmap ? JSON.parse(heatmapElement.dataset.heatmap) : [];
   }
 
   const heatmapData = heatmapElement.dataset.heatmap ? JSON.parse(heatmapElement.dataset.heatmap) : [];

+  const displayName = heatmapElement.dataset.displayName;

   const colorScheme = document.documentElement.getAttribute("data-bs-theme") ?? "auto";
   const rangeColors = ["#14432a", "#166b34", "#37a446", "#4dd05a"];
   const startDate = new Date(Date.now() - (365 * 24 * 60 * 60 * 1000));
   const colorScheme = document.documentElement.getAttribute("data-bs-theme") ?? "auto";
   const rangeColors = ["#14432a", "#166b34", "#37a446", "#4dd05a"];
   const startDate = new Date(Date.now() - (365 * 24 * 60 * 60 * 1000));


@@ -33,7 +34,7 @@ document.addEventListener("DOMContentLoaded", () => {
         type: "month",
         gutter: 4,
         label: {
         type: "month",
         gutter: 4,
         label: {

-          text: (timestamp) => monthNames[new Date(timestamp).getMonth() + 1],
+          text: (timestamp) => monthNames[new Date(timestamp).getUTCMonth() + 1],

           position: "top",
           textAlign: "middle"
         },
           position: "top",
           textAlign: "middle"
         },


@@ -68,6 +69,22 @@ document.addEventListener("DOMContentLoaded", () => {
         text: (date, value) => getTooltipText(date, value)
       }]
     ]);
         text: (date, value) => getTooltipText(date, value)
       }]
     ]);

+
+    cal.on("mouseover", (event, timestamp, value) => {
+      if (!displayName || !value) return;
+      if (event.target.parentElement.nodeName === "a") return;
+
+      for (const { date, max_id } of heatmapData) {
+        if (!max_id) continue;
+        if (timestamp !== Date.parse(date)) continue;
+
+        const params = new URLSearchParams([["before", max_id + 1]]);
+        const a = document.createElementNS("http://www.w3.org/2000/svg", "a");
+        a.setAttribute("href", `/user/${encodeURIComponent(displayName)}/history?${params}`);
+        $(event.target).wrap(a);
+        break;
+      }
+    });

   }
 
   function getTooltipText(date, value) {
   }
 
   function getTooltipText(date, value) {