fix for node delete in case of env filter

Author: vivek-devtron

src/components/app/details/appConfig/AppConfig.tsx

@@ -89,7 +89,7 @@ export default function AppConfig({ appName, isJobView, filteredEnvIds }: AppCon
     useEffect(() => {
         Promise.all([
             getAppConfigStatus(+appId, isJobView),
-            getWorkflowList(appId, filteredEnvIds),
+            getWorkflowList(appId),
             getAppOtherEnvironmentMin(appId),
             typeof getConfigProtections === 'function' && !isJobView
                 ? getConfigProtections(Number(appId))

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

@@ -417,6 +417,7 @@ export interface Tree {
     componentId: number
     parentId: number
     parentType: PipelineType
+    isLast?: boolean
 }
 
 export interface Workflow {

src/components/app/details/triggerView/workflow.service.ts

@@ -193,7 +193,7 @@ export function processWorkflow(
                             cdPipeline.parentPipelineType = branch.parentType
                         }
 
-                        const cdNode = cdPipelineToNode(cdPipeline, dimensions, branch.parentId)
+                        const cdNode = cdPipelineToNode(cdPipeline, dimensions, branch.parentId, branch.isLast??false)
                         wf.nodes.push(cdNode)
 
                         if (cdPipeline.userApprovalConfig?.requiredCount > 0) {
@@ -498,7 +498,7 @@ function webhookToNode(webhookDetails: WebhookDetailsType, dimensions: WorkflowD
     } as NodeAttr
 }
 
-function cdPipelineToNode(cdPipeline: CdPipeline, dimensions: WorkflowDimensions, parentId: number): NodeAttr {
+function cdPipelineToNode(cdPipeline: CdPipeline, dimensions: WorkflowDimensions, parentId: number, isLast: boolean): NodeAttr {
     let trigger = cdPipeline.triggerType?.toLowerCase() ?? ''
     let preCD: NodeAttr | undefined = undefined,
         postCD: NodeAttr | undefined = undefined
@@ -575,6 +575,7 @@ function cdPipelineToNode(cdPipeline: CdPipeline, dimensions: WorkflowDimensions
         isVirtualEnvironment: cdPipeline.isVirtualEnvironment,
         deploymentAppType: cdPipeline.deploymentAppType,
         helmPackageName: cdPipeline?.helmPackageName || '',
+        isLast: isLast
     } as NodeAttr
     stageIndex++
 

src/components/cdPipeline/NewCDPipeline.tsx

@@ -68,6 +68,7 @@ export default function NewCDPipeline({
     getWorkflows,
     refreshParentWorkflows,
     envIds,
+    isLastNode
 }) {
     const isCdPipeline = true
     const urlParams = new URLSearchParams(location.search)
@@ -706,7 +707,7 @@ export default function NewCDPipeline({
         const request = responseCode()
 
         const _form = { ...formData }
-        
+
         let promise = cdPipelineId ? updateCDPipeline(request) : saveCDPipeline(request)
         promise
             .then((response) => {
@@ -897,9 +898,9 @@ export default function NewCDPipeline({
 
     const renderSecondaryButton = () => {
         if (cdPipelineId) {
-            let canDeletePipeline = downstreamNodeSize === 0
-            let message =
-                downstreamNodeSize > 0 ? 'This Pipeline cannot be deleted as it has connected CD pipeline' : ''
+            const canDeletePipeline = isLastNode //?? downstreamNodeSize === 0
+            const message =
+                !canDeletePipeline ? 'This Pipeline cannot be deleted as it has connected CD pipeline' : ''
             return (
                 <ConditionalWrap
                     condition={!canDeletePipeline}
@@ -1060,7 +1061,7 @@ export default function NewCDPipeline({
         } else {
             title = CREATE_DEPLOYMENT_PIPELINE;
         }
-        
+
         return (
             <div
                 className={`modal__body modal__body__ci_new_ui br-0 modal__body--p-0 ${

src/components/workflowEditor/workflowEditor.tsx

@@ -171,14 +171,17 @@ class WorkflowEdit extends Component<WorkflowEditProps, WorkflowEditState> {
     }
 
     toggleCIMenu = (event) => {
-        const { top, left } = event.target.getBoundingClientRect()
-        this.setState({
-            cIMenuPosition: {
-                top: top,
-                left: left,
-            },
-            showCIMenu: !this.state.showCIMenu,
-        })
+      if (this.props.filteredEnvIds) {
+          return
+      }
+      const { top, left } = event.target.getBoundingClientRect()
+      this.setState({
+          cIMenuPosition: {
+              top: top,
+              left: left,
+          },
+          showCIMenu: !this.state.showCIMenu,
+      })
     }
 
     deleteWorkflow = (appId?: string, workflowId?: number) => {
@@ -361,6 +364,7 @@ class WorkflowEdit extends Component<WorkflowEditProps, WorkflowEditState> {
                                     getWorkflows={this.getWorkflows}
                                     refreshParentWorkflows={this.props.getWorkflows}
                                     envIds={this.state.envIds}
+                                    isLastNode={cdNode['isLast']}
                                 />
                             )
                         }}
@@ -438,10 +442,9 @@ class WorkflowEdit extends Component<WorkflowEditProps, WorkflowEditState> {
             <>
                 <button
                     type="button"
-                    className="cta dc__no-decor flex mb-20"
+                    className={`cta dc__no-decor flex mb-20 ${this.props.filteredEnvIds ? 'dc__disabled' : ''}`}
                     data-testid="new-workflow-button"
                     onClick={this.toggleCIMenu}
-                    disabled={!!this.props.filteredEnvIds}
                 >
                     <img src={add} alt="add-worflow" className="icon-dim-18 mr-5" />
                     New workflow

src/css/base.scss

@@ -3658,6 +3658,6 @@ textarea::placeholder {
 }
 
 .dc__disabled {
-  cursor: not-allowed;
+  cursor: not-allowed !important;
   opacity: 0.5;
 }