Skip to content

Commit 7940726

Browse files
authored
Merge pull request #273 from devtron-labs/fix/webhook-date-separator
fix: webhook date separator
2 parents d61c36b + 2f21a95 commit 7940726

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
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": "0.2.17",
3+
"version": "0.2.17-patch-2",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Shared/Components/CICDHistory/Artifacts.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,11 @@ const Artifacts = ({
179179
</div>
180180
)
181181
}
182-
if (status.toLowerCase() === TERMINAL_STATUS_MAP.FAILED || status.toLowerCase() === TERMINAL_STATUS_MAP.CANCELLED) {
182+
if (
183+
status.toLowerCase() === TERMINAL_STATUS_MAP.FAILED ||
184+
status.toLowerCase() === TERMINAL_STATUS_MAP.CANCELLED ||
185+
status.toLowerCase() === TERMINAL_STATUS_MAP.ERROR
186+
) {
183187
if (isJobCI) {
184188
return (
185189
<GenericEmptyState

src/Shared/Components/MaterialHistory/MaterialHistory.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ const MaterialHistory = ({
5959
const historyList = materialHistoryMapWithTime[date]
6060
return (
6161
<>
62-
{!isCommitInfoModal && (
62+
{!isCommitInfoModal && material.type !== SourceTypeMap.WEBHOOK && (
6363
<div className="flex left dc__gap-8">
6464
<span className="fs-12 lh-18 cn-7 fw-6 w-130">{date}</span>
6565
<div className="h-1 bcn-2 w-100" />

0 commit comments

Comments
 (0)