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

NYS 156: Reenable microsite caching and implement long-term fix for field block caching issue #207

Merged
merged 4 commits into from
Jun 28, 2024
Merged

NYS 156: Reenable microsite caching and implement long-term fix for field block caching issue #207

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12e3ca0
nys-156: reenable microsite page caching
nathanielwoodland Jun 20, 2024
7bda454
Merge branch 'main' of https://github.com/nysenate/NYSenate.gov-Websi…
nathanielwoodland Jun 26, 2024
09f4bd8
nys-156: move field_block render array manipulations from node prepro…
nathanielwoodland Jun 26, 2024
923ef0a
nys-156: code clean-up
nathanielwoodland Jun 27, 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
35 changes: 24 additions & 11 deletions web/themes/custom/nysenate_theme/nysenate_theme.theme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2912,6 +2912,28 @@ function get_issue_card($term) {
return $issue_card;
}

/**
* Implements hook_preprocess_HOOK().
*/
function nysenate_theme_preprocess_field__node__field_block(&$variables) {
// Remove microsite_hero and senator_microsite_menu blocks from field
// rendering, as these blocks are rendered directly through
// page--node--microsite-page.html.twig
foreach ($variables['items'] ?? [] as $key => $item) {
nathanielwoodland marked this conversation as resolved.
Show resolved Hide resolved
$block_types = [
nathanielwoodland marked this conversation as resolved.
Show resolved Hide resolved
'microsite_hero',
'senator_microsite_menu',
];
/** @var \Drupal\block_content\Entity\BlockContent $block_content */
$block_content = ($item['content']['#block_content'] ?? []);
if ($block_content instanceof BlockContent) {
if (in_array($block_content->bundle(), $block_types)) {
unset($variables['items'][$key]);
}
}
}
}

/**
* Implements hook_preprocess_page__node__TYPE().
*/
Expand All @@ -2930,7 +2952,8 @@ function nysenate_theme_preprocess_page__node__microsite_page(&$variables) {
$block_content = $value->entity;

if ($block_content instanceof BlockContent) {
// Alter the field_block contents to be displayed.
// Provide microsite_hero and senator_microsite_menu blocks directly to
// page--node--microsite-page.html.twig.
if (in_array($block_content->bundle(), $block_types)) {
if ($block_content->bundle() == 'microsite_hero') {
$variables['microsite_hero'] = \Drupal::entityTypeManager()
Expand All @@ -2942,10 +2965,6 @@ function nysenate_theme_preprocess_page__node__microsite_page(&$variables) {
->getViewBuilder('block_content')
->view($block_content);
}

// Set both microsite blocks to empty array
// to prevent from rendering in the display.
$node->get('field_block')[$key] = [];
}
}
}
Expand Down Expand Up @@ -5027,12 +5046,6 @@ function get_item_cta($node) {
* Implements hook_preprocess_page().
*/
function nysenate_theme_preprocess_node__microsite_page__full(&$variables) {
// Disable page caching, to ensure field_block modifications in
// nysenate_theme_preprocess_page__node__microsite_page always run.
// @todo reimplement field_block modifications and turn page caching back on.
$variables['#cache']['max-age'] = 0;
\Drupal::service('page_cache_kill_switch')->trigger();

$node = \Drupal::routeMatch()->getParameter('node');

if (!empty($node) && $node->hasField('field_microsite_page_type') &&
Expand Down
Loading