diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/BasicConfiguration/schema.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/BasicConfiguration/schema.js index 9a92ca03a3..5438d9d79e 100644 --- a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/BasicConfiguration/schema.js +++ b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/BasicConfiguration/schema.js @@ -14,6 +14,14 @@ const SHUTDOWN_ACTIONS = [ ] export const FORM_FIELDS = [ + { + name: 'registration_time', + type: INPUT_TYPES.TEXT, + htmlType: INPUT_TYPES.HIDDEN, + validation: yup + .number() + .default(undefined) + }, { name: 'name', label: 'Name', @@ -65,6 +73,12 @@ export const FORM_FIELDS = [ 'Wait for VM/containers to finish their boot process to report that they are READY and allow children tiers to spawn', type: INPUT_TYPES.CHECKBOX, validation: yup.boolean().default(false) + }, + { + name: 'automatic_deletion', + label: 'Automatic delete service if all tiers are terminated', + type: INPUT_TYPES.CHECKBOX, + validation: yup.boolean().default(false) } ] diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/schema.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/schema.js index 4f698043a9..046ffd9550 100644 --- a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/schema.js +++ b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Networking/schema.js @@ -27,7 +27,7 @@ const ID = { name: 'id', label: 'ID', type: INPUT_TYPES.TEXT, - htmlType: 'hidden', + htmlType: INPUT_TYPES.HIDDEN, validation: yup .string() .uuid() diff --git a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/fields.js b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/fields.js index 7feb5aa7ca..2260809cef 100644 --- a/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/fields.js +++ b/src/fireedge/src/client/containers/ApplicationsTemplates/Form/Create/Steps/Tiers/Steps/Policies/schemas/fields.js @@ -10,7 +10,7 @@ export const ID = { name: 'id', label: 'ID', type: INPUT_TYPES.TEXT, - htmlType: 'hidden', + htmlType: INPUT_TYPES.HIDDEN, validation: yup .string() .trim() diff --git a/src/fireedge/src/client/containers/Login/Form.js b/src/fireedge/src/client/containers/Login/Form.js index c602bd1c18..34dd3978f8 100644 --- a/src/fireedge/src/client/containers/Login/Form.js +++ b/src/fireedge/src/client/containers/Login/Form.js @@ -17,8 +17,6 @@ const Form = ({ onBack, onSubmit, resolver, fields, error, isLoading, transition const defaultValues = resolver.default() const classes = loginStyles() - console.log(defaultValues) - const { handleSubmit, setError, ...methods } = useForm({ reValidateMode: 'onSubmit', defaultValues, diff --git a/src/fireedge/src/client/utils/parser/toApplicationTemplate.js b/src/fireedge/src/client/utils/parser/toApplicationTemplate.js index addd3b276f..6d820c57bb 100644 --- a/src/fireedge/src/client/utils/parser/toApplicationTemplate.js +++ b/src/fireedge/src/client/utils/parser/toApplicationTemplate.js @@ -9,7 +9,7 @@ const mapNetworkToUserInput = network => { const mandatoryValue = mandatory ? 'M' : 'O' const descriptionValue = description ?? '' const idVnetValue = idVnet ?? '' - const extraValue = `:${extra}` ?? '' + const extraValue = `:${extra ?? ''}` return `${mandatoryValue}|network|${descriptionValue}| |${type}:${idVnetValue}${extraValue}` } @@ -28,7 +28,7 @@ const mapTiersToRoles = (tiers, networking, cluster) => return [...res, networkString] }, []) ?.join('') - ?.concat(`SCHED_REQUIREMENTS = "ClUSTER_ID="${cluster}""`) + ?.concat(`SCHED_REQUIREMENTS = "ClUSTER_ID=\\"${cluster}\\""`) const parentsValue = parents?.reduce((res, id) => { const parent = tiers.find(t => t.id === id)