Skip to content

Commit eabfd87

Browse files
committed
Use version_updates.v2.json
1 parent 92a8bda commit eabfd87

File tree

2 files changed

+17
-18
lines changed

2 files changed

+17
-18
lines changed

src/components/StatusDashboard/version_updates.jsx

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@ import React, { useEffect, useState } from "react";
44
import styles from "./styles.module.css";
55

66
export default function VersionUpdates({ onLoad }) {
7-
const [{ collapsed, errored, expanded, errors, queued }, setState] =
7+
const [{ collapsed, expanded, errors, queued }, setState] =
88
useState({
99
collapsed: { queued: false, errored: true },
1010
expanded: {},
11-
errored: [],
1211
errors: {},
13-
queued: []
12+
queued: {}
1413
});
1514
const toggleItem = item => () => setState(prev => (
1615
{ ...prev, expanded: { ...prev.expanded, [item]: !prev.expanded[item] } }
@@ -35,9 +34,9 @@ export default function VersionUpdates({ onLoad }) {
3534
<h3>
3635
Version Updates
3736
{" "}
38-
<span className="badge badge--secondary">{queued.length}</span>
37+
<span className="badge badge--secondary">{Object.keys(queued).length}</span>
3938
{" "}
40-
<span className="badge badge--warning">{errored.length}</span>
39+
<span className="badge badge--warning">{Object.keys(errors).length}</span>
4140
</h3>
4241
</div>
4342
<div className="card__body">
@@ -47,19 +46,19 @@ export default function VersionUpdates({ onLoad }) {
4746
(collapsed.queued ? styles.collapsed : styles.expanded)
4847
}>
4948
Queued Version Updates{" "}
50-
<span className="badge badge--secondary">{queued.length}</span>
49+
<span className="badge badge--secondary">{Object.keys(queued).length}</span>
5150
</div>
5251
<div className={styles.version_updates_content}
5352
style={collapsed.queued ?
5453
{ display: "none" } :
5554
{ display: "flex", flexDirection: "row" }
5655
}>
57-
{queued.map((item, index) => (
56+
{Object.entries(queued).map(([name, version], index) => (
5857
<div key={index}
5958
style={{ margin: 2 }}
6059
className={`${styles.badge} badge badge--secondary`}>
61-
<Link href={urls.versions.pr.replace("<NAME>", item)}>
62-
{item}
60+
<Link href={urls.versions.pr.replace("<NAME>", name)}>
61+
{`${name} ${version}`}
6362
</Link>
6463
</div>
6564
))}
@@ -70,29 +69,29 @@ export default function VersionUpdates({ onLoad }) {
7069
(collapsed.errored ? styles.collapsed : styles.expanded)
7170
}>
7271
Errored Version Updates{" "}
73-
<span className="badge badge--warning">{errored.length}</span>
72+
<span className="badge badge--warning">{Object.keys(errors).length}</span>
7473
</div>
7574
<div className={styles.version_updates_content}
7675
style={collapsed.errored ?
7776
{ display: "none" } :
7877
{ display: "flex", flexDirection: "column" }}>
79-
{errored.map((item, index) => (
78+
{Object.entries(errors).map(([name, message], index) => (
8079
<React.Fragment key={index}>
8180
<div className={
8281
styles.errored_item + " " +
83-
(expanded[item] ? styles.expanded : styles.collapsed)}
84-
onClick={toggleItem(item)}>
82+
(expanded[name] ? styles.expanded : styles.collapsed)}
83+
onClick={toggleItem(name)}>
8584
<HoverEllipsis />
8685
<div className={`${styles.badge} badge badge--secondary`}>
8786
{/* Prevent link clicks from expanding/collapsing. */}
8887
<Link onClick={event => event.stopPropagation()}
89-
href={urls.versions.pr.replace("<NAME>", item)}>{item}
88+
href={urls.versions.pr.replace("<NAME>", name)}>{name}
9089
</Link>
9190
</div>
9291
</div>
9392
<div className={styles.errored_item_content}
94-
style={{ display: !expanded[item] && "none" }}>
95-
<pre dangerouslySetInnerHTML={{ __html: errors[item]}} />
93+
style={{ display: !expanded[name] && "none" }}>
94+
<pre dangerouslySetInnerHTML={{ __html: message}} />
9695
</div>
9796
</React.Fragment>
9897
))}

src/constants.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,8 @@ export const urls = {
138138
usage: "https://conda-forge.herokuapp.com/status-monitor/report/travis-ci",
139139
},
140140
versions: {
141-
api: "https://raw.githubusercontent.com/regro/cf-graph-countyfair/master/status/version_status.json",
142-
pr: "https://github.com/conda-forge/<NAME>-feedstock/blob/main/recipe/meta.yaml",
141+
api: "https://raw.githubusercontent.com/regro/cf-graph-countyfair/master/status/version_status.v2.json",
142+
pr: "https://github.com/conda-forge/<NAME>-feedstock/tree/main/recipe",
143143
},
144144
schemas: {
145145
"conda-forge.yml":

0 commit comments

Comments
 (0)