diff --git a/core/modules/views/views.module b/core/modules/views/views.module index 787e9fb..ae14bac 100644 --- a/core/modules/views/views.module +++ b/core/modules/views/views.module @@ -468,34 +468,44 @@ function views_add_contextual_links(&$render_element, $location, ViewExecutable } /** - * Implements hook_entity_insert(). + * Implements hook_ENTITY_TYPE_insert(). */ -function views_entity_insert(EntityInterface $entity) { - views_invalidate_field_data($entity); +function views_field_config_insert(EntityInterface $entity) { + Views::viewsData()->clear(); } /** - * Implements hook_entity_update(). + * Implements hook_ENTITY_TYPE_update(). */ -function views_entity_update(EntityInterface $entity) { - views_invalidate_field_data($entity); +function views_field_config_update(EntityInterface $entity) { + Views::viewsData()->clear(); } /** - * Implements hook_entity_delete(). + * Implements hook_ENTITY_TYPE_delete(). */ -function views_entity_delete(EntityInterface $entity) { - views_invalidate_field_data($entity); +function views_field_config_delete(EntityInterface $entity) { + Views::viewsData()->clear(); } /** - * Invalidates field data for 'field_config' and 'base_field_override' entities. - * @param \Drupal\Core\Entity\EntityInterface $entity + * Implements hook_ENTITY_TYPE_insert(). */ -function views_invalidate_field_data(EntityInterface $entity) { - if ($entity->getEntityTypeId() !== 'field_config' && $entity->getEntityTypeId() !== 'base_field_override') { - return; - } +function views_base_field_override_insert(EntityInterface $entity) { + Views::viewsData()->clear(); +} + +/** + * Implements hook_ENTITY_TYPE_update(). + */ +function views_base_field_override_update(EntityInterface $entity) { + Views::viewsData()->clear(); +} + +/** + * Implements hook_ENTITY_TYPE_delete(). + */ +function views_base_field_override_delete(EntityInterface $entity) { Views::viewsData()->clear(); } diff --git a/core/modules/views/views.views.inc b/core/modules/views/views.views.inc index 30b3d23..6e69a60 100644 --- a/core/modules/views/views.views.inc +++ b/core/modules/views/views.views.inc @@ -364,8 +364,8 @@ function views_field_default_views_data(FieldStorageConfigInterface $field_stora if (!empty($translatable_configs) && empty($untranslatable_configs)) { $translation_join_type = 'language'; } - // If the field is translatable only on certain bundles, there will be a - // join on langcode OR bundle name. + // If the field is translatable only on certain bundles, there will be a join + // on langcode OR bundle name. elseif (!empty($translatable_configs) && !empty($untranslatable_configs)) { foreach ($untranslatable_configs as $config) { $untranslatable_config_bundles[] = $config->getTargetBundle();