Skip to content

Allow reference field properties to be preserved after expanding the values. #252

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

Open
idimopoulos wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow reference field properties to be preserved after expanding the values. #252

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
75e2e2e
Allow properties to be preserved after expanding the values.
idimopoulos Oct 13, 2022
8a91bf4
Use the main property key instead of hardcoding 'target_id'.
idimopoulos Oct 13, 2022
efb23b7
Fix codesniffs.
idimopoulos Oct 13, 2022
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
35 changes: 23 additions & 12 deletions src/Drupal/Driver/Fields/Drupal8/EntityReferenceHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,9 @@ class EntityReferenceHandler extends AbstractHandler {
* {@inheritdoc}
*/
public function expand($values) {
$return = [];
$entity_type_id = $this->fieldInfo->getSetting('target_type');
$entity_definition = \Drupal::entityTypeManager()->getDefinition($entity_type_id);

$id_key = $entity_definition->getKey('id');

// Determine label field key.
if ($entity_type_id !== 'user') {
$label_key = $entity_definition->getKey('label');
Expand All @@ -36,24 +33,38 @@ public function expand($values) {
$target_bundle_key = $entity_definition->getKey('bundle');
}

foreach ((array) $values as $value) {
$query = \Drupal::entityQuery($entity_type_id);
$or = $query->orConditionGroup();
$or->condition($id_key, $value)
->condition($label_key, $value);
$query->condition($or);
// The values can either be a direct label reference or a complex array
// containing multiple properties of the field. For example, the file field
// contains a target_id, a description and a display property. If the
// target_id exists as a property, we assume that the other properties are
// also present. Retrieve all labels and load the entities.
$main_property = $this->fieldInfo->getMainPropertyName();
$labels = array_map(function ($value) use ($main_property) {
return is_array($value) && isset($value[$main_property]) ? $value[$main_property] : $value;
}, $values);

foreach ((array) $labels as $index => $label) {
$query = \Drupal::entityQuery($entity_type_id)->condition($label_key, $label);
$query->accessCheck(FALSE);
if ($target_bundles && $target_bundle_key) {
$query->condition($target_bundle_key, $target_bundles, 'IN');
}
if ($entities = $query->execute()) {
$return[] = array_shift($entities);
$entity_id = array_shift($entities);
// Replace the entity IDs in the original array so that other properties
// are not lost.
if (is_array($values[$index]) && isset($values[$index][$main_property])) {
$values[$index][$main_property] = $entity_id;
}
else {
$values[$index] = $entity_id;
}
}
else {
throw new \Exception(sprintf("No entity '%s' of type '%s' exists.", $value, $entity_type_id));
throw new \Exception(sprintf("No entity '%s' of type '%s' exists.", $label, $entity_type_id));
}
}
return $return;
return $values;
}

/**
Expand Down
Loading