Skip to content
Snippets Groups Projects
Commit fa17978a authored by Max Frederiksen's avatar Max Frederiksen
Browse files

Revert "Put host log stream + IOC log stream in SimpleAccordion"

This reverts commit 0fc003e2.
parent 0fc003e2
No related branches found
No related tags found
1 merge request!542Prepare 4.1.0
Pipeline #195241 passed
......@@ -19,8 +19,7 @@ export function IOCLiveStatus({ ioc }) {
const [state, setState] = useUrlState(
{
procserv_log_open: "true",
records_open: "false",
log_stream_open: "false"
records_open: "false"
},
{ navigateMode: "replace" }
);
......@@ -82,23 +81,15 @@ export function IOCLiveStatus({ ioc }) {
allowedRoles={["DeploymentToolAdmin", "DeploymentToolIntegrator"]}
renderNoAccess={() => <></>}
>
<SimpleAccordion
summary="IOC log stream"
expanded={deserialize(state.log_stream_open)}
onChange={(_, expanded) =>
setState({ log_stream_open: serialize(expanded) })
}
>
<LokiContainer
hostName={liveIOC.activeDeployment?.host.hostName}
iocName={ioc.namingName}
isDeployed={isIocDeployed(ioc)}
/>
</SimpleAccordion>
<LokiContainer
hostName={liveIOC.activeDeployment?.host.hostName}
iocName={ioc.namingName}
isDeployed={isIocDeployed(ioc)}
/>
<SimpleAccordion
summary="Records"
expanded={deserialize(state.records_open)}
onChange={(_, expanded) =>
onChange={(event, expanded) =>
setState({ records_open: serialize(expanded) })
}
>
......
import { Box } from "@mui/material";
import { Box, Typography } from "@mui/material";
import { LokiPanel } from "./LokiPanel";
export function LokiContainer({ hostName, iocName, isDeployed }) {
......@@ -6,6 +6,12 @@ export function LokiContainer({ hostName, iocName, isDeployed }) {
<>
{hostName && (
<Box sx={{ pt: 2 }}>
<Typography
sx={{ my: 2.5 }}
variant="h3"
>
IOC log stream
</Typography>
<LokiPanel
hostName={hostName}
isSyslog={false}
......
......@@ -37,7 +37,6 @@ export function HostDetailsView({ hostId, host, status }) {
iocs_rows: 20,
iocs_page: 0,
details_open: false,
log_stream_open: false,
job_log_open: false,
job_log_rows: 20,
job_log_page: 0
......@@ -101,31 +100,22 @@ export function HostDetailsView({ hostId, host, status }) {
<HostDetailsTable host={host} />
</SimpleAccordion>
<SimpleAccordion
summary={
<Typography
variant="h3"
component="h2"
>
Host log stream
</Typography>
}
expanded={deserialize(urlState.log_stream_open)}
onChange={(_, expanded) =>
setUrlState({ log_stream_open: serialize(expanded) })
}
<Stack
gap={2}
sx={{ marginTop: "10px" }}
>
<Stack
gap={2}
sx={{ marginTop: "10px" }}
<Typography
variant="h3"
component="h2"
>
<LokiPanel
hostName={host.name}
isSyslog
isDeployed
/>
</Stack>
</SimpleAccordion>
Host log stream
</Typography>
<LokiPanel
hostName={host.name}
isSyslog
isDeployed
/>
</Stack>
</AccessControl>
<KeyValueTable
obj={{
......
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