Skip to content

Commit 6a3ead8

Browse files
committed
refactor: remove Tooltip components from GitTriggerList for cleaner display; streamline icon rendering in renderMaterialIcon function
1 parent 38ed0c9 commit 6a3ead8

File tree

2 files changed

+14
-17
lines changed

2 files changed

+14
-17
lines changed

src/Shared/Components/CICDHistory/GitTriggerList.tsx

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { ReactComponent as ICBranch } from '@Icons/ic-branch.svg'
33
import { GitTriggers } from '@Shared/types'
44
import { createGitCommitUrl, SourceTypeMap } from '@Common/Common.service'
55
import { getHandleOpenURL, renderMaterialIcon } from '@Shared/Helpers'
6-
import { Tooltip } from '@Common/Tooltip'
76
import { DeploymentSummaryTooltipCardType } from './types'
87
import { CiPipelineSourceConfig } from './CiPipelineSourceConfig'
98
import { CommitChipCell } from '../CommitChipCell'
@@ -42,16 +41,14 @@ const GitTriggerList = memo(
4241
</div>
4342
) : (
4443
<div className="flexbox-col dc__gap-8">
45-
<div className="flexbox dc__gap-4 dc__align-start">
44+
<div className="flexbox dc__gap-4 dc__align-start flex-wrap">
4645
{renderMaterialIcon(gitMaterialUrl)}
4746

4847
{gitDetail?.GitRepoName && (
4948
<>
50-
<Tooltip content={gitDetail.GitRepoName}>
51-
<span className="cn-9 fs-13 fw-6 lh-20">
52-
{gitDetail.GitRepoName}
53-
</span>
54-
</Tooltip>
49+
<span className="cn-9 fs-13 fw-6 lh-20 dc__word-break">
50+
{gitDetail.GitRepoName}
51+
</span>
5552

5653
<span className="cn-5 fs-13 fw-4 lh-20 dc__no-shrink">/</span>
5754
</>
@@ -61,7 +58,7 @@ const GitTriggerList = memo(
6158
href={createGitCommitUrl(gitMaterialUrl, gitDetail?.Commit)}
6259
target="_blank"
6360
rel="noopener noreferrer"
64-
className="anchor flexbox dc__gap-2 dc__align-items-center"
61+
className="anchor flexbox dc__gap-2 dc__align-items-center dc__word-break"
6562
>
6663
<ICBranch className="icon-dim-12 dc__no-shrink fcn-7" />
6764
{sourceValue}
@@ -78,11 +75,9 @@ const GitTriggerList = memo(
7875
)}
7976

8077
{gitDetail?.Message && (
81-
<Tooltip content={gitDetail.Message}>
82-
<p className="m-0 cn-9 fs-13 fw-4 lh-20 dc__truncate--clamp-3">
83-
{gitDetail.Message}
84-
</p>
85-
</Tooltip>
78+
<p className="m-0 cn-9 fs-13 fw-4 lh-20 dc__truncate--clamp-3">
79+
{gitDetail.Message}
80+
</p>
8681
)}
8782
</div>
8883
)}

src/Shared/Helpers.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,21 +1015,23 @@ export const isAWSCodeCommitURL = (url: string = ''): boolean =>
10151015
url.includes('git-codecommit.') && url.includes('.amazonaws.com')
10161016

10171017
export const renderMaterialIcon = (url: string = '') => {
1018+
const baseClass = 'dc__vertical-align-middle icon-dim-20 dc__no-shrink'
1019+
10181020
if (url.includes('gitlab')) {
1019-
return <ICGitlab className="dc__vertical-align-middle icon-dim-20" />
1021+
return <ICGitlab className={baseClass} />
10201022
}
10211023

10221024
if (url.includes('github')) {
1023-
return <ICGithub className="dc__vertical-align-middle icon-dim-20 fcn-8" />
1025+
return <ICGithub className={`${baseClass} fcn-8`} />
10241026
}
10251027

10261028
if (url.includes('bitbucket')) {
1027-
return <ICBitbucket className="dc__vertical-align-middle icon-dim-20" />
1029+
return <ICBitbucket className={baseClass} />
10281030
}
10291031

10301032
if (isAWSCodeCommitURL(url)) {
10311033
return <ICAWSCodeCommit className="dc__vertical-align-middle icon-dim-18" />
10321034
}
10331035

1034-
return <ICGit className="dc__vertical-align-middle icon-dim-20" />
1036+
return <ICGit className={baseClass} />
10351037
}

0 commit comments

Comments
 (0)