feat: update check for showing reports

Author: arunjaindev

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.3.19-beta-1",
+    "version": "0.3.19-beta-3",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -19,7 +19,7 @@ import { getArtifactInfo, getCITriggerInfo } from '../../Services/app.service'
 import { APIResponseHandler } from '../APIResponseHandler'
 import { ReactComponent as ICClose } from '../../../Assets/Icon/ic-close.svg'
 import { ReactComponent as ICArrowDown } from '../../../Assets/Icon/ic-arrow-down.svg'
-import { Artifacts, HistoryComponentType } from '../CICDHistory'
+import { Artifacts } from '../CICDHistory'
 import MaterialHistory from '../MaterialHistory/MaterialHistory.component'
 import { ArtifactInfoModalProps } from './types'
 
@@ -118,8 +118,6 @@ const ArtifactInfoModal = ({
                                     artifact={artifactInfo.image}
                                     blobStorageEnabled
                                     isArtifactUploaded={false}
-                                    isJobView={false}
-                                    type={HistoryComponentType.CI}
                                     imageReleaseTags={artifactInfo.imageReleaseTags}
                                     imageComment={artifactInfo.imageComment}
                                     ciPipelineId={artifactInfo.ciPipelineId}

src/Shared/Components/ArtifactInfoModal/ArtifactInfoModal.component.tsx

@@ -32,7 +32,7 @@ import { ReactComponent as Down } from '../../../Assets/Icon/ic-arrow-forward.sv
 import docker from '../../../Assets/Icon/ic-docker.svg'
 import folder from '../../../Assets/Icon/ic-folder.svg'
 import noartifact from '../../../Assets/Img/no-artifact@2x.png'
-import { ArtifactType, CIListItemType, HistoryComponentType } from './types'
+import { ArtifactType, CIListItemType } from './types'
 import { TERMINAL_STATUS_MAP } from './constants'
 import { EMPTY_STATE_STATUS } from '../../constants'
 
@@ -124,11 +124,9 @@ const Artifacts = ({
     downloadArtifactUrl,
     ciPipelineId,
     artifactId,
-    isJobView,
     isJobCI,
     imageComment,
     imageReleaseTags,
-    type,
     appReleaseTagNames,
     tagsEditable,
     hideImageTaggingHardDelete,
@@ -156,21 +154,26 @@ const Artifacts = ({
     // If artifactId is not 0 image info is shown, if isArtifactUploaded is true reports are shown
     // In case both are not present empty state is shown
     // isArtifactUploaded can be true even if status is failed
+
+    // NOTE: This means there are no reports and no image artifacts i.e. empty state
     if (!isArtifactUploaded && !artifactId) {
         if (
             status.toLowerCase() === TERMINAL_STATUS_MAP.FAILED ||
             status.toLowerCase() === TERMINAL_STATUS_MAP.CANCELLED ||
             status.toLowerCase() === TERMINAL_STATUS_MAP.ERROR
         ) {
-            return isJobCI ? (
-                <GenericEmptyState
-                    title={EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.FailedToFetchArtifacts}
-                    subTitle={EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.FailedToFetchArtifactsError}
-                />
-            ) : (
+            return (
                 <GenericEmptyState
-                    title={EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.NoArtifactsGenerated}
-                    subTitle={EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.NoArtifactsError}
+                    title={
+                        isJobCI
+                            ? EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.FailedToFetchArtifacts
+                            : EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.NoArtifactsGenerated
+                    }
+                    subTitle={
+                        isJobCI
+                            ? EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.FailedToFetchArtifactsError
+                            : EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.NoArtifactsError
+                    }
                 />
             )
         }
@@ -218,28 +221,26 @@ const Artifacts = ({
                         </div>
                     </CIListItem>
                 )}
-                {blobStorageEnabled &&
-                    downloadArtifactUrl &&
-                    (type === HistoryComponentType.CD || isArtifactUploaded || isJobView) && (
-                        <CIListItem
-                            type="report"
-                            hideImageTaggingHardDelete={hideImageTaggingHardDelete}
-                            isSuperAdmin={isSuperAdmin}
-                            renderCIListHeader={renderCIListHeader}
-                        >
-                            <div className="flex column left">
-                                <div className="cn-9 fs-14">Reports.zip</div>
-                                <button
-                                    type="button"
-                                    onClick={handleArtifact}
-                                    className="anchor p-0 cb-5 fs-12 flex left pointer"
-                                >
-                                    Download
-                                    <Download className="ml-5 icon-dim-16" />
-                                </button>
-                            </div>
-                        </CIListItem>
-                    )}
+                {blobStorageEnabled && downloadArtifactUrl && isArtifactUploaded && (
+                    <CIListItem
+                        type="report"
+                        hideImageTaggingHardDelete={hideImageTaggingHardDelete}
+                        isSuperAdmin={isSuperAdmin}
+                        renderCIListHeader={renderCIListHeader}
+                    >
+                        <div className="flex column left">
+                            <div className="cn-9 fs-14">Reports.zip</div>
+                            <button
+                                type="button"
+                                onClick={handleArtifact}
+                                className="anchor p-0 cb-5 fs-12 flex left pointer"
+                            >
+                                Download
+                                <Download className="ml-5 icon-dim-16" />
+                            </button>
+                        </div>
+                    </CIListItem>
+                )}
             </div>
             {!blobStorageEnabled && (
                 <div className="flexbox dc__position-abs-b-20 dc__content-center w-100">

src/Shared/Components/CICDHistory/Artifacts.tsx

@@ -634,7 +634,6 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({
                                     appReleaseTagNames={appReleaseTags}
                                     hideImageTaggingHardDelete={hideImageTaggingHardDelete}
                                     downloadArtifactUrl={CDBuildReportUrl}
-                                    type={HistoryComponentType.CD}
                                     renderCIListHeader={renderCIListHeader}
                                     rootClassName="p-16 flex-grow-1"
                                 />

src/Shared/Components/CICDHistory/TriggerOutput.tsx

@@ -608,9 +608,7 @@ export interface ArtifactType {
     blobStorageEnabled: boolean
     isArtifactUploaded?: boolean
     downloadArtifactUrl?: string
-    isJobView?: boolean
     isJobCI?: boolean
-    type: HistoryComponentType
     ciPipelineId?: number
     artifactId?: number
     imageComment?: ImageComment