Merge pull request #1508 from devtron-labs/fix/hide-deployement-status-ea-moda

fix: Don't show deployment status card for EA mode

Author: prajjwal-devtron

src/components/app/details/appDetails/DeployedCommitCard.tsx

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react'
 import Tippy from '@tippyjs/react'
 import { ReactComponent as Question } from '../../../../assets/icons/ic-help-outline.svg'
-import { ReactComponent as GitHub } from '../../../../assets/icons/git/github.svg'
+// import { ReactComponent as GitHub } from '../../../../assets/icons/git/github.svg'
 import { ReactComponent as CommitIcon } from '../../../../assets/icons/ic-code-commit.svg'
 import { DeployedCommitCardType } from './appDetails.type'
 import { showError } from '@devtron-labs/devtron-fe-common-lib'
@@ -11,6 +11,7 @@ import LoadingCard from './LoadingCard'
 const DeployedCommitCard = ({ cardLoading, showCommitInfoDrawer, envId, ciArtifactId }: DeployedCommitCardType) => {
     const [commitId, setCommitId] = useState<string>(null)
     const [commitMessage, setCommitMessage] = useState<string>(null)
+    const [noValidCommit, setNoValidCommit] = useState<boolean>(false)
 
     useEffect(() => {
         if (envId && ciArtifactId) {
@@ -22,17 +23,23 @@ const DeployedCommitCard = ({ cardLoading, showCommitInfoDrawer, envId, ciArtifa
             getCITriggerInfoModal(params, null)
                 .then((response) => {
                     const materials = response.result?.materials
-                    const lastCommit = materials[0]?.history[0]
-                    const shortenCommitId = lastCommit?.commit?.slice(0, 8)
-                    setCommitId(shortenCommitId)
-                    setCommitMessage(lastCommit?.message)
+                    if (materials && materials.length > 0) {
+                        const lastCommit = materials[0]?.history[0]
+                        const shortenCommitId = lastCommit?.commit?.slice(0, 8)
+                        setCommitId(shortenCommitId)
+                        setCommitMessage(lastCommit?.message)
+                    } else {
+                        setNoValidCommit(true)
+                    }
                 })
                 .catch((error) => {
                     showError(error)
+                    setNoValidCommit(true)
                 })
         }
     }, [envId, ciArtifactId])
 
+    if (noValidCommit) return null
     if (cardLoading || !commitId) return <LoadingCard />
 
     return (
@@ -59,7 +66,9 @@ const DeployedCommitCard = ({ cardLoading, showCommitInfoDrawer, envId, ciArtifa
                         <div className="dc__ellipsis-right cn-7 ml-2 fw-4 fs-12 dc__ff-monospace">{commitId}</div>
                     </div>
                 </div>
-                <GitHub className="github-icon" />
+                <div className="dc__git-logo" />
+                {/* @TODO: This should be dynamic, dependent on the source */}
+                {/* <GitHub className="github-icon" /> */}
             </div>
             <div className="app-details-info-card__bottom-container dc__content-space">
                 <span className="app-details-info-card__bottom-container__message fs-12 fw-4">{commitMessage}</span>

src/components/app/details/appDetails/SourceInfo.tsx

@@ -1,6 +1,5 @@
-//@ts-nocheck
-
-import React, { useMemo } from 'react'
+// @ts-nocheck - @TODO: Remove this by fixing the type issues
+import React, { useEffect, useMemo, useState } from 'react'
 import { Link } from 'react-router-dom'
 import { URLS } from '../../../../config'
 import { EnvSelector } from './AppDetails'
@@ -11,7 +10,7 @@ import { Nodes, SourceInfoType } from '../../types'
 import Tippy from '@tippyjs/react'
 import { ReactComponent as LinkIcon } from '../../../../assets/icons/ic-link.svg'
 import { ReactComponent as Trash } from '../../../../assets/icons/ic-delete-dots.svg'
-import { ConditionalWrap, DeploymentAppTypes } from '@devtron-labs/devtron-fe-common-lib'
+import { ConditionalWrap, DeploymentAppTypes, showError } from '@devtron-labs/devtron-fe-common-lib'
 import DeploymentStatusCard from './DeploymentStatusCard'
 import { importComponentFromFELibrary } from '../../../common/helpers/Helpers'
 import DeploymentTypeIcon from '../../../common/DeploymentTypeIcon/DeploymentTypeIcon'
@@ -20,6 +19,7 @@ import DeployedCommitCard from './DeployedCommitCard'
 import IssuesCard from './IssuesCard'
 import SecurityVulnerabilityCard from './SecurityVulnerabilityCard'
 import AppStatusCard from './AppStatusCard'
+import { getLastExecutionByArtifactId } from '../../../../services/service'
 
 const AppDetailsDownloadCard = importComponentFromFELibrary('AppDetailsDownloadCard')
 
@@ -45,6 +45,7 @@ export function SourceInfo({
     ciArtifactId,
     setErrorsList,
 }: SourceInfoType) {
+    const [showVulnerabilitiesCard, setShowVulnerabilitiesCard] = useState<boolean>(false)
     const isdeploymentAppDeleting = appDetails?.deploymentAppDeleteRequest || false
     const isArgoCdApp = appDetails?.deploymentAppType === DeploymentAppTypes.GITOPS
     const status = appDetails?.resourceTree?.status || ''
@@ -63,6 +64,30 @@ export function SourceInfo({
         message = Rollout[0].health.message
     }
 
+    const getScannedStatus = async () => {
+        const { appId, ciArtifactId } = appDetails
+        try {
+            const {
+                result: { scanEnabled, scanned },
+            } = await getLastExecutionByArtifactId(appId, ciArtifactId)
+            if (scanEnabled && scanned) {
+                // If scanEnabled and scanned is true, then show the vulnerabilities card
+                setShowVulnerabilitiesCard(true)
+            } else {
+                setShowVulnerabilitiesCard(false)
+            }
+        } catch (error) {
+            setShowVulnerabilitiesCard(false)
+            showError(error)
+        }
+    }
+
+    useEffect(() => {
+        if (appDetails?.ciArtifactId && appDetails?.appId) {
+            getScannedStatus()
+        }
+    }, [appDetails?.ciArtifactId, appDetails?.appId])
+
     const onClickShowCommitInfo = (): void => {
         showCommitInfo(true)
     }
@@ -218,17 +243,21 @@ export function SourceInfo({
                         isVirtualEnvironment={isVirtualEnvironment}
                         refetchDeploymentStatus={refetchDeploymentStatus}
                     />
-                    <DeployedCommitCard
-                        cardLoading={cardLoading}
-                        showCommitInfoDrawer={onClickShowCommitInfo}
-                        envId={envId}
-                        ciArtifactId={ciArtifactId}
-                    />
-                    <SecurityVulnerabilityCard
-                        cardLoading={cardLoading}
-                        severityCount={severityCount}
-                        showVulnerabilitiesModal={showVulnerabilitiesModal}
-                    />
+                    {appDetails?.dataSource !== 'EXTERNAL' && (
+                        <DeployedCommitCard
+                            cardLoading={cardLoading}
+                            showCommitInfoDrawer={onClickShowCommitInfo}
+                            envId={envId}
+                            ciArtifactId={ciArtifactId}
+                        />
+                    )}
+                    {!appDetails?.deploymentAppDeleteRequest && showVulnerabilitiesCard && (
+                        <SecurityVulnerabilityCard
+                            cardLoading={cardLoading}
+                            severityCount={severityCount}
+                            showVulnerabilitiesModal={showVulnerabilitiesModal}
+                        />
+                    )}
                     <div className="flex right ml-auto">
                         {appDetails?.appStoreChartId && (
                             <>

src/components/v2/appDetails/sourceInfo/environmentStatus/EnvironmentStatus.component.tsx

@@ -118,28 +118,28 @@ function EnvironmentStatusComponent({
     }
 
     const renderLastUpdatedBlock = () => {
-        if (
-            appDetails?.deploymentAppType === DeploymentAppTypes.HELM &&
-            appDetails?.appType === AppType.DEVTRON_HELM_CHART &&
-            appDetails?.lastDeployedTime
-        ) {
-            return (
-                <LastUpdatedCard
-                    deploymentTriggerTime={appDetails?.lastDeployedTime}
-                    triggeredBy={appDetails?.lastDeployedBy}
-                    cardLoading={cardLoading}
-                />
-            )
+        if (appDetails?.appType === AppType.DEVTRON_HELM_CHART && appDetails?.lastDeployedTime) {
+            if (appDetails?.deploymentAppType === DeploymentAppTypes.HELM) {
+                return (
+                    <LastUpdatedCard
+                        deploymentTriggerTime={appDetails?.lastDeployedTime}
+                        triggeredBy={appDetails?.lastDeployedBy}
+                        cardLoading={cardLoading}
+                    />
+                )
+            } else {
+                return (
+                    <DeploymentStatusCard
+                        deploymentStatusDetailsBreakdownData={deploymentStatusDetailsBreakdownData}
+                        cardLoading={cardLoading}
+                        hideDetails={false}
+                        refetchDeploymentStatus={refetchDeploymentStatus}
+                        isVirtualEnvironment={isVirtualEnvironment}
+                    />
+                )
+            }
         }
-        return (
-            <DeploymentStatusCard
-                deploymentStatusDetailsBreakdownData={deploymentStatusDetailsBreakdownData}
-                cardLoading={cardLoading}
-                hideDetails={false}
-                refetchDeploymentStatus={refetchDeploymentStatus}
-                isVirtualEnvironment={isVirtualEnvironment}
-            />
-        )
+        return null
     }
 
     const renderChartUsedBlock = () => {