USEFULL/drone
1
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-04-05 00:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: [code-1991]: fix issue in merge message (#2095)

Browse Source
This commit is contained in:
Calvin Lee 2024-06-12 00:15:55 +00:00 committed by Harness
parent 4d81d27091
commit 2f7e665267
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
View File

@ -233,11 +233,7 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
messageTitle = messageTitle =
mergeOption.method === MergeStrategy.SQUASH mergeOption.method === MergeStrategy.SQUASH
? `${commit.title} (#${pullReqMetadata?.number})` ? `${commit.title} (#${pullReqMetadata?.number})`
: getString('mergeBranchTitle', { : `Merge branch ${pullReqMetadata?.source_branch} of ${repoMetadata?.path} (#${pullReqMetadata?.number}})`
branchName: pullReqMetadata?.source_branch,
repoPath: repoMetadata?.path,
prNum: pullReqMetadata?.number
})
}) })
} }
return { return {

9
web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss
View File

@ -176,7 +176,7 @@
line-height: 10px !important; line-height: 10px !important;
color: var(--fgColor) !important; color: var(--fgColor) !important;
background-color: var(--bgColor) !important; background-color: var(--bgColor) !important;
padding-left: 8px !important; padding-left: 4px !important;
padding-right: 4px !important; padding-right: 4px !important;
} }
@ -188,6 +188,10 @@
padding-right: 4.05rem !important; padding-right: 4.05rem !important;
} }
.paddingWithOutReq {
padding-right: 4.55rem !important;
}
.changeContainerPadding { .changeContainerPadding {
padding-right: 3.5rem !important; padding-right: 3.5rem !important;
} }
@ -200,7 +204,7 @@
.gridContainer { .gridContainer {
display: grid !important; display: grid !important;
grid-template-columns: 1fr 1fr !important; /* Two equal columns */ grid-template-columns: 1fr 0.75fr !important;
position: relative !important; position: relative !important;
} }
@ -227,6 +231,7 @@
content: ''; content: '';
display: block !important; display: block !important;
height: 0 !important; /* Ensures it doesn't take up additional vertical space */ height: 0 !important; /* Ensures it doesn't take up additional vertical space */
visibility: hidden !important; /* Ensures it doesn't appear visually */
background-color: transparent !important; background-color: transparent !important;
border: none !important; border: none !important;
} }

1
web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss.d.ts vendored
View File

@ -34,6 +34,7 @@ export declare const iconStatus: string
export declare const mainContainer: string export declare const mainContainer: string
export declare const mergedContainer: string export declare const mergedContainer: string
export declare const paddingContainer: string export declare const paddingContainer: string
export declare const paddingWithOutReq: string
export declare const pendingIcon: string export declare const pendingIcon: string
export declare const redIcon: string export declare const redIcon: string
export declare const required: string export declare const required: string

2
web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/sections/ChecksSection.tsx
View File

@ -283,7 +283,7 @@ const ChecksSection = (props: ChecksSectionProps) => {
/> />
</Text> </Text>
</Layout.Horizontal> </Layout.Horizontal>
<Container className={css.checkContainerPadding}> <Container className={check.required ? css.checkContainerPadding : css.paddingWithOutReq}>
<Layout.Horizontal className={css.gridContainer} flex={{ justifyContent: 'center' }}> <Layout.Horizontal className={css.gridContainer} flex={{ justifyContent: 'center' }}>
{check.check.status !== CheckStatus.PENDING && ( {check.check.status !== CheckStatus.PENDING && (
<Link <Link