Skip to content

Commit dd84db6

Browse files
committed
chore: version bump
1 parent 95013f6 commit dd84db6

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.0.4-beta-1",
3+
"version": "1.0.4-beta-2",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Shared/Components/GitCommitInfoGeneric/GitCommitInfoGeneric.tsx

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,21 @@ const GitCommitInfoGeneric = ({
7575
</a>
7676
) : null
7777

78-
function renderBasicGitCommitInfoForWebhook() {
78+
function renderBasicGitCommitInfoForWebhook(isPRWebhook?: boolean) {
7979
const _date = getWebhookDate(materialSourceType, commitInfo)
8080
return (
8181
<div className="flex column dc__gap-4 w-100">
82-
<div className="flex left lh-20 dc__gap-8 w-100">
83-
<PullRequestIcon className="icon-dim-16" />
84-
<div className="flex left dc__gap-4">
85-
Merge commit into&nbsp;
86-
{renderBranchName(_webhookData.data['target branch name'])}
87-
&nbsp;from&nbsp;
88-
{renderBranchName(_webhookData.data['source branch name'])}
82+
{isPRWebhook ? (
83+
<div className="flex left lh-20 dc__gap-8 w-100">
84+
<PullRequestIcon className="icon-dim-16" />
85+
<div className="flex left dc__gap-4">
86+
Merge commit into&nbsp;
87+
{renderBranchName(_webhookData.data['target branch name'])}
88+
&nbsp;from&nbsp;
89+
{renderBranchName(_webhookData.data['source branch name'])}
90+
</div>
8991
</div>
90-
</div>
92+
) : null}
9193
{_webhookData.data.author ? (
9294
<div className="material-history__text lh-20 flex left dc__gap-8 w-100">
9395
<PersonIcon className="icon-dim-16" /> {_webhookData.data.author}
@@ -264,7 +266,7 @@ const GitCommitInfoGeneric = ({
264266
{getCheckUncheckIcon()}
265267
</div>
266268
{renderWebhookTitle()}
267-
{renderBasicGitCommitInfoForWebhook()}
269+
{renderBasicGitCommitInfoForWebhook(true)}
268270
{handleMoreDataForWebhook()}
269271
</div>
270272
)

0 commit comments

Comments
 (0)