Skip to content

Commit 7effa8c

Browse files
committed
fix: scoped variables un interactive if open over modal
1 parent 27b7585 commit 7effa8c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/components/CIPipelineN/CIPipeline.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,6 @@ export default function CIPipeline({
913913

914914
return (
915915
<>
916-
{renderFloatingVariablesWidget()}
917916
{(ciPipelineId || isAdvanced) && (
918917
<Drawer position="right" width="75%" minWidth="1024px" maxWidth="1200px" onEscape={handleClose}>
919918
<div className="modal__body modal__body__ci_new_ui br-0 modal__body--p-0 advanced-option-container">
@@ -939,6 +938,7 @@ export default function CIPipeline({
939938
</div>
940939
)}
941940
</div>
941+
{renderFloatingVariablesWidget()}
942942
</Drawer>
943943
)}
944944
<GenericModal

src/components/cdPipeline/CDPipeline.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,10 @@ export default function CDPipeline({
730730
environmentId: formData.environmentId,
731731
namespace: formData.namespace,
732732
id: +cdPipelineId,
733-
strategies: formData.releaseMode === ReleaseMode.MIGRATE_EXTERNAL_APPS && formData.isCustomChart ? [] : formData.savedStrategies,
733+
strategies:
734+
formData.releaseMode === ReleaseMode.MIGRATE_EXTERNAL_APPS && formData.isCustomChart
735+
? []
736+
: formData.savedStrategies,
734737
parentPipelineType,
735738
parentPipelineId: +parentPipelineId,
736739
isClusterCdActive: formData.isClusterCdActive,
@@ -1504,6 +1507,7 @@ export default function CDPipeline({
15041507
envId={formData.environmentId}
15051508
/>
15061509
)}
1510+
{(cdPipelineId || isAdvanced) && renderFloatingVariablesWidget()}
15071511
</div>
15081512
)
15091513
}
@@ -1533,13 +1537,9 @@ export default function CDPipeline({
15331537
}
15341538

15351539
return cdPipelineId || isAdvanced ? (
1536-
<>
1537-
{renderFloatingVariablesWidget()}
1538-
1539-
<Drawer onEscape={closePipelineModal} position="right" width="75%" minWidth="1024px" maxWidth="1200px">
1540-
{renderCDPipelineModal()}
1541-
</Drawer>
1542-
</>
1540+
<Drawer onEscape={closePipelineModal} position="right" width="75%" minWidth="1024px" maxWidth="1200px">
1541+
{renderCDPipelineModal()}
1542+
</Drawer>
15431543
) : (
15441544
<VisibleModal className="">{renderCDPipelineModal()}</VisibleModal>
15451545
)

0 commit comments

Comments
 (0)