Merge branch 'develop' of https://github.com/devtron-labs/dashboard into feat/command-bar

Author: AbhishekA1509

.eslintignore

@@ -4,6 +4,7 @@
 *.test.tsx
 .eslintrc.js
 vite.config.mts
+scripts/
 
 # The following files have eslint errors/warnings
 src/Pages/GlobalConfigurations/Authorization/APITokens/__tests__/ApiTokens.test.tsx
@@ -101,10 +102,7 @@ src/components/app/details/testViewer/TestRunDetails.tsx
 src/components/app/details/testViewer/TestRunList.tsx
 src/components/app/details/triggerView/EmptyStateCIMaterial.tsx
 src/components/app/details/triggerView/MaterialSource.tsx
-src/components/app/details/triggerView/TriggerView.tsx
 src/components/app/details/triggerView/__tests__/triggerview.test.tsx
-src/components/app/details/triggerView/cdMaterial.tsx
-src/components/app/details/triggerView/ciMaterial.tsx
 src/components/app/details/triggerView/ciWebhook.service.ts
 src/components/app/details/triggerView/config.ts
 src/components/app/details/triggerView/workflow.service.ts

.gitignore

@@ -52,3 +52,6 @@ yalc.lock
 !.yarn/sdks
 !.yarn/versions
 .pnp.*
+
+.env.secrets
+scripts/

index.css

@@ -2,6 +2,7 @@
 @import url('https://fonts.googleapis.com/css2?family=Inconsolata&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=Merriweather:wght@300;400;700;900&display=swap');
 @import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500;600&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:[email protected]&display=swap');
 
 /*
  * Although this is duplicated but this would help us with consistent loader in case

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.19.0",
+        "@devtron-labs/devtron-fe-common-lib": "1.19.0-pre-5",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
@@ -48,6 +48,7 @@
         "lint": "tsc --noEmit && eslint 'src/**/*.{js,jsx,ts,tsx}' --max-warnings 0",
         "lint-fix": "eslint 'src/**/*.{js,jsx,ts,tsx}' --fix",
         "start": "vite --open",
+        "dev": "node scripts/secrets-mgr.js",
         "build": "NODE_OPTIONS=--max_old_space_size=8192 vite build",
         "serve": "vite preview",
         "build-light": "NODE_OPTIONS=--max_old_space_size=8192 GENERATE_SOURCEMAP=false vite build",

src/Pages/ChartStore/ChartDetails/ChartDetailsAbout.tsx

@@ -134,16 +134,18 @@ export const ChartDetailsAbout = ({ chartDetails, isLoading }: ChartDetailsAbout
     return (
         <div className="flexbox-col dc__gap-20 mw-none">
             <div className="flexbox-col dc__gap-12">
-                <ImageWithFallback
-                    imageProps={{
-                        src: icon,
-                        alt: 'chart-icon',
-                        className: 'br-6',
-                        height: 48,
-                        width: 48,
-                    }}
-                    fallbackImage={<Icon name="ic-helm" color="N700" size={48} />}
-                />
+                <div className="h-48 dc__mxw-200">
+                    <ImageWithFallback
+                        imageProps={{
+                            src: icon,
+                            alt: 'chart-icon',
+                            className: 'br-6',
+                            height: '100%',
+                            width: 'auto',
+                        }}
+                        fallbackImage={<Icon name="ic-helm" color="N700" size={48} />}
+                    />
+                </div>
                 <h2 className="m-0 fs-16 lh-24 fw-6 cn-9">{name}</h2>
                 <p className="m-0 fs-13 lh-20 cn-9">{description}</p>
             </div>

src/components/ApplicationGroup/AppGroup.types.ts

@@ -14,31 +14,27 @@
  * limitations under the License.
  */
 
-import { Dispatch, SetStateAction } from 'react'
 import { MultiValue } from 'react-select'
 
 import {
     ACTION_STATE,
     AppInfoListType,
-    ApprovalConfigDataType,
-    CDModalTabType,
+    CIMaterialType,
     CommonNodeAttr,
     DeploymentNodeType,
-    DeploymentStrategyTypeWithDefault,
-    FilterConditionsListType,
     GVKType,
     MODAL_TYPE,
     OptionType,
-    PipelineIdsVsDeploymentStrategyMap,
     ResponseType,
     RuntimePluginVariables,
+    ServerErrors,
+    TriggerBlockedInfo,
     UseUrlFiltersReturnType,
-    WorkflowNodeType,
     WorkflowType,
 } from '@devtron-labs/devtron-fe-common-lib'
 
-import { TIME_STAMP_ORDER } from '@Components/app/details/triggerView/Constants'
-import { CDMaterialProps, RuntimeParamsErrorState, WebhookPayloadType } from '@Components/app/details/triggerView/types'
+import { GitInfoMaterialProps } from '@Components/app/details/triggerView/BuildImageModal/types'
+import { DeployImageContentProps } from '@Components/app/details/triggerView/DeployImageModal/types'
 import {
     AppConfigState,
     EnvConfigurationsNavProps,
@@ -50,58 +46,60 @@ import { WorkloadCheckType } from '../v2/appDetails/sourceInfo/scaleWorkloads/sc
 import { AppFilterTabs, BulkResponseStatus } from './Constants'
 
 interface BulkTriggerAppDetailType {
-    workFlowId: string
     appId: number
     name: string
     material?: any[]
     warningMessage?: string
 }
 
 export interface BulkCIDetailType extends BulkTriggerAppDetailType {
-    ciPipelineName: string
-    ciPipelineId: string
-    isFirstTrigger: boolean
-    isCacheAvailable: boolean
-    isLinkedCI: boolean
-    isLinkedCD: boolean
-    title: string
-    isJobCI: boolean
-    isWebhookCI: boolean
-    parentAppId: number
-    parentCIPipelineId: number
+    workflowId: string
+    material: CIMaterialType[]
+    runtimeParams: RuntimePluginVariables[]
+    node: CommonNodeAttr
     errorMessage: string
-    hideSearchHeader: boolean
+    runtimeParamsInitialError: ServerErrors | null
+    materialInitialError: ServerErrors | null
     filteredCIPipelines: any
+    ciConfiguredGitMaterialId: WorkflowType['ciConfiguredGitMaterialId']
+    runtimeParamsErrorState: GitInfoMaterialProps['runtimeParamsErrorState']
+    ignoreCache: boolean
+}
+
+export type BulkCDDetailDerivedFromNode = Required<
+    Pick<
+        DeployImageContentProps,
+        | 'pipelineId'
+        | 'appId'
+        | 'parentEnvironmentName'
+        | 'isTriggerBlockedDueToPlugin'
+        | 'configurePluginURL'
+        | 'triggerType'
+        | 'appName'
+    >
+> & {
+    stageNotAvailable: boolean
+    errorMessage: string
+    triggerBlockedInfo: TriggerBlockedInfo
+    consequence: CommonNodeAttr['pluginBlockState']
+    showPluginWarning: CommonNodeAttr['showPluginWarning']
 }
 
+export type BulkCDDetailType = BulkCDDetailDerivedFromNode &
+    Pick<DeployImageContentProps, 'materialResponse' | 'deploymentWindowMetadata' | 'deployViewState'> & {
+        /**
+         * True in cases when we reload materials on single app
+         */
+        areMaterialsLoading: boolean
+        materialError: ServerErrors | null
+        tagsWarningMessage: string
+    }
+
 export interface BulkCDDetailTypeResponse {
     bulkCDDetailType: BulkCDDetailType[]
     uniqueReleaseTags: string[]
 }
 
-export interface BulkCDDetailType
-    extends BulkTriggerAppDetailType,
-        Pick<CDMaterialProps, 'isTriggerBlockedDueToPlugin' | 'configurePluginURL' | 'consequence'>,
-        Partial<Pick<CommonNodeAttr, 'showPluginWarning' | 'triggerBlockedInfo'>> {
-    cdPipelineName?: string
-    cdPipelineId?: string
-    stageType?: DeploymentNodeType
-    triggerType?: string
-    envName: string
-    envId: number
-    parentPipelineId?: string
-    parentPipelineType?: WorkflowNodeType
-    parentEnvironmentName?: string
-    approvalConfigData?: ApprovalConfigDataType
-    requestedUserId?: number
-    appReleaseTags?: string[]
-    tagsEditable?: boolean
-    ciPipelineId?: number
-    hideImageTaggingHardDelete?: boolean
-    resourceFilters?: FilterConditionsListType[]
-    isExceptionUser?: boolean
-}
-
 export type TriggerVirtualEnvResponseRowType =
     | {
           isVirtual: true
@@ -123,61 +121,6 @@ export type ResponseRowType = {
     envId?: number
 } & TriggerVirtualEnvResponseRowType
 
-interface BulkRuntimeParamsType {
-    runtimeParams: Record<string, RuntimePluginVariables[]>
-    setRuntimeParams: React.Dispatch<React.SetStateAction<Record<string, RuntimePluginVariables[]>>>
-    runtimeParamsErrorState: Record<string, RuntimeParamsErrorState>
-    setRuntimeParamsErrorState: React.Dispatch<React.SetStateAction<Record<string, RuntimeParamsErrorState>>>
-}
-
-export interface BulkCITriggerType extends BulkRuntimeParamsType {
-    appList: BulkCIDetailType[]
-    closePopup: (e) => void
-    updateBulkInputMaterial: (materialList: Record<string, any[]>) => void
-    onClickTriggerBulkCI: (appIgnoreCache: Record<number, boolean>, appsToRetry?: Record<string, boolean>) => void
-    getWebhookPayload: (id, webhookTimeStampOrder?: typeof TIME_STAMP_ORDER) => void
-    webhookPayloads: WebhookPayloadType
-    setWebhookPayloads: React.Dispatch<React.SetStateAction<WebhookPayloadType>>
-    isWebhookPayloadLoading: boolean
-    isShowRegexModal: (_appId: number, ciNodeId: number, inputMaterialList: any[]) => boolean
-    responseList: ResponseRowType[]
-    isLoading: boolean
-    setLoading: React.Dispatch<React.SetStateAction<boolean>>
-    setPageViewType: React.Dispatch<React.SetStateAction<string>>
-}
-
-export interface BulkCDTriggerType extends BulkRuntimeParamsType {
-    stage: DeploymentNodeType
-    appList: BulkCDDetailType[]
-    closePopup: (e) => void
-    updateBulkInputMaterial: (materialList: Record<string, any>) => void
-    onClickTriggerBulkCD: (
-        skipIfHibernated: boolean,
-        pipelineIdVsStrategyMap: PipelineIdsVsDeploymentStrategyMap,
-        appsToRetry?: Record<string, boolean>,
-    ) => void
-    changeTab?: (
-        materrialId: string | number,
-        artifactId: number,
-        tab: CDModalTabType,
-        selectedCDDetail?: { id: number; type: DeploymentNodeType },
-    ) => void
-    toggleSourceInfo?: (materialIndex: number, selectedCDDetail?: { id: number; type: DeploymentNodeType }) => void
-    selectImage?: (
-        index: number,
-        materialType: string,
-        selectedCDDetail?: { id: number; type: DeploymentNodeType },
-    ) => void
-    responseList: ResponseRowType[]
-    isLoading: boolean
-    setLoading: React.Dispatch<React.SetStateAction<boolean>>
-    isVirtualEnv?: boolean
-    uniqueReleaseTags: string[]
-    feasiblePipelineIds: Set<number>
-    bulkDeploymentStrategy: DeploymentStrategyTypeWithDefault
-    setBulkDeploymentStrategy: Dispatch<SetStateAction<DeploymentStrategyTypeWithDefault>>
-}
-
 export interface ProcessWorkFlowStatusType {
     cicdInProgress: boolean
     workflows: WorkflowType[]
@@ -211,15 +154,11 @@ export interface TriggerResponseModalBodyProps {
 
 type RetryFailedType =
     | {
-          onClickRetryDeploy: BulkCDTriggerType['onClickTriggerBulkCD']
-          skipHibernatedApps: boolean
-          pipelineIdVsStrategyMap: PipelineIdsVsDeploymentStrategyMap
+          onClickRetryDeploy: (appsToRetry: Record<string, boolean>) => void
           onClickRetryBuild?: never
       }
     | {
           onClickRetryDeploy?: never
-          skipHibernatedApps?: never
-          pipelineIdVsStrategyMap?: never
           onClickRetryBuild: (appsToRetry: Record<string, boolean>) => void
       }
 
@@ -233,11 +172,6 @@ export interface TriggerModalRowType {
     isVirtualEnv?: boolean
 }
 
-export interface WorkflowNodeSelectionType {
-    id: number
-    name: string
-    type: WorkflowNodeType
-}
 export interface WorkflowAppSelectionType {
     id: number
     name: string

src/components/ApplicationGroup/AppGroup.utils.ts

@@ -96,28 +96,37 @@ export const processWorkflowStatuses = (
             }
         })
     }
-    // Update Workflow using maps
-    const _workflows = workflowsList.map((wf) => {
-        wf.nodes = wf.nodes.map((node) => {
+    // Update Workflow using maps, returning new objects for reactivity
+    const _workflows = workflowsList.map((wf) => ({
+        ...wf,
+        nodes: wf.nodes.map((node) => {
             switch (node.type) {
                 case 'CI':
-                    node.status = ciMap[node.id]?.status
-                    node.storageConfigured = ciMap[node.id]?.storageConfigured
-                    break
+                    return {
+                        ...node,
+                        status: ciMap[node.id]?.status,
+                        storageConfigured: ciMap[node.id]?.storageConfigured,
+                    }
                 case 'PRECD':
-                    node.status = preCDMap[node.id]
-                    break
+                    return {
+                        ...node,
+                        status: preCDMap[node.id],
+                    }
                 case 'POSTCD':
-                    node.status = postCDMap[node.id]
-                    break
+                    return {
+                        ...node,
+                        status: postCDMap[node.id],
+                    }
                 case 'CD':
-                    node.status = cdMap[node.id]
-                    break
+                    return {
+                        ...node,
+                        status: cdMap[node.id],
+                    }
+                default:
+                    return { ...node }
             }
-            return node
         })
-        return wf
-    })
+    }))
     return { cicdInProgress, workflows: _workflows }
 }