Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix switching between different ADR modes #7053

Merged
merged 2 commits into from
Apr 29, 2024
Merged

Fix switching between different ADR modes #7053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8feb431
console: Fix choosing different adr
ryaplots Apr 29, 2024
2d0c9e0
console: Fix condition
ryaplots Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/webui/console/components/mac-settings-section/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ const MacSettingsSection = props => {
}
}, [handleIsCollapsedChange, isABP, isClassB, isCollapsed, isMulticast, pingPeriodicityRequired])

const adrOverrides = mac_settings.adr.dynamic.overrides
const showEditNbTrans = !values.mac_settings?.adr.dynamic._use_default_nb_trans
const defaultNbTransDisabled = !values.mac_settings?.adr.dynamic._override_nb_trans_defaults
const adrOverrides = mac_settings.adr.dynamic?.overrides
const showEditNbTrans = !values.mac_settings.adr.dynamic?._use_default_nb_trans
const defaultNbTransDisabled = !values.mac_settings.adr.dynamic?._override_nb_trans_defaults
const addOverride = React.useCallback(() => {
const newOverride = { _data_rate_index: '', min_nb_trans: '', max_nb_trans: '' }
setFieldValue(
Expand Down
25 changes: 17 additions & 8 deletions pkg/webui/console/views/device-general-settings/network-server-form/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,13 +247,19 @@ const NetworkServerForm = React.memo(props => {
...defaultValues.mac_settings,
...macSettings,
...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,
},
},
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 },
Expand Down Expand Up @@ -282,7 +288,10 @@ const NetworkServerForm = React.memo(props => {
async (values, { resetForm, setSubmitting }) => {
let parsedValues = values
// If the nbTrans values are not overridden, remove them from the payload.
if (!values.mac_settings?.adr.dynamic._override_nb_trans_defaults) {
if (
'dynamic' in values.mac_settings?.adr &&
!('_override_nb_trans_defaults' in values.mac_settings?.adr.dynamic)
) {
const { max_nb_trans, min_nb_trans, ...rest } = parsedValues.mac_settings?.adr.dynamic
parsedValues = {
...parsedValues,
Expand Down