Show development pamel on running #757
diff --git a/karavan-app/src/main/webui/src/projects/ProjectDevelopment.tsx b/karavan-app/src/main/webui/src/projects/ProjectDevelopment.tsx
index a58b52b..64f1699 100644
--- a/karavan-app/src/main/webui/src/projects/ProjectDevelopment.tsx
+++ b/karavan-app/src/main/webui/src/projects/ProjectDevelopment.tsx
@@ -76,6 +76,10 @@
})
}
+ function showConsole(): boolean {
+ return podStatus.phase !== '' ;
+ }
+
const {project, config} = props;
return (
<Card className="project-development">
@@ -83,19 +87,19 @@
<Flex direction={{default: "row"}}
justifyContent={{default: "justifyContentSpaceBetween"}}>
<FlexItem flex={{default: "flex_1"}}>
- <RunnerInfoPod podStatus={podStatus} config={config} />
+ <RunnerInfoPod podStatus={podStatus} config={config} showConsole={showConsole()} />
</FlexItem>
<Divider orientation={{default: "vertical"}}/>
<FlexItem flex={{default: "flex_1"}}>
- <RunnerInfoMemory jvm={jvm} memory={memory} config={config} />
+ <RunnerInfoMemory jvm={jvm} memory={memory} config={config} showConsole={showConsole()} />
</FlexItem>
<Divider orientation={{default: "vertical"}}/>
<FlexItem flex={{default: "flex_1"}}>
- <RunnerInfoContext context={context} config={config} />
+ <RunnerInfoContext context={context} config={config} showConsole={showConsole()} />
</FlexItem>
<Divider orientation={{default: "vertical"}}/>
<FlexItem>
- <RunnerToolbar project={project} config={config} />
+ <RunnerToolbar project={project} config={config} showConsole={showConsole()} />
</FlexItem>
</Flex>
</CardBody>
diff --git a/karavan-app/src/main/webui/src/projects/RunnerInfoContext.tsx b/karavan-app/src/main/webui/src/projects/RunnerInfoContext.tsx
index 57ce057..8f49c15 100644
--- a/karavan-app/src/main/webui/src/projects/RunnerInfoContext.tsx
+++ b/karavan-app/src/main/webui/src/projects/RunnerInfoContext.tsx
@@ -19,6 +19,7 @@
interface Props {
context: any,
config: any,
+ showConsole: boolean
}
export const RunnerInfoContext = (props: Props) => {
@@ -127,7 +128,7 @@
}
function getRunning(): boolean {
- return isRunning(props.context);
+ return props.context ? isRunning(props.context) : false;
}
@@ -138,35 +139,37 @@
return (
<DescriptionList isHorizontal>
<DescriptionListGroup>
- <DescriptionListTerm>Camel Context</DescriptionListTerm>
+ <DescriptionListTerm>Camel</DescriptionListTerm>
<DescriptionListDescription>
{getContextInfo()}
</DescriptionListDescription>
</DescriptionListGroup>
- <DescriptionListGroup>
- <DescriptionListTerm>Version</DescriptionListTerm>
- <DescriptionListDescription>
- {getVersionInfo()}
- </DescriptionListDescription>
- </DescriptionListGroup>
- <DescriptionListGroup>
- <DescriptionListTerm>State</DescriptionListTerm>
- <DescriptionListDescription>
- {getContextState()}
- </DescriptionListDescription>
- </DescriptionListGroup>
- <DescriptionListGroup>
- <DescriptionListTerm>Exchanges:</DescriptionListTerm>
- <DescriptionListDescription>
- {getExchanges()}
- </DescriptionListDescription>
- </DescriptionListGroup>
- <DescriptionListGroup>
- <DescriptionListTerm>Processing Time</DescriptionListTerm>
- <DescriptionListDescription>
- {getProcessingTime()}
- </DescriptionListDescription>
- </DescriptionListGroup>
+ {props.showConsole && <>
+ <DescriptionListGroup>
+ <DescriptionListTerm>Version</DescriptionListTerm>
+ <DescriptionListDescription>
+ {getVersionInfo()}
+ </DescriptionListDescription>
+ </DescriptionListGroup>
+ <DescriptionListGroup>
+ <DescriptionListTerm>State</DescriptionListTerm>
+ <DescriptionListDescription>
+ {getContextState()}
+ </DescriptionListDescription>
+ </DescriptionListGroup>
+ <DescriptionListGroup>
+ <DescriptionListTerm>Exchanges:</DescriptionListTerm>
+ <DescriptionListDescription>
+ {getExchanges()}
+ </DescriptionListDescription>
+ </DescriptionListGroup>
+ <DescriptionListGroup>
+ <DescriptionListTerm>Processing Time</DescriptionListTerm>
+ <DescriptionListDescription>
+ {getProcessingTime()}
+ </DescriptionListDescription>
+ </DescriptionListGroup>
+ </>}
</DescriptionList>
);
}
diff --git a/karavan-app/src/main/webui/src/projects/RunnerInfoMemory.tsx b/karavan-app/src/main/webui/src/projects/RunnerInfoMemory.tsx
index 1e44a4c..2511b79 100644
--- a/karavan-app/src/main/webui/src/projects/RunnerInfoMemory.tsx
+++ b/karavan-app/src/main/webui/src/projects/RunnerInfoMemory.tsx
@@ -20,6 +20,7 @@
jvm: any,
memory: any,
config: any,
+ showConsole: boolean
}
export const RunnerInfoMemory = (props: Props) => {
@@ -122,35 +123,37 @@
return (
<DescriptionList isHorizontal>
<DescriptionListGroup>
- <DescriptionListTerm>JVM Memory</DescriptionListTerm>
+ <DescriptionListTerm>JVM</DescriptionListTerm>
<DescriptionListDescription>
{getJvmInfo()}
</DescriptionListDescription>
</DescriptionListGroup>
- <DescriptionListGroup>
- <DescriptionListTerm>PID</DescriptionListTerm>
- <DescriptionListDescription>
- {getPid()}
- </DescriptionListDescription>
- </DescriptionListGroup>
- <DescriptionListGroup>
- <DescriptionListTerm>Uptime</DescriptionListTerm>
- <DescriptionListDescription>
- {getJvmUptime()}
- </DescriptionListDescription>
- </DescriptionListGroup>
- <DescriptionListGroup>
- <DescriptionListTerm>Heap</DescriptionListTerm>
- <DescriptionListDescription>
- {getHeapInfo()}
- </DescriptionListDescription>
- </DescriptionListGroup>
- <DescriptionListGroup>
- <DescriptionListTerm>Non-Heap</DescriptionListTerm>
- <DescriptionListDescription>
- {getNonHeapInfo()}
- </DescriptionListDescription>
- </DescriptionListGroup>
+ {props.showConsole && <>
+ <DescriptionListGroup>
+ <DescriptionListTerm>PID</DescriptionListTerm>
+ <DescriptionListDescription>
+ {getPid()}
+ </DescriptionListDescription>
+ </DescriptionListGroup>
+ <DescriptionListGroup>
+ <DescriptionListTerm>Uptime</DescriptionListTerm>
+ <DescriptionListDescription>
+ {getJvmUptime()}
+ </DescriptionListDescription>
+ </DescriptionListGroup>
+ <DescriptionListGroup>
+ <DescriptionListTerm>Heap</DescriptionListTerm>
+ <DescriptionListDescription>
+ {getHeapInfo()}
+ </DescriptionListDescription>
+ </DescriptionListGroup>
+ <DescriptionListGroup>
+ <DescriptionListTerm>Non-Heap</DescriptionListTerm>
+ <DescriptionListDescription>
+ {getNonHeapInfo()}
+ </DescriptionListDescription>
+ </DescriptionListGroup>
+ </>}
</DescriptionList>
);
}
diff --git a/karavan-app/src/main/webui/src/projects/RunnerInfoPod.tsx b/karavan-app/src/main/webui/src/projects/RunnerInfoPod.tsx
index 5590be7..be606cd 100644
--- a/karavan-app/src/main/webui/src/projects/RunnerInfoPod.tsx
+++ b/karavan-app/src/main/webui/src/projects/RunnerInfoPod.tsx
@@ -18,6 +18,7 @@
interface Props {
podStatus: PodStatus,
config: any,
+ showConsole: boolean
}
export const RunnerInfoPod = (props: Props) => {
@@ -97,30 +98,32 @@
{getPodInfo()}
</DescriptionListDescription>
</DescriptionListGroup>
- <DescriptionListGroup>
- <DescriptionListTerm>Status</DescriptionListTerm>
- <DescriptionListDescription>
- {getPodStatus()}
- </DescriptionListDescription>
- </DescriptionListGroup>
- <DescriptionListGroup>
- <DescriptionListTerm>Requests</DescriptionListTerm>
- <DescriptionListDescription>
- {getPodRequests()}
- </DescriptionListDescription>
- </DescriptionListGroup>
- <DescriptionListGroup>
- <DescriptionListTerm>Limits</DescriptionListTerm>
- <DescriptionListDescription>
- {getPodLimits()}
- </DescriptionListDescription>
- </DescriptionListGroup>
- <DescriptionListGroup>
- <DescriptionListTerm>Created</DescriptionListTerm>
- <DescriptionListDescription>
- {getPodCreation()}
- </DescriptionListDescription>
- </DescriptionListGroup>
+ {props.showConsole && <>
+ <DescriptionListGroup>
+ <DescriptionListTerm>Status</DescriptionListTerm>
+ <DescriptionListDescription>
+ {getPodStatus()}
+ </DescriptionListDescription>
+ </DescriptionListGroup>
+ <DescriptionListGroup>
+ <DescriptionListTerm>Requests</DescriptionListTerm>
+ <DescriptionListDescription>
+ {getPodRequests()}
+ </DescriptionListDescription>
+ </DescriptionListGroup>
+ <DescriptionListGroup>
+ <DescriptionListTerm>Limits</DescriptionListTerm>
+ <DescriptionListDescription>
+ {getPodLimits()}
+ </DescriptionListDescription>
+ </DescriptionListGroup>
+ <DescriptionListGroup>
+ <DescriptionListTerm>Created</DescriptionListTerm>
+ <DescriptionListDescription>
+ {getPodCreation()}
+ </DescriptionListDescription>
+ </DescriptionListGroup>
+ </>}
</DescriptionList>
);
}
diff --git a/karavan-app/src/main/webui/src/projects/RunnerToolbar.tsx b/karavan-app/src/main/webui/src/projects/RunnerToolbar.tsx
index 532b91b..cd972fe 100644
--- a/karavan-app/src/main/webui/src/projects/RunnerToolbar.tsx
+++ b/karavan-app/src/main/webui/src/projects/RunnerToolbar.tsx
@@ -16,6 +16,7 @@
interface Props {
project: Project,
config: any,
+ showConsole: boolean
}
export const RunnerToolbar = (props: Props) => {
@@ -25,7 +26,7 @@
const [isRunning, setIsRunning] = useState(false);
const [isDeletingPod, setIsDeletingPod] = useState(false);
- function jbangRun () {
+ function jbangRun() {
setJbangIsRunning(true);
KaravanApi.runProject(props.project, res => {
if (res.status === 200 || res.status === 201) {
@@ -39,7 +40,7 @@
});
}
- function deleteRunner () {
+ function deleteRunner() {
setIsDeletingPod(true);
KaravanApi.deleteRunner(podName, res => {
if (res.status === 202) {
@@ -55,7 +56,7 @@
<React.Fragment>
<div className="runner-toolbar">
<div className="row">
- <Tooltip content="JBang run" position={TooltipPosition.left}>
+ <Tooltip content="Run in development mode" position={TooltipPosition.left}>
<Button isLoading={isJbangRunning ? true : undefined}
isSmall
variant={"primary"}
@@ -66,32 +67,20 @@
</Button>
</Tooltip>
</div>
- <div className="row">
- <Tooltip content="Runtime run" position={TooltipPosition.left}>
- <Button isLoading={isRunning ? true : undefined}
- isDisabled
- isSmall
- variant={"secondary"}
- className="project-button"
- icon={!isRunning ? <PlayIcon/> : <div></div>}
- onClick={() => {
- }}>
- {isRunning ? "..." : "Run"}
- </Button>
- </Tooltip>
- </div>
- <div className="row">
- <Tooltip content="Delete pod" position={TooltipPosition.left}>
- <Button isLoading={isDeletingPod ? true : undefined}
- isSmall
- variant={"secondary"}
- className="project-button"
- icon={!isRunning ? <DeleteIcon/> : <div></div>}
- onClick={() => deleteRunner()}>
- {isDeletingPod ? "..." : "Delete"}
- </Button>
- </Tooltip>
- </div>
+ {props.showConsole && <>
+ <div className="row">
+ <Tooltip content="Delete pod" position={TooltipPosition.left}>
+ <Button isLoading={isDeletingPod ? true : undefined}
+ isSmall
+ variant={"secondary"}
+ className="project-button"
+ icon={!isRunning ? <DeleteIcon/> : <div></div>}
+ onClick={() => deleteRunner()}>
+ {isDeletingPod ? "..." : "Delete"}
+ </Button>
+ </Tooltip>
+ </div>
+ </>}
</div>
</React.Fragment>
);
