Skip to content
Snippets Groups Projects
Commit a6aa8da9 authored by Johanna Szepanski's avatar Johanna Szepanski
Browse files

updated components affected by the endpoint split

parent efcadc96
No related branches found
No related tags found
2 merge requests!497CE-2790: Prepare for 4.0.0,!492CE-2887: Modify host endpoints
......@@ -2,12 +2,12 @@ import React from "react";
import { IconBadge } from "@ess-ics/ce-ui-common";
import { HostStatusIcon } from "./HostStatusIcon";
export function HostBadge({ host, ...rest }) {
export function HostBadge({ host, status, ...rest }) {
return (
<IconBadge
icon={<HostStatusIcon hostStatus={host.status} />}
title={host.netBoxHost?.fqdn}
subtitle={host.netBoxHost?.network || "---"}
icon={<HostStatusIcon hostStatus={status} />}
title={host.fqdn}
subtitle={host.network || "---"}
{...rest}
/>
);
......
......@@ -36,10 +36,12 @@ export function HostDetailsContainer({ hostId, hostFqdn }) {
useEffect(() => {
if (fetchError || statusError) {
const message = fetchError.message
const message = fetchError?.message
? fetchError.message
: statusError.message;
const status = fetchError.status ? fetchError.status : statusError.status;
const status = fetchError?.status
? fetchError.status
: statusError?.status;
onFetchEntityError(message, status, setError);
}
}, [fetchError, statusError]);
......
......@@ -19,20 +19,10 @@ const Tags = ({ tags }) => (
);
const getTableData = (host) => ({
"device type": host?.netBoxHost?.vm
? "Virtual machine"
: host?.netBoxHost?.deviceType,
description: host?.netBoxHost?.description ? (
host.netBoxHost.description
) : (
<EmptyValue />
),
scope: host?.netBoxHost?.scope,
tags: host?.netBoxHost?.tags ? (
<Tags tags={host?.netBoxHost?.tags} />
) : (
<EmptyValue />
)
"device type": host.vm ? "Virtual machine" : host.deviceType,
description: host.description ? host.description : <EmptyValue />,
scope: host.scope,
tags: host.tags ? <Tags tags={host.tags} /> : <EmptyValue />
});
export const HostDetailsTable = ({ host }) => (
......
......@@ -23,14 +23,14 @@ import { HostJobsSection } from "./HostJobsSection";
import { HostIocSection } from "./HostIocSection";
import env from "../../../config/env";
export function HostDetailsView({ hostId, host }) {
export function HostDetailsView({ hostId, host, status }) {
const { setTitle } = useContext(GlobalAppBarContext);
const navigate = useNavigate();
const [urlState, setUrlState] = useUrlState();
useEffect(() => {
if (host && host.netBoxHost) {
setTitle(applicationTitle("Host Details: " + host.netBoxHost.name));
if (host && host.name) {
setTitle(applicationTitle("Host Details: " + host.name));
}
}, [host, setTitle]);
......@@ -63,8 +63,11 @@ export function HostDetailsView({ hostId, host }) {
</Box>
{host ? (
<>
<AlertBannerList alerts={host.alerts ?? []} />
<HostBadge host={host} />
<AlertBannerList alerts={status.alerts ?? []} />
<HostBadge
host={host}
status={status}
/>
<Stack gap={2}>
<HostIocSection
hostId={hostId}
......@@ -113,7 +116,7 @@ export function HostDetailsView({ hostId, host }) {
Host log stream
</Typography>
<LokiPanel
hostName={host.netBoxHost.name}
hostName={host.name}
isSyslog
isDeployed
/>
......@@ -124,24 +127,24 @@ export function HostDetailsView({ hostId, host }) {
"Host Configuration": (
<ExternalLink
href={
host?.netBoxHost.vm
? `${env.NETBOX_ADDRESS}/virtualization/virtual-machines/${host?.netBoxHost.id}`
: `${env.NETBOX_ADDRESS}/dcim/devices/${host?.netBoxHost.id}`
host.vm
? `${env.NETBOX_ADDRESS}/virtualization/virtual-machines/${host.hostId}`
: `${env.NETBOX_ADDRESS}/dcim/devices/${host.hostId}`
}
aria-label="Host Configuration"
>
{" "}
{host?.netBoxHost.vm
? `${env.NETBOX_ADDRESS}/virtualization/virtual-machines/${host?.netBoxHost.id}`
: `${env.NETBOX_ADDRESS}/dcim/devices/${host?.netBoxHost.id}`}
{host.vm
? `${env.NETBOX_ADDRESS}/virtualization/virtual-machines/${host.hostId}`
: `${env.NETBOX_ADDRESS}/dcim/devices/${host.hostId}`}
</ExternalLink>
),
"Host Metrics": (
<ExternalLink
href={`https://grafana.tn.esss.lu.se/d/5zJT23xWz/node-exporter-full?orgId=1&var-node=${host?.netBoxHost.fqdn}`}
href={`https://grafana.tn.esss.lu.se/d/5zJT23xWz/node-exporter-full?orgId=1&var-node=${host.fqdn}`}
aria-label="Host Metrics"
>
{`https://grafana.tn.esss.lu.se/d/5zJT23xWz/node-exporter-full?orgId=1&var-node=${host?.netBoxHost.fqdn}`}
{`https://grafana.tn.esss.lu.se/d/5zJT23xWz/node-exporter-full?orgId=1&var-node=${host.fqdn}`}
</ExternalLink>
)
}}
......
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