Merge pull request #656 from City-of-Helsinki/UHF-9963

UHF-9963: You might be interested in blocks new design

conf/cmi/block.block.hdbt_subtheme_aipoweredrecommendations.yml

@@ -10,8 +10,8 @@ dependencies:
     - hdbt_subtheme
 id: hdbt_subtheme_aipoweredrecommendations
 theme: hdbt_subtheme
-region: after_content
-weight: -12
+region: content
+weight: 1
 provider: null
 plugin: helfi_recommendations
 settings:

conf/cmi/block.block.hdbt_subtheme_views_block__frontpage_news_of_interest.yml

@@ -11,8 +11,8 @@ dependencies:
     - hdbt_subtheme
 id: hdbt_subtheme_views_block__frontpage_news_of_interest
 theme: hdbt_subtheme
-region: after_content
-weight: -12
+region: content
+weight: 1
 provider: null
 plugin: 'views_block:frontpage_news-of_interest'
 settings:

conf/cmi/views.view.frontpage_news.yml

@@ -1836,6 +1836,11 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
+      pager:
+        type: some
+        options:
+          offset: 0
+          items_per_page: 3
       empty: {  }
       sorts:
         published_at:
@@ -2036,10 +2041,24 @@ display:
         operator: AND
         groups:
           1: AND
+      style:
+        type: default
+        options:
+          row_class: ''
+          default_row_class: true
+          uses_fields: true
+      row:
+        type: 'entity:node'
+        options:
+          relationship: none
+          view_mode: teaser
       defaults:
         empty: false
         title: false
+        pager: false
         group_by: false
+        style: false
+        row: false
         fields: false
         sorts: false
         arguments: false

public/modules/custom/helfi_annif/helfi_annif.info.yml

@@ -7,3 +7,5 @@ dependencies:
   - drupal:text
   - drupal:language
   - helfi_api_base:helfi_api_base
+'interface translation project': helfi_annif
+'interface translation server pattern': modules/custom/helfi_annif/translations/%language.po

public/modules/custom/helfi_annif/src/Plugin/Block/RecommendationsBlock.php

@@ -7,6 +7,7 @@
 use Drupal\Core\Block\Attribute\Block;
 use Drupal\Core\Block\BlockBase;
 use Drupal\Core\Cache\Cache;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\Core\Plugin\Context\EntityContextDefinition;
 use Drupal\Core\Plugin\ContextAwarePluginInterface;
@@ -37,6 +38,7 @@ public function __construct(
     $plugin_id,
     $plugin_definition,
     private readonly RecommendationManager $recommendationManager,
+    private readonly EntityTypeManagerInterface $entityTypeManager,
     private readonly AccountInterface $currentUser,
     private readonly LoggerInterface $logger,
   ) {
@@ -49,6 +51,7 @@ public function __construct(
   public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) : static {
     return new static($configuration, $plugin_id, $plugin_definition,
       $container->get(RecommendationManager::class),
+      $container->get('entity_type.manager'),
       $container->get('current_user'),
       $container->get('logger.channel.helfi_annif'),
     );
@@ -60,10 +63,10 @@ public static function create(ContainerInterface $container, array $configuratio
   public function build() : array {
     $node = $this->getContextValue('node');
 
-    // @todo #UHF-9964 Lisätään suosittelulohkon piilotustoiminto.
+    // @todo #UHF-9964 Add recommendation block hiding feature.
     $response = [
       '#theme' => 'recommendations_block',
-      '#title' => $this->t('You might be interested in'),
+      '#title' => $this->t('You might be interested in', [], ['context' => 'Recommendations block title']),
     ];
 
     $recommendations = [];
@@ -79,7 +82,14 @@ public function build() : array {
       return $this->handleNoRecommendations($response);
     }
 
-    $response['#rows'] = $recommendations;
+    $nodes = [];
+    // We want to render the recommendation results as nodes
+    // so that all fields are correctly preprocessed.
+    foreach ($recommendations as $recommendation) {
+      $view_builder = $this->entityTypeManager->getViewBuilder('node');
+      $nodes[] = $view_builder->view($recommendation, 'teaser');
+    }
+    $response['#rows'] = $nodes;
     return $response;
   }
 

public/modules/custom/helfi_annif/templates/recommendations-block.html.twig

@@ -1,31 +1,3 @@
 {% for row in rows %}
-  {# Created date and modified date #}
-  {% set published_at = row.published_at.value  %}
-  {% if published_at is not empty %}
-    {% set html_published_at  %}
-      <time datetime="{{ published_at|format_date('custom', 'Y-m-d') ~ 'T' ~ published_at|format_date('custom', 'H:i') }}" class="news-listing__datetime news-listing__datetime--published" {{ alternative_language ? create_attribute(({ 'lang': lang_attributes.fallback_lang, 'dir': lang_attributes.fallback_dir })) }}>
-        <span class="visually-hidden">{{ 'Published'|t({}, {'context': 'The helper text before the node published timestamp'}) }}</span>
-        {{ published_at|format_date('publication_date_format') }}
-      </time>
-    {% endset %}
-  {% else %}
-    {% set html_published_at = '-' %}
-  {% endif %}
-
-  {% set card_url = url('entity.node.canonical', {'node': row.id})['#markup'] %}
-
-  {% embed '@hdbt/component/card.twig' with {
-    card_modifier_class: 'news-listing__item',
-    card_title_level: 'h3',
-    card_title: row.title.value,
-    card_url: card_url,
-    card_metas: [
-      {
-        icon: 'clock',
-        label: 'Published'|t({}, {'context': 'Label for news card published time'}),
-        content: html_published_at
-      },
-    ],
-  } %}
-  {% endembed %}
+  {{ row }}
 {% endfor %}

public/modules/custom/helfi_annif/translations/fi.po

@@ -0,0 +1,6 @@
+msgid ""
+msgstr ""
+
+msgctxt "Recommendations block title"
+msgid "You might be interested in"
+msgstr "Sinua voisi kiinnostaa"

public/modules/custom/helfi_annif/translations/sv.po

@@ -0,0 +1,6 @@
+msgid ""
+msgstr ""
+
+msgctxt "Recommendations block title"
+msgid "You might be interested in"
+msgstr "Du kanske är intresserad av"