@@ -137,7 +137,11 @@ export default function WorkloadsCreateEditPage({
137137
138138 getWorkloadCatalog ( { body : { url : '' , sub : user . sub , teamId } } ) . then ( ( res : any ) => {
139139 const { url, catalog } : { url : string ; catalog : any [ ] } = res . data
140- const item = catalog . find ( ( item ) => item . name === catalogName )
140+ let item = null
141+
142+ if ( workload ?. spec ?. path ) item = catalog . find ( ( c ) => c . name === workload . spec . path )
143+ else if ( catalogName ) item = catalog . find ( ( c ) => c . name === catalogName )
144+
141145 if ( ! item ) return
142146
143147 const {
@@ -162,10 +166,6 @@ export default function WorkloadsCreateEditPage({
162166 typeof valuesData === 'string' ? valuesData : YAML . stringify ( valuesData ?? { } ) ,
163167 )
164168
165- useEffect ( ( ) => {
166- if ( workload ) console . log ( 'halo raw values' , workload )
167- } , [ workload ] )
168-
169169 useEffect ( ( ) => {
170170 setWorkloadValuesYaml ( typeof valuesData === 'string' ? valuesData : YAML . stringify ( valuesData ?? { } ) )
171171 } , [ workloadData , valuesData ] )
@@ -180,9 +180,9 @@ export default function WorkloadsCreateEditPage({
180180 const mutating = isLoadingDWL || isCreating || isUpdating
181181 if ( ! mutating && isSuccessDWL ) return < Redirect to = { `/teams/${ teamId } /workloads` } />
182182
183- const icon = workloadData ?. spec ?. icon || catalogItem . icon
183+ const icon = workloadData ?. spec ?. icon || catalogItem . icon || '/logos/akamai_logo.svg'
184184 const headerName = workloadData ?. metadata ?. name || catalogItem . name
185- const headerPath = workloadData ?. spec ?. path || catalogItem . path
185+ const headerPath = workloadData ?. spec ?. path || catalogItem . path || 'custom'
186186
187187 // ---- Auto image updater state ----
188188 type AutoUpdaterType = 'disabled' | 'digest' | 'semver'
@@ -238,8 +238,8 @@ export default function WorkloadsCreateEditPage({
238238 const onSubmit = async ( formData : CreateAplWorkloadApiResponse ) => {
239239 const workloadBody = omit ( formData . spec , [ 'chartProvider' , 'chart' , 'revision' ] )
240240 const chartMetadata = omit ( formData . spec ?. chartMetadata , [ 'helmChartCatalog' , 'helmChart' ] )
241- const path = workloadData ?. path ?? ( formData as any ) . path
242- const url = workloadData ?. url ?? ( formData as any ) . url ?? ''
241+ const path = workloadData ?. spec ?. path ?? ( formData as any ) . path
242+ const url = workloadData ?. spec ?. url ?? ( formData as any ) . url ?? ''
243243
244244 // ---- derive imageUpdateStrategy from values.yaml if needed ----
245245 let imageUpdateStrategy = formData . spec . imageUpdateStrategy
@@ -365,33 +365,6 @@ export default function WorkloadsCreateEditPage({
365365 value = { autoUpdaterType }
366366 onChange = { handleAutoUpdaterChange }
367367 />
368- { /* {autoUpdaterType === 'digest' && (
369- <Box sx={{ mt: 3, maxWidth: 480 }}>
370- <TextField
371- label='Version'
372- width='large'
373- noMarginTop
374- placeholder='latest, feat, dev'
375- {...methods.register('spec.imageUpdateStrategy.digest.tag' as const)}
376- />
377- </Box>
378- )}
379- {autoUpdaterType === 'semver' && (
380- <Box sx={{ mt: 3, maxWidth: 480 }}>
381- <TextField
382- label='Version'
383- width='large'
384- noMarginTop
385- placeholder='1.x.x'
386- {...methods.register('spec.imageUpdateStrategy.semver.versionConstraint' as const)}
387- />
388- </Box>
389- )} */ }
390- { /* {autoUpdaterType === 'disabled' && (
391- <Box sx={{ mt: 3, maxWidth: 480 }}>
392- <TextField label='Version' width='large' noMarginTop placeholder='latest, feat, dev' disabled />
393- </Box>
394- )} */ }
395368 </ Section >
396369
397370 { /* Values editor */ }
0 commit comments