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

harness · Jun 12, 2024 · 2f7e665 · 2f7e665
1 parent 4d81d27
commit 2f7e665
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx b/web/src/pages/PullRequest/Conversation/PullRequestActionsBox/PullRequestActionsBox.tsx
@@ -233,11 +233,7 @@ export const PullRequestActionsBox: React.FC<PullRequestActionsBoxProps> = ({
  messageTitle =
  mergeOption.method === MergeStrategy.SQUASH
  ? `${commit.title} (#${pullReqMetadata?.number})`
- : getString('mergeBranchTitle', {
- branchName: pullReqMetadata?.source_branch,
- repoPath: repoMetadata?.path,
- prNum: pullReqMetadata?.number
- })
+ : `Merge branch ${pullReqMetadata?.source_branch} of ${repoMetadata?.path} (#${pullReqMetadata?.number}})`
  })
  }
  return {

diff --git a/...es/PullRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss b/...es/PullRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss
@@ -176,7 +176,7 @@
  line-height: 10px !important;
  color: var(--fgColor) !important;
  background-color: var(--bgColor) !important;
- padding-left: 8px !important;
+ padding-left: 4px !important;
  padding-right: 4px !important;
 }
 
@@ -188,6 +188,10 @@
  padding-right: 4.05rem !important;
 }
 
+.paddingWithOutReq {
+ padding-right: 4.55rem !important;
+}
+
 .changeContainerPadding {
  padding-right: 3.5rem !important;
 }
@@ -200,7 +204,7 @@
 
 .gridContainer {
  display: grid !important;
- grid-template-columns: 1fr 1fr !important; /* Two equal columns */
+ grid-template-columns: 1fr 0.75fr !important;
  position: relative !important;
 }
 
@@ -227,6 +231,7 @@
  content: '';
  display: block !important;
  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;
  border: none !important;
 }

diff --git a/...llRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss.d.ts b/...llRequest/Conversation/PullRequestOverviewPanel/PullRequestOverviewPanel.module.scss.d.ts
@@ -34,6 +34,7 @@ export declare const iconStatus: string
 export declare const mainContainer: string
 export declare const mergedContainer: string
 export declare const paddingContainer: string
+export declare const paddingWithOutReq: string
 export declare const pendingIcon: string
 export declare const redIcon: string
 export declare const required: string

diff --git a/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/sections/ChecksSection.tsx b/web/src/pages/PullRequest/Conversation/PullRequestOverviewPanel/sections/ChecksSection.tsx
@@ -283,7 +283,7 @@ const ChecksSection = (props: ChecksSectionProps) => {
  />
  </Text>
  </Layout.Horizontal>
- <Container className={css.checkContainerPadding}>
+ <Container className={check.required ? css.checkContainerPadding : css.paddingWithOutReq}>
  <Layout.Horizontal className={css.gridContainer} flex={{ justifyContent: 'center' }}>
  {check.check.status !== CheckStatus.PENDING && (
  <Link