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

Add check for cache tags in JSON-LD alter hook. #862

Merged
merged 8 commits into from
Mar 25, 2022
Merged

Add check for cache tags in JSON-LD alter hook. #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7709425
Add check for cache tags in JSON-LD alter hook.
alxp Feb 2, 2022
2199336
Add further check to jsonld context cacheability to avoid white screen.
alxp Feb 28, 2022
1a61b17
Update to File Hash 2.x due to failing tests.
alxp Mar 23, 2022
20f7ebb
Maintain backward compatibility with File Hash v. 1.x
alxp Mar 23, 2022
9c8193b
islandora:862 Incorporate PR review suggestion
alxp Mar 24, 2022
f7287be
islandora:862 Add Use statement to go with last commit.
alxp Mar 24, 2022
ac749ce
Fix syntax error.
alxp Mar 24, 2022
4c08d5a
islandora:862 Remove white space at end of line causing failing tests.
alxp Mar 24, 2022
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: 2 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"islandora/jsonld": "^2",
"stomp-php/stomp-php": "4.*",
"drupal/jwt": "^1.0.0-beta5",
"drupal/filehash": "^1.1",
"drupal/filehash": "^1.1 || ^2",
"drupal/prepopulate" : "^2.2",
"drupal/eva" : "^2.0",
"drupal/features" : "^3.7",
Expand All @@ -39,7 +39,7 @@
"suggest": {
"drupal/transliterate_filenames": "Sanitizes filenames when they are uploaded so they don't break your repository."
},
"license": "GPL-2.0+",
"license": "GPL-2.0-or-later",
"authors": [
{
"name": "Islandora Foundation",
Expand Down
5 changes: 3 additions & 2 deletions islandora.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ use Drupal\media\MediaInterface;
use Drupal\file\FileInterface;
use Drupal\taxonomy\TermInterface;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\serialization\Normalizer\CacheableNormalizerInterface;

/**
* Implements hook_help().
Expand Down Expand Up @@ -251,8 +252,8 @@ function islandora_jsonld_alter_normalized_array(EntityInterface $entity, array
$reaction->execute($entity, $normalized, $context);
foreach ($context_manager->getActiveContexts() as $context_config) {
try {
if ($context_config->getReaction($reaction->getPluginId())) {
$context['cacheability']->addCacheTags($context_config->getCacheTags());
if ($context_config->getReaction($reaction->getPluginId()) && isset($context[CacheableNormalizerInterface::SERIALIZATION_CONTEXT_CACHEABILITY])) {
$context[CacheableNormalizerInterface::SERIALIZATION_CONTEXT_CACHEABILITY]->addCacheableDependency($context_config);
};
}
catch (PluginNotFoundException $e) {
Expand Down