Merge pull request #155 from localgovdrupal/fix/154-cache-context-con…

…ditons

src/Entity/AlertBannerEntity.php

@@ -401,6 +401,18 @@ public function getCacheContexts() {
       $conditions_config = $this->get('visibility')->getValue()[0]['conditions'];
 
       foreach ($conditions_config as $condition_id => $values) {
+
+        // Skip adding contexts for banners that arn't visible.
+        // @see #154
+        // Show banner on restricted pages, skip when hidden.
+        if (!$this->isVisible() && $values['negate'] == 0) {
+          continue;
+        }
+        // Hide banner on restricted pages, skip when visible.
+        if ($this->isVisible() && $values['negate'] == 1) {
+          continue;
+        }
+
         /** @var \Drupal\Core\Condition\ConditionInterface $condition */
         $condition = $this->pluginManagerCondition->createInstance($condition_id, $values);
         $contexts = Cache::mergeContexts($contexts, $condition->getCacheContexts());

src/Plugin/Block/AlertBannerBlock.php

@@ -129,8 +129,13 @@ public function build() {
     // Render the alert banner.
     $build = [];
     foreach ($this->currentAlertBanners as $alert_banner) {
-      $build[] = $this->entityTypeManager->getViewBuilder('localgov_alert_banner')
-        ->view($alert_banner);
+
+      // Only add to the build if it is visible.
+      // @see #154.
+      if ($alert_banner->isVisible()) {
+        $build[] = $this->entityTypeManager->getViewBuilder('localgov_alert_banner')
+          ->view($alert_banner);
+      }
     }
     return $build;
   }
@@ -159,12 +164,11 @@ protected function getCurrentAlertBanners() {
     }
     $published_alert_banners = $published_alert_banner_query->execute();
 
-    // Load alert banners and check they're visible.
+    // Load alert banners and add all.
+    // Visibility check happens in build, so we get cache contexts on all.
     foreach ($published_alert_banners as $alert_banner_id) {
       $alert_banner = $this->entityTypeManager->getStorage('localgov_alert_banner')->load($alert_banner_id);
-      if ($alert_banner->isVisible()) {
-        $alert_banners[] = $alert_banner;
-      }
+      $alert_banners[] = $alert_banner;
     }
 
     return $alert_banners;