Merge branch 'main' into trivy-image-scanning

Author: Shivam-nagar23

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.0.7-beta-40",
+        "@devtron-labs/devtron-fe-common-lib": "0.0.9",
         "@sentry/browser": "^7.3.1",
         "@sentry/integrations": "^7.3.1",
         "@sentry/tracing": "^7.3.1",

src/assets/icons/ic-environment-temp.svg

@@ -46,11 +46,13 @@ export interface BulkCDDetailType extends BulkTriggerAppDetailType {
 }
 
 export interface ResponseRowType {
-    appId: string
+    appId: number
     appName: string
     status: BulkResponseStatus
     statusText: string
     message: string
+    isVirtual?: boolean
+    envId?: number
 }
 
 export interface BulkCITriggerType {
@@ -90,6 +92,7 @@ export interface BulkCDTriggerType {
     responseList: ResponseRowType[]
     isLoading: boolean
     setLoading: React.Dispatch<React.SetStateAction<boolean>>
+    isVirtualEnv?: boolean
 }
 
 export interface ProcessWorkFlowStatusType {
@@ -122,6 +125,15 @@ export interface TriggerResponseModalType {
     responseList: ResponseRowType[]
     isLoading: boolean
     onClickRetryBuild: (appsToRetry: Record<string, boolean>) => void
+    isVirtualEnv?: boolean
+    envName?: string
+}
+
+export interface TriggerModalRowType {
+    rowData: ResponseRowType
+    key: number
+    isVirtualEnv?: boolean
+    envName?: string
 }
 
 export interface WorkflowNodeSelectionType {
@@ -162,6 +174,7 @@ export interface EnvAppList {
     isClusterCdActive: boolean
     environmentIdentifier: string
     appCount: number
+    isVirtualEnvironment?: boolean
 }
 
 export interface EmptyEnvState {
@@ -232,6 +245,7 @@ export interface AppGroupAdminType {
 export interface AppGroupDetailDefaultType {
     filteredAppIds: string
     appGroupListData?: AppGroupListType
+    isVirtualEnv?: boolean
 }
 
 interface CIPipeline {

src/assets/icons/ic-paper-rocket.svg

@@ -69,10 +69,12 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
     const [showDeleteGroup, setShowDeleteGroup] = useState<boolean>(false)
     const [clickedGroup, setClickedGroup] = useState<GroupOptionType>(null)
     const [allAppsList, setAllAppsList] = useState<CreateGroupAppListType[]>([])
+    const [isVirtualEnv, setIsVirtualEnv] = useState<boolean>(false)
 
     useEffect(() => {
         if (envList?.result) {
             const environment = envList.result.envList?.find((env) => env.id === +envId)
+            setIsVirtualEnv(environment?.isVirtualEnvironment)
             setEnvName(environment.environment_name)
             setShowEmpty(!environment.appCount)
         }
@@ -258,10 +260,11 @@ export default function AppGroupDetailsRoute({ isSuperAdmin }: AppGroupAdminType
                                 <EnvironmentOverview
                                     filteredAppIds={_filteredAppsIds}
                                     appGroupListData={filteredAppListData}
+                                    isVirtualEnv={isVirtualEnv}
                                 />
                             </Route>
                             <Route path={`${path}/${URLS.APP_TRIGGER}`}>
-                                <EnvTriggerView filteredAppIds={_filteredAppsIds} />
+                                <EnvTriggerView filteredAppIds={_filteredAppsIds} isVirtualEnv={isVirtualEnv} />
                             </Route>
                             <Route path={`${path}/${URLS.APP_CI_DETAILS}/:pipelineId(\\d+)?/:buildId(\\d+)?`}>
                                 <EnvCIDetails filteredAppIds={_filteredAppsIds} />

src/assets/icons/ic-virtual-cluster.svg

@@ -47,6 +47,12 @@ export enum BulkResponseStatus {
     'UNAUTHORIZE' = 'unauthorized',
 }
 
+export const BULK_VIRTUAL_RESPONSE_STATUS = {
+    [BulkResponseStatus.PASS]: 'Succeeded',
+    [BulkResponseStatus.FAIL]: 'Failed',
+    [BulkResponseStatus.UNAUTHORIZE]: 'Not authorised',
+}
+
 export const BULK_CI_RESPONSE_STATUS_TEXT = {
     [BulkResponseStatus.PASS]: 'Build triggered',
     [BulkResponseStatus.FAIL]: 'Build not triggered',
@@ -59,6 +65,12 @@ export const BULK_CD_RESPONSE_STATUS_TEXT = {
     [BulkResponseStatus.UNAUTHORIZE]: 'Not authorized',
 }
 
+export const responseListOrder = {
+    [BulkResponseStatus.FAIL]: 0,
+    [BulkResponseStatus.UNAUTHORIZE]: 1,
+    [BulkResponseStatus.PASS]: 2,
+}
+
 export const BULK_CI_MESSAGING = {
     emptyLinkedCI: {
         title: 'is using a linked build pipeline',

src/assets/img/paper-rocket-deployment.png

@@ -10,7 +10,11 @@ import { getDeploymentStatus } from '../../AppGroup.service'
 import { AppGroupDetailDefaultType, AppGroupListType, AppInfoListType, AppListDataType } from '../../AppGroup.types'
 import './envOverview.scss'
 
-export default function EnvironmentOverview({ appGroupListData, filteredAppIds }: AppGroupDetailDefaultType) {
+export default function EnvironmentOverview({
+    appGroupListData,
+    filteredAppIds,
+    isVirtualEnv,
+}: AppGroupDetailDefaultType) {
     const { envId } = useParams<{ envId: string }>()
     const [appListData, setAppListData] = useState<AppListDataType>()
     const [loading, setLoading] = useState<boolean>()
@@ -50,7 +54,7 @@ export default function EnvironmentOverview({ appGroupListData, filteredAppIds }
     const parseAppListData = (data: AppGroupListType, statusRecord: Record<string, string>): void => {
         const parsedData = {
             environment: data.environmentName,
-            namespace: data.namespace,
+            namespace: data.namespace || '-',
             cluster: data.clusterName,
             appInfoList: [],
         }
@@ -84,8 +88,16 @@ export default function EnvironmentOverview({ appGroupListData, filteredAppIds }
                 className="app-deployments-info-row display-grid dc__align-items-center"
             >
                 <span className="fs-13 fw-4 cn-7">{item.application}</span>
-                <AppStatus appStatus={item.lastDeployed ? item.appStatus : StatusConstants.NOT_DEPLOYED.noSpaceLower} />
-                <AppStatus appStatus={item.lastDeployed ? item.deploymentStatus : '-'} isDeploymentStatus={true} />
+                {!isVirtualEnv && (
+                    <AppStatus
+                        appStatus={item.lastDeployed ? item.appStatus : StatusConstants.NOT_DEPLOYED.noSpaceLower}
+                    />
+                )}
+                <AppStatus
+                    appStatus={item.lastDeployed ? item.deploymentStatus : StatusConstants.NOT_DEPLOYED.noSpaceLower}
+                    isDeploymentStatus={true}
+                    isVirtualEnv={isVirtualEnv}
+                />
                 <span className="fs-13 fw-4 cn-7">{processDeployedTime(item.lastDeployed, true)}</span>
             </div>
         )
@@ -100,11 +112,11 @@ export default function EnvironmentOverview({ appGroupListData, filteredAppIds }
                 </div>
                 <div className="mb-16">
                     <div className="fs-12 fw-4 lh-20 cn-7">{GROUP_LIST_HEADER.NAMESPACE}</div>
-                    <div className="fs-13 fw-4 lh-20 cn-9">{appListData.namespace} </div>
+                    <div className="fs-13 fw-4 lh-20 cn-9 dc__break-word">{appListData.namespace} </div>
                 </div>
                 <div className="mb-16">
                     <div className="fs-12 fw-4 lh-20 cn-7">{GROUP_LIST_HEADER.CLUSTER}</div>
-                    <div className="fs-13 fw-4 lh-20 cn-9">{appListData.cluster}</div>
+                    <div className="fs-13 fw-4 lh-20 cn-9 dc__break-word">{appListData.cluster}</div>
                 </div>
             </div>
             <div className="dc__overflow-scroll">
@@ -115,7 +127,7 @@ export default function EnvironmentOverview({ appGroupListData, filteredAppIds }
                     <div className="app-deployments-info-wrapper w-100">
                         <div className="app-deployments-info-header display-grid dc__align-items-center dc__border-bottom-n1 dc__uppercase fs-12 fw-6 cn-7">
                             <span>{OVERVIEW_HEADER.APPLICATION}</span>
-                            <span>{OVERVIEW_HEADER.APP_STATUS}</span>
+                            {!isVirtualEnv && <span>{OVERVIEW_HEADER.APP_STATUS}</span>}
                             <span>{OVERVIEW_HEADER.DEPLOYMENT_STATUS}</span>
                             <span>{OVERVIEW_HEADER.LAST_DEPLOYED}</span>
                         </div>

src/components/ApplicationGroup/AppGroup.types.ts

@@ -6,7 +6,7 @@
 
         .app-deployments-info-header,
         .app-deployments-info-row {
-            grid-template-columns: 250px 110px 130px 1fr;
+            grid-template-columns: 250px 130px 130px 1fr;
             column-gap: 16px;
             grid-auto-rows: 36px;
         }