[6.x] Fix Addresses fields not reading the posted form value - #19432
Merged
Merged
Conversation
📚 Storybook previews@craftcms/ui — open Storybook No changed components detected in this Storybook. resources/js — open Storybook No changed components detected in this Storybook. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Addresses::formControl()renders the field with the Matrix form control, which posts its value as{"entries": {…}, "sortOrder": […]}, butAddresses::createAddressesFromSerializedData()still expected the legacy flat[addressId => data]shape. It iterated the envelope's own keys, so every save fabricated one blank address per key — always exactly two — and never applied removals or edits.The user-visible symptom: removing every address from an entry left two blank addresses attached, and the entry could no longer be saved ("Validation errors found in two addresses within the Address field").
createAddressesFromSerializedData()now reads the same formatMatrix::_createEntriesFromSerializedData()does — theentries/blocks/sortOrderenvelope, addresses keyed by UUID (with or without theuid:prefix), and the canonical→derivative UUID map so draft autosaves match up their addresses instead of recreating them. New addresses keep their posted UUID, and the address format attributes the Address control nests underaddressare applied alongside the top-level native attributes. The legacy flat format still works.normalizeValueFromRequest()also now treats anullvalue as "every address was removed", matching the Matrix fix in 42516a1 — Laravel'sConvertEmptyStringsToNullmiddleware turns the''sentinel intonullbefore the field sees it.