@@ -15,7 +15,12 @@ import { useApplyFleetMutation } from 'services/fleet';
1515import { DEFAULT_FLEET_INFO } from 'pages/Project/constants' ;
1616import { useYupValidationResolver } from 'pages/Project/hooks/useYupValidationResolver' ;
1717
18- import { getMaxInstancesValidator , getMinInstancesValidator , idleDurationValidator } from './FleetFormFields/constants' ;
18+ import {
19+ fleetFormDefaultValues ,
20+ getMaxInstancesValidator ,
21+ getMinInstancesValidator ,
22+ idleDurationValidator ,
23+ } from './FleetFormFields/constants' ;
1924import { FleetFormFields } from './FleetFormFields' ;
2025
2126import { IFleetWizardForm } from './types' ;
@@ -33,6 +38,7 @@ const fleetValidationSchema = yup.object({
3338 min_instances : getMinInstancesValidator ( 'max_instances' ) ,
3439 max_instances : getMaxInstancesValidator ( 'min_instances' ) ,
3540 idle_duration : idleDurationValidator ,
41+ spot_policy : yup . string ( ) . required ( requiredFieldError ) ,
3642} ) ;
3743
3844export const FleetAdd : React . FC = ( ) => {
@@ -52,17 +58,16 @@ export const FleetAdd: React.FC = () => {
5258 const formMethods = useForm < IFleetWizardForm > ( {
5359 resolver,
5460 defaultValues : {
61+ ...fleetFormDefaultValues ,
5562 project_name : paramProjectName ,
56- min_instances : 0 ,
57- idle_duration : '5m' ,
5863 } ,
5964 } ) ;
6065
6166 const { handleSubmit, control, clearErrors, trigger, watch, getValues } = formMethods ;
6267 const formValues = watch ( ) ;
6368
6469 const getFormValuesForFleetApplying = ( ) : IApplyFleetPlanRequestRequest => {
65- const { min_instances, max_instances, idle_duration, name } = getValues ( ) ;
70+ const { min_instances, max_instances, idle_duration, name, spot_policy } = getValues ( ) ;
6671
6772 return {
6873 plan : {
@@ -74,6 +79,7 @@ export const FleetAdd: React.FC = () => {
7479 ...( max_instances ? { max : max_instances } : { } ) ,
7580 } ,
7681 ...( idle_duration ? { idle_duration } : { } ) ,
82+ spot_policy,
7783 } ,
7884 profile : { } ,
7985 } ,
@@ -185,7 +191,13 @@ export const FleetAdd: React.FC = () => {
185191 } ;
186192
187193 const getDefaultFleetSummary = ( ) => {
188- const summaryFields : Array < keyof IFleetWizardForm > = [ 'name' , 'min_instances' , 'max_instances' , 'idle_duration' ] ;
194+ const summaryFields : Array < keyof IFleetWizardForm > = [
195+ 'name' ,
196+ 'min_instances' ,
197+ 'max_instances' ,
198+ 'idle_duration' ,
199+ 'spot_policy' ,
200+ ] ;
189201
190202 const result : string [ ] = [ ] ;
191203
0 commit comments