USEFULL
/
drone
mirror of https://github.com/harness/drone.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: [code-1625]: fix empty state

code-1625
Calvin Lee 2024-04-10 15:51:58 -06:00
parent 4cf5b2ceeb
commit 1d194fb35c
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/src/pages/PullRequest/Conversation/Conversation.tsx
View File

@ -59,6 +59,7 @@ import { CodeCommentHeader } from './CodeCommentHeader'
import { SystemComment } from './SystemComment'
import PullRequestOverviewPanel from './PullRequestOverviewPanel/PullRequestOverviewPanel'
import css from './Conversation.module.scss'
import CodeOwnersOverview from '../CodeOwners/CodeOwnersOverview'
export interface ConversationProps extends Pick<GitInfoProps, 'repoMetadata' | 'pullReqMetadata'> {
prStats?: TypesPullReqStats
@ -391,8 +392,8 @@ export const Conversation: React.FC<ConversationProps> = ({
prChecksDecisionResult={prChecksDecisionResult}
codeOwners={codeOwners as TypesCodeOwnerEvaluation}
/>
)}
{codeOwners && prChecksDecisionResult && (
)} */}
{/* {codeOwners && prChecksDecisionResult && (
<CodeOwnersOverview
standalone={standalone}
codeOwners={codeOwners}
@ -402,7 +403,7 @@ export const Conversation: React.FC<ConversationProps> = ({
/>
)} */}
{prChecksDecisionResult && codeOwners && (
{prChecksDecisionResult && (
<Container padding={{ top: 'small', bottom: 'small' }}>
<PullRequestOverviewPanel
repoMetadata={repoMetadata}

29
web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/sections/ChangesSection.tsx
View File

@ -9,7 +9,7 @@ import {
useToggle,
stringSubstitute
} from '@harnessio/uicore'
import React, { useEffect, useState } from 'react'
import React, { useEffect, useMemo, useState } from 'react'
import cx from 'classnames'
import { Render } from 'react-jsx-match'
import { isEmpty } from 'lodash-es'
@ -94,7 +94,6 @@ const ChangesSection = (props: ChangesSectionProps) => {
approved => !checkIfOutdatedSha(approved.sha, pullReqMetadata?.source_sha as string)
)
const changeReqEvaluations = reviewers?.filter(evaluation => evaluation.review_decision === 'changereq')
const changeReqReviewer =
changeReqEvaluations && !isEmpty(changeReqEvaluations)
? capitalizeFirstLetter(
@ -323,6 +322,12 @@ const ChangesSection = (props: ChangesSectionProps) => {
</Layout.Horizontal>
)
}
const viewBtn =
minApproval > minReqLatestApproval ||
(approvedEvaluations && minReqLatestApproval === 0) ||
minReqLatestApproval > 0 ||
!isEmpty(changeReqEvaluations) ||
!isEmpty(codeOwners)
return (
<Render when={!loading && status}>
@ -356,14 +361,16 @@ const ChangesSection = (props: ChangesSectionProps) => {
</Text>
</Layout.Vertical>
</Layout.Horizontal>
<Button
padding={{ right: 'unset', bottom: 'medium' }}
className={cx(css.showMore, css.blueText, css.buttonPadding)}
variation={ButtonVariation.LINK}
size={ButtonSize.SMALL}
text={getString(isExpanded ? 'showLess' : 'showMore')}
onClick={toggleExpanded}
/>
{viewBtn && (
<Button
padding={{ right: 'unset', bottom: 'medium' }}
className={cx(css.showMore, css.blueText, css.buttonPadding)}
variation={ButtonVariation.LINK}
size={ButtonSize.SMALL}
text={getString(isExpanded ? 'showLess' : 'showMore')}
onClick={toggleExpanded}
/>
)}
</Layout.Horizontal>
</Container>
@ -521,7 +528,7 @@ const ChangesSection = (props: ChangesSectionProps) => {
</Container>
)}
</Container>
{codeOwners && (
{codeOwners && !isEmpty(codeOwners?.evaluation_entries) && (
<Container
className={css.codeOwnerContainer}
padding={{ top: 'small', bottom: 'small', left: 'xlarge', right: 'small' }}>