diff --git a/.travis.yml b/.travis.yml old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/composer.json b/composer.json old mode 100644 new mode 100755 diff --git a/css/jquery.treetable.css b/css/jquery.treetable.css old mode 100644 new mode 100755 diff --git a/css/token.css b/css/token.css old mode 100644 new mode 100755 diff --git a/css/token.treetable.theme.css b/css/token.treetable.theme.css old mode 100644 new mode 100755 diff --git a/js/jquery.treetable.js b/js/jquery.treetable.js old mode 100644 new mode 100755 diff --git a/js/token.js b/js/token.js old mode 100644 new mode 100755 diff --git a/src/Controller/TokenAutocompleteController.php b/src/Controller/TokenAutocompleteController.php old mode 100644 new mode 100755 diff --git a/src/Controller/TokenCacheController.php b/src/Controller/TokenCacheController.php old mode 100644 new mode 100755 diff --git a/src/Controller/TokenDevelController.php b/src/Controller/TokenDevelController.php old mode 100644 new mode 100755 diff --git a/src/Controller/TokenTreeController.php b/src/Controller/TokenTreeController.php old mode 100644 new mode 100755 diff --git a/src/Element/TokenTreeTable.php b/src/Element/TokenTreeTable.php old mode 100644 new mode 100755 diff --git a/src/Plugin/Derivative/DevelLocalTask.php b/src/Plugin/Derivative/DevelLocalTask.php old mode 100644 new mode 100755 diff --git a/src/Routing/RouteSubscriber.php b/src/Routing/RouteSubscriber.php old mode 100644 new mode 100755 diff --git a/src/Tests/TokenBlockTest.php b/src/Tests/TokenBlockTest.php old mode 100644 new mode 100755 diff --git a/src/Tests/TokenCurrentPageTest.php b/src/Tests/TokenCurrentPageTest.php old mode 100644 new mode 100755 diff --git a/src/Tests/TokenFieldUiTest.php b/src/Tests/TokenFieldUiTest.php old mode 100644 new mode 100755 diff --git a/src/Tests/TokenMenuTest.php b/src/Tests/TokenMenuTest.php old mode 100644 new mode 100755 index 5e1f874..023721c --- a/src/Tests/TokenMenuTest.php +++ b/src/Tests/TokenMenuTest.php @@ -19,6 +19,8 @@ class TokenMenuTest extends TokenTestBase { public static $modules = ['menu_ui', 'node']; function testMenuTokens() { + // Make sure we have a body field on the node type. + $this->drupalCreateContentType(['type' => 'page']); // Add a menu. $menu = entity_create('menu', array( 'id' => 'main-menu', @@ -118,5 +120,137 @@ class TokenMenuTest extends TokenTestBase { // Regression test for http://drupal.org/node/1317926 to ensure the // original node object is not changed when calling menu_node_prepare(). $this->assertTrue(!isset($loaded_node->menu), t('The $node->menu property was not modified during token replacement.'), 'Regression'); + + // Now add a node with a menu-link from the UI and ensure it works. + $this->drupalLogin($this->drupalCreateUser([ + 'create page content', + 'edit any page content', + 'administer menu', + 'administer nodes', + 'administer content types', + 'access administration pages', + ])); + // Setup node type menu options. + $edit = array( + 'menu_options[main-menu]' => 1, + 'menu_options[main]' => 1, + 'menu_parent' => 'main-menu:', + ); + $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type')); + + // Use a menu-link token in the body. + $this->drupalGet('node/add/page'); + $this->drupalPostForm(NULL, [ + // This should get replaced on save. + // @see token_module_test_node_presave() + 'title[0][value]' => 'Node menu title test', + 'body[0][value]' => 'This is a [node:menu-link:title] token to the menu link title', + 'menu[enabled]' => 1, + 'menu[title]' => 'Test preview', + ], t('Save and publish')); + $node = $this->drupalGetNodeByTitle('Node menu title test'); + $this->assertEqual('This is a Test preview token to the menu link title', $node->body->value); + + // Now test a parent link and token. + $this->drupalGet('node/add/page'); + // Make sure that the previous node save didn't result in two menu-links + // being created by the computed menu-link ER field. + // @see token_entity_base_field_info() + // @see token_node_menu_link_submit() + $selects = $this->cssSelect('select[name="menu[menu_parent]"]'); + $select = reset($selects); + $options = $this->getAllOptions($select); + // Filter to items with title containing 'Test preview'. + $options = array_filter($options, function(\SimpleXMLElement $item) { + return strpos((string) $item[0], 'Test preview') !== FALSE; + }); + $this->assertEqual(1, count($options)); + $this->drupalPostForm(NULL, [ + 'title[0][value]' => 'Node menu title parent path test', + 'body[0][value]' => 'This is a [node:menu-link:parent:url:path] token to the menu link parent', + 'menu[enabled]' => 1, + 'menu[title]' => 'Child link', + 'menu[menu_parent]' => 'main-menu:' . $parent_link->getPluginId(), + ], t('Save and publish')); + $node = $this->drupalGetNodeByTitle('Node menu title parent path test'); + $this->assertEqual('This is a /admin/config token to the menu link parent', $node->body->value); + + // Now edit the node and update the parent and title. + $this->drupalPostForm('node/' . $node->id() . '/edit', [ + 'menu[menu_parent]' => 'main-menu:' . $node_link->getPluginId(), + 'title[0][value]' => 'Node menu title edit parent path test', + 'body[0][value]' => 'This is a [node:menu-link:parent:url:path] token to the menu link parent', + ], t('Save and keep published')); + $node = $this->drupalGetNodeByTitle('Node menu title edit parent path test', TRUE); + $this->assertEqual(sprintf('This is a /node/%d token to the menu link parent', $loaded_node->id()), $node->body->value); + + // Make sure that the previous node edit didn't result in two menu-links + // being created by the computed menu-link ER field. + // @see token_entity_base_field_info() + // @see token_node_menu_link_submit() + $this->drupalGet('node/add/page'); + $selects = $this->cssSelect('select[name="menu[menu_parent]"]'); + $select = reset($selects); + $options = $this->getAllOptions($select); + // Filter to items with title containing 'Test preview'. + $options = array_filter($options, function(\SimpleXMLElement $item) { + return strpos((string) $item[0], 'Child link') !== FALSE; + }); + $this->assertEqual(1, count($options)); + + // Now add a node with a menu-link from the UI and ensure it works. + $this->drupalLogin($this->drupalCreateUser([ + 'create page content', + 'administer menu', + 'administer nodes', + 'administer content types', + 'access administration pages', + ])); + // Setup node type menu options. + $edit = array( + 'menu_options[main-menu]' => 1, + 'menu_options[main]' => 1, + 'menu_parent' => 'main-menu:', + ); + $this->drupalPostForm('admin/structure/types/manage/page', $edit, t('Save content type')); + + // Use a menu-link token in the body. + $this->drupalGet('node/add/page'); + $this->drupalPostForm(NULL, [ + // This should get replaced on save. + // @see token_module_test_node_presave() + 'title[0][value]' => 'Node menu title test', + 'body[0][value]' => 'This is a [node:menu-link:title] token to the menu link title', + 'menu[enabled]' => 1, + 'menu[title]' => 'Test preview', + ], t('Save and publish')); + $node = $this->drupalGetNodeByTitle('Node menu title test'); + $this->assertEqual('This is a Test preview token to the menu link title', $node->body->value); + + // Now test a parent link and token. + $this->drupalGet('node/add/page'); + // Make sure that the previous node save didn't result in two menu-links + // being created by the computed menu-link ER field. + // @see token_entity_base_field_info() + // @see token_node_menu_link_submit() + $selects = $this->cssSelect('select[name="menu[menu_parent]"]'); + $select = reset($selects); + $options = $this->getAllOptions($select); + // Filter to items with title containing 'Test preview'. + $options = array_filter($options, function(\SimpleXMLElement $item) { + return strpos((string) $item[0], 'Test preview') !== FALSE; + }); + $this->assertEqual(1, count($options)); + $this->drupalPostForm(NULL, [ + 'title[0][value]' => 'Node menu title parent path test', + 'body[0][value]' => 'This is a [node:menu-link:parent:url:path] token to the menu link parent', + 'menu[enabled]' => 1, + 'menu[title]' => 'Child link', + 'menu[menu_parent]' => 'main-menu:' . $parent_link->getPluginId(), + ], t('Save and publish')); + $node = $this->drupalGetNodeByTitle('Node menu title parent path test'); + $this->assertEqual('This is a /admin/config token to the menu link parent', $node->body->value); + $this->drupalGet('admin/structure/menu/manage/main-menu'); } + } diff --git a/src/Tests/TokenTestBase.php b/src/Tests/TokenTestBase.php old mode 100644 new mode 100755 diff --git a/src/Tests/TokenTestTrait.php b/src/Tests/TokenTestTrait.php old mode 100644 new mode 100755 diff --git a/src/Tests/TokenURLTest.php b/src/Tests/TokenURLTest.php old mode 100644 new mode 100755 diff --git a/src/Tests/TokenUserTest.php b/src/Tests/TokenUserTest.php old mode 100644 new mode 100755 diff --git a/src/Tests/Tree/AutocompleteTest.php b/src/Tests/Tree/AutocompleteTest.php old mode 100644 new mode 100755 diff --git a/src/Tests/Tree/HelpPageTest.php b/src/Tests/Tree/HelpPageTest.php old mode 100644 new mode 100755 diff --git a/src/Tests/Tree/TokenTreeTestTrait.php b/src/Tests/Tree/TokenTreeTestTrait.php old mode 100644 new mode 100755 diff --git a/src/Tests/Tree/TreeTest.php b/src/Tests/Tree/TreeTest.php old mode 100644 new mode 100755 diff --git a/src/Token.php b/src/Token.php old mode 100644 new mode 100755 diff --git a/src/TokenEntityMapper.php b/src/TokenEntityMapper.php old mode 100644 new mode 100755 diff --git a/src/TokenEntityMapperInterface.php b/src/TokenEntityMapperInterface.php old mode 100644 new mode 100755 diff --git a/src/TokenInterface.php b/src/TokenInterface.php old mode 100644 new mode 100755 diff --git a/src/TokenServiceProvider.php b/src/TokenServiceProvider.php old mode 100644 new mode 100755 diff --git a/src/TreeBuilder.php b/src/TreeBuilder.php old mode 100644 new mode 100755 diff --git a/src/TreeBuilderInterface.php b/src/TreeBuilderInterface.php old mode 100644 new mode 100755 diff --git a/templates/token-tree-link.html.twig b/templates/token-tree-link.html.twig old mode 100644 new mode 100755 diff --git a/tests/modules/token_module_test/config/install/core.date_format.token_module_test.yml b/tests/modules/token_module_test/config/install/core.date_format.token_module_test.yml old mode 100644 new mode 100755 diff --git a/tests/modules/token_module_test/src/Controller/TokenTreeBrowseController.php b/tests/modules/token_module_test/src/Controller/TokenTreeBrowseController.php old mode 100644 new mode 100755 diff --git a/tests/modules/token_module_test/token_module_test.info.yml b/tests/modules/token_module_test/token_module_test.info.yml old mode 100644 new mode 100755 diff --git a/tests/modules/token_module_test/token_module_test.module b/tests/modules/token_module_test/token_module_test.module old mode 100644 new mode 100755 index b907534..f81636e --- a/tests/modules/token_module_test/token_module_test.module +++ b/tests/modules/token_module_test/token_module_test.module @@ -4,6 +4,7 @@ * @file * Helper module for token tests. */ +use Drupal\node\NodeInterface; /** * Implements hook_page_attachments(). @@ -17,3 +18,15 @@ function token_module_test_page_attachments() { \Drupal::state()->set('token_page_tokens', $debug); } } + +/** + * Implements hook_ENTITY_TYPE_presave for Node entities. + */ +function token_module_test_node_presave(NodeInterface $node) { + // Transform tokens in the body. + // @see \Drupal\token\Tests\TokenMenuTest::testMenuTokens() + if ($node->hasField('body')) { + $node->body->value = \Drupal::token() + ->replace($node->body->value, ['node' => $node]); + } +} \ No newline at end of file diff --git a/tests/modules/token_module_test/token_module_test.routing.yml b/tests/modules/token_module_test/token_module_test.routing.yml old mode 100644 new mode 100755 diff --git a/tests/modules/token_module_test/token_module_test.tokens.inc b/tests/modules/token_module_test/token_module_test.tokens.inc old mode 100644 new mode 100755 diff --git a/tests/modules/token_user_picture/config/install/core.entity_form_display.user.user.default.yml b/tests/modules/token_user_picture/config/install/core.entity_form_display.user.user.default.yml old mode 100644 new mode 100755 diff --git a/tests/modules/token_user_picture/config/install/field.field.user.user.user_picture.yml b/tests/modules/token_user_picture/config/install/field.field.user.user.user_picture.yml old mode 100644 new mode 100755 diff --git a/tests/modules/token_user_picture/config/install/field.storage.user.user_picture.yml b/tests/modules/token_user_picture/config/install/field.storage.user.user_picture.yml old mode 100644 new mode 100755 diff --git a/tests/modules/token_user_picture/token_user_picture.info.yml b/tests/modules/token_user_picture/token_user_picture.info.yml old mode 100644 new mode 100755 diff --git a/tests/src/Kernel/ArrayTest.php b/tests/src/Kernel/ArrayTest.php old mode 100644 new mode 100755 diff --git a/tests/src/Kernel/CommentTest.php b/tests/src/Kernel/CommentTest.php old mode 100644 new mode 100755 diff --git a/tests/src/Kernel/DateTest.php b/tests/src/Kernel/DateTest.php old mode 100644 new mode 100755 diff --git a/tests/src/Kernel/EntityTest.php b/tests/src/Kernel/EntityTest.php old mode 100644 new mode 100755 diff --git a/tests/src/Kernel/FieldTest.php b/tests/src/Kernel/FieldTest.php old mode 100644 new mode 100755 diff --git a/tests/src/Kernel/FileTest.php b/tests/src/Kernel/FileTest.php old mode 100644 new mode 100755 diff --git a/tests/src/Kernel/KernelTestBase.php b/tests/src/Kernel/KernelTestBase.php old mode 100644 new mode 100755 diff --git a/tests/src/Kernel/NodeTest.php b/tests/src/Kernel/NodeTest.php old mode 100644 new mode 100755 diff --git a/tests/src/Kernel/RandomTest.php b/tests/src/Kernel/RandomTest.php old mode 100644 new mode 100755 diff --git a/tests/src/Kernel/TaxonomyTest.php b/tests/src/Kernel/TaxonomyTest.php old mode 100644 new mode 100755 diff --git a/tests/src/Kernel/UnitTest.php b/tests/src/Kernel/UnitTest.php old mode 100644 new mode 100755 diff --git a/token.drush.inc b/token.drush.inc old mode 100644 new mode 100755 diff --git a/token.info.yml b/token.info.yml old mode 100644 new mode 100755 diff --git a/token.install b/token.install old mode 100644 new mode 100755 diff --git a/token.libraries.yml b/token.libraries.yml old mode 100644 new mode 100755 diff --git a/token.links.task.yml b/token.links.task.yml old mode 100644 new mode 100755 diff --git a/token.module b/token.module old mode 100644 new mode 100755 index 1078cca..79cc8f6 --- a/token.module +++ b/token.module @@ -1,3 +1,7 @@ +use Drupal\Core\Utility\Token; +use Drupal\Core\Url; +use Drupal\menu_link_content\Entity\MenuLinkContent; +use Drupal\node\NodeInterface; moduleExists('devel'); - /* @var $entity_types \Drupal\Core\Entity\EntityTypeInterface[] */ + /* @var $entity_types EntityTypeInterface[] */ foreach ($entity_types as $entity_type_id => $entity_type) { if (!$entity_type->get('token_type')) { // Fill in default token types for entities. @@ -632,4 +639,108 @@ function token_element_children(&$elements, $sort = FALSE) { } return array_keys($children); +} + +/** + * Implements hook_entity_base_field_info(). + */ +function token_entity_base_field_info(EntityTypeInterface $entity_type) { + // We add a psuedo entity-reference field to track the menu entry created + // from the node add/edit form so that tokens generated at that time that + // reference the menu link can access the yet to be saved menu link. + // @todo Revisit when https://www.drupal.org/node/2315773 is resolved. + if ($entity_type->id() === 'node' && \Drupal::moduleHandler()->moduleExists('menu_ui')) { + $fields['menu_link'] = BaseFieldDefinition::create('entity_reference') + ->setLabel(t('Menu link')) + ->setDescription(t('Computed menu link for the node (only available during node saving).')) + ->setRevisionable(TRUE) + ->setSetting('target_type', 'menu_link_content') + ->setTranslatable(TRUE) + ->setDisplayOptions('view', array( + 'label' => 'hidden', + 'type' => 'hidden', + )) + ->setComputed(TRUE) + ->setDisplayOptions('form', array( + 'type' => 'hidden', + )); + + return $fields; + } + return []; +} + +/** + * Implements hook_form_BASE_FORM_ID_alter() for node_form. + * + * Populates menu_link field on nodes from the menu item on unsaved nodes. + * + * @see menu_ui_form_node_form_submit() + * @see token_entity_base_field_info() + */ +function token_form_node_form_alter(&$form, FormStateInterface $form_state) { + if (!\Drupal::moduleHandler()->moduleExists('menu_ui')) { + return; + } + /** @var \Drupal\node\NodeForm $form_object */ + if (!\Drupal::currentUser()->hasPermission('administer menu')) { + // We're only interested in when the node is unsaved and the editor has + // permission to create new menu links. + return; + } + $form['#entity_builders'][] = 'token_node_menu_link_submit'; +} + +/** + * Entity builder. + */ +function token_node_menu_link_submit($entity_type, NodeInterface $node, &$form, FormStateInterface $form_state) { + // Entity builders run twice, once during validation and again during + // submission, so we only run this code after validation has been performed. + if (!$form_state->isValueEmpty('menu') && $form_state->getTemporaryValue('entity_validated')) { + $values = $form_state->getValue('menu'); + if (!empty($values['enabled']) && trim($values['title'])) { + if (!empty($values['menu_parent'])) { + list($menu_name, $parent) = explode(':', $values['menu_parent'], 2); + $values['menu_name'] = $menu_name; + $values['parent'] = $parent; + } + // Construct an unsaved entity. + if ($entity_id = $form_state->getValue(['menu', 'entity_id'])) { + // Use the existing menu_link_content entity. + $entity = MenuLinkContent::load($entity_id); + } + else { + // Create a new menu_link_content entity. + $entity = MenuLinkContent::create(array( + // Lets just reference the UUID for now, the link is not important for + // token generation. + 'link' => ['uri' => 'internal:/node/' . $node->uuid()], + 'langcode' => $node->language()->getId(), + )); + } + $entity->enabled->value = 1; + $entity->title->value = trim($values['title']); + $entity->description->value = trim($values['description']); + $entity->menu_name->value = $values['menu_name']; + $entity->parent->value = $values['parent']; + $entity->weight->value = isset($values['weight']) ? $values['weight'] : 0; + $entity->save(); + $node->menu_link = $entity; + // Leave this for _menu_ui_node_save() to pick up so we don't end up with + // duplicate menu-links. + $form_state->setValue(['menu', 'entity_id'], $entity->id()); + } + } +} + +/** + * Implements hook_ENTITY_TYPE_insert for node entities. + */ +function token_node_insert(NodeInterface $node) { + if ($node->hasField('menu_link') && $menu_link = $node->menu_link->entity) { + // Update the menu-link to point to the now saved node. + $menu_link->link = 'entity:node/' . $node->id(); + $menu_link->save(); + } } \ No newline at end of file diff --git a/token.pages.inc b/token.pages.inc old mode 100644 new mode 100755 diff --git a/token.routing.yml b/token.routing.yml old mode 100644 new mode 100755 diff --git a/token.services.yml b/token.services.yml old mode 100644 new mode 100755 diff --git a/token.tokens.inc b/token.tokens.inc old mode 100644 new mode 100755 index 60125dc..9524a72 --- a/token.tokens.inc +++ b/token.tokens.inc @@ -1060,20 +1060,45 @@ function menu_ui_tokens($type, $tokens, array $data = array(), array $options = foreach ($tokens as $name => $original) { switch ($name) { case 'menu-link': - $url = $node->urlInfo(); - if ($links = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $url->getRouteParameters())) { - $link = reset($links); - $replacements[$original] = $link->getTitle(); + // On first save we populate a calculated field with a menu_link + // references. + // @see token_node_menu_link_submit() + if ($node->getFieldDefinition('menu_link') && $menu_link = $node->menu_link->entity) { + /** @var \Drupal\menu_link_content\MenuLinkContentInterface $menu_link */ + $replacements[$original] = $menu_link->getTitle(); + } + else { + $url = $node->urlInfo(); + if ($links = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $url->getRouteParameters())) { + $link = reset($links); + $replacements[$original] = $link->getTitle(); + } } break; } // Chained token relationships. if ($menu_tokens = \Drupal::token()->findWithPrefix($tokens, 'menu-link')) { - $url = $node->urlInfo(); - if ($links = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $url->getRouteParameters())) { - $link = reset($links); - $replacements += \Drupal::token()->generate('menu-link', $menu_tokens, array('menu-link' => $link), $options, $bubbleable_metadata); + if ($node->getFieldDefinition('menu_link') && $menu_link = $node->menu_link->entity) { + /** @var \Drupal\menu_link_content\MenuLinkContentInterface $menu_link */ + $replacements += \Drupal::token()->generate('menu-link', $menu_tokens, array('menu-link' => $menu_link), $options, $bubbleable_metadata); + } + else { + // On node-form save we populate a calculated field with a menu_link + // references. + // @see token_node_menu_link_submit() + if ($node->getFieldDefinition('menu_link') && $menu_link = $node->menu_link->entity) { + /** @var \Drupal\menu_link_content\MenuLinkContentInterface $menu_link */ + $replacements[$original] = $menu_link->getTitle(); + } + else { + $url = $node->urlInfo(); + if ($links = $menu_link_manager->loadLinksByRoute($url->getRouteName(), $url->getRouteParameters())) { + $link = reset($links); + $replacements[$original] = $link->getTitle(); + } + $replacements += \Drupal::token()->generate('menu-link', $menu_tokens, array('menu-link' => $link), $options, $bubbleable_metadata); + } } } }