fix: rollback and deploy modal opening together

Author: arunjaindev

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

@@ -74,7 +74,7 @@ import { BulkCDDetailType, BulkCDTriggerType } from '../../AppGroup.types'
 import { BULK_CD_DEPLOYMENT_STATUS, BULK_CD_MATERIAL_STATUS, BULK_CD_MESSAGING, BUTTON_TITLE } from '../../Constants'
 import { BULK_ERROR_MESSAGES } from './constants'
 import TriggerResponseModalBody, { TriggerResponseModalFooter } from './TriggerResponseModal'
-import { getIsImageApprovedByDeployerSelected, getIsNonApprovedImageSelected } from './utils'
+import { getIsImageApprovedByDeployerSelected, getIsNonApprovedImageSelected, getSelectedAppListForBulkStrategy } from './utils'
 
 const DeploymentWindowInfoBar = importComponentFromFELibrary('DeploymentWindowInfoBar')
 const BulkDeployResistanceTippy = importComponentFromFELibrary('BulkDeployResistanceTippy')
@@ -991,8 +991,6 @@ const BulkCDTrigger = ({
         )
     }
 
-    console.log(appList)
-
     return (
         <Drawer position="right" width="75%" minWidth="1024px" maxWidth="1200px">
             <div className="bg__primary bulk-ci-trigger-container">
@@ -1004,7 +1002,7 @@ const BulkCDTrigger = ({
                         bulkDeploymentStrategy={bulkDeploymentStrategy}
                         pipelineIdVsStrategyMap={pipelineIdVsStrategyMap}
                         setPipelineIdVsStrategyMap={setPipelineIdVsStrategyMap}
-                        appList={appList.map((app) => ({ pipelineId: +app.cdPipelineId, appName: app.name }))}
+                        appList={getSelectedAppListForBulkStrategy(appList)}
                     />
                 ) : (
                     <>

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

@@ -45,3 +45,6 @@ export const getIsImageApprovedByDeployerSelected = (appList: BulkCDDetailType[]
                 material.userApprovalMetadata?.hasCurrentUserApproved,
         )
     })
+
+export const getSelectedAppListForBulkStrategy = (appList: BulkCDDetailType[]) =>
+    appList.map((app) => ({ pipelineId: +app.cdPipelineId, appName: app.name }))

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

@@ -62,12 +62,14 @@ const AppDetailsCDButton = ({
     const location = useLocation()
     const queryParams = new URLSearchParams(location.search)
     const mode = queryParams.get('mode')
+    const materialType = queryParams.get('materialType')
 
     const onClickDeployButton = (event) => {
         stopPropagation(event)
         const newParams = {
             ...searchParams,
             mode: URL_PARAM_MODE_TYPE.LIST,
+            materialType: isForRollback ? MATERIAL_TYPE.rollbackMaterialList : MATERIAL_TYPE.inputMaterialList,
         }
 
         history.push({
@@ -114,8 +116,6 @@ const AppDetailsCDButton = ({
         isVirtualEnvironment,
     }
 
-    const materialType = isForRollback ? MATERIAL_TYPE.rollbackMaterialList : MATERIAL_TYPE.inputMaterialList
-
     const renderApprovalMaterial = () =>
         ApprovalMaterialModal &&
         location.search.includes(TRIGGER_VIEW_PARAMS.APPROVAL_NODE) && (