This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new 452ddd0a Polish UI
452ddd0a is described below
commit 452ddd0ae999afbe3d48f2707c4907814f662878
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Wed Nov 29 15:28:34 2023 -0500
Polish UI
---
.../karavan-app/src/main/webui/src/api/SsoApi.tsx | 1 -
.../webui/src/containers/ContainerTableRow.tsx | 26 ++++++++++++----------
.../main/webui/src/containers/ContainersPage.tsx | 15 ++++++-------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/webui/src/api/SsoApi.tsx
b/karavan-web/karavan-app/src/main/webui/src/api/SsoApi.tsx
index f9b816f8..04ed5748 100644
--- a/karavan-web/karavan-app/src/main/webui/src/api/SsoApi.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/api/SsoApi.tsx
@@ -24,7 +24,6 @@ export class SsoApi {
static auth(after: () => void) {
KaravanApi.getConfig((config: any) => {
- console.log(config)
SsoApi.keycloak = new Keycloak({url: config.url, realm:
config.realm, clientId: config.clientId});
SsoApi.keycloak.init({onLoad: 'login-required', flow: 'hybrid',
checkLoginIframe: false}).then(value => {
console.log('SsoApi', 'User is now authenticated.');
diff --git
a/karavan-web/karavan-app/src/main/webui/src/containers/ContainerTableRow.tsx
b/karavan-web/karavan-app/src/main/webui/src/containers/ContainerTableRow.tsx
index edc74604..b93c8543 100644
---
a/karavan-web/karavan-app/src/main/webui/src/containers/ContainerTableRow.tsx
+++
b/karavan-web/karavan-app/src/main/webui/src/containers/ContainerTableRow.tsx
@@ -43,8 +43,6 @@ export function ContainerTableRow(props: Props) {
const container = props.container;
const commands = container.commands;
- const imageParts = container.image?.split("@");
- const image = imageParts?.length > -1 ? imageParts[0] : "";
const ports = container.ports;
const isRunning = container.state === 'running';
const inTransit = container.inTransit;
@@ -98,9 +96,6 @@ export function ContainerTableRow(props: Props) {
<Td>
<Label color={color}>{container.containerName}</Label>
</Td>
- <Td>
- <p style={{wordWrap:"break-word"}}>{image}</p>
- </Td>
<Td>
{isRunning && container.cpuInfo && <Label
color={color}>{container.cpuInfo}</Label>}
</Td>
@@ -160,19 +155,26 @@ export function ContainerTableRow(props: Props) {
</Tr>
{<Tr isExpanded={isExpanded}>
<Td></Td>
- <Td colSpan={2}>Container ID</Td>
- <Td colSpan={2}>
+ <Td colSpan={1}>ID</Td>
+ <Td colSpan={4}>
<ExpandableRowContent>
- <Flex direction={{default: "column"}}
cellPadding={"0px"}>
- {container.containerId?.substring(0, 10) + "..."}
- </Flex>
+ {container.containerId}
+ </ExpandableRowContent>
+ </Td>
+ </Tr>}
+ {<Tr isExpanded={isExpanded}>
+ <Td></Td>
+ <Td colSpan={1}>Image</Td>
+ <Td colSpan={4}>
+ <ExpandableRowContent>
+ {container.image}
</ExpandableRowContent>
</Td>
</Tr>}
{ports !== undefined && ports.length > 0 && <Tr
isExpanded={isExpanded}>
<Td></Td>
- <Td colSpan={2}>Ports</Td>
- <Td colSpan={2}>
+ <Td colSpan={1}>Ports</Td>
+ <Td colSpan={5}>
<ExpandableRowContent>
<Flex direction={{default: "row"}} cellPadding={"0px"}>
{ports.sort((a, b) => a.privatePort &&
b.privatePort && (a.privatePort > b.privatePort) ? 1 : -1)
diff --git
a/karavan-web/karavan-app/src/main/webui/src/containers/ContainersPage.tsx
b/karavan-web/karavan-app/src/main/webui/src/containers/ContainersPage.tsx
index d8523b6f..5f8bae73 100644
--- a/karavan-web/karavan-app/src/main/webui/src/containers/ContainersPage.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/containers/ContainersPage.tsx
@@ -145,14 +145,13 @@ export function ContainersPage () {
<Table aria-label="Projects" variant={TableVariant.compact}>
<Thead>
<Tr>
- <Th />
- <Th key='type'>Type</Th>
- <Th key='name'>Name</Th>
- <Th key='image'>Image</Th>
- <Th key='cpuInfo'>CPU</Th>
- <Th key='memoryInfo'>Memory</Th>
- <Th key='state'>State</Th>
- <Th key='action'></Th>
+ <Th modifier="fitContent" textCenter={true} />
+ <Th modifier="fitContent" textCenter={true}
key='type'>Type</Th>
+ <Th key='name'>Name</Th>
+ <Th modifier="fitContent" textCenter={true}
key='cpuInfo'>CPU</Th>
+ <Th modifier="fitContent" textCenter={true}
key='memoryInfo'>Memory</Th>
+ <Th modifier="fitContent" textCenter={true}
key='state'>State</Th>
+ <Th modifier="fitContent" textCenter={true}
key='action'>Actions</Th>
</Tr>
</Thead>
{conts?.map((container: ContainerStatus, index: number) =>
(
