Only Global tokens available on Redirect behavior settings

Problem

When settings default Rabbit Hole behavior on a bundle (like the Vocabulary), and adding a Page Redirect, you only have access to global tokens. It would make sense that you would also have access to the tokens for the entity type here (in this case, the underlying term that will eventually be the context for this setting). That way you can take advantage of fields on the entity, like a Link field, so you can redirect to the value of that field.

Solution

It does seem that "taxonomy_term" is added to the $entity_type_for_tokens variable when creating the Browse Tokens link, but the Token tree builder is expecting just "term." This is how the core taxonomy module defines it's tokens.

We need another way to get the entity type in PageRedirect.php, one that takes into account this discrepancy. This is the current code:

$entity_type_for_tokens = $entity_is_bundle
        ? $entity->getEntityType()->getBundleOf()
        : $entity->getEntityTypeId();