@@ -153,32 +153,6 @@ const Artifacts = ({
153
153
if ( status . toLowerCase ( ) === TERMINAL_STATUS_MAP . RUNNING || status . toLowerCase ( ) === TERMINAL_STATUS_MAP . STARTING ) {
154
154
return < CIProgressView />
155
155
}
156
- if ( ! blobStorageEnabled ) {
157
- return (
158
- < div className = "flex column p-24 w-100 h-100" >
159
- < GenericEmptyState
160
- title = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . NoFilesFound }
161
- subTitle = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . BlobStorageNotConfigured }
162
- image = { noartifact }
163
- />
164
- < div className = "flexbox pt-8 pr-12 pb-8 pl-12 bcv-1 ev-2 bw-1 br-4 dc__position-abs-b-20" >
165
- < ICHelpOutline className = "icon-dim-20 fcv-5" />
166
- < span className = "fs-13 fw-4 mr-8 ml-8" >
167
- { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . StoreFiles }
168
- </ span >
169
- < a
170
- className = "fs-13 fw-6 cb-5 dc__no-decor"
171
- href = { DOCUMENTATION . BLOB_STORAGE }
172
- target = "_blank"
173
- rel = "noreferrer"
174
- >
175
- { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . ConfigureBlobStorage }
176
- </ a >
177
- < OpenInNew className = "icon-dim-20 ml-8" />
178
- </ div >
179
- </ div >
180
- )
181
- }
182
156
if (
183
157
status . toLowerCase ( ) === TERMINAL_STATUS_MAP . FAILED ||
184
158
status . toLowerCase ( ) === TERMINAL_STATUS_MAP . CANCELLED ||
@@ -200,7 +174,7 @@ const Artifacts = ({
200
174
/>
201
175
)
202
176
}
203
- if ( ! artifactId && status . toLowerCase ( ) === TERMINAL_STATUS_MAP . SUCCEEDED && ! isJobView ) {
177
+ if ( ! artifactId && status . toLowerCase ( ) === TERMINAL_STATUS_MAP . SUCCEEDED ) {
204
178
return (
205
179
< GenericEmptyState
206
180
title = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . NoArtifactsFound }
@@ -210,8 +184,8 @@ const Artifacts = ({
210
184
)
211
185
}
212
186
return (
213
- < div className = { `flex left column dc__gap-12 dc__content-start ${ rootClassName ?? '' } ` } >
214
- { ! isJobView && type !== HistoryComponentType . CD && (
187
+ < >
188
+ < div className = { `flex left column dc__gap-12 dc__content-start ${ rootClassName ?? '' } ` } >
215
189
< CIListItem
216
190
type = "artifact"
217
191
ciPipelineId = { ciPipelineId }
@@ -239,30 +213,49 @@ const Artifacts = ({
239
213
</ div >
240
214
</ div >
241
215
</ CIListItem >
216
+ { blobStorageEnabled &&
217
+ downloadArtifactUrl &&
218
+ ( type === HistoryComponentType . CD || isArtifactUploaded || isJobView ) && (
219
+ < CIListItem
220
+ type = "report"
221
+ hideImageTaggingHardDelete = { hideImageTaggingHardDelete }
222
+ isSuperAdmin = { isSuperAdmin }
223
+ renderCIListHeader = { renderCIListHeader }
224
+ >
225
+ < div className = "flex column left" >
226
+ < div className = "cn-9 fs-14" > Reports.zip</ div >
227
+ < button
228
+ type = "button"
229
+ onClick = { handleArtifact }
230
+ className = "anchor p-0 cb-5 fs-12 flex left pointer"
231
+ >
232
+ Download
233
+ < Download className = "ml-5 icon-dim-16" />
234
+ </ button >
235
+ </ div >
236
+ </ CIListItem >
237
+ ) }
238
+ </ div >
239
+ { ! blobStorageEnabled && (
240
+ < div className = "flexbox dc__position-abs-b-20 dc__content-center w-100" >
241
+ < div className = "flexbox pt-8 pr-12 pb-8 pl-12 bcv-1 ev-2 bw-1 br-4" >
242
+ < ICHelpOutline className = "icon-dim-20 fcv-5" />
243
+ < span className = "fs-13 fw-4 mr-8 ml-8" >
244
+ { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . StoreFiles }
245
+ </ span >
246
+ < a
247
+ className = "fs-13 fw-6 cb-5 dc__no-decor"
248
+ href = { DOCUMENTATION . BLOB_STORAGE }
249
+ target = "_blank"
250
+ rel = "noreferrer"
251
+ >
252
+ { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . ConfigureBlobStorage }
253
+ </ a >
254
+ < OpenInNew className = "icon-dim-20 ml-8" />
255
+ </ div >
256
+ </ div >
242
257
) }
243
- { blobStorageEnabled &&
244
- downloadArtifactUrl &&
245
- ( type === HistoryComponentType . CD || isArtifactUploaded || isJobView ) && (
246
- < CIListItem
247
- type = "report"
248
- hideImageTaggingHardDelete = { hideImageTaggingHardDelete }
249
- isSuperAdmin = { isSuperAdmin }
250
- renderCIListHeader = { renderCIListHeader }
251
- >
252
- < div className = "flex column left" >
253
- < div className = "cn-9 fs-14" > Reports.zip</ div >
254
- < button
255
- type = "button"
256
- onClick = { handleArtifact }
257
- className = "anchor p-0 cb-5 fs-12 flex left pointer"
258
- >
259
- Download
260
- < Download className = "ml-5 icon-dim-16" />
261
- </ button >
262
- </ div >
263
- </ CIListItem >
264
- ) }
265
- </ div >
258
+ </ >
266
259
)
267
260
}
268
261
0 commit comments