From 0e5676719dabe991efc173d78892504dfb642093 Mon Sep 17 00:00:00 2001
From: Frederick Borges <fborges@opennebula.io>
Date: Fri, 15 Jul 2022 13:26:09 +0200
Subject: [PATCH] F #5897: Improve Remote connections (#2238)

(cherry picked from commit 50c31dedceaf1027bc53917fba37df3c1d5c0aa1)
---
 .../Vm/AttachNicForm/Steps/AdvancedOptions/schema.js     | 3 ++-
 .../components/Forms/Vm/AttachNicForm/Steps/index.js     | 9 +++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/fireedge/src/client/components/Forms/Vm/AttachNicForm/Steps/AdvancedOptions/schema.js b/src/fireedge/src/client/components/Forms/Vm/AttachNicForm/Steps/AdvancedOptions/schema.js
index 3810edda60..b51daa942a 100644
--- a/src/fireedge/src/client/components/Forms/Vm/AttachNicForm/Steps/AdvancedOptions/schema.js
+++ b/src/fireedge/src/client/components/Forms/Vm/AttachNicForm/Steps/AdvancedOptions/schema.js
@@ -23,6 +23,7 @@ import {
   getObjectSchemaFromFields,
 } from 'client/utils'
 import { T, INPUT_TYPES, HYPERVISORS, VN_DRIVERS, Nic } from 'client/constants'
+import { Console } from 'winston/lib/winston/transports'
 
 const { firecracker } = HYPERVISORS
 const { ovswitch, vcenter } = VN_DRIVERS
@@ -41,7 +42,7 @@ const GENERAL_FIELDS = ({ nics = [] } = {}) =>
       name: 'RDP',
       label: T.RdpConnection,
       type: INPUT_TYPES.SWITCH,
-      validation: boolean().yesOrNo(),
+      validation: boolean().default(() => false).yesOrNo(),
       grid: { md: 12 },
     },
     {
diff --git a/src/fireedge/src/client/components/Forms/Vm/AttachNicForm/Steps/index.js b/src/fireedge/src/client/components/Forms/Vm/AttachNicForm/Steps/index.js
index 8a9aa0ac8a..e484a1a223 100644
--- a/src/fireedge/src/client/components/Forms/Vm/AttachNicForm/Steps/index.js
+++ b/src/fireedge/src/client/components/Forms/Vm/AttachNicForm/Steps/index.js
@@ -22,7 +22,7 @@ import AdvancedOptions, {
 import { createSteps } from 'client/utils'
 
 const Steps = createSteps([NetworksTable, AdvancedOptions], {
-  transformInitialValue: (nic) => {
+  transformInitialValue: (nic, schema) => {
     const {
       NETWORK,
       NETWORK_ID: ID,
@@ -32,6 +32,11 @@ const Steps = createSteps([NetworksTable, AdvancedOptions], {
       ...rest
     } = nic ?? {}
 
+    const castedValue = schema.cast(
+      { [ADVANCED_ID]: rest },
+      { stripUnknown: true }
+    )
+
     return {
       [NETWORK_ID]: [
         {
@@ -43,7 +48,7 @@ const Steps = createSteps([NetworksTable, AdvancedOptions], {
           SECURITY_GROUPS,
         },
       ],
-      [ADVANCED_ID]: rest,
+      [ADVANCED_ID]: castedValue[ADVANCED_ID],
     }
   },
   transformBeforeSubmit: (formData) => {