Skip to content
Snippets Groups Projects
Commit 9561ba28 authored by John Sparger's avatar John Sparger
Browse files

updating IOCDetails a bit. Linked to Grafana node metrics (embedding did not work)

parent 7427dc4e
No related branches found
No related tags found
2 merge requests!25IOCListView now has tabs to prefilter on all or currentUsers IOCs. The currentUser is hardcoded,!18Merge current UI state
Pipeline #67356 failed
...@@ -35,7 +35,7 @@ export function IOCConfiguration({ ioc, getIOC }) { ...@@ -35,7 +35,7 @@ export function IOCConfiguration({ ioc, getIOC }) {
let content = <></>; let content = <></>;
if (ioc) { if (ioc) {
const getSubset = ({ name, description, host, active, status }) => ({ name, description, host, active, status }); const getSubset = ({ name, description, host, active, status, git }) => ({ name, description, host, active, status, git });
const ioc2 = getSubset(ioc) const ioc2 = getSubset(ioc)
console.log(ioc2); console.log(ioc2);
delete ioc2.activeDeployment; delete ioc2.activeDeployment;
......
...@@ -10,7 +10,7 @@ export function IOCDetails({ ioc }) { ...@@ -10,7 +10,7 @@ export function IOCDetails({ ioc }) {
return ( return (
<> <>
<SimpleAccordion defaultExpanded summary={<IOCBadge ioc={ioc} />} > <SimpleAccordion defaultExpanded summary={<IOCBadge ioc={ioc} />} >
<KeyValueTable obj={ioc} variant="table"/> <KeyValueTable obj={ioc} variant="overline"/>
</SimpleAccordion> </SimpleAccordion>
<SimpleAccordion summary="Deployment"> <SimpleAccordion summary="Deployment">
Check me out! Check me out!
......
...@@ -6,9 +6,13 @@ export function IOCLiveStatus({ioc}) { ...@@ -6,9 +6,13 @@ export function IOCLiveStatus({ioc}) {
useGlobalAppBar( useGlobalAppBar(
"IOC Details" "IOC Details"
); );
const liveIOC = {...ioc};
liveIOC.host = ioc.activeDeployment.host.host;
return ( return (
<> <>
<IOCBadge ioc={ioc}/> <IOCBadge ioc={liveIOC}/>
<a href={`https://grafana.tn.esss.lu.se/d/5zJT23xWz/node-exporter-full?orgId=1&var-node=${liveIOC.host}`} target="_blank" rel="noreferrer">View Host Status on Graphana</a>
</> </>
); );
} }
\ No newline at end of file
...@@ -37,9 +37,9 @@ export function KeyValueTable({ obj, variant="overline" }) { ...@@ -37,9 +37,9 @@ export function KeyValueTable({ obj, variant="overline" }) {
</Typography> </Typography>
} }
{ {
typeof(obj[key]) === "string" ? typeof(obj[key]) !== "object" ?
<Typography> <Typography>
{obj[key]} {`${obj[key]}`}
</Typography> </Typography>
: <div>{obj[key]}</div> : <div>{obj[key]}</div>
} }
......
...@@ -66,7 +66,7 @@ export function DeploymentDetails({ deployment, onDeploymentStart, startButtonDi ...@@ -66,7 +66,7 @@ export function DeploymentDetails({ deployment, onDeploymentStart, startButtonDi
</Card> </Card>
</Grid> </Grid>
<Grid item xs={12} md={12}> <Grid item xs={12} md={12}>
<SimpleAccordion summary="Deployment steps" defaultExpanded> <SimpleAccordion summary="Deployment Job Output" defaultExpanded>
<DeploymentJobStdOut deploymentJob={deploymentJob} /> <DeploymentJobStdOut deploymentJob={deploymentJob} />
</SimpleAccordion> </SimpleAccordion>
</Grid> </Grid>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment