Dedupe finder field wrangler - de-nest groupTree results #29640
Merged
Conversation
This file contains 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
The function never uses the 'subtype' key & it could possibly cause a regression not removing it as I removed a protection against non-numeric values thinking 'info' was the only one The other bit of code is for handling entityType being in a weird format - but I think we can be pretty confident that is not relevant here
The only thing that is used in the groupTree is the custom fields, most easily in a flat array of fields rather than nested under groups. This denests as early as possible & does corresponding simplification
|
🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this PR. 👷 Introduction for new contributors...
Quick links for reviewers...
|
colemanw
reviewed
Mar 6, 2024
| foreach ($cg['fields'] as $cf) { | ||
| $flat[$cf['column_name']] = $cf['customValue']['data'] ?? NULL; | ||
| } | ||
| $customFields = self::getTree($ctype, $subTypes, $fields); |
There was a problem hiding this comment.
Would be nice if this could just be switched from getTree() to BAO_CustomGroup::getAll() - is that the eventual goal?
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.
Overview
Dedupe finder field wrangler - de-nest groupTree results
Before
The groupTree is layered up by group ID & then an array of fields - each time the function handles the fields it iterates through them to get to these layers
After
`$customFields is flattened at the start - handling is simplified, formatting of unused fields is removed
Technical Details
Note that this cleanup fixed #29554 - I think there was some oddness around the wrangling causing an actual bug that got fixed in the cleanup
Comments