Skip to content

ISSUE-348: Adds a pseudo Node "Upcaster" for Routed Views in the presence of "Active Display Settings" tab #349

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

Merged
DiegoPino merged 3 commits into from
Aug 1, 2023
Merged

ISSUE-348: Adds a pseudo Node "Upcaster" for Routed Views in the presence of "Active Display Settings" tab #349

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59e0bfb
Adds a pseudo Node Upcaster for Views
DiegoPino Aug 1, 2023
1d89982
Remove un-used usage of Node Entity itself
DiegoPino Aug 1, 2023
a41eecd
Update src/Plugin/Menu/LocalTask/ViewModeLocalTask.php
DiegoPino Aug 1, 2023
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
48 changes: 41 additions & 7 deletions src/Plugin/Menu/LocalTask/ViewModeLocalTask.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Drupal\format_strawberryfield\Plugin\Menu\LocalTask;

use Drupal\Core\Entity\EntityTypeManagerInterface;
use Drupal\Core\Menu\LocalTaskDefault;
use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
use Drupal\Core\Routing\RouteMatchInterface;
Expand All @@ -21,21 +22,29 @@ class ViewModeLocalTask extends LocalTaskDefault implements ContainerFactoryPlug
*/
protected $viewModeResolver;

/**
* The Entity Type Manager.
*
* @var \Drupal\Core\Entity\EntityTypeManagerInterface
*/
protected EntityTypeManagerInterface $entityTypeManager;

/**
* Construct the ViewModeLocalTask object.
*
* @param array $configuration
* @param array $configuration
* A configuration array containing information about the plugin instance.
* @param string $plugin_id
* @param string $plugin_id
* The plugin_id for the plugin instance.
* @param array $plugin_definition
* @param array $plugin_definition
* The plugin implementation definition.
* @param \Drupal\format_strawberryfield\ViewModeResolverInterface
* The SBF View Mode resolver.
* @param \Drupal\format_strawberryfield\ViewModeResolverInterface $view_mode_resolver
* @param \Drupal\Core\Entity\EntityTypeManagerInterface $entitytype_manager
*/
public function __construct(array $configuration, $plugin_id, array $plugin_definition, ViewModeResolverInterface $view_mode_resolver) {
public function __construct(array $configuration, $plugin_id, array $plugin_definition, ViewModeResolverInterface $view_mode_resolver, EntityTypeManagerInterface $entitytype_manager) {
parent::__construct($configuration, $plugin_id, $plugin_definition);
$this->viewModeResolver = $view_mode_resolver;
$this->entityTypeManager = $entitytype_manager;
}

/**
Expand All @@ -46,7 +55,8 @@ public static function create(ContainerInterface $container, array $configuratio
$configuration,
$plugin_id,
$plugin_definition,
$container->get('format_strawberryfield.view_mode_resolver')
$container->get('format_strawberryfield.view_mode_resolver'),
$container->get('entity_type.manager')
);
}

Expand All @@ -66,6 +76,30 @@ public function getRouteParameters(RouteMatchInterface $route_match) {
}
$params += ['bundle' => $node->bundle(), 'node' => $node->id(), 'view_mode_name' => $viewmode];
}
elseif ($route_match->getParameter('view_id') && is_numeric($node)) {
/* Upcasting %node route argument to NodeInterface will not happen for
Routed Views (Page/Rest), when under access control because of
https://www.drupal.org/project/drupal/issues/2528166
@TODO Revisit this work-around on Drupal 11.x
*/
$node = $this->entityTypeManager->getStorage('node')->load($node);
if ($node) {
if ($node->hasField('ds_switch')
&& !empty($node->ds_switch->value)
) {
$viewmode = $node->ds_switch->value;
}
else {
$viewmode = $this->viewModeResolver->get($node);
}
$params += [
'bundle' => $node->bundle(),
'node' => $node->id(),
'view_mode_name' => $viewmode
];
}
}

return $params;
}

Expand Down