Skip to content

Migrate to OCP 4.19 #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 5, 2025
Merged

Migrate to OCP 4.19 #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
34c2fce
feat: change @openshift-console/dynamic-plugin-sdk/@openshift-console…
gansheer Jul 18, 2025
7dbceff
feat: Add workload camel in admin view
gansheer Jul 21, 2025
5619f0d
feat: Migrate to Patternfly 6
gansheer Jul 21, 2025
e0356ac
feat: Complete camel app detail metrics tab
gansheer Jul 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 36 additions & 7 deletions console-extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,29 +13,42 @@
{
"type": "console.page/route",
"flags": {
"required": ["CAMEL_APP_FLAG"]
"required": [
"CAMEL_APP_FLAG"
]
},
"properties": {
"exact": false,
"path": "/camel/app/ns/:ns/name/:name",
"component": { "$codeRef": "CamelApp" }
"component": {
"$codeRef": "CamelApp"
}
}
},
{
"type": "console.page/route",
"flags": {
"required": ["CAMEL_APP_FLAG"]
"required": [
"CAMEL_APP_FLAG"
]
},
"properties": {
"exact": true,
"path": ["/camel/ns/:ns", "/camel/all-namespaces"],
"component": { "$codeRef": "CamelAppList" }
"path": [
"/camel/ns/:ns",
"/camel/all-namespaces"
],
"component": {
"$codeRef": "CamelAppList"
}
}
},
{
"type": "console.navigation/href",
"flags": {
"required": ["CAMEL_APP_FLAG"]
"required": [
"CAMEL_APP_FLAG"
]
},
"properties": {
"id": "camel",
Expand All @@ -45,5 +58,21 @@
"section": "resources",
"namespaced": true
}
},
{
"type": "console.navigation/href",
"flags": {
"required": [
"CAMEL_APP_FLAG"
]
},
"properties": {
"id": "camel",
"name": "%plugin__camel-openshift-console-plugin~Camel%",
"href": "/camel",
"perspective": "admin",
"section": "workloads",
"namespaced": true
}
}
]
]
15 changes: 8 additions & 7 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@
},
"devDependencies": {
"@cypress/webpack-preprocessor": "^5.15.5",
"@openshift-console/dynamic-plugin-sdk": "1.8.0",
"@openshift-console/dynamic-plugin-sdk-webpack": "1.3.0",
"@patternfly/react-core": "^5.1.1",
"@patternfly/react-icons": "^5.1.1",
"@patternfly/react-styles": "^5.1.1",
"@patternfly/react-table": "^5.1.1",
"@openshift-console/dynamic-plugin-sdk": "4.19.0",
"@openshift-console/dynamic-plugin-sdk-webpack": "4.19.0",
"@patternfly/react-component-groups": "^6.2.1",
"@patternfly/react-core": "^6.2.2",
"@patternfly/react-icons": "^6.2.2",
"@patternfly/react-table": "^6.2.2",
"@patternfly/react-styles": "^6.2.2",
"@types/jsonpath": "^0.2.4",
"@types/node": "^20.14.9",
"@types/react": "^17.0.37",
Expand Down Expand Up @@ -96,4 +97,4 @@
"i18next": "^23.11.5",
"mocha": "^10.5.1"
}
}
}
246 changes: 131 additions & 115 deletions src/components/camel-app-details/CamelAppDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import * as React from 'react';
import { CamelAppKind } from '../../types';
import {
Card,
CardBody,
DescriptionList,
DescriptionListDescription,
DescriptionListGroup,
DescriptionListTerm,
TextList,
TextListItem,
Divider,
Grid,
GridItem,
PageSection,
Title,
} from '@patternfly/react-core';
import { useTranslation } from 'react-i18next';
import {
Expand All @@ -24,6 +25,7 @@ import CamelAppStatusPod from './CamelAppStatusPod';
import CamelAppHealth from '../camel-list-page/CamelAppHealth';
import { PopoverCamelHealth } from './CamelAppHealthPopover';
import { formatDuration } from '../../date-utils';
import { Table, Tbody } from '@patternfly/react-table';

type CamelAppDetailsProps = {
obj: CamelAppKind;
Expand Down Expand Up @@ -68,117 +70,131 @@ const CamelAppDetails: React.FC<CamelAppDetailsProps> = ({ obj: camelInt }) => {
const healthy = healthyCondition(camelInt);

return (
<div className="co-m-pane__body">
<h2>{t('Camel App Details')}</h2>
<Card>
<CardBody>
<h4>
<ResourceLink
displayName={camelInt.metadata.name}
groupVersionKind={camelAppGVK}
name={camelInt.metadata.name}
namespace={camelInt.metadata.namespace}
/>
</h4>

<DescriptionList
columnModifier={{
default: '1Col',
}}
>
<DescriptionListGroup>
<DescriptionListTerm>{t('Image')}:</DescriptionListTerm>
<DescriptionListDescription>
{camelInt.status?.image ? camelInt.status.image : 'unknown'}
</DescriptionListDescription>
</DescriptionListGroup>
<DescriptionListGroup>
<DescriptionListTerm>{t('Monitored')}:</DescriptionListTerm>
<DescriptionListDescription>
{monitored && monitored?.status == K8sResourceConditionStatus.True ? (
<>
<GreenCheckCircleIcon />
&nbsp;&nbsp;True
</>
) : (
<>
<YellowExclamationTriangleIcon />
&nbsp;&nbsp;False&nbsp;&nbsp;({monitored.message})
</>
)}
</DescriptionListDescription>
</DescriptionListGroup>
<DescriptionListGroup>
<DescriptionListTerm>
<PopoverCamelHealth popoverBody={t('Health') + ' :'} condition={healthy} />
</DescriptionListTerm>
<DescriptionListDescription>
<CamelAppHealth
health={
camelInt.status?.sliExchangeSuccessRate?.status
? camelInt.status.sliExchangeSuccessRate.status
: ''
}
/>
</DescriptionListDescription>
</DescriptionListGroup>
{camelInt.status?.sliExchangeSuccessRate ? (
<DescriptionListGroup>
<DescriptionListTerm>{t('Percentage of success rate')}:</DescriptionListTerm>
<DescriptionListDescription>
<TextList>
{camelInt.status?.sliExchangeSuccessRate.lastTimestamp ? (
<TextListItem>
<strong>{t('Last message')}:</strong>
<Timestamp
timestamp={camelInt.status.sliExchangeSuccessRate.lastTimestamp}
/>
</TextListItem>
) : (
<></>
)}
<TextListItem>
<strong>{t('Sampling interval')}: </strong>
{formatDuration(
camelInt.status.sliExchangeSuccessRate.samplingInterval / 1000000,
t,
{ omitSuffix: true },
)}
</TextListItem>
<TextListItem>
<strong>{t('Failed exchanges')}: </strong>
{camelInt.status.sliExchangeSuccessRate.samplingIntervalFailed | 0}
</TextListItem>
<TextListItem>
<strong>{t('Total exchanges')}: </strong>
{camelInt.status.sliExchangeSuccessRate.samplingIntervalTotal}
</TextListItem>
<TextListItem>
<strong>{t('Success percentage')}: </strong>
{camelInt.status.sliExchangeSuccessRate.successPercentage} %
</TextListItem>
</TextList>
</DescriptionListDescription>
</DescriptionListGroup>
) : (
<></>
)}
</DescriptionList>
</CardBody>
</Card>

<ul className="list-group">
{camelInt.status?.pods
? camelInt.status.pods.map((pod, i) => {
return (
<li key={i} className="list-group-item">
<CamelAppStatusPod obj={camelInt} pod={pod} />
</li>
);
})
: ''}
</ul>
</div>
<>
<PageSection>
<Title headingLevel="h2">{t('Camel Application Details')}</Title>
</PageSection>
<PageSection>
<DescriptionList
columnModifier={{
default: '1Col',
md: '2Col',
lg: '2Col',
xl: '2Col',
}}
>
<DescriptionListGroup>
<DescriptionListTerm>{t('Resource')}:</DescriptionListTerm>
<DescriptionListDescription>
<ResourceLink
displayName={camelInt.metadata.name}
groupVersionKind={camelAppGVK}
name={camelInt.metadata.name}
namespace={camelInt.metadata.namespace}
/>
</DescriptionListDescription>
<DescriptionListTerm>{t('Image')}:</DescriptionListTerm>
<DescriptionListDescription>
{camelInt.status?.image ? camelInt.status.image : 'unknown'}
</DescriptionListDescription>
<DescriptionListTerm>{t('Monitored')}:</DescriptionListTerm>
<DescriptionListDescription>
{monitored && monitored?.status == K8sResourceConditionStatus.True ? (
<>
<GreenCheckCircleIcon />
&nbsp;&nbsp;True
</>
) : (
<>
<YellowExclamationTriangleIcon />
&nbsp;&nbsp;False&nbsp;&nbsp;({monitored.message})
</>
)}
</DescriptionListDescription>
</DescriptionListGroup>
<DescriptionListGroup>
<DescriptionListTerm>
<PopoverCamelHealth popoverBody={t('Health') + ' :'} condition={healthy} />
</DescriptionListTerm>
<DescriptionListDescription>
<CamelAppHealth
health={
camelInt.status?.sliExchangeSuccessRate?.status
? camelInt.status.sliExchangeSuccessRate.status
: ''
}
/>
{camelInt.status?.sliExchangeSuccessRate ? (
<>
<DescriptionListTerm>{t('Percentage of success rate')}:</DescriptionListTerm>
<DescriptionListDescription>
<Table>
<Tbody>
{camelInt.status?.sliExchangeSuccessRate.lastTimestamp ? (
<tr>
<td>{t('Last message')}:</td>
<td>
<Timestamp
timestamp={camelInt.status.sliExchangeSuccessRate.lastTimestamp}
/>
</td>
</tr>
) : (
<></>
)}
<tr>
<td>{t('Sampling interval')}:</td>
<td>
{formatDuration(
camelInt.status.sliExchangeSuccessRate.samplingInterval / 1000000,
t,
{ omitSuffix: true },
)}
</td>
</tr>
<tr>
<td>{t('Failed exchanges')}:</td>
<td>
{camelInt.status.sliExchangeSuccessRate.samplingIntervalFailed | 0}
</td>
</tr>
<tr>
<td>{t('Total exchanges')}:</td>
<td>{camelInt.status.sliExchangeSuccessRate.samplingIntervalTotal}</td>
</tr>
<tr>
<td>{t('Success percentage')}:</td>
<td>{camelInt.status.sliExchangeSuccessRate.successPercentage} %</td>
</tr>
</Tbody>
</Table>
</DescriptionListDescription>
</>
) : (
<></>
)}
</DescriptionListDescription>
</DescriptionListGroup>
</DescriptionList>
</PageSection>
<PageSection>
<Divider />
<PageSection>
<Title headingLevel="h3">{t('Pods')}</Title>
</PageSection>
<Grid hasGutter sm={12} md={6} lg={6} xl={6} xl2={4}>
{camelInt.status?.pods
? camelInt.status.pods.map((pod, i) => {
return (
<GridItem key={i}>
<CamelAppStatusPod obj={camelInt} pod={pod} />
</GridItem>
);
})
: ''}
</Grid>
</PageSection>
</>
);
};

Expand Down
Loading
Loading