From 2d0c9e0cc58bc769cf8ad93d9e0dcf2ac996ca23 Mon Sep 17 00:00:00 2001 From: Darya Plotnytska Date: Mon, 29 Apr 2024 12:23:12 +0200 Subject: [PATCH] console: Fix condition --- .../network-server-form/index.js | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkg/webui/console/views/device-general-settings/network-server-form/index.js b/pkg/webui/console/views/device-general-settings/network-server-form/index.js index 43f0d41337..2a65ce1864 100644 --- a/pkg/webui/console/views/device-general-settings/network-server-form/index.js +++ b/pkg/webui/console/views/device-general-settings/network-server-form/index.js @@ -247,20 +247,19 @@ const NetworkServerForm = React.memo(props => { ...defaultValues.mac_settings, ...macSettings, ...device.mac_settings, - adr: - 'dynamic' in device.mac_settings?.adr - ? { - dynamic: { - ...device.mac_settings?.adr?.dynamic, - min_nb_trans: device.mac_settings?.adr?.dynamic?.min_nb_trans ?? null, - max_nb_trans: device.mac_settings?.adr?.dynamic?.max_nb_trans ?? null, - }, - } - : { - ...defaultValues.mac_settings.adr, - ...macSettings.adr, - ...device.mac_settings.adr, + adr: Boolean(device.mac_settings?.adr?.dynamic) + ? { + dynamic: { + ...device.mac_settings?.adr?.dynamic, + min_nb_trans: device.mac_settings?.adr?.dynamic?.min_nb_trans ?? null, + max_nb_trans: device.mac_settings?.adr?.dynamic?.max_nb_trans ?? null, }, + } + : { + ...defaultValues.mac_settings.adr, + ...macSettings.adr, + ...device.mac_settings?.adr, + }, }, }, { context: validationContext, stripUnknown: true },