@@ -35,7 +35,11 @@ export default function AdvancedConfigOptions({
35
35
const [ selectedTargetPlatforms , setSelectedTargetPlatforms ] = useState < OptionType [ ] > ( [ ] )
36
36
const [ showCustomPlatformWarning , setShowCustomPlatformWarning ] = useState < boolean > ( false )
37
37
38
- const isGlobalAndNotBuildpack = ! allowOverride && parentState . ciConfig ?. ciBuildConfig . ciBuildType !== CIBuildType . BUILDPACK_BUILD_TYPE
38
+ const isGlobalAndNotBuildpack =
39
+ ! allowOverride && parentState . ciConfig ?. ciBuildConfig . ciBuildType !== CIBuildType . BUILDPACK_BUILD_TYPE
40
+ const isCurrentCITypeBuildpack = parentState . currentCIBuildType === CIBuildType . BUILDPACK_BUILD_TYPE
41
+ const hasParentLoaded = parentState ?. loadingState === ComponentStates . loaded
42
+ const showNonBuildpackOptions = hasParentLoaded && ( isGlobalAndNotBuildpack || ! isCurrentCITypeBuildpack )
39
43
40
44
useEffect ( ( ) => {
41
45
if ( parentState . ciConfig ) {
@@ -184,33 +188,35 @@ export default function AdvancedConfigOptions({
184
188
setLoadingStateFromParent = { setLoadingState }
185
189
/>
186
190
187
- { parentState ?. loadingState === ComponentStates . loaded &&
188
- ( isGlobalAndNotBuildpack || parentState . currentCIBuildType !== CIBuildType . BUILDPACK_BUILD_TYPE ) && (
189
- < >
190
- < div className = "white-card white-card__docker-config dc__position-rel mb-15" >
191
- < TargetPlatformSelector
192
- allowOverride = { allowOverride }
193
- selectedTargetPlatforms = { selectedTargetPlatforms }
194
- setSelectedTargetPlatforms = { setSelectedTargetPlatforms }
195
- showCustomPlatformWarning = { showCustomPlatformWarning }
196
- setShowCustomPlatformWarning = { setShowCustomPlatformWarning }
197
- targetPlatformMap = { targetPlatformMap }
198
- targetPlatform = { targetPlatforms }
199
- configOverrideView = { true }
200
- updateDockerConfigOverride = { updateDockerConfigOverride }
201
- />
202
- </ div >
203
- < CustomImageTags
204
- savedTagPattern = { parentState . selectedCIPipeline . customTag ?. tagPattern }
205
- formData = { formData }
206
- setFormData = { setFormData }
207
- formDataErrorObj = { formDataErrorObj }
208
- setFormDataErrorObj = { setFormDataErrorObj }
209
- />
210
-
211
- < DockerArgs args = { formData . args } handleDockerArgsUpdate = { handleDockerArgsUpdate } />
212
- </ >
213
- ) }
191
+ { showNonBuildpackOptions && (
192
+ < div className = "white-card white-card__docker-config dc__position-rel mb-15" >
193
+ < TargetPlatformSelector
194
+ allowOverride = { allowOverride }
195
+ selectedTargetPlatforms = { selectedTargetPlatforms }
196
+ setSelectedTargetPlatforms = { setSelectedTargetPlatforms }
197
+ showCustomPlatformWarning = { showCustomPlatformWarning }
198
+ setShowCustomPlatformWarning = { setShowCustomPlatformWarning }
199
+ targetPlatformMap = { targetPlatformMap }
200
+ targetPlatform = { targetPlatforms }
201
+ configOverrideView = { true }
202
+ updateDockerConfigOverride = { updateDockerConfigOverride }
203
+ />
204
+ </ div >
205
+ ) }
206
+
207
+ { hasParentLoaded && (
208
+ < CustomImageTags
209
+ savedTagPattern = { parentState . selectedCIPipeline . customTag ?. tagPattern }
210
+ formData = { formData }
211
+ setFormData = { setFormData }
212
+ formDataErrorObj = { formDataErrorObj }
213
+ setFormDataErrorObj = { setFormDataErrorObj }
214
+ />
215
+ ) }
216
+
217
+ { showNonBuildpackOptions && (
218
+ < DockerArgs args = { formData . args } handleDockerArgsUpdate = { handleDockerArgsUpdate } />
219
+ ) }
214
220
</ div >
215
221
</ div >
216
222
)
0 commit comments