Skip to content

Commit 70b9910

Browse files
committed
fix: show reports in artifact tab in ci and cd when artifact is uploaded
1 parent 199185a commit 70b9910

File tree

4 files changed

+36
-31
lines changed

4 files changed

+36
-31
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.3.19",
3+
"version": "0.3.20",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Shared/Components/CICDHistory/Artifacts.tsx

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,11 @@ const Artifacts = ({
154154
return <CIProgressView />
155155
}
156156
if (
157-
status.toLowerCase() === TERMINAL_STATUS_MAP.FAILED ||
158-
status.toLowerCase() === TERMINAL_STATUS_MAP.CANCELLED ||
159-
status.toLowerCase() === TERMINAL_STATUS_MAP.ERROR
157+
(status.toLowerCase() === TERMINAL_STATUS_MAP.FAILED ||
158+
status.toLowerCase() === TERMINAL_STATUS_MAP.CANCELLED ||
159+
status.toLowerCase() === TERMINAL_STATUS_MAP.ERROR) &&
160+
!isArtifactUploaded &&
161+
!artifactId
160162
) {
161163
if (isJobCI) {
162164
return (
@@ -174,7 +176,7 @@ const Artifacts = ({
174176
/>
175177
)
176178
}
177-
if (!artifactId && status.toLowerCase() === TERMINAL_STATUS_MAP.SUCCEEDED) {
179+
if (!artifactId && !isArtifactUploaded && status.toLowerCase() === TERMINAL_STATUS_MAP.SUCCEEDED) {
178180
return (
179181
<GenericEmptyState
180182
title={EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.NoArtifactsFound}
@@ -186,33 +188,35 @@ const Artifacts = ({
186188
return (
187189
<>
188190
<div className={`flex left column dc__gap-12 dc__content-start ${rootClassName ?? ''}`}>
189-
<CIListItem
190-
type="artifact"
191-
ciPipelineId={ciPipelineId}
192-
artifactId={artifactId}
193-
imageComment={imageComment}
194-
imageReleaseTags={imageReleaseTags}
195-
appReleaseTagNames={appReleaseTagNames}
196-
tagsEditable={tagsEditable}
197-
hideImageTaggingHardDelete={hideImageTaggingHardDelete}
198-
isSuperAdmin={isSuperAdmin}
199-
renderCIListHeader={renderCIListHeader}
200-
>
201-
<div className="flex column left hover-trigger">
202-
<div className="cn-9 fs-14 flex left" data-testid="artifact-text-visibility">
203-
{extractImage(artifact)}
204-
<div className="pl-4">
205-
<ClipboardButton content={extractImage(artifact)} />
191+
{!!artifactId && (
192+
<CIListItem
193+
type="artifact"
194+
ciPipelineId={ciPipelineId}
195+
artifactId={artifactId}
196+
imageComment={imageComment}
197+
imageReleaseTags={imageReleaseTags}
198+
appReleaseTagNames={appReleaseTagNames}
199+
tagsEditable={tagsEditable}
200+
hideImageTaggingHardDelete={hideImageTaggingHardDelete}
201+
isSuperAdmin={isSuperAdmin}
202+
renderCIListHeader={renderCIListHeader}
203+
>
204+
<div className="flex column left hover-trigger">
205+
<div className="cn-9 fs-14 flex left" data-testid="artifact-text-visibility">
206+
{extractImage(artifact)}
207+
<div className="pl-4">
208+
<ClipboardButton content={extractImage(artifact)} />
209+
</div>
206210
</div>
207-
</div>
208-
<div className="cn-7 fs-12 flex left" data-testid="artifact-image-text">
209-
{artifact}
210-
<div className="pl-4">
211-
<ClipboardButton content={artifact} />
211+
<div className="cn-7 fs-12 flex left" data-testid="artifact-image-text">
212+
{artifact}
213+
<div className="pl-4">
214+
<ClipboardButton content={artifact} />
215+
</div>
212216
</div>
213217
</div>
214-
</div>
215-
</CIListItem>
218+
</CIListItem>
219+
)}
216220
{blobStorageEnabled &&
217221
downloadArtifactUrl &&
218222
(type === HistoryComponentType.CD || isArtifactUploaded || isJobView) && (

src/Shared/Components/CICDHistory/TriggerOutput.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -625,6 +625,7 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({
625625
status={triggerDetails.status}
626626
artifact={triggerDetails.artifact}
627627
blobStorageEnabled={triggerDetails.blobStorageEnabled}
628+
isArtifactUploaded={triggerDetails.isArtifactUploaded}
628629
ciPipelineId={triggerDetails.ciPipelineId}
629630
artifactId={triggerDetails.artifactId}
630631
imageComment={triggerDetails?.imageComment}

0 commit comments

Comments
 (0)