Access test with caching fix. #10

config/install/views.view.localgov_openreferral_services.yml

@@ -334,7 +334,8 @@ display:
         options: {  }
       display_description: ''
       cache:
-        type: none
+        type: search_api_tag
+        options: {  }
       defaults:
         cache: false
     cache_metadata:

localgov_openreferral.module

@@ -5,7 +5,10 @@
  * Primary module hooks for Open Referral module.
  */
 
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\localgov_openreferral\Entity\PropertyMappingInterface;
+use Drupal\localgov_openreferral\Entity\PropertyMappingStorage;
 use Drupal\localgov_openreferral\SearchApiIndexConfig;
 
 /**
@@ -29,3 +32,22 @@ function localgov_openreferral_localgov_openreferral_mapping_delete(PropertyMapp
       ->removeFromServicesIndex($map);
   }
 }
+
+/**
+ * Implements hook_entity_presave().
+ */
+function localgov_openreferral_entity_presave(EntityInterface $entity) {
+  // If the entity is one that can appear in the Views services list invalidate
+  // that tag. search_api_list:openreferral_services.
+  // Search API does a reasonable job of clearing the list if it is a referenced
+  // entity in the list; but not if it's not explicitly in the search index and
+  // just something that gets rendered as referenced.
+  //
+  // Having the bubbleable caching metadata ala jsonapi #15 would probably
+  // negate the need to do this, as long as the render plugin passes it on.
+  $mapping_storage = \Drupal::entityTypeManager()->getStorage('localgov_openreferral_mapping');
+  assert($mapping_storage instanceof PropertyMappingStorage);
+  if ($mapping_storage->loadByIds($entity->getEntityTypeId(), $entity->bundle())) {
+    Cache::invalidateTags(['search_api_list:openreferral_services']);
+  }
+}

src/MappingInformation.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\localgov_openreferral;
 
-use Drupal\Core\Entity\EntityTypeBundleInfoInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 
 /**

src/Normalizer/EntityReferenceFieldNormalizer.php

@@ -69,6 +69,10 @@ public function normalize($field, $format = NULL, array $context = []) {
       $direction = $reference_parent[$context['field']['public_name']] == $parent_type;
 
       foreach ($field->referencedEntities() as $entity) {
+        $this->addCacheableDependency($context, $entity);
+        if (!$entity->access('view')) {
+          continue;
+        }
         $type = $this->mappingInformation->getPublicType($entity->getEntityTypeId(), $entity->bundle());
         $id = $direction ?
           $parent->uuid() . '-' . $entity->uuid() :
@@ -85,21 +89,28 @@ public function normalize($field, $format = NULL, array $context = []) {
     }
     elseif (!empty($reference_single[$context['field']['public_name']])) {
       $refrenced_entities = $field->referencedEntities();
-      $entity = reset($refrenced_entities);
-      if (count($context['parents']) < 3) {
-        $attributes = $this->serializer->normalize($entity, $format, $context);
-      }
-      else {
-        $attributes = $entity->uuid();
+      if ($entity = reset($refrenced_entities)) {
+        $this->addCacheableDependency($context, $entity);
+        if ($entity->access('view')) {
+          if (count($context['parents']) < 3) {
+            $attributes = $this->serializer->normalize($entity, $format, $context);
+          }
+          else {
+            $attributes = $entity->uuid();
+          }
+        }
       }
     }
     else {
       foreach ($field->referencedEntities() as $entity) {
-        if (count($context['parents']) < 3) {
-          $attributes[] = $this->serializer->normalize($entity, $format, $context);
-        }
-        else {
-          $attributes[] = ['id' => $entity->uuid()];
+        $this->addCacheableDependency($context, $entity);
+        if ($entity->access('view')) {
+          if (count($context['parents']) < 3) {
+            $attributes[] = $this->serializer->normalize($entity, $format, $context);
+          }
+          else {
+            $attributes[] = ['id' => $entity->uuid()];
+          }
         }
       }
     }