fix: update on clicks and common functions

Author: arunjaindev

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

@@ -1503,6 +1503,8 @@ const EnvTriggerView = ({ filteredAppIds, isVirtualEnv }: AppGroupDetailDefaultT
                         onClickCDMaterial,
                         onClickRollbackMaterial,
                         reloadTriggerView,
+                        // TODO: Update below function
+                        onClickApprovalNode: () => {}
                     }}
                 >
                     {renderWorkflow()}

src/components/app/details/triggerView/Constants.ts

@@ -113,4 +113,5 @@ export const TRIGGER_VIEW_PARAMS = {
     APPROVAL_NODE: 'approval-node',
     CD_NODE: 'cd-node',
     NODE_TYPE: 'node-type',
+    ROLLBACK_NODE: 'rollback-node',
 }

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

@@ -16,7 +16,14 @@
 
 import { useLocation } from 'react-router-dom'
 
-import { DeploymentHistoryDetail, DeploymentWithConfigType } from '@devtron-labs/devtron-fe-common-lib'
+import {
+    CommonNodeAttr,
+    DeploymentHistoryDetail,
+    DeploymentNodeType,
+    DeploymentWithConfigType,
+    showError,
+    WorkflowType,
+} from '@devtron-labs/devtron-fe-common-lib'
 
 import { URLS } from '@Config/routes'
 
@@ -190,3 +197,29 @@ export const shouldRenderWebhookAddImageModal = (location: ReturnType<typeof use
         location.pathname.includes(URLS.BUILD) ||
         location.pathname.includes(URLS.LINKED_CI_DETAILS)
     )
+
+export const getSelectedNodeFromWorkflows = (workflows: WorkflowType[], search: string): CommonNodeAttr => {
+    const searchParams = new URLSearchParams(search)
+    const cdNodeId =
+        searchParams.get(TRIGGER_VIEW_PARAMS.CD_NODE) ||
+        searchParams.get(TRIGGER_VIEW_PARAMS.ROLLBACK_NODE) ||
+        searchParams.get(TRIGGER_VIEW_PARAMS.APPROVAL_NODE)
+
+    if (!cdNodeId) {
+        showError('Could not find node')
+        return {} as CommonNodeAttr
+    }
+    const nodeType = searchParams.get(TRIGGER_VIEW_PARAMS.NODE_TYPE) ?? DeploymentNodeType.CD
+
+    // Use flatMap to flatten all nodes, then find the matching node
+    const allNodes = workflows.flatMap((workflow) => workflow.nodes)
+
+    const foundNode = allNodes.find((n) => cdNodeId === n.id && n.type === nodeType)
+
+    if (foundNode) {
+        return foundNode
+    }
+
+    showError('Could not find node')
+    return {} as CommonNodeAttr
+}

src/components/app/details/triggerView/TriggerView.utils.tsx

@@ -310,7 +310,7 @@ const CDMaterial = ({
     const materialsResult: CDMaterialResponseType = responseList?.[0]
     const deploymentWindowMetadata = responseList?.[1] ?? {}
 
-    const { onClickCDMaterial } = useContext<TriggerViewContextType>(TriggerViewContext)
+    const { onClickApprovalNode } = useContext<TriggerViewContextType>(TriggerViewContext)
     const [noMoreImages, setNoMoreImages] = useState<boolean>(false)
     const [tagsEditable, setTagsEditable] = useState<boolean>(false)
     const [appReleaseTagNames, setAppReleaseTagNames] = useState<string[]>([])
@@ -662,7 +662,7 @@ const CDMaterial = ({
             })
         } else {
             closeCDModal(e)
-            onClickCDMaterial(pipelineId, DeploymentNodeType.CD, true)
+            onClickApprovalNode(pipelineId)
         }
     }
 

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

@@ -22,9 +22,10 @@ import { importComponentFromFELibrary } from '@Components/common'
 const WebhookAddImageButton = importComponentFromFELibrary('WebhookAddImageButton', null, 'function')
 
 export const TriggerViewContext = createContext<TriggerViewContextType>({
-    onClickCDMaterial: (cdNodeId, nodeType: DeploymentNodeType, isApprovalNode?: boolean, imageTag?: string) => {},
-    onClickRollbackMaterial: (cdNodeId: number, offset?: number, size?: number) => {},
+    onClickCDMaterial: (cdNodeId: number, nodeType: DeploymentNodeType) => {},
+    onClickRollbackMaterial: (cdNodeId: number) => {},
     reloadTriggerView: () => {},
+    onClickApprovalNode: (cdNodeId: number) => {},
 })
 
 export enum WorkflowDimensionType {

src/components/app/details/triggerView/config.ts

@@ -336,8 +336,9 @@ export interface WorkflowProps
 }
 
 export interface TriggerViewContextType {
-    onClickCDMaterial: (cdNodeId, nodeType: DeploymentNodeType, isApprovalNode?: boolean) => void
-    onClickRollbackMaterial: (cdNodeId: number, offset?: number, size?: number) => void
+    onClickCDMaterial: (cdNodeId: number, nodeType: DeploymentNodeType) => void
+    onClickApprovalNode: (cdNodeId: number) => void
+    onClickRollbackMaterial: (cdNodeId: number) => void
     reloadTriggerView: () => void
 }
 
@@ -381,9 +382,6 @@ export interface TriggerViewState {
     code: number
     view: string
     workflows: WorkflowType[]
-    nodeType: null | 'CI' | 'CD' | 'PRECD' | 'POSTCD' | 'APPROVAL'
-    cdNodeId: number
-    materialType: '' | 'inputMaterialList' | 'rollbackMaterialList'
     isLoading: boolean
     hostURLConfig: HostURLConfig
     workflowId: number

src/components/app/details/triggerView/types.ts

@@ -35,6 +35,7 @@ import { WorkflowProps, TriggerViewContextType } from '../types'
 import { WebhookNode } from '../../../../workflowEditor/nodes/WebhookNode'
 import { GIT_BRANCH_NOT_CONFIGURED } from '../../../../../config'
 import { TriggerViewContext } from '../config'
+import { TRIGGER_VIEW_PARAMS } from '../Constants'
 
 const ApprovalNodeEdge = importComponentFromFELibrary('ApprovalNodeEdge')
 const LinkedCDNode = importComponentFromFELibrary('LinkedCDNode')
@@ -322,7 +323,7 @@ export class Workflow extends Component<WorkflowProps> {
     onClickNodeEdge = (nodeId: number) => {
         this.context.onClickCDMaterial(nodeId, DeploymentNodeType.CD, true)
         this.props.history.push({
-            search: `approval-node=${nodeId}`,
+            search: `${TRIGGER_VIEW_PARAMS.APPROVAL_NODE}=${nodeId}`,
         })
     }