@ -293,6 +293,7 @@ export class TbDeviceInstallDialogComponent extends DialogComponent<TbDeviceInst
ep . entityOutput = output ;
ep . entityOutput = output ;
ep . existingEntity = null ;
ep . existingEntity = null ;
ep . conflictType = null ;
ep . conflictType = null ;
ep . resolution = resolution ;
ep . status = 'success' ;
ep . status = 'success' ;
const alias = stepTypeAliasMap [ ep . step . type ] ;
const alias = stepTypeAliasMap [ ep . step . type ] ;
@ -565,11 +566,13 @@ export class TbDeviceInstallDialogComponent extends DialogComponent<TbDeviceInst
ws . entitySteps = ws . rawSteps . map ( s = > {
ws . entitySteps = ws . rawSteps . map ( s = > {
const alias = stepTypeAliasMap [ s . type ] ;
const alias = stepTypeAliasMap [ s . type ] ;
const output = alias ? this . entityOutputs . get ( alias ) : null ;
const output = alias ? this . entityOutputs . get ( alias ) : null ;
const storedState = this . data . installState ? . [ s . name ] || this . data . installState ? . [ this . resolveVariables ( s . name ) ] ;
return {
return {
step : s ,
step : s ,
status : 'success' as const ,
status : 'success' as const ,
resolvedName : this.resolveVariables ( s . name ) ,
resolvedName : this.resolveVariables ( s . name ) ,
entityOutput : output || undefined
entityOutput : output || undefined ,
resolution : storedState?.resolution || 'created'
} ;
} ;
} ) ;
} ) ;
ws . progressDone = true ;
ws . progressDone = true ;
@ -615,6 +618,7 @@ export class TbDeviceInstallDialogComponent extends DialogComponent<TbDeviceInst
await this . delay ( ENTITY_STEP_MIN_DELAY - elapsed ) ;
await this . delay ( ENTITY_STEP_MIN_DELAY - elapsed ) ;
}
}
ep . entityOutput = output ;
ep . entityOutput = output ;
ep . resolution = 'created' ;
ep . status = 'success' ;
ep . status = 'success' ;
const alias = stepTypeAliasMap [ ep . step . type ] ;
const alias = stepTypeAliasMap [ ep . step . type ] ;
@ -912,7 +916,7 @@ export class TbDeviceInstallDialogComponent extends DialogComponent<TbDeviceInst
} else if ( ws . type === 'progress' && ws . entitySteps ) {
} else if ( ws . type === 'progress' && ws . entitySteps ) {
for ( const ep of ws . entitySteps ) {
for ( const ep of ws . entitySteps ) {
if ( ep . status === 'success' && ep . entityOutput ) {
if ( ep . status === 'success' && ep . entityOutput ) {
state [ ep . step . name ] = { entityOutput : ep.entityOutput } ;
state [ ep . step . name ] = { entityOutput : ep.entityOutput , resolution : ep.resolution || 'created' } ;
}
}
}
}
}
}