Skip to content

Commit a5f99b1

Browse files
authored
Merge pull request #93 from keithchong/7158-AlignmentIssueInPodsTable
Align pod details under the Resource tab (#7158)
2 parents 7dce637 + 90fee44 commit a5f99b1

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

src/components/topology/console/PodsOverview.tsx

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import * as React from 'react';
22
import { useTranslation } from 'react-i18next';
3+
import { Grid, GridItem } from '@patternfly/react-core';
34
import { Link } from 'react-router-dom-v5-compat';
45
import * as _ from 'lodash';
56

@@ -98,24 +99,23 @@ export const PodOverviewItem: React.FC<PodOverviewItemProps> = ({ pod }) => {
9899
const { t } = useTranslation();
99100
const status = podPhase(pod);
100101
return (
101-
<li className="list-group-item container-fluid">
102-
<div className="row">
103-
<span className="col-xs-5">
102+
<li className="list-group-item">
103+
<Grid hasGutter>
104+
<GridItem span={5}>
104105
<ResourceLink kind={pod.kind} name={name} namespace={namespace} />
105-
</span>
106-
<span className="col-xs-3">
106+
</GridItem>
107+
<GridItem span={3}>
107108
<StatusComponent status={status} />
108-
</span>
109-
110-
<span className="col-xs-1">
109+
</GridItem>
110+
<GridItem span={1}>
111111
<PodTraffic podName={name} namespace={namespace} tooltipFlag />
112-
</span>
113-
<span className="col-xs-3 text-right">
112+
</GridItem>
113+
<GridItem span={3}>
114114
<Link to={`${resourcePath(pod.metadata.name, pod.metadata.namespace)}/logs`}>
115115
{t('public~View logs')}
116116
</Link>
117-
</span>
118-
</div>
117+
</GridItem>
118+
</Grid>
119119
</li>
120120
);
121121
};

src/components/utils/flags/detectOpenShiftVersion.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ export const detectOpenShiftVersion = (setFeatureFlag: SetFeatureFlag) => {
1010
const enableTopology = openshiftVersion
1111
? new SemVer(openshiftVersion).compare('4.18.99999999') >= 0
1212
: false; // Need to set this so nightly builds will work, eg: 4.19.0-0.nightly-2025-06-09-210043
13+
console.log(`GitOps: Detected OpenShift version = ${openshiftVersion}`);
14+
console.log(`GitOps: Enable GitOps in Topology View = ${enableTopology}`);
1315
setFeatureFlag(FLAG_GITOPS_ENABLE_TOPOLOGY, enableTopology);
1416
};

0 commit comments

Comments
 (0)