Merge pull request #1770 from devtron-labs/fix/pre-build

fix: add key to component & open InputVariables in pre/post build modal
devtron-labs · May 21, 2024 · 3804c4f · 3804c4f
2 parents 694eca0 + 7d54f4d
commit 3804c4f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/CIPipelineN/PreBuild.tsx b/src/components/CIPipelineN/PreBuild.tsx
@@ -19,7 +19,7 @@ import { importComponentFromFELibrary } from '../common'
 import { pipelineContext } from '../workflowEditor/workflowEditor'
 
 const isRequired = importComponentFromFELibrary('isRequired', null, 'function')
-export function PreBuild({ presetPlugins, sharedPlugins, mandatoryPluginsMap, isJobView }: PreBuildType) {
+export const PreBuild: React.FC<PreBuildType> = ({ presetPlugins, sharedPlugins, mandatoryPluginsMap, isJobView }) => {
     const {
         formData,
         isCdPipeline,
@@ -223,5 +223,5 @@ export function PreBuild({ presetPlugins, sharedPlugins, mandatoryPluginsMap, is
         )
     }
 
-    return renderComponent()
+    return <React.Fragment key={activeStageName}>{renderComponent()}</React.Fragment>
 }
diff --git a/src/components/CIPipelineN/VariableContainer.tsx b/src/components/CIPipelineN/VariableContainer.tsx
@@ -7,7 +7,7 @@ import { ReactComponent as AlertTriangle } from '../../assets/icons/ic-alert-tri
 import { pipelineContext } from '../workflowEditor/workflowEditor'
 
 export const VariableContainer = ({ type }: { type: PluginVariableType }) => {
-    const [collapsedSection, setCollapsedSection] = useState<boolean>(true)
+    const [collapsedSection, setCollapsedSection] = useState<boolean>(type !== PluginVariableType.INPUT)
     const { formData, selectedTaskIndex, activeStageName, formDataErrorObj } = useContext(pipelineContext)
     const variableLength =
         formData[activeStageName].steps[selectedTaskIndex].pluginRefStepDetail[