Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OEL-3315: Remove empty title wrapper. #307

Merged
merged 5 commits into from
Sep 3, 2024
Merged

OEL-3315: Remove empty title wrapper. #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6191682
OEL-3315: Add check for empty title in test.
AaronGilMartinez Aug 26, 2024
2c73706
OEL-3315: Send field values.
AaronGilMartinez Aug 27, 2024
b3afc45
OEL-3315: Check for empty link.
AaronGilMartinez Aug 27, 2024
6fec2cd
OEL-3315: Replace value for empty title.
AaronGilMartinez Aug 28, 2024
fa4ece3
OEL-3315: Fix comparison, use NULL for link.
AaronGilMartinez Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion modules/oe_whitelabel_paragraphs/oe_whitelabel_paragraphs.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,9 @@ function oe_whitelabel_preprocess_paragraph__oe_banner(array &$variables): void
]),
};

$variables['title'] = $paragraph->get('field_oe_title')->value;
if (!$paragraph->get('field_oe_title')->isEmpty()) {
$variables['title'] = $paragraph->get('field_oe_title')->value;
}
$variables['description'] = $paragraph->get('field_oe_text')->value;
$variables['full_width'] = (bool) $paragraph->get('field_oe_banner_full_width')->value;
_oe_whitelabel_set_banner_link($paragraph, $variables);
Expand Down
47 changes: 37 additions & 10 deletions modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/MediaParagraphsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,9 @@ public function testBanner(): void {
$this->assertBannerRendering($crawler);
$this->assertCount(0, $crawler->filter('.bcl-banner.full-width'));

// Variant - image / Modifier - hero_left / Full width - No.
// Variant - image / Modifier - hero_left / Full width - No / Title - NULL.
$paragraph->get('field_oe_banner_alignment')->setValue('left');
$paragraph->get('field_oe_title')->setValue(NULL);
$paragraph->save();

$html = $this->renderParagraph($paragraph);
Expand All @@ -363,12 +364,14 @@ public function testBanner(): void {
'url(' . \Drupal::service('file_url_generator')->generateAbsoluteString($en_file->getFileUri()) . ')',
$image_element->attr('style')
);
$this->assertBannerRendering($crawler);
$this->assertBannerRendering($crawler, ['title' => NULL]);
$this->assertCount(0, $crawler->filter('.bcl-banner.full-width'));

// Variant - image / Modifier - page_center / Full width - No.
// Variant - image / Modifier - page_center / Full width - No / Link - NULL.
$paragraph->get('field_oe_banner_size')->setValue('medium');
$paragraph->get('field_oe_banner_alignment')->setValue('centered');
$paragraph->get('field_oe_title')->setValue('Banner');
$paragraph->get('field_oe_link')->setValue(NULL);
$paragraph->save();
$html = $this->renderParagraph($paragraph);
$crawler = new Crawler($html);
Expand All @@ -381,13 +384,17 @@ public function testBanner(): void {
'url(' . \Drupal::service('file_url_generator')->generateAbsoluteString($en_file->getFileUri()) . ')',
$image_element->attr('style')
);
$this->assertBannerRendering($crawler);
$this->assertBannerRendering($crawler, ['link_label' => NULL]);
$this->assertCount(0, $crawler->filter('.bcl-banner.full-width'));

// Variant - image / Modifier - page_left / Full width - Yes.
$paragraph->get('field_oe_banner_size')->setValue('medium');
$paragraph->get('field_oe_banner_alignment')->setValue('left');
$paragraph->get('field_oe_banner_full_width')->setValue('1');
$paragraph->get('field_oe_link')->setValue([
'uri' => 'http://www.example.com/',
'title' => 'Example',
]);
$paragraph->save();
$html = $this->renderParagraph($paragraph);
$crawler = new Crawler($html);
Expand Down Expand Up @@ -672,13 +679,33 @@ public function testBanner(): void {
*
* @param \Symfony\Component\DomCrawler\Crawler $crawler
* The DomCrawler where to check the element.
* @param array $expected_values
* The text values for paragraph fields.
*/
protected function assertBannerRendering(Crawler $crawler): void {
$this->assertEquals('Banner', trim($crawler->filter('.bcl-banner__content div')->text()));
$this->assertEquals('Description', trim($crawler->filter('.bcl-banner__content p')->text()));
$this->assertCount(1, $crawler->filter('svg.bi.icon--fluid'));
$this->assertStringContainsString('Example', trim($crawler->filter('a.btn')->text()));
$this->assertStringContainsString('#chevron-right', trim($crawler->filter('a.btn')->html()));
protected function assertBannerRendering(Crawler $crawler, array $expected_values = []): void {
$values = array_merge([
'title' => 'Banner',
'description' => 'Description',
'link_label' => 'Example',
], $expected_values);
// Check optional title.
if ($values['title'] !== NULL) {
$this->assertEquals($values['title'], trim($crawler->filter('.bcl-banner__content div')->text()));
}
else {
$this->assertCount(0, $crawler->filter('.bcl-banner__content div'));
}
// Check description text.
$this->assertEquals($values['description'], trim($crawler->filter('.bcl-banner__content p')->text()));
// Check optional button.
if ($values['link_label'] !== NULL) {
$this->assertCount(1, $crawler->filter('svg.bi.icon--fluid'));
$this->assertStringContainsString($values['link_label'], trim($crawler->filter('a.btn')->text()));
$this->assertStringContainsString('#chevron-right', trim($crawler->filter('a.btn')->html()));
}
else {
$this->assertCount(0, $crawler->filter('a.btn'));
}
}

}
4 changes: 2 additions & 2 deletions templates/paragraphs/paragraph--oe-banner.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
{% set _shade = 'shade' in variant %}
{{ pattern('banner', {
'variant': variant,
'title': content.field_oe_title,
'description': content.field_oe_text,
'title': title,
'description': description,
'call_to_action': _call_to_action,
'image': image.src,
'hero': _hero,
Expand Down