Merge pull request #1325 from UN-OCHA/berliner/HPC-10021

HPC-10021: Show display form if articles have already been added, mark protected articles in selection preview, don't show protected articles publicly

Author: berliner

html/modules/custom/ghi_blocks/src/Plugin/Block/GHIBlockBase.php

@@ -894,7 +894,7 @@ public function blockForm($form, FormStateInterface $form_state) {
       ]));
       $this->configuration['is_preview'] = TRUE;
       $build = $this->build();
-      $form['container']['preview'] = [
+      $form['container']['preview'] = $build ? [
         '#theme' => 'block',
         '#attributes' => [
           'data-block-preview' => $this->getPluginId(),
@@ -908,7 +908,7 @@ public function blockForm($form, FormStateInterface $form_state) {
           'library' => ['ghi_blocks/block.preview'],
         ],
         'content' => $build,
-      ];
+      ] : NULL;
     }
 
     return $form;

html/modules/custom/ghi_content/src/Entity/ContentBase.php

@@ -54,6 +54,16 @@ public function access($operation = 'view', ?AccountInterface $account = NULL, $
     return parent::access($operation, $account, $return_as_object);
   }
 
+  /**
+   * Check if the entity is currently protected.
+   *
+   * @return bool
+   *   TRUE if the entity is currently protected, FALSE otherwise.
+   */
+  public function isProtected() {
+    return $this->getEmbargoedAccessManager()?->isProtected($this) ?? FALSE;
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -477,6 +487,17 @@ protected static function getDateFormatter() {
     return \Drupal::service('date.formatter');
   }
 
+  /**
+   * Get the embargoed access manager service.
+   *
+   * @return \Drupal\ghi_embargoed_access\EmbargoedAccessManager|null
+   *   The embargoed access manager service or NULL.
+   */
+  protected static function getEmbargoedAccessManager() {
+    $service = 'ghi_embargoed_access.manager';
+    return \Drupal::hasService($service) ? \Drupal::service($service) : NULL;
+  }
+
   /**
    * Check if the node has been manually unpublished.
    *

html/modules/custom/ghi_content/src/Plugin/Block/RelatedArticles.php

@@ -49,12 +49,7 @@ public function buildContent() {
     $conf = $this->getBlockConfig();
     $options = [];
 
-    $articles = $this->getArticles();
-    if (empty($articles)) {
-      // Nothing to show.
-      return [];
-    }
-
+    $articles = $this->getArticles(TRUE);
     $display = $conf['display']['select'];
 
     // If articles have been selected, use only those, otherwise use all.
@@ -68,6 +63,11 @@ public function buildContent() {
       }, $display['order']));
     }
 
+    if (empty($articles)) {
+      // Nothing to show.
+      return NULL;
+    }
+
     // Build the render array.
     $build = [
       '#theme' => 'related_articles_cards',
@@ -104,7 +104,7 @@ protected function getConfigurationDefaults() {
    * {@inheritdoc}
    */
   public function getDefaultSubform($is_new = FALSE) {
-    return 'articles';
+    return empty($this->getArticles()) ? 'articles' : 'display';
   }
 
   /**
@@ -154,10 +154,10 @@ public function displayForm(array $form, FormStateInterface $form_state) {
   /**
    * Get the articles that this block should display.
    *
-   * @return \Drupal\Core\Entity\EntityInterface[]|null
+   * @return \Drupal\ghi_content\Entity\Article[]
    *   An array of entity objects indexed by their ids.
    */
-  private function getArticles() {
+  private function getArticles($check_access = FALSE) {
     $conf = $this->getBlockConfig();
     $entity_keys = $conf['articles']['article_select']['entity_ids'] ?? [];
     /** @var \Drupal\ghi_content\Entity\Article[] $articles */
@@ -182,6 +182,11 @@ private function getArticles() {
         }
       }
     }
+    if ($check_access) {
+      $articles = array_filter($articles, function (Article $article) {
+        return $article->access() && !$article->isProtected();
+      });
+    }
     return $articles;
   }
 

html/modules/custom/ghi_embargoed_access/src/EmbargoedAccessManager.php

@@ -263,8 +263,14 @@ public function alterNode(&$variables) {
     unset($variables['label']);
     unset($variables['metadata']);
     unset($variables['content']['field_image']);
+    unset($variables['content']['field_summary']);
     $variables['display_submitted'] = FALSE;
-    $variables['attributes']['class'][] = 'content-width';
+
+    if ($variables['view_mode'] == 'password_protected') {
+      $variables['attributes']['class'][] = 'content-width';
+    }
+
+    $variables['attributes']['class'][] = 'protected';
 
     $cacheableMetadata = new CacheableMetadata();
     $cacheableMetadata->addCacheContexts([EntityIsProtectedCacheContext::CONTEXT_ID . ':' . $entity->getEntityTypeId() . '||' . $entity->id()]);

html/themes/custom/common_design_subtheme/css/styles.css

@@ -4,6 +4,21 @@ article.node--view-mode-grid {
   height: 100%;
   border: 1px solid var(--cd-default-border-color);
 
+  #layout-builder-modal &.protected::before {
+    position: absolute;
+    top: -3px;
+    left: -3px;
+    width: calc(100% + 6px);
+    content: 'Protected';
+    text-align: center;
+    color: white;
+    border-radius: inherit;
+    border-bottom-right-radius: 0;
+    border-bottom-left-radius: 0;
+    background-color: var(--cd-contrast-red);
+    font-size: 0.8rem;
+  }
+
   .cd-teaser__image {
     max-width: unset;
     margin-top: 0;