diff --git a/src/components/StatusDashboard/version_updates.jsx b/src/components/StatusDashboard/version_updates.jsx index d8368d9722..f8ad1829bd 100644 --- a/src/components/StatusDashboard/version_updates.jsx +++ b/src/components/StatusDashboard/version_updates.jsx @@ -4,13 +4,12 @@ import React, { useEffect, useState } from "react"; import styles from "./styles.module.css"; export default function VersionUpdates({ onLoad }) { - const [{ collapsed, errored, expanded, errors, queued }, setState] = + const [{ collapsed, expanded, errors, queued }, setState] = useState({ collapsed: { queued: false, errored: true }, expanded: {}, - errored: [], errors: {}, - queued: [] + queued: {} }); const toggleItem = item => () => setState(prev => ( { ...prev, expanded: { ...prev.expanded, [item]: !prev.expanded[item] } } @@ -35,9 +34,9 @@ export default function VersionUpdates({ onLoad }) {

Version Updates {" "} - {queued.length} + {Object.keys(queued).length} {" "} - {errored.length} + {Object.keys(errors).length}

@@ -47,19 +46,19 @@ export default function VersionUpdates({ onLoad }) { (collapsed.queued ? styles.collapsed : styles.expanded) }> Queued Version Updates{" "} - {queued.length} + {Object.keys(queued).length}
- {queued.map((item, index) => ( + {Object.entries(queued).map(([name, version], index) => (
- ", item)}> - {item} + ", name)}> + {`${name} ${version}`}
))} @@ -70,29 +69,29 @@ export default function VersionUpdates({ onLoad }) { (collapsed.errored ? styles.collapsed : styles.expanded) }> Errored Version Updates{" "} - {errored.length} + {Object.keys(errors).length}
- {errored.map((item, index) => ( + {Object.entries(errors).map(([name, message], index) => (
+ (expanded[name] ? styles.expanded : styles.collapsed)} + onClick={toggleItem(name)}>
{/* Prevent link clicks from expanding/collapsing. */} event.stopPropagation()} - href={urls.versions.pr.replace("", item)}>{item} + href={urls.versions.pr.replace("", name)}>{name}
-
+                style={{ display: !expanded[name] && "none" }}>
+                
               
))} diff --git a/src/constants.js b/src/constants.js index cc44f7d6a3..5947f8e173 100644 --- a/src/constants.js +++ b/src/constants.js @@ -138,8 +138,8 @@ export const urls = { usage: "https://conda-forge.herokuapp.com/status-monitor/report/travis-ci", }, versions: { - api: "https://raw.githubusercontent.com/regro/cf-graph-countyfair/master/status/version_status.json", - pr: "https://github.com/conda-forge/-feedstock/blob/main/recipe/meta.yaml", + api: "https://raw.githubusercontent.com/regro/cf-graph-countyfair/master/status/version_status.v2.json", + pr: "https://github.com/conda-forge/-feedstock/tree/main/recipe", }, schemas: { "conda-forge.yml":