EWPP-2016: Improve display of person teaser.

openeuropa · Mar 23, 2022 · 22991c5 · 22991c5
1 parent a8803c1
commit 22991c5
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 32 deletions.
diff --git a/composer.json b/composer.json
@@ -58,7 +58,8 @@
         "openeuropa/rdf_skos": "^1.0",
         "openeuropa/task-runner-drupal-project-symlink": "^1.0-beta5",
         "phpspec/prophecy-phpunit": "^2",
-        "symfony/dom-crawler": "^4.4.12"
+        "symfony/dom-crawler": "^4.4.12",
+        "phpmd/phpmd": "2.11.1"
     },
     "scripts": {
         "post-install-cmd": "./vendor/bin/run drupal:site-setup",
@@ -115,7 +116,8 @@
             "Explicit minimum version requirement of drupal/ctools module due to D9.2 compatability.",
             "Explicit minimum version requirement of behat library due to PHP compatibility.",
             "Explicit requirement for egulias/email-validator due to https://www.drupal.org/project/drupal/issues/3061074#comment-14300579. It can be removed when Drupal core 9.2 support is droppped.",
-            "Explicit minimum version requirement for symfony/dom-crawler due to its lower versions using the deprecated function libxml_disable_entity_loader() in PHP8."
+            "Explicit minimum version requirement for symfony/dom-crawler due to its lower versions using the deprecated function libxml_disable_entity_loader() in PHP8.",
+            "Explicit requirement for phpmd since version 2.7 is installed after latest composer update"
         ]
     },
     "config": {

diff --git a/modules/oe_theme_content_person/oe_theme_content_person.module b/modules/oe_theme_content_person/oe_theme_content_person.module
@@ -10,6 +10,20 @@ declare(strict_types = 1);
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Core\Entity\EntityInterface;
 
+/**
+ * Implements hook_theme().
+ */
+function oe_theme_content_person_theme() {
+  return [
+    'oe_theme_content_person_job_list' => [
+      'variables' => [
+        'simple' => TRUE,
+        'items' => [],
+      ],
+    ],
+  ];
+}
+
 /**
  * Implements hook_preprocess_HOOK().
  *

diff --git a/modules/oe_theme_content_person/src/Plugin/ExtraField/Display/PersonJobListExtraField.php b/modules/oe_theme_content_person/src/Plugin/ExtraField/Display/PersonJobListExtraField.php
@@ -91,39 +91,45 @@ public function viewElements(ContentEntityInterface $entity) {
       return [];
     }
 
-    $pattern = [
-      '#type' => 'pattern',
-      '#id' => 'field_list',
-      '#variant' => 'horizontal',
-      '#fields' => [
-        'items' => [],
-      ],
-    ];
-
-    $cacheable_metadata = CacheableMetadata::createFromRenderArray($pattern);
+    $cacheable_metadata = new CacheableMetadata();
     $cacheable_metadata->addCacheableDependency($entity);
-
+    $job_list = [
+      '#theme' => 'oe_theme_content_person_job_list',
+      '#items' => [],
+    ];
     // Prepare person jobs to be shown in the field list pattern.
     $view_builder = $this->entityTypeManager->getViewBuilder('oe_person_job');
     foreach ($entity->get('oe_person_jobs')->referencedEntities() as $person_job) {
       // Retrieve the translation of the person job entity.
       $person_job = $this->entityRepository->getTranslationFromContext($person_job);
 
-      // Body has to be filled with at least empty space. Otherwise whole line
-      // will be hidden.
-      $body = ' ';
+      $body = '';
       if (!$person_job->get('oe_description')->isEmpty()) {
         $body = $view_builder->viewField($person_job->get('oe_description'), [
           'label' => 'hidden',
         ]);
+        $job_list['#simple'] = FALSE;
       }
-      $pattern['#fields']['items'][] = [
+      $job_list['#items'][] = [
         'label' => $person_job->label(),
         'body' => $body,
       ];
       $cacheable_metadata->addCacheableDependency($person_job);
     }
 
+    $pattern = [
+      '#type' => 'pattern',
+      '#id' => 'field_list',
+      '#variant' => 'horizontal',
+      '#fields' => [
+        'items' => [
+          [
+            'label' => $this->t('Responsibilities'),
+            'body' => $job_list,
+          ],
+        ],
+      ],
+    ];
     $cacheable_metadata->applyTo($pattern);
     return $pattern;
   }

diff --git a/modules/oe_theme_content_person/templates/oe-theme-content-person-job-list.html.twig b/modules/oe_theme_content_person/templates/oe-theme-content-person-job-list.html.twig
@@ -0,0 +1,25 @@
+{#
+/**
+ * @file
+ * Theme template for Person job list extra field.
+ *
+ * @see \Drupal\oe_theme_content_person\Plugin\ExtraField\Display\PersonJobListExtraField::viewElements()
+ */
+#}
+{% if simple %}
+  <ul class="ecl-unordered-list">
+    {% for item in items %}
+      <li class="ecl-unordered-list__item">
+        {{ item.label}}
+      </li>
+    {% endfor %}
+  </ul>
+{% else %}
+  {% for item in items %}
+    <div class="ecl-u-type-m ecl-u-type-bold ecl-u-mb-xs">{{ item.label }}</div>
+    {% if item.body %}
+      <div class="ecl-u-mb-xs">{{ item.body }}</div>
+    {% endif %}
+  {% endfor %}
+{% endif %}
+
diff --git a/sass/compositions/_content_item.scss b/sass/compositions/_content_item.scss
@@ -5,6 +5,7 @@
 .ecl-content-item {
   &__meta {
     text-transform: uppercase;
+    line-height: 1.25rem!important;
   }
   &__description {
     p {
@@ -18,7 +19,7 @@
   a {
     color: map.get(theme.$color, 'blue-100');
     font-weight: map.get(theme.$font-weight, 'bold')!important;
-    font: map.get(theme.$font-prolonged, 'm');
+    font: map.get(theme.$font-prolonged, 'xl');
   }
 }
 

diff --git a/templates/field/field--node--oe-departments--oe-person--teaser.html.twig b/templates/field/field--node--oe-departments--oe-person--teaser.html.twig
@@ -6,4 +6,4 @@
  * @see ./core/themes/stable/templates/field/field.html.twig
  */
 #}
-{%- include 'field--multiple-values--pipe-separated.html.twig' -%}
+{%- include 'field--multiple-values--comma-separated.html.twig' -%}
diff --git a/tests/src/Kernel/PersonRenderTest.php b/tests/src/Kernel/PersonRenderTest.php
@@ -152,7 +152,7 @@ public function testTeaser(): void {
         'items' => [
           [
             'label' => 'Departments',
-            'body' => 'Audit Board of the European Communities | Arab Common Market',
+            'body' => 'Audit Board of the European Communities, Arab Common Market',
           ],
         ],
       ]),
@@ -262,8 +262,8 @@ public function testTeaser(): void {
     $expected_values['additional_information'][1] = new PatternAssertState(new FieldListAssert(), [
       'items' => [
         [
-          'label' => '(Acting) Adviser',
-          'body' => 'Description job_1',
+          'label' => 'Responsibilities',
+          'body' => '(Acting) AdviserDescription job_1',
         ],
       ],
     ]);
@@ -275,11 +275,8 @@ public function testTeaser(): void {
     $expected_values['additional_information'][1] = new PatternAssertState(new FieldListAssert(), [
       'items' => [
         [
-          'label' => '(Acting) Adviser',
-          'body' => 'Description job_1',
-        ], [
-          'label' => 'Chief Adviser',
-          'body' => 'Description job_2',
+          'label' => 'Responsibilities',
+          'body' => '(Acting) AdviserDescription job_1Chief AdviserDescription job_2',
         ],
       ],
     ]);
@@ -345,11 +342,8 @@ public function testTeaser(): void {
         new PatternAssertState(new FieldListAssert(), [
           'items' => [
             [
-              'label' => 'Singer',
-              'body' => 'Description job_1',
-            ], [
-              'label' => 'Dancer',
-              'body' => 'Description job_2',
+              'label' => 'Responsibilities',
+              'body' => 'SingerDescription job_1DancerDescription job_2',
             ],
           ],
         ]),