Skip to content

Commit db45cd1

Browse files
committed
feat: Update DeployImageModal layout for improved filter visibility and responsiveness
1 parent 88b7197 commit db45cd1

File tree

2 files changed

+29
-27
lines changed

2 files changed

+29
-27
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ const DeployImageContent = ({
526526
)}
527527

528528
<div
529-
className={`flex-grow-1 dc__overflow-auto ${isPreOrPostCD && !isBulkTrigger ? 'display-grid cd-material__container-with-sidebar' : 'flexbox-col py-16 px-20'}`}
529+
className={`flex-grow-1 dc__overflow-auto ${isPreOrPostCD && !isBulkTrigger ? 'display-grid cd-material__container-with-sidebar' : 'flexbox-col flex-grow-1 h-100 py-16 px-20'}`}
530530
>
531531
{renderSidebar()}
532532

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

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -774,32 +774,34 @@ const DeployImageModal = ({
774774
onClick={stopPropagation}
775775
>
776776
<div className="flexbox-col dc__overflow-auto flex-grow-1">
777-
<DeployImageHeader
778-
handleClose={handleClose}
779-
envName={envName}
780-
stageType={stageType}
781-
isRollbackTrigger={isRollbackTrigger}
782-
isVirtualEnvironment={isVirtualEnvironment}
783-
handleNavigateToMaterialListView={showConfigDiffView ? handleNavigateToListView : null}
784-
>
785-
{showConfigDiffView && selectedMaterial && (
786-
<ArtifactInfo
787-
{...getTriggerArtifactInfoProps({
788-
material: selectedMaterial,
789-
showApprovalInfoTippy:
790-
(isCDNode || isRollbackTrigger) &&
791-
isApprovalConfigured &&
792-
ApprovalInfoTippy,
793-
isRollbackTrigger,
794-
appId,
795-
pipelineId,
796-
isExceptionUser,
797-
reloadMaterials: reloadInitialData,
798-
requestedUserId,
799-
})}
800-
/>
801-
)}
802-
</DeployImageHeader>
777+
{!deployViewState.showAppliedFilters && !deployViewState.showConfiguredFilters && (
778+
<DeployImageHeader
779+
handleClose={handleClose}
780+
envName={envName}
781+
stageType={stageType}
782+
isRollbackTrigger={isRollbackTrigger}
783+
isVirtualEnvironment={isVirtualEnvironment}
784+
handleNavigateToMaterialListView={showConfigDiffView ? handleNavigateToListView : null}
785+
>
786+
{showConfigDiffView && selectedMaterial && (
787+
<ArtifactInfo
788+
{...getTriggerArtifactInfoProps({
789+
material: selectedMaterial,
790+
showApprovalInfoTippy:
791+
(isCDNode || isRollbackTrigger) &&
792+
isApprovalConfigured &&
793+
ApprovalInfoTippy,
794+
isRollbackTrigger,
795+
appId,
796+
pipelineId,
797+
isExceptionUser,
798+
reloadMaterials: reloadInitialData,
799+
requestedUserId,
800+
})}
801+
/>
802+
)}
803+
</DeployImageHeader>
804+
)}
803805

804806
<div className="flex-grow-1 dc__overflow-auto bg__tertiary w-100">{renderContent()}</div>
805807
</div>

0 commit comments

Comments
 (0)