Merge branch 'main' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/use-download-global

Author: arunjaindev

package-lock.json

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

package.json

@@ -162,7 +162,7 @@ const Artifacts = ({
     if (status.toLowerCase() === TERMINAL_STATUS_MAP.RUNNING || status.toLowerCase() === TERMINAL_STATUS_MAP.STARTING) {
         return <CIProgressView />
     }
-    if (isJobView && !blobStorageEnabled) {
+    if (!blobStorageEnabled) {
         return (
             <div className="flex column p-24 w-100 h-100">
                 <GenericEmptyState
@@ -188,15 +188,6 @@ const Artifacts = ({
             </div>
         )
     }
-    if (isJobView && !isArtifactUploaded) {
-        return (
-            <GenericEmptyState
-                title={EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.NoFilesFound}
-                subTitle={EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.NoFilesGenerated}
-                image={noartifact}
-            />
-        )
-    }
     if (status.toLowerCase() === TERMINAL_STATUS_MAP.FAILED || status.toLowerCase() === TERMINAL_STATUS_MAP.CANCELLED) {
         if (isJobCI) {
             return (
@@ -214,7 +205,7 @@ const Artifacts = ({
             />
         )
     }
-    if (!artifactId && status.toLowerCase() === TERMINAL_STATUS_MAP.SUCCEEDED) {
+    if (!artifactId && status.toLowerCase() === TERMINAL_STATUS_MAP.SUCCEEDED && !isJobView) {
         return (
             <GenericEmptyState
                 title={EMPTY_STATE_STATUS.ARTIFACTS_EMPTY_STATE_TEXTS.NoArtifactsFound}
@@ -254,26 +245,28 @@ const Artifacts = ({
                     </div>
                 </CIListItem>
             )}
-            {blobStorageEnabled && downloadArtifactUrl && (type === HistoryComponentType.CD || 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>
-            )}
+            {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>
+                )}
         </div>
     )
 }

src/Shared/Components/CICDHistory/Artifacts.tsx

@@ -9,6 +9,7 @@ import { HandleDownloadProps } from './types'
 
 const useDownload = () => {
     const [isDownloading, setIsDownloading] = useState<boolean>(false)
+    const [downloadError, setDownloadError] = useState(null)
 
     /**
      * @param downloadUrl - API url for downloading file
@@ -77,13 +78,14 @@ const useDownload = () => {
                 throw new ServerErrors(jsonResponseError)
             }
         } catch (error) {
+            setDownloadError(error)
             showError(error)
         } finally {
             setIsDownloading(false)
         }
     }
 
-    return { handleDownload, isDownloading }
+    return { handleDownload, isDownloading, downloadError }
 }
 
 export default useDownload