Merge pull request #2949 from devtron-labs/fix/scoped-variables-interaction

fix: scoped variables un interactive if open over modal

Author: arunjaindev

src/components/CIPipelineN/CIPipeline.tsx

@@ -913,7 +913,6 @@ export default function CIPipeline({
 
     return (
         <>
-            {renderFloatingVariablesWidget()}
             {(ciPipelineId || isAdvanced) && (
                 <Drawer position="right" width="75%" minWidth="1024px" maxWidth="1200px" onEscape={handleClose}>
                     <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({
                             </div>
                         )}
                     </div>
+                    {renderFloatingVariablesWidget()}
                 </Drawer>
             )}
             <GenericModal

src/components/cdPipeline/CDPipeline.tsx

@@ -730,7 +730,10 @@ export default function CDPipeline({
             environmentId: formData.environmentId,
             namespace: formData.namespace,
             id: +cdPipelineId,
-            strategies: formData.releaseMode === ReleaseMode.MIGRATE_EXTERNAL_APPS && formData.isCustomChart ? [] : formData.savedStrategies,
+            strategies:
+                formData.releaseMode === ReleaseMode.MIGRATE_EXTERNAL_APPS && formData.isCustomChart
+                    ? []
+                    : formData.savedStrategies,
             parentPipelineType,
             parentPipelineId: +parentPipelineId,
             isClusterCdActive: formData.isClusterCdActive,
@@ -1504,6 +1507,7 @@ export default function CDPipeline({
                         envId={formData.environmentId}
                     />
                 )}
+                {(cdPipelineId || isAdvanced) && renderFloatingVariablesWidget()}
             </div>
         )
     }
@@ -1533,13 +1537,9 @@ export default function CDPipeline({
     }
 
     return cdPipelineId || isAdvanced ? (
-        <>
-            {renderFloatingVariablesWidget()}
-
-            <Drawer onEscape={closePipelineModal} position="right" width="75%" minWidth="1024px" maxWidth="1200px">
-                {renderCDPipelineModal()}
-            </Drawer>
-        </>
+        <Drawer onEscape={closePipelineModal} position="right" width="75%" minWidth="1024px" maxWidth="1200px">
+            {renderCDPipelineModal()}
+        </Drawer>
     ) : (
         <VisibleModal className="">{renderCDPipelineModal()}</VisibleModal>
     )