Merge pull request #2850 from devtron-labs/fix/cd-trigger

feat: remove duplication between EnvTrigger and TriggerView regarding Deploy and Bulk Deploy

Author: AbhishekA1509

.eslintignore

@@ -102,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

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.19.0-pre-4",
+        "@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",

src/components/ApplicationGroup/AppGroup.types.ts

@@ -14,33 +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 { GitInfoMaterialProps } from '@Components/app/details/triggerView/BuildImageModal/types'
-import { CDMaterialProps, RuntimeParamsErrorState } from '@Components/app/details/triggerView/types'
+import { DeployImageContentProps } from '@Components/app/details/triggerView/DeployImageModal/types'
 import {
     AppConfigState,
     EnvConfigurationsNavProps,
@@ -72,35 +66,40 @@ export interface BulkCIDetailType extends BulkTriggerAppDetailType {
     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'>> {
-    workFlowId: string
-    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
@@ -122,45 +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 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[]
@@ -194,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
       }
 
@@ -216,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 }
 }