UCPKN-3176: Accessibility statement link in the footer. #1488
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
peterserfozo
force-pushed
the
contribution/UCPKN-3176
branch
from
b572a9a to
adb2912
Compare
drishu
previously approved these changes
Aug 13, 2024
drishu
force-pushed
the
contribution/UCPKN-3176
branch
from
adb2912 to
fa7d00d
Compare
drishu
previously approved these changes
Aug 13, 2024
drishu
force-pushed
the
contribution/UCPKN-3176
branch
2 times, most recently
from
c5bc68a to
9ec93bb
Compare
drishu
previously approved these changes
Aug 14, 2024
brummbar
requested changes
Aug 16, 2024
oe_theme.theme
Outdated
Comment on lines
1944
to
1948
| if (!function_exists('oe_corporate_blocks_preprocess_set_accessibility_link')) { | ||
| return; | ||
| } | ||
| $cacheability = CacheableMetadata::createFromRenderArray($variables); | ||
| $configuration = \Drupal::configFactory()->get(SiteInformation::CONFIG_NAME); | ||
| $cacheability->addCacheableDependency($configuration); | ||
| /** @var \Drupal\oe_corporate_site_info\SiteInformationInterface $site_information */ | ||
| $site_information = \Drupal::service('oe_corporate_site_info.site_information'); | ||
| if (!$site_information->hasAccessibilityLink()) { | ||
| $cacheability->applyTo($variables); | ||
|
|
||
| oe_corporate_blocks_preprocess_set_accessibility_link($variables); | ||
|
|
||
| if (!isset($variables['accessibility_link']) || !$variables['accessibility_link'] instanceof Url) { | ||
| return; | ||
| } | ||
| $uri = $site_information->getAccessibilityLink(); | ||
| $uri_parts = parse_url($uri); | ||
| if ($uri_parts['scheme'] === 'entity') { | ||
| [$entity_type_id, $entity_id] = explode('/', $uri_parts['path'], 2); | ||
| $entity = \Drupal::entityTypeManager()->getStorage($entity_type_id)->load($entity_id); | ||
| if ($entity instanceof NodeInterface) { | ||
| $cacheability->addCacheableDependency($entity); | ||
| $access = $entity->access('view', \Drupal::currentUser(), TRUE); | ||
| $cacheability->addCacheableDependency($access); | ||
| if (!$access->isAllowed()) { | ||
| $cacheability->applyTo($variables); | ||
| // Do not show the button if access to the node is forbidden. | ||
| return; | ||
| } | ||
| } | ||
| } | ||
| $url = Url::fromUri($uri)->toString(); | ||
|
|
||
| $variables['accessibility_link'] = $url; | ||
| $cacheability->applyTo($variables); | ||
| $variables['accessibility_link'] = $variables['accessibility_link']->toString(); |
There was a problem hiding this comment.
I am not sure I understand the need of manually calling the preprocess function as it's already set in the two theme implementations.
The accessibility_link variable is already there when I debugged the method, and the toString() method is not needed as far as I can see, because it's called by twig when rendering. I have commented out this method and the links were showing ok for me. The only limitation that we need to be sure to put is a constraint in both oe_theme and oe_corporate_blocks to make sure that previous versions of either components are not used with an older version of the other.
Or, alternatively, we keep the code in this method, leave a todo for the next major, and bail out if the accessibility_link is already there.
There was a problem hiding this comment.
removed the function entirely and marked the conflict.
drishu
force-pushed
the
contribution/UCPKN-3176
branch
2 times, most recently
from
aa0973d to
67c41ac
Compare
AaronGilMartinez
previously approved these changes
Aug 21, 2024
drishu
force-pushed
the
contribution/UCPKN-3176
branch
from
67c41ac to
cee5e2f
Compare
brummbar
previously approved these changes
Aug 22, 2024
drishu
previously approved these changes
Aug 23, 2024
…oe_corporate_blocks module.
AaronGilMartinez
force-pushed
the
contribution/UCPKN-3176
branch
from
7b7fb7a to
6981fe6
Compare
brummbar
approved these changes
Aug 23, 2024
AaronGilMartinez
approved these changes
Aug 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
OPENEUROPA-[Insert ticket number here]
Description
The accessibility statement link logic is in the oe_coporate_blocks module from now. See openeuropa/oe_corporate_blocks#155
Change log
Commands