fix: [code-2088]: fix bugs on pr panel (#2190)

* fix: [code-2088]: fix bugs on pr panel
unified-ui
Calvin Lee 2024-07-10 07:38:21 +00:00 committed by Harness
parent 6e525fca4a
commit 6864710e8e
5 changed files with 15 additions and 3 deletions

View File

@ -587,6 +587,16 @@ const ChangesInternal: React.FC<ChangesProps> = ({
</Container>
</Case>
</Match>
{diffs === undefined && (
<Container padding="xlarge">
<NoResultCard
showWhen={() => diffs === undefined && !loadingRawDiff && !loading}
forSearch={true}
title={emptyTitle}
emptySearchMessage={emptyMessage}
/>
</Container>
)}
</Render>
</Container>
)

View File

@ -30,6 +30,7 @@ import GitLogo from 'images/gitLogo.png'
import HarnessDarkLogo from 'images/logo-dark.png'
import MergeStrat from 'images/mergeStrat.png'
import MergeRebase from 'images/mergeRebase.png'
import PrEmptyChangesState from 'images/prEmptyChanges.png'
export const Images = {
HarnessDarkLogo,
@ -47,5 +48,6 @@ export const Images = {
Subtract,
EmptySpace,
MergeStrat,
MergeRebase
MergeRebase,
PrEmptyChangesState
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

View File

@ -235,7 +235,7 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
messageString += `* ${commit.message}\n`
messageTitle =
mergeOption.method === MergeStrategy.SQUASH
? `${commit.title} (#${pullReqMetadata?.number})`
? `${pullReqMetadata?.title} (#${pullReqMetadata?.number})`
: `Merge branch ${pullReqMetadata?.source_branch} of ${repoMetadata?.path} (#${pullReqMetadata?.number})`
})
}

View File

@ -562,7 +562,7 @@ const ChangesSection = (props: ChangesSectionProps) => {
</Layout.Horizontal>
</Container>
)}
{!isEmpty(codeOwners) && (
{!isEmpty(codeOwners) && !isEmpty(codeOwners.evaluation_entries) && (
<Container className={css.borderContainer} padding={{ left: 'xlarge', right: 'small' }}>
<Layout.Horizontal className={css.paddingContainer} flex={{ justifyContent: 'space-between' }}>
{codeOwnerChangeReqEntries && codeOwnerChangeReqEntries?.length > 0 ? (