Merge branch 'fix/bulk-cd' of https://github.com/devtron-labs/dashboard into fix/build-deploy-trigger

arunjaindev · arunjaindev · commit e10a7c3b9fbb · 2025-08-07T14:34:25.000+05:30
diff --git a/src/components/app/details/triggerView/DeployImageModal/BulkDeployModal.tsx b/src/components/app/details/triggerView/DeployImageModal/BulkDeployModal.tsx
@@ -243,6 +243,7 @@ const BulkDeployModal = ({
             ...prev,
             [selectedAppId]: {
                 ...prev[selectedAppId],
+                materialResponse: response[selectedAppId]?.materialResponse,
                 warningMessage,
                 materialError,
                 deploymentWindowMetadata,
@@ -258,6 +259,10 @@ const BulkDeployModal = ({
         }))
     }
 
+    const reloadMaterials = async () => {
+        await reloadOrSearchSelectedApp()
+    }
+
     const handleLoadOlderImages = async () => {
         try {
             // Even if user changes selectedAppId this will persist since a state closure
@@ -459,29 +464,31 @@ const BulkDeployModal = ({
     const handleTagChange: DeployImageContentProps['handleTagChange'] = (tagOption) => {
         setSelectedImageTagOption(tagOption)
 
-        const selectedApp = appInfoMap[selectedAppId]
-        const updatedMaterials = getUpdatedMaterialsForTagSelection(
-            tagOption.value,
-            selectedApp.materialResponse?.materials || [],
-        )
-        const { tagsWarning, updatedMaterials: newMaterials } = updatedMaterials
+        setAppInfoMap((prev) => {
+            const updatedAppInfoMap = structuredClone(prev)
+            Object.values(updatedAppInfoMap).forEach((appDetails) => {
+                const { tagsWarning, updatedMaterials } = getUpdatedMaterialsForTagSelection(
+                    tagOption.value,
+                    appDetails.materialResponse?.materials || [],
+                )
 
-        const { tagsWarning: previousTagWarning } = getUpdatedMaterialsForTagSelection(
-            selectedImageTagOption.value,
-            selectedApp.materialResponse?.materials || [],
-        )
+                const { tagsWarning: previousTagWarning } = getUpdatedMaterialsForTagSelection(
+                    selectedImageTagOption.value,
+                    appDetails.materialResponse?.materials || [],
+                )
 
-        setAppInfoMap((prev) => ({
-            ...prev,
-            [selectedAppId]: {
-                ...prev[selectedAppId],
-                materialResponse: {
-                    ...prev[selectedAppId].materialResponse,
-                    materials: newMaterials,
-                },
-                warningMessage: previousTagWarning ? tagsWarning : prev[selectedAppId].warningMessage,
-            },
-        }))
+                updatedAppInfoMap[appDetails.appId] = {
+                    ...appDetails,
+                    materialResponse: {
+                        ...appDetails.materialResponse,
+                        materials: updatedMaterials,
+                    },
+                    warningMessage:
+                        previousTagWarning || !appDetails.warningMessage ? tagsWarning : appDetails.warningMessage,
+                }
+            })
+            return updatedAppInfoMap
+        })
     }
 
     const changeApp: DeployImageContentProps['changeApp'] = (appId) => {
@@ -614,7 +621,7 @@ const BulkDeployModal = ({
                 appName={appName}
                 isSecurityModuleInstalled={isSecurityModuleInstalled}
                 envName={envName}
-                reloadMaterials={reloadOrSearchSelectedApp}
+                reloadMaterials={reloadMaterials}
                 parentEnvironmentName={parentEnvironmentName}
                 isVirtualEnvironment={isVirtualEnvironment}
                 loadOlderImages={handleLoadOlderImages}
diff --git a/src/components/app/details/triggerView/DeployImageModal/BulkTriggerSidebar.tsx b/src/components/app/details/triggerView/DeployImageModal/BulkTriggerSidebar.tsx
@@ -66,6 +66,14 @@ const BulkTriggerSidebar = ({
                 return false
             }
 
+            if (selectedTagName === BULK_DEPLOY_ACTIVE_IMAGE_TAG.value) {
+                return !(selectedImage.deployed && selectedImage.latest)
+            }
+
+            if (selectedTagName === BULK_DEPLOY_LATEST_IMAGE_TAG.value) {
+                return selectedImage.index !== 0
+            }
+
             return !selectedImage.imageReleaseTags?.some((tagDetails) => tagDetails.tagName === selectedTagName)
         })
 
diff --git a/src/components/app/details/triggerView/DeployImageModal/DeployImageContent.tsx b/src/components/app/details/triggerView/DeployImageModal/DeployImageContent.tsx
@@ -518,6 +518,32 @@ const DeployImageContent = ({
             )
         })
 
+    const renderMaterialListEmptyState = () => (
+        <div className="flexbox-col flex-grow-1 dc__overflow-auto h-100">
+            <MaterialListEmptyState
+                isRollbackTrigger={isRollbackTrigger}
+                stageType={stageType}
+                appId={appId}
+                isSearchApplied={isSearchApplied}
+                policyConsequences={policyConsequences}
+                isTriggerBlockedDueToPlugin={isTriggerBlockedDueToPlugin}
+                configurePluginURL={configurePluginURL}
+                isConsumedImagePresent={consumedImage.length > 0}
+                envName={envName}
+                materialResponse={materialResponse}
+                isExceptionUser={isExceptionUser}
+                isLoadingMore={isLoadingOlderImages}
+                viewAllImages={viewAllImages}
+                triggerType={triggerType}
+                loadOlderImages={loadOlderImages}
+                onSearchApply={onSearchApply}
+                eligibleImagesCount={eligibleImagesCount}
+                handleEnableFiltersView={handleShowConfiguredFilters}
+                handleAllImagesView={handleAllImagesView}
+            />
+        </div>
+    )
+
     const renderContent = () => {
         if (isBulkTrigger) {
             if (showFiltersView) {
@@ -599,33 +625,9 @@ const DeployImageContent = ({
                         </div>
                     </div>
 
-                    {materialList.length === 0 ? (
-                        <div className="flexbox-col flex-grow-1 dc__overflow-auto h-100">
-                            <MaterialListEmptyState
-                                isRollbackTrigger={isRollbackTrigger}
-                                stageType={stageType}
-                                appId={appId}
-                                isSearchApplied={isSearchApplied}
-                                policyConsequences={policyConsequences}
-                                isTriggerBlockedDueToPlugin={isTriggerBlockedDueToPlugin}
-                                configurePluginURL={configurePluginURL}
-                                isConsumedImagePresent={consumedImage.length > 0}
-                                envName={envName}
-                                materialResponse={materialResponse}
-                                isExceptionUser={isExceptionUser}
-                                isLoadingMore={isLoadingOlderImages}
-                                viewAllImages={viewAllImages}
-                                triggerType={triggerType}
-                                loadOlderImages={loadOlderImages}
-                                onSearchApply={onSearchApply}
-                                eligibleImagesCount={eligibleImagesCount}
-                                handleEnableFiltersView={handleShowConfiguredFilters}
-                                handleAllImagesView={handleAllImagesView}
-                            />
-                        </div>
-                    ) : (
-                        renderMaterialList(materialList, false)
-                    )}
+                    {materialList.length === 0
+                        ? renderMaterialListEmptyState()
+                        : renderMaterialList(materialList, false)}
 
                     {!areNoMoreImagesPresent && !!materialList?.length && (
                         <button
@@ -659,6 +661,10 @@ const DeployImageContent = ({
         return renderConfiguredFilters()
     }
 
+    if (materials.length === 0 && !isBulkTrigger) {
+        return renderMaterialListEmptyState()
+    }
+
     return (
         <>
             {!showFiltersView &&
@@ -687,7 +693,11 @@ const DeployImageContent = ({
                 className={`flex-grow-1 dc__overflow-auto h-100 ${isPreOrPostCD || isBulkTrigger ? 'display-grid cd-material__container-with-sidebar' : 'flexbox-col flex-grow-1'}`}
             >
                 {renderSidebar()}
-                <div className="flexbox-col py-16 px-20 dc__overflow-auto flex-grow-1">{renderContent()}</div>
+                <div
+                    className={`flexbox-col dc__overflow-auto flex-grow-1 ${isBulkTrigger && showFiltersView ? '' : 'py-16 px-20 '}`}
+                >
+                    {renderContent()}
+                </div>
             </div>
         </>
     )
diff --git a/src/components/app/details/triggerView/DeployImageModal/DeployImageModal.tsx b/src/components/app/details/triggerView/DeployImageModal/DeployImageModal.tsx
@@ -130,6 +130,7 @@ const DeployImageModal = ({
                     initialSearch: searchImageTag,
                 }),
             [searchImageTag],
+            !isTriggerBlockedDueToPlugin,
         )
 
     const [, moduleInfoRes] = useAsync(() => getModuleInfo(ModuleNameMap.SECURITY))
diff --git a/src/components/app/details/triggerView/DeployImageModal/MaterialListEmptyState.tsx b/src/components/app/details/triggerView/DeployImageModal/MaterialListEmptyState.tsx
@@ -42,7 +42,7 @@ const MaterialListEmptyState = ({
     const isApprovalConfigured = getIsApprovalPolicyConfigured(
         materialResponse?.deploymentApprovalInfo?.approvalConfigData,
     )
-    const areNoMoreImagesPresent = materialResponse && materialResponse.materials.length >= materialResponse.totalCount
+    const areNoMoreImagesPresent = materialResponse && material.length >= materialResponse.totalCount
     const resourceFilters = materialResponse?.resourceFilters ?? []
 
     const clearSearch = () => {
diff --git a/src/components/app/details/triggerView/DeployImageModal/utils.tsx b/src/components/app/details/triggerView/DeployImageModal/utils.tsx
@@ -520,7 +520,7 @@ export const getBulkCDDetailsMapFromResponse: GetBulkCDDetailsMapFromResponseTyp
     cdMaterialResponseList.forEach((materialResponse, index) => {
         const { appId } = validWorkflows[index]
 
-        if (materialResponse.status === PromiseAllStatusType.FULFILLED) {
+        if (materialResponse.status === PromiseAllStatusType.FULFILLED && materialResponse.value) {
             const { tagsWarning, updatedMaterials } = getUpdatedMaterialsForTagSelection(
                 selectedTagName,
                 materialResponse.value.materials,
@@ -552,7 +552,8 @@ export const getBulkCDDetailsMapFromResponse: GetBulkCDDetailsMapFromResponseTyp
                 materialResponse: {} as CDMaterialResponseType,
                 deploymentWindowMetadata: {} as DeploymentWindowProfileMetaData,
                 deployViewState: structuredClone(INITIAL_DEPLOY_VIEW_STATE),
-                materialError: materialResponse.reason,
+                materialError:
+                    materialResponse.status === PromiseAllStatusType.REJECTED ? materialResponse.reason : null,
                 areMaterialsLoading: false,
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,7 @@ const DeployImageModal = ({`
`130`	`130`	`initialSearch: searchImageTag,`
`131`	`131`	`}),`
`132`	`132`	`[searchImageTag],`
	`133`	`+ !isTriggerBlockedDueToPlugin,`
`133`	`134`	`)`
`134`	`135`
`135`	`136`	`const [, moduleInfoRes] = useAsync(() => getModuleInfo(ModuleNameMap.SECURITY))`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ const MaterialListEmptyState = ({`
`42`	`42`	`const isApprovalConfigured = getIsApprovalPolicyConfigured(`
`43`	`43`	`materialResponse?.deploymentApprovalInfo?.approvalConfigData,`
`44`	`44`	`)`
`45`		`- const areNoMoreImagesPresent = materialResponse && materialResponse.materials.length >= materialResponse.totalCount`
	`45`	`+ const areNoMoreImagesPresent = materialResponse && material.length >= materialResponse.totalCount`
`46`	`46`	`const resourceFilters = materialResponse?.resourceFilters ?? []`
`47`	`47`
`48`	`48`	`const clearSearch = () => {`