diff --git a/package-lock.json b/package-lock.json index 4bb77abca..26859bd98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.3.0", + "version": "0.3.0-patch-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.3.0", + "version": "0.3.0-patch-1", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index 587edfd2f..53d2fc1bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.3.0", + "version": "0.3.0-patch-1", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Shared/Components/CICDHistory/Artifacts.tsx b/src/Shared/Components/CICDHistory/Artifacts.tsx index b18effca4..c240ba61a 100644 --- a/src/Shared/Components/CICDHistory/Artifacts.tsx +++ b/src/Shared/Components/CICDHistory/Artifacts.tsx @@ -153,32 +153,6 @@ const Artifacts = ({ if (status.toLowerCase() === TERMINAL_STATUS_MAP.RUNNING || status.toLowerCase() === TERMINAL_STATUS_MAP.STARTING) { return } - if (!blobStorageEnabled) { - return ( -
- -
- - - {EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.StoreFiles} - - - {EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.ConfigureBlobStorage} - - -
-
- ) - } if ( status.toLowerCase() === TERMINAL_STATUS_MAP.FAILED || status.toLowerCase() === TERMINAL_STATUS_MAP.CANCELLED || @@ -200,7 +174,7 @@ const Artifacts = ({ /> ) } - if (!artifactId && status.toLowerCase() === TERMINAL_STATUS_MAP.SUCCEEDED && !isJobView) { + if (!artifactId && status.toLowerCase() === TERMINAL_STATUS_MAP.SUCCEEDED) { return ( - {!isJobView && type !== HistoryComponentType.CD && ( + <> +
+ {blobStorageEnabled && + downloadArtifactUrl && + (type === HistoryComponentType.CD || isArtifactUploaded || isJobView) && ( + +
+
Reports.zip
+ +
+
+ )} + + {!blobStorageEnabled && ( +
+
+ + + {EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.StoreFiles} + + + {EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.ConfigureBlobStorage} + + +
+
)} - {blobStorageEnabled && - downloadArtifactUrl && - (type === HistoryComponentType.CD || isArtifactUploaded || isJobView) && ( - -
-
Reports.zip
- -
-
- )} - + ) }