Skip to content

Fix mac settings profiles #8003

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

Merged
ryaplots merged 3 commits into from
Aug 19, 2026
+14 −8
Merged

Fix mac settings profiles #8003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3789a6
console: Fix mac settings profiles
ryaplots Aug 18, 2026
59b3f20
console: Fix end to end tests
ryaplots Aug 19, 2026
0bf1e2c
console: Fix mac settings profile
ryaplots Aug 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions pkg/webui/console/containers/mac-settings-profile-form/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,8 +622,10 @@ const MACSettingsProfileForm = ({ edit, macSettingsProfile, macSettingsProfileId
}
: Boolean(macSettingsProfile?.mac_settings?.adr?.static)
? {
...initialValues.mac_settings.adr,
...macSettingsProfile.mac_settings.adr,
static: {
...initialValues.mac_settings.adr.static,
...macSettingsProfile.mac_settings.adr.static,
},
}
: {
disabled: {},
Expand Down Expand Up @@ -659,7 +661,7 @@ const MACSettingsProfileForm = ({ edit, macSettingsProfile, macSettingsProfileId

const handleEdit = useCallback(
async (_, { setSubmitting }, cleanedValues) => {
const profileDiff = diff(macSettingsProfile, cleanedValues)
const profileDiff = diff(parsedInitialValues, cleanedValues)
try {
if (!isEmpty(profileDiff)) {
profileDiff.ids = {
Expand All @@ -686,7 +688,7 @@ const MACSettingsProfileForm = ({ edit, macSettingsProfile, macSettingsProfileId
setError(error)
}
},
[appId, dispatch, macSettingsProfile, macSettingsProfileId],
[appId, dispatch, parsedInitialValues, macSettingsProfileId],
)

return (
Expand Down
12 changes: 8 additions & 4 deletions sdk/js/src/service/network-server-mac-settings-profiles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,13 @@ class NsMACSettingsProfiles {
}

async update(applicationId, macSettingsProfileId, patch) {
const fieldMaskPaths = Marshaler.fieldMaskFromPatch(
patch,
this._api.UpdateAllowedFieldMaskPaths,
)
const fieldMaskPathsWithoutAncestors = fieldMaskPaths.filter(
path => !fieldMaskPaths.some(other => other !== path && other.startsWith(`${path}.`)),
)
const result = await this._api.Update(
{
routeParams: {
Expand All @@ -65,11 +72,8 @@ class NsMACSettingsProfiles {
},
},
{
mac_settings_profile_ids: {
application_ids: { application_id: applicationId },
profile_id: macSettingsProfileId,
},
mac_settings_profile: patch,
field_mask: { paths: fieldMaskPathsWithoutAncestors },
},
)
return Marshaler.payloadSingleResponse(result)
Expand Down
Loading