@@ -153,38 +153,39 @@ const Artifacts = ({
153153 if ( status . toLowerCase ( ) === TERMINAL_STATUS_MAP . RUNNING || status . toLowerCase ( ) === TERMINAL_STATUS_MAP . STARTING ) {
154154 return < CIProgressView />
155155 }
156- if (
157- ( status . toLowerCase ( ) === TERMINAL_STATUS_MAP . FAILED ||
156+ // If artifactId is not 0 image info is shown, if isArtifactUploaded is true reports are shown
157+ // In case both are not present empty state is shown
158+ // isArtifactUploaded can be true even if status is failed
159+ if ( ! isArtifactUploaded && ! artifactId ) {
160+ if (
161+ status . toLowerCase ( ) === TERMINAL_STATUS_MAP . FAILED ||
158162 status . toLowerCase ( ) === TERMINAL_STATUS_MAP . CANCELLED ||
159- status . toLowerCase ( ) === TERMINAL_STATUS_MAP . ERROR ) &&
160- ! isArtifactUploaded &&
161- ! artifactId
162- ) {
163- if ( isJobCI ) {
164- return (
163+ status . toLowerCase ( ) === TERMINAL_STATUS_MAP . ERROR
164+ ) {
165+ return isJobCI ? (
165166 < GenericEmptyState
166167 title = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . FailedToFetchArtifacts }
167168 subTitle = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . FailedToFetchArtifactsError }
168169 />
170+ ) : (
171+ < GenericEmptyState
172+ title = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . NoArtifactsGenerated }
173+ subTitle = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . NoArtifactsError }
174+ />
169175 )
170176 }
171177
172- return (
173- < GenericEmptyState
174- title = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . NoArtifactsGenerated }
175- subTitle = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . NoArtifactsError }
176- />
177- )
178- }
179- if ( ! artifactId && ! isArtifactUploaded && status . toLowerCase ( ) === TERMINAL_STATUS_MAP . SUCCEEDED ) {
180- return (
181- < GenericEmptyState
182- title = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . NoArtifactsFound }
183- subTitle = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . NoArtifactsFoundError }
184- image = { noartifact }
185- />
186- )
178+ if ( status . toLowerCase ( ) === TERMINAL_STATUS_MAP . SUCCEEDED ) {
179+ return (
180+ < GenericEmptyState
181+ title = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . NoArtifactsFound }
182+ subTitle = { EMPTY_STATE_STATUS . ARTIFACTS_EMPTY_STATE_TEXTS . NoArtifactsFoundError }
183+ image = { noartifact }
184+ />
185+ )
186+ }
187187 }
188+
188189 return (
189190 < >
190191 < div className = { `flex left column dc__gap-12 dc__content-start ${ rootClassName ?? '' } ` } >
0 commit comments