OEL-1618: Upgrade BCL to 0.23.0. #144

escuriola · 2022-05-20T10:45:52Z

No description provided.

donquixote · 2022-05-31T15:14:45Z

This seems to be ok.
However, I suspect we now have duplicate <article> tags in node (teaser) templates.
(I think only event teaser and news teaser)

Let's:

Remove the outer <article> wrapper, if we include a card pattern that already does add an article wrapper via bcl-card.
Pass the node attributes into the pattern.
Add a test line to count the article tags when we render a news or event teaser.

Also, after changing card h* tags in oebt to h1, we need to update the tests here in whitelabel.

donquixote · 2022-06-01T22:52:47Z

I notice we have a bunch of templates where we put custom hx elements with fw-bold class.
I found these by looking for "fw-bold" in templates, and then checking if it is used for hx elements.

templates/content/field--node--body--oe-sc-event.html.twig
templates/content/field--node--oe-documents--oe-sc-event.html.twig
templates/overrides/navigation/oe-corporate-blocks-eu-footer.html.twig
templates/overrides/navigation/oe-corporate-blocks-neutral-footer.html.twig
templates/paragraphs/paragraph--oe-description-list.html.twig
templates/paragraphs/paragraph--oe-rich-text.html.twig

We need to compare these to netlify. In most cases I checked, the hx tags in netlify don't have the fw-bold class.

We could also consider, instead of having custom title elements, to use the new option of sending the title as a parameter to the pattern or bcl template. Unfortunately the patterns currently do not support this option.

TBD if we do this here or in a follow-up issue.

donquixote · 2022-06-02T08:56:22Z

Conclusion: Fix these in the same issue.

modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ContentRowTest.php

donquixote · 2022-06-03T16:12:49Z

I listed 6 templates above. I see only 2 of them were changed.

donquixote · 2022-06-13T16:18:15Z

@escuriola And now project has the wrong heading fonts!
templates/content/node--oe-project--full.html.twig
Sorry!

templates/content/field--node--body--oe-sc-event.html.twig

templates/content/field--node--oe-documents--oe-sc-event.html.twig

donquixote · 2022-06-13T11:36:44Z

templates/content/node--oe-sc-event--teaser.html.twig

+    content.oe_sc_event_dates|field_value,
+  ],
+  attributes: attributes,
+}) }}


Note to 2nd reviewer:

The article tag is now included in card pattern.

Passing 'attributes' to the card pattern means that all the entity attributes will now be on the card.

templates/list_pages/oe-list-pages-selected-facet.html.twig

donquixote · 2022-06-13T18:14:06Z

@escuriola And now project has the wrong heading fonts! templates/content/node--oe-project--full.html.twig Sorry!

And list page too - netlify has h2 for heading on top of the results.
templates/list_pages/node--oe-list-page--full.html.twig

also search page - netlify has h2 for heading on top of the results.
templates/overrides/search/block--facets-summary-block.html.twig

Perhaps there is more.

templates/content/field--node--body--oe-sc-event.html.twig

donquixote · 2022-06-15T15:58:55Z

templates/content/field--node--oe-documents--oe-sc-event.html.twig

+    {%- endset -%}
+    {% include '@oe-bcl/bcl-heading/heading.html.twig' with {
+      title: _label,
+      title_tag: 'h2',


h2 is the default, we can omit it.
Not a blocker though.

templates/overrides/search/block--facets-summary-block.html.twig

templates/content/node--oe-project--full.html.twig

modules/oe_whitelabel_list_pages/tests/src/Functional/ListPagesTest.php

templates/list_pages/node--oe-list-page--full.html.twig

templates/overrides/search/block--facets-summary-block.html.twig

…heading to last changes and fix testing.

… and ContentRow paragraphs.

…ing to h2.

drishu · 2022-06-24T14:45:14Z

tests/src/PatternAssertions/CardAssert.php

@@ -33,7 +33,7 @@ protected function getAssertions($variant): array {
      ],


https://citnet.tech.ec.europa.eu/CITnet/jira/browse/OEL-1771

escuriola force-pushed the OEL-1618 branch 2 times, most recently from 0c0aed3 to c19217e Compare May 20, 2022 13:38

escuriola force-pushed the OEL-1618 branch from c19217e to df8a095 Compare May 31, 2022 12:22

escuriola force-pushed the OEL-1618 branch 2 times, most recently from 879d816 to f653d87 Compare June 1, 2022 18:32

escuriola force-pushed the OEL-1618 branch 2 times, most recently from aaeec65 to 775b6ab Compare June 3, 2022 11:49

donquixote reviewed Jun 3, 2022

View reviewed changes

modules/oe_whitelabel_paragraphs/tests/src/Kernel/Paragraphs/ContentRowTest.php Show resolved Hide resolved

escuriola force-pushed the OEL-1618 branch 3 times, most recently from 84a347e to 639905c Compare June 10, 2022 07:34

donquixote requested changes Jun 13, 2022

View reviewed changes

donquixote requested changes Jun 15, 2022

View reviewed changes

escuriola force-pushed the OEL-1618 branch 2 times, most recently from 72883c8 to e298c73 Compare June 16, 2022 15:09

donquixote previously approved these changes Jun 16, 2022

View reviewed changes

escuriola added 8 commits June 23, 2022 12:56

OEL-1618: Upgrade BCL to 0.23.0.

9f2afb0

OEL-1618: Fix heading changes tests.

2240772

OEL-1618: Update development release.

3902121

OEL-1618: Remove duplicated article tag, now in BCL component. Adapt …

090da59

…heading to last changes and fix testing.

OEL-1618: Removing fw-bold classes and add heading to DescriptionList…

511faa6

… and ContentRow paragraphs.

OEL-1618: Add BCL headings instead custom.

a4c1ac7

OEL-1618: Update bootstrap_theme with a new tmp release.

8fc00b5

OEL-1618: Update composer to a recent oebt release.

350e5c1

escuriola added 5 commits June 23, 2022 12:56

OEL-1618: Fixing tests after rebasing.

45471b7

OEL-1618: Fixing ListPages tests after rebasing.

34e0c15

OEL-1618: Event fields heading. Recover title_classes and change head…

afec2ac

…ing to h2.

OEL-1618: Remove debug dump.

a26da52

OEL-1618: Remove title_tag when default 'h2'.

588f0f5

escuriola dismissed donquixote’s stale review via 588f0f5 June 23, 2022 10:56

escuriola force-pushed the OEL-1618 branch from e298c73 to 588f0f5 Compare June 23, 2022 10:56

OEL-1618: Add new oe_bootstrap_theme dev release after BCL upgrade.

ef3a5af

escuriola force-pushed the OEL-1618 branch from 0d6a7b3 to 73a5a1e Compare June 23, 2022 13:47

OEL-1618: Fixing heading test in featured_media paragraph.

eae03c3

escuriola force-pushed the OEL-1618 branch from 3c664ca to eae03c3 Compare June 23, 2022 14:21

drishu reviewed Jun 24, 2022

View reviewed changes

drishu approved these changes Jun 24, 2022

View reviewed changes

brummbar approved these changes Jun 24, 2022

View reviewed changes

brummbar merged commit f3b5dab into 1.x Jun 24, 2022

brummbar deleted the OEL-1618 branch June 24, 2022 15:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

OEL-1618: Upgrade BCL to 0.23.0. #144

OEL-1618: Upgrade BCL to 0.23.0. #144

escuriola commented May 20, 2022

donquixote commented May 31, 2022

donquixote commented Jun 1, 2022

donquixote commented Jun 2, 2022

donquixote commented Jun 3, 2022

donquixote commented Jun 13, 2022

donquixote Jun 13, 2022

donquixote commented Jun 13, 2022

donquixote Jun 15, 2022

drishu Jun 24, 2022

		@@ -33,7 +33,7 @@ protected function getAssertions($variant): array {
		],

OEL-1618: Upgrade BCL to 0.23.0. #144

OEL-1618: Upgrade BCL to 0.23.0. #144

Conversation

escuriola commented May 20, 2022

donquixote commented May 31, 2022

donquixote commented Jun 1, 2022

donquixote commented Jun 2, 2022

donquixote commented Jun 3, 2022

donquixote commented Jun 13, 2022

donquixote Jun 13, 2022

Choose a reason for hiding this comment

donquixote commented Jun 13, 2022

donquixote Jun 15, 2022

Choose a reason for hiding this comment

drishu Jun 24, 2022

Choose a reason for hiding this comment