decouple CD Trigger testing

.eslintignore

@@ -103,8 +103,6 @@ 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/__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-2",
+        "@devtron-labs/devtron-fe-common-lib": "1.19.0-beta-2",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/components/ApplicationGroup/AppGroup.types.ts

@@ -79,7 +79,7 @@ export type BulkCDDetailDerivedFromNode = Required<
     >
 > & {
     stageNotAvailable: boolean
-    warningMessage: string
+    errorMessage: string
     triggerBlockedInfo: TriggerBlockedInfo
     consequence: CommonNodeAttr['pluginBlockState']
     showPluginWarning: CommonNodeAttr['showPluginWarning']
@@ -92,6 +92,7 @@ export type BulkCDDetailType = BulkCDDetailDerivedFromNode &
          */
         areMaterialsLoading: boolean
         materialError: ServerErrors | null
+        tagsWarningMessage: string
     }
 
 export interface BulkCDDetailTypeResponse {

src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import React, { useEffect, useRef, useState } from 'react'
+import React, { useEffect, useState } from 'react'
 import { Prompt, Route, Switch, useHistory, useLocation, useParams, useRouteMatch } from 'react-router-dom'
 import Tippy from '@tippyjs/react'
 
@@ -29,7 +29,6 @@ import {
     DEFAULT_ROUTE_PROMPT_MESSAGE,
     DeploymentNodeType,
     ErrorScreenManager,
-    handleAnalyticsEvent,
     PopupMenu,
     Progressing,
     ServerErrors,
@@ -43,7 +42,8 @@ import {
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import { BuildImageModal, BulkBuildImageModal } from '@Components/app/details/triggerView/BuildImageModal'
-import { BulkDeployModal, DeployImageModal } from '@Components/app/details/triggerView/DeployImageModal'
+import CDMaterial from '@Components/app/details/triggerView/CDMaterial'
+import { BulkDeployModal } from '@Components/app/details/triggerView/DeployImageModal'
 import { shouldRenderWebhookAddImageModal } from '@Components/app/details/triggerView/TriggerView.utils'
 import { getExternalCIConfig } from '@Components/ciPipeline/Webhook/webhook.service'
 
@@ -58,7 +58,7 @@ import { TRIGGER_VIEW_PARAMS } from '../../../app/details/triggerView/Constants'
 import { CIMaterialRouterProps, MATERIAL_TYPE } from '../../../app/details/triggerView/types'
 import { Workflow } from '../../../app/details/triggerView/workflow/Workflow'
 import { triggerBranchChange } from '../../../app/service'
-import { getCDPipelineURL, importComponentFromFELibrary, sortObjectArrayAlphabetically } from '../../../common'
+import { importComponentFromFELibrary, sortObjectArrayAlphabetically } from '../../../common'
 import { getModuleInfo } from '../../../v2/devtronStackManager/DevtronStackManager.service'
 import { getWorkflows, getWorkflowStatus } from '../../AppGroup.service'
 import {
@@ -70,14 +70,12 @@ import {
 import { processWorkflowStatuses } from '../../AppGroup.utils'
 import {
     BulkResponseStatus,
-    ENV_TRIGGER_VIEW_GA_EVENTS,
     GetBranchChangeStatus,
     SKIPPED_RESOURCES_MESSAGE,
     SKIPPED_RESOURCES_STATUS_TEXT,
 } from '../../Constants'
 import BulkSourceChange from './BulkSourceChange'
-import { RenderCDMaterialContentProps } from './types'
-import { getSelectedNodeAndAppId, getSelectedNodeAndMeta } from './utils'
+import { getSelectedNodeAndAppId } from './utils'
 
 import './EnvTriggerView.scss'
 
@@ -492,7 +490,7 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
                 workflows={filteredWorkflows}
                 isVirtualEnvironment={isVirtualEnv}
                 envId={+envId}
-                handleSuccess={reloadTriggerView}
+                handleSuccess={getWorkflowStatusData}
             />
         )
     }
@@ -529,95 +527,18 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
         )
     }
 
-    const renderCDMaterialContent = ({
-        node,
-        appId,
-        workflowId,
-        selectedAppName,
-        doesWorkflowContainsWebhook,
-        ciNodeId,
-    }: RenderCDMaterialContentProps) => {
-        const configurePluginURL = getCDPipelineURL(
-            String(appId),
-            workflowId,
-            doesWorkflowContainsWebhook ? '0' : ciNodeId,
-            doesWorkflowContainsWebhook,
-            node?.id,
-            true,
-        )
-
-        const cdMaterialType = location.search.includes(TRIGGER_VIEW_PARAMS.CD_NODE)
-            ? MATERIAL_TYPE.inputMaterialList
-            : MATERIAL_TYPE.rollbackMaterialList
-
-        return (
-            <DeployImageModal
-                appId={appId}
-                envId={node?.environmentId}
-                appName={selectedAppName}
-                stageType={node.type as DeploymentNodeType}
-                envName={node?.environmentName}
-                pipelineId={+node.id}
-                materialType={cdMaterialType}
-                handleClose={revertToPreviousURL}
-                handleSuccess={getWorkflowStatusData}
-                deploymentAppType={node?.deploymentAppType}
-                isVirtualEnvironment={isVirtualEnv}
-                showPluginWarningBeforeTrigger={node?.showPluginWarning}
-                consequence={node?.pluginBlockState}
-                configurePluginURL={configurePluginURL}
-                isTriggerBlockedDueToPlugin={node?.showPluginWarning && node?.isTriggerBlocked}
-                triggerType={node?.triggerType}
-                parentEnvironmentName={node?.parentEnvironmentName}
-            />
-        )
-    }
-
-    const renderCDMaterial = (): JSX.Element | null => {
-        if (
-            location.search.includes(TRIGGER_VIEW_PARAMS.CD_NODE) ||
-            location.search.includes(TRIGGER_VIEW_PARAMS.ROLLBACK_NODE)
-        ) {
-            const { node, appId, workflowId, appName, selectedCINode } = getSelectedNodeAndMeta(
-                filteredWorkflows,
-                location.search,
-            )
-
-            if (!node?.id) {
-                return null
-            }
-
-            return renderCDMaterialContent({
-                node,
-                appId,
-                selectedAppName: appName,
-                workflowId,
-                doesWorkflowContainsWebhook: selectedCINode?.type === WorkflowNodeType.WEBHOOK,
-                ciNodeId: selectedCINode?.id,
-            })
-        }
-
-        return null
-    }
-
     const renderApprovalMaterial = () => {
         if (ApprovalMaterialModal && location.search.includes(TRIGGER_VIEW_PARAMS.APPROVAL_NODE)) {
             const { node, appId } = getSelectedNodeAndAppId(filteredWorkflows, location.search)
 
-            if (!node?.id || !appId) {
-                showError('Invalid node id')
-                return null
-            }
-
             return (
                 <ApprovalMaterialModal
-                    isLoading={false}
                     node={node ?? ({} as CommonNodeAttr)}
                     materialType={MATERIAL_TYPE.inputMaterialList}
                     stageType={DeploymentNodeType.CD}
                     closeApprovalModal={closeApprovalModal}
                     appId={appId}
-                    pipelineId={node.id}
+                    pipelineId={node?.id}
                     getModuleInfo={getModuleInfo}
                     ciPipelineId={node?.connectingCiPipelineId}
                     history={history}
@@ -831,7 +752,12 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
                         />
                     </Route>
                 </Switch>
-                {renderCDMaterial()}
+                <CDMaterial
+                    workflows={filteredWorkflows}
+                    handleClose={revertToPreviousURL}
+                    handleSuccess={getWorkflowStatusData}
+                    isTriggerView={false}
+                />
                 {renderBulkCDMaterial()}
                 {renderBulkCIMaterial()}
                 {renderApprovalMaterial()}

src/components/ApplicationGroup/Details/TriggerView/TriggerResponseModal.tsx

@@ -81,7 +81,7 @@ const TriggerResponseModalBody = ({ responseList, isLoading, isVirtualEnv }: Tri
         return <Progressing pageLoader />
     }
     return (
-        <div className="response-list-container bg__primary pr-20 pb-16 pl-20 flex-grow-1">
+        <div className="response-list-container bg__primary pr-20 pb-16 pl-20 flex-grow-1 h-100">
             <div
                 className="dc__position-sticky dc__top-0 bg__primary dc__border-bottom response-row dc__border-bottom pt-24 pb-8"
                 style={{ zIndex: 1 }}

src/components/ApplicationGroup/Details/TriggerView/types.ts

@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import { CommonNodeAttr } from '@devtron-labs/devtron-fe-common-lib'
-
 // Legacy components with no props so setting to any
 export interface BulkSourceChangeProps {
     closePopup: any
@@ -29,12 +27,3 @@ export interface SourceUpdateResponseModalProps {
     responseList: any
     isLoading: any
 }
-
-export interface RenderCDMaterialContentProps {
-    node: CommonNodeAttr
-    appId: number
-    selectedAppName: string
-    workflowId: string
-    doesWorkflowContainsWebhook: boolean
-    ciNodeId: string
-}

src/components/ApplicationGroup/Details/TriggerView/utils.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { CommonNodeAttr, DeploymentNodeType, WorkflowNodeType, WorkflowType } from '@devtron-labs/devtron-fe-common-lib'
+import { CommonNodeAttr, DeploymentNodeType, WorkflowType } from '@devtron-labs/devtron-fe-common-lib'
 
 import { DeployImageContentProps } from '@Components/app/details/triggerView/DeployImageModal/types'
 import { getNodeIdAndTypeFromSearch } from '@Components/app/details/triggerView/TriggerView.utils'
@@ -56,45 +56,6 @@ export const getSelectedAppListForBulkStrategy = (
     return appList.filter(({ pipelineId }) => feasiblePipelineIds.has(pipelineId))
 }
 
-export const getSelectedNodeAndMeta = (
-    workflows: WorkflowType[],
-    search: string,
-): { node: CommonNodeAttr; workflowId: string; appId: number; appName: string; selectedCINode: CommonNodeAttr } => {
-    const { cdNodeId, nodeType } = getNodeIdAndTypeFromSearch(search)
-
-    const result = workflows.reduce(
-        (acc, workflow) => {
-            if (acc.node) return acc
-            const foundNode = workflow.nodes.find((node) => cdNodeId === node.id && node.type === nodeType)
-
-            if (foundNode) {
-                const selectedCINode = workflow.nodes.find(
-                    (node) => node.type === WorkflowNodeType.CI || node.type === WorkflowNodeType.WEBHOOK,
-                )
-                return {
-                    node: foundNode,
-                    workflowId: workflow.id,
-                    appId: workflow.appId,
-                    appName: workflow.name,
-                    selectedCINode,
-                }
-            }
-            return acc
-        },
-        { node: undefined, workflowId: undefined, appId: undefined, appName: undefined, selectedCINode: undefined },
-    )
-
-    return (
-        result || {
-            node: undefined,
-            workflowId: undefined,
-            appId: undefined,
-            appName: undefined,
-            selectedCINode: undefined,
-        }
-    )
-}
-
 export const getSelectedNodeAndAppId = (
     workflows: WorkflowType[],
     search: string,

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

@@ -592,7 +592,6 @@ const Details: React.FC<DetailsType> = ({
                 environmentName={appDetails.environmentName}
                 isVirtualEnvironment={appDetails.isVirtualEnvironment}
                 deploymentAppType={appDetails.deploymentAppType}
-                loadingDetails={loadingDetails}
                 cdModal={{
                     cdPipelineId: appDetails.cdPipelineId,
                     ciPipelineId: appDetails.ciPipelineId,

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

@@ -34,7 +34,6 @@ const AppDetailsCDModal = ({
     cdModal,
     deploymentAppType,
     isVirtualEnvironment,
-    loadingDetails,
     environmentName,
     handleSuccess,
     materialType,
@@ -55,7 +54,6 @@ const AppDetailsCDModal = ({
         ApprovalMaterialModal &&
         location.search.includes(TRIGGER_VIEW_PARAMS.APPROVAL_NODE) && (
             <ApprovalMaterialModal
-                isLoading={loadingDetails}
                 node={node}
                 materialType={materialType}
                 stageType={DeploymentNodeType.CD}

src/components/app/details/triggerView/CDMaterial.tsx

@@ -0,0 +1,67 @@
+import { useLocation } from 'react-router-dom'
+
+import { DeploymentNodeType } from '@devtron-labs/devtron-fe-common-lib'
+
+import { getCDPipelineURL, useAppContext } from '@Components/common'
+
+import { TRIGGER_VIEW_PARAMS } from './Constants'
+import { DeployImageModal } from './DeployImageModal'
+import { getSelectedNodeFromWorkflows } from './TriggerView.utils'
+import { CDMaterialProps, MATERIAL_TYPE } from './types'
+
+const CDMaterial = ({ workflows, handleClose, handleSuccess, isTriggerView }: CDMaterialProps) => {
+    const location = useLocation()
+    const { currentAppName: triggerViewAppName } = useAppContext()
+
+    if (
+        location.search.includes(TRIGGER_VIEW_PARAMS.CD_NODE) ||
+        location.search.includes(TRIGGER_VIEW_PARAMS.ROLLBACK_NODE)
+    ) {
+        const { node: cdNode, cdNodeId } = getSelectedNodeFromWorkflows(workflows, location.search)
+
+        const materialType = location.search.includes(TRIGGER_VIEW_PARAMS.CD_NODE)
+            ? MATERIAL_TYPE.inputMaterialList
+            : MATERIAL_TYPE.rollbackMaterialList
+
+        const selectedWorkflow = workflows.find((wf) => wf.nodes.some((node) => node.id === cdNodeId))
+        const selectedCINode = selectedWorkflow?.nodes.find((node) => node.type === 'CI' || node.type === 'WEBHOOK')
+        const doesWorkflowContainsWebhook = selectedCINode?.type === 'WEBHOOK'
+
+        const appId = selectedWorkflow?.appId ?? 0
+
+        const configurePluginURL = getCDPipelineURL(
+            String(appId),
+            selectedWorkflow?.id || '0',
+            doesWorkflowContainsWebhook ? '0' : selectedCINode?.id,
+            doesWorkflowContainsWebhook,
+            cdNode.id || '0',
+            true,
+        )
+
+        return (
+            <DeployImageModal
+                materialType={materialType}
+                appId={appId}
+                envId={cdNode.environmentId}
+                appName={isTriggerView ? triggerViewAppName : selectedWorkflow?.name ?? ''}
+                stageType={cdNode.type as DeploymentNodeType}
+                envName={cdNode.environmentName}
+                pipelineId={Number(cdNodeId)}
+                handleClose={handleClose}
+                handleSuccess={handleSuccess}
+                deploymentAppType={cdNode.deploymentAppType}
+                isVirtualEnvironment={cdNode.isVirtualEnvironment}
+                showPluginWarningBeforeTrigger={cdNode.showPluginWarning}
+                consequence={cdNode.pluginBlockState}
+                configurePluginURL={configurePluginURL}
+                isTriggerBlockedDueToPlugin={cdNode.showPluginWarning && cdNode.isTriggerBlocked}
+                triggerType={cdNode.triggerType}
+                parentEnvironmentName={cdNode.parentEnvironmentName}
+            />
+        )
+    }
+
+    return null
+}
+
+export default CDMaterial

src/components/app/details/triggerView/DeployImageModal/BulkDeployEmptyState.tsx

@@ -52,7 +52,7 @@ const BulkDeployEmptyState = ({
     return (
         <GenericEmptyState
             image={emptyPreDeploy}
-            title={`${selectedApp?.appName} ${BULK_CD_MESSAGING[stageType].title}`}
+            title={`${selectedApp.appName} ${BULK_CD_MESSAGING[stageType].title}`}
             subTitle={BULK_CD_MESSAGING[stageType].subTitle}
         />
     )