Skip to content

Commit 53b9ee3

Browse files
Merge pull request #1020 from ankrsinha/fix/SRVKP-9789-main
SRVKP-9789: Fix sidebar list bullets for PipelineRuns and Triggers in Topology Page
2 parents 0b8374d + 41ade0a commit 53b9ee3

File tree

3 files changed

+13
-16
lines changed

3 files changed

+13
-16
lines changed

src/components/pipeline-overview/PipelineOverview.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { Flex, FlexItem } from '@patternfly/react-core';
2+
import { Flex, FlexItem, List, ListItem } from '@patternfly/react-core';
33
import * as _ from 'lodash';
44
import { useTranslation } from 'react-i18next';
55
import { Link } from 'react-router-dom';
@@ -72,8 +72,8 @@ const PipelinesOverview: React.FC<PipelinesOverviewProps> = ({
7272
</Link>
7373
)}
7474
</SidebarSectionHeading>
75-
<ul className="list-group">
76-
<li className="list-group-item pipeline-overview">
75+
<List isPlain>
76+
<ListItem>
7777
<Flex justifyContent={{ default: 'justifyContentSpaceBetween' }}>
7878
<FlexItem>
7979
<ResourceLink
@@ -97,11 +97,11 @@ const PipelinesOverview: React.FC<PipelinesOverviewProps> = ({
9797
)}
9898
</FlexItem>
9999
</Flex>
100-
</li>
100+
</ListItem>
101101
{_.take(pipelineRuns, MAX_VISIBLE).map((pr) => (
102102
<PipelineRunItem key={pr.metadata.uid} pipelineRun={pr} />
103103
))}
104-
</ul>
104+
</List>
105105
<TriggersOverview pipeline={pipeline} />
106106
</div>
107107
);

src/components/pipeline-overview/PipelineRunItem.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { Grid, GridItem } from '@patternfly/react-core';
2+
import { Grid, GridItem, ListItem } from '@patternfly/react-core';
33
import { useTranslation } from 'react-i18next';
44
import { Link } from 'react-router-dom-v5-compat';
55
import { useTaskRuns } from '../hooks/useTaskRuns';
@@ -45,7 +45,7 @@ const PipelineRunItem: React.FC<PipelineRunItemProps> = ({ pipelineRun }) => {
4545
: creationTimestamp;
4646
const logDetails = getPLRLogSnippet(pipelineRun, taskRuns);
4747
return (
48-
<li className="opp-pipeline-run-item list-group-item">
48+
<ListItem className="opp-pipeline-run-item">
4949
<Grid hasGutter>
5050
<GridItem span={6}>
5151
<div>
@@ -84,7 +84,7 @@ const PipelineRunItem: React.FC<PipelineRunItemProps> = ({ pipelineRun }) => {
8484
</GridItem>
8585
)}
8686
</Grid>
87-
</li>
87+
</ListItem>
8888
);
8989
};
9090

src/components/pipeline-overview/TriggersOverview.tsx

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { Flex, FlexItem } from '@patternfly/react-core';
2+
import { Flex, FlexItem, List, ListItem } from '@patternfly/react-core';
33
import { useTranslation } from 'react-i18next';
44

55
import { usePipelineTriggerTemplateNames } from '../utils/triggers';
@@ -25,11 +25,8 @@ const TriggersOverview: React.FC<TriggersOverviewProps> = ({ pipeline }) => {
2525
data-testid="triggers-heading"
2626
text={t('Triggers')}
2727
/>
28-
<ul className="list-group" data-testid="triggers-list">
29-
<li
30-
className="list-group-item pipeline-overview"
31-
data-testid="triggers-list-item"
32-
>
28+
<List isPlain data-testid="triggers-list">
29+
<ListItem data-testid="triggers-list-item">
3330
<Flex justifyContent={{ default: 'justifyContentSpaceBetween' }}>
3431
<FlexItem>
3532
<TriggerResourceLinks
@@ -39,8 +36,8 @@ const TriggersOverview: React.FC<TriggersOverviewProps> = ({ pipeline }) => {
3936
/>
4037
</FlexItem>
4138
</Flex>
42-
</li>
43-
</ul>
39+
</ListItem>
40+
</List>
4441
</>
4542
) : null;
4643
};

0 commit comments

Comments
 (0)