The existing entity_usage_entity_presave() hook is recording entities in some cases when it should not.
The code is currently grabbing an ImmutableConfig object and treating as if were an array. The hook is written such that if the returned object is not an array, it will always proceed to record the entity. Since it is getting an ImmutableConfig passed to it, it will always record the entity regardless of configuration.
/**
* Implements hook_entity_presave().
*/
function entity_usage_entity_presave(EntityInterface $entity): void {
if (!$entity->isNew() && ($entity->hasLinkTemplate('canonical') || $entity->hasLinkTemplate('edit-form'))) {
$enabled_target_entity_types = \Drupal::config('track_enabled_target_entity_types');
// Every entity type is tracked if not set.
if (!is_array($enabled_target_entity_types) || in_array($entity->getEntityTypeId(), $enabled_target_entity_types, TRUE)) {
\Drupal::service(PreSaveUrlRecorder::class)->recordEntity($entity);
}
}
}
/**
* Implements hook_entity_presave().
*/
function entity_usage_entity_presave(EntityInterface $entity): void {
if (!$entity->isNew() && ($entity->hasLinkTemplate('canonical') || $entity->hasLinkTemplate('edit-form'))) {
$config = \Drupal::config('entity_usage.settings');
$enabled_target_entity_types = $config->get('track_enabled_target_entity_types');
// Every entity type is tracked if not set.
if (!is_array($enabled_target_entity_types) || in_array($entity->getEntityTypeId(), $enabled_target_entity_types, TRUE)) {
\Drupal::service(PreSaveUrlRecorder::class)->recordEntity($entity);
}
}
}
Review
None
None
None
Active
Code
Issue #3511713 by daceej, marcoscano: Entity Usage not respecting...
Opened 📌 Add test coverage for entity types that should not be tracked Active as I feel this should be covered with tests.
Automatically closed - issue fixed for 2 weeks with no activity.