Add code to update scoregraph when active bracket changes (#94)

* Update top scoregraph when active bracket changes * Closes #91. Thanks @reteps!
CTFd · Sep 7, 2024 · 266251e · 266251e
1 parent dbc603a
commit 266251e
Show file tree

Hide file tree

Showing 26 changed files with 70 additions and 65 deletions.
diff --git a/assets/js/scoreboard.js b/assets/js/scoreboard.js
@@ -12,9 +12,10 @@ const scoreboardUpdateInterval = window.scoreboardUpdateInterval || 300000;
 Alpine.data("ScoreboardDetail", () => ({
   data: {},
   show: true,
+  activeBracket: null,
 
   async update() {
-    this.data = await CTFd.pages.scoreboard.getScoreboardDetail(10);
+    this.data = await CTFd.pages.scoreboard.getScoreboardDetail(10, this.activeBracket);
 
     let optionMerge = window.scoreboardChartOptions;
     let option = getOption(CTFd.config.userMode, this.data, optionMerge);
@@ -38,15 +39,15 @@ Alpine.data("ScoreboardList", () => ({
   activeBracket: null,
 
   async update() {
-    let response = await CTFd.fetch(`/api/v1/brackets?type=${CTFd.config.userMode}`, {
-      method: "GET",
-    });
-    const body = await response.json();
-    this.brackets = body["data"];
+    this.brackets = await CTFd.pages.scoreboard.getBrackets(CTFd.config.userMode);
     this.standings = await CTFd.pages.scoreboard.getScoreboard();
   },
 
   async init() {
+    this.$watch("activeBracket", value => {
+      this.$dispatch("bracket-change", value);
+    });
+
     this.update();
 
     setInterval(() => {

diff --git a/assets/js/utils/graphs/echarts/index.js b/assets/js/utils/graphs/echarts/index.js
@@ -34,7 +34,11 @@ echarts.use([
 
 export function embed(target, option) {
   let chart = echarts.init(target);
-  chart.setOption(option);
+
+  // https://echarts.apache.org/en/api.html#echartsInstance.setOption
+  // https://github.com/apache/echarts/issues/6202#issuecomment-315054637
+  // https://stackoverflow.com/a/72211534
+  chart.setOption(option, true);
 
   window.addEventListener("resize", () => {
     if (chart) {

diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "verify": "vite build; git diff --quiet --exit-code"
   },
   "dependencies": {
-    "@ctfdio/ctfd-js": "^0.0.12",
+    "@ctfdio/ctfd-js": "^0.0.14",
     "@fontsource/lato": "^4.5.3",
     "@fontsource/raleway": "^4.5.3",
     "@fortawesome/fontawesome-free": "6.5.1",

diff --git a/static/assets/challenges.a2215eea.js → static/assets/challenges.369de531.js b/static/assets/challenges.a2215eea.js → static/assets/challenges.369de531.js
diff --git a/static/assets/clipboard.1749e720.js → static/assets/clipboard.0c9c5ddd.js b/static/assets/clipboard.1749e720.js → static/assets/clipboard.0c9c5ddd.js
diff --git a/static/assets/index.955e6486.js → static/assets/index.1cf73b05.js b/static/assets/index.955e6486.js → static/assets/index.1cf73b05.js
diff --git a/static/assets/index.7e48942e.js → static/assets/index.2e31e3b8.js b/static/assets/index.7e48942e.js → static/assets/index.2e31e3b8.js
diff --git a/static/assets/notifications.c77681af.js → static/assets/notifications.91eecfcb.js b/static/assets/notifications.c77681af.js → static/assets/notifications.91eecfcb.js
diff --git a/static/assets/page.328a4621.js b/static/assets/page.328a4621.js
diff --git a/static/assets/page.3c5083de.js b/static/assets/page.3c5083de.js
@@ -0,0 +1 @@
+import{C as o,m as d}from"./index.2e31e3b8.js";window.CTFd=o;window.Alpine=d;d.start();
diff --git a/static/assets/scoreboard.3f07d373.js b/static/assets/scoreboard.3f07d373.js
diff --git a/static/assets/scoreboard.b1c04d97.js b/static/assets/scoreboard.b1c04d97.js
diff --git a/static/assets/settings.c0694ce6.js → static/assets/settings.64728c4b.js b/static/assets/settings.c0694ce6.js → static/assets/settings.64728c4b.js