diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php index e92a3d6643..d5dde27ab2 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Node/NodeHalJsonAnonTest.php @@ -38,6 +38,7 @@ class NodeHalJsonAnonTest extends NodeResourceTestBase { 'changed', 'promote', 'sticky', + 'path', 'revision_timestamp', 'revision_uid', ]; @@ -54,7 +55,7 @@ protected function getExpectedNormalizedEntity() { return $normalization + [ '_links' => [ 'self' => [ - 'href' => $this->baseUrl . '/node/1?_format=hal_json', + 'href' => $this->baseUrl . '/llama?_format=hal_json', ], 'type' => [ 'href' => $this->baseUrl . '/rest/type/node/camelids', diff --git a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php index ff952eabdf..73a1549e0a 100644 --- a/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php +++ b/core/modules/hal/tests/src/Functional/EntityResource/Term/TermHalJsonAnonTest.php @@ -40,7 +40,7 @@ protected function getExpectedNormalizedEntity() { return $normalization + [ '_links' => [ 'self' => [ - 'href' => $this->baseUrl . '/taxonomy/term/1?_format=hal_json', + 'href' => $this->baseUrl . '/llama?_format=hal_json', ], 'type' => [ 'href' => $this->baseUrl . '/rest/type/taxonomy_term/camelids', diff --git a/core/modules/path/path.module b/core/modules/path/path.module index a724b773d6..9b3d8af832 100644 --- a/core/modules/path/path.module +++ b/core/modules/path/path.module @@ -4,7 +4,7 @@ * @file * Enables users to rename URLs. */ - +use Drupal\Core\Entity\ContentEntityInterface; use Drupal\Core\Entity\EntityTypeInterface; use Drupal\Core\Field\BaseFieldDefinition; use Drupal\Core\Form\FormStateInterface; @@ -76,3 +76,17 @@ function path_entity_base_field_info(EntityTypeInterface $entity_type) { return $fields; } } + +/** + * Implements hook_entity_translation_create(). + */ +function path_entity_translation_create(ContentEntityInterface $translation) { + foreach ($translation->getFieldDefinitions() as $field_name => $field_definition) { + if ($field_definition->getType() === 'path' && $translation->get($field_name)->pid) { + // If there are values and a path ID, update the langcode and unset the + // path ID to save this as a new alias. + $translation->get($field_name)->langcode = $translation->language()->getId(); + $translation->get($field_name)->pid = NULL; + } + } +} diff --git a/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php b/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php index ee03361d96..a98e718696 100644 --- a/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php +++ b/core/modules/path/src/Plugin/Field/FieldType/PathFieldItemList.php @@ -34,4 +34,42 @@ public function delete() { \Drupal::service('path.alias_storage')->delete($conditions); } + /** + * {@inheritdoc} + */ + public function getValue($include_computed = FALSE) { + $this->ensureLoaded(); + return parent::getValue($include_computed); + } + + /** + * {@inheritdoc} + */ + public function isEmpty() { + $this->ensureLoaded(); + return parent::isEmpty(); + } + + /** + * {@inheritdoc} + */ + public function getIterator() { + $this->ensureLoaded(); + return parent::getIterator(); + } + + /** + * Automatically create the first item for computed fields. + * + * This ensures that ::getValue() and ::isEmpty() calls will behave like a + * non-computed field. + * + * @todo: Move this to the base class in https://www.drupal.org/node/2392845. + */ + protected function ensureLoaded() { + if (!isset($this->list[0]) && $this->definition->isComputed()) { + $this->list[0] = $this->createItem(0); + } + } + } diff --git a/core/modules/path/src/Plugin/Field/FieldType/PathItem.php b/core/modules/path/src/Plugin/Field/FieldType/PathItem.php index 4d8da7a8ad..53ddcc2689 100644 --- a/core/modules/path/src/Plugin/Field/FieldType/PathItem.php +++ b/core/modules/path/src/Plugin/Field/FieldType/PathItem.php @@ -23,6 +23,13 @@ class PathItem extends FieldItemBase { /** + * Whether the alias has been loaded from the alias storage service yet. + * + * @var bool + */ + protected $isLoaded = FALSE; + + /** * {@inheritdoc} */ public static function propertyDefinitions(FieldStorageDefinitionInterface $field_definition) { @@ -30,12 +37,22 @@ public static function propertyDefinitions(FieldStorageDefinitionInterface $fiel ->setLabel(t('Path alias')); $properties['pid'] = DataDefinition::create('integer') ->setLabel(t('Path id')); + $properties['langcode'] = DataDefinition::create('string') + ->setLabel(t('Language Code')); return $properties; } /** * {@inheritdoc} */ + public function __get($name) { + $this->ensureLoaded(); + return parent::__get($name); + } + + /** + * {@inheritdoc} + */ public static function schema(FieldStorageDefinitionInterface $field_definition) { return []; } @@ -43,6 +60,30 @@ public static function schema(FieldStorageDefinitionInterface $field_definition) /** * {@inheritdoc} */ + public function getValue() { + $this->ensureLoaded(); + return parent::getValue(); + } + + /** + * {@inheritdoc} + */ + public function isEmpty() { + $this->ensureLoaded(); + return parent::isEmpty(); + } + + /** + * {@inheritdoc} + */ + public function getIterator() { + $this->ensureLoaded(); + return parent::getIterator(); + } + + /** + * {@inheritdoc} + */ public function preSave() { $this->alias = trim($this->alias); } @@ -50,6 +91,28 @@ public function preSave() { /** * {@inheritdoc} */ + public function __set($name, $value) { + // Also ensure that existing values are loaded when setting a value, this + // ensures that it is possible to set a new value immediately after loading + // an entity. + $this->ensureLoaded(); + parent::__set($name, $value); + } + + /** + * {@inheritdoc} + */ + public function set($property_name, $value, $notify = TRUE) { + // Also ensure that existing values are loaded when setting a value, this + // ensures that it is possible to set a new value immediately after loading + // an entity. + $this->ensureLoaded(); + return parent::set($property_name, $value, $notify); + } + + /** + * {@inheritdoc} + */ public function postSave($update) { if (!$update) { if ($this->alias) { @@ -88,4 +151,38 @@ public static function mainPropertyName() { return 'alias'; } + /** + * Ensures the alias properties are loaded if available. + * + * This ensures that the properties will always be loaded and act like + * non-computed fields when calling ::__get() and getValue(). + * + * @todo: Determine if this should be moved to the base class in + * https://www.drupal.org/node/2392845. + */ + protected function ensureLoaded() { + if (!$this->isLoaded) { + $entity = $this->getEntity(); + if (!$entity->isNew()) { + // @todo Support loading languge neutral aliases in + // https://www.drupal.org/node/2511968. + $alias = \Drupal::service('path.alias_storage')->load([ + 'source' => '/' . $entity->toUrl()->getInternalPath(), + 'langcode' => $this->getLangcode(), + ]); + if ($alias) { + $this->setValue($alias); + } + else { + // If there is no existing alias, default the langcode to the current + // language. + // @todo Set the langcode to not specified for untranslatable fields + // in https://www.drupal.org/node/2689459. + $this->langcode = $this->getLangcode(); + } + } + $this->isLoaded = TRUE; + } + } + } diff --git a/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php b/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php index ea69ca1bd0..13ab1f1076 100644 --- a/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php +++ b/core/modules/path/src/Plugin/Field/FieldWidget/PathWidget.php @@ -5,7 +5,6 @@ use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\WidgetBase; use Drupal\Core\Form\FormStateInterface; -use Drupal\Core\Language\LanguageInterface; use Symfony\Component\Validator\ConstraintViolationInterface; /** @@ -26,23 +25,6 @@ class PathWidget extends WidgetBase { */ public function formElement(FieldItemListInterface $items, $delta, array $element, array &$form, FormStateInterface $form_state) { $entity = $items->getEntity(); - $path = []; - if (!$entity->isNew()) { - $conditions = ['source' => '/' . $entity->urlInfo()->getInternalPath()]; - if ($items->getLangcode() != LanguageInterface::LANGCODE_NOT_SPECIFIED) { - $conditions['langcode'] = $items->getLangcode(); - } - $path = \Drupal::service('path.alias_storage')->load($conditions); - if ($path === FALSE) { - $path = []; - } - } - $path += [ - 'pid' => NULL, - 'source' => !$entity->isNew() ? '/' . $entity->urlInfo()->getInternalPath() : NULL, - 'alias' => '', - 'langcode' => $items->getLangcode(), - ]; $element += [ '#element_validate' => [[get_class($this), 'validateFormElement']], @@ -50,22 +32,22 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen $element['alias'] = [ '#type' => 'textfield', '#title' => $element['#title'], - '#default_value' => $path['alias'], + '#default_value' => $items[$delta]->alias, '#required' => $element['#required'], '#maxlength' => 255, '#description' => $this->t('Specify an alternative path by which this data can be accessed. For example, type "/about" when writing an about page.'), ]; $element['pid'] = [ '#type' => 'value', - '#value' => $path['pid'], + '#value' => $items[$delta]->pid, ]; $element['source'] = [ '#type' => 'value', - '#value' => $path['source'], - ]; + '#value' => !$entity->isNew() ? '/' . $entity->toUrl()->getInternalPath() : NULL, + ]; $element['langcode'] = [ '#type' => 'value', - '#value' => $path['langcode'], + '#value' => $items[$delta]->langcode, ]; return $element; } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php index cfbd971611..7c4436a729 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Node/NodeResourceTestBase.php @@ -12,7 +12,7 @@ /** * {@inheritdoc} */ - public static $modules = ['node']; + public static $modules = ['node', 'path']; /** * {@inheritdoc} @@ -28,6 +28,7 @@ 'changed', 'promote', 'sticky', + 'path', 'revision_timestamp', 'revision_uid', ]; @@ -49,6 +50,10 @@ protected function setUpAuthorization($method) { $this->grantPermissionsToTestedRole(['access content', 'create camelids content']); break; case 'PATCH': + // Do not grant the 'create url aliases' permission to test the case + // when the path field is protected/not accessible, see + // \Drupal\Tests\rest\Functional\EntityResource\Term\TermResourceTestBase + // for a positive test. $this->grantPermissionsToTestedRole(['access content', 'edit any camelids content']); break; case 'DELETE': @@ -77,6 +82,7 @@ protected function createEntity() { ->setCreatedTime(123456789) ->setChangedTime(123456789) ->setRevisionCreationTime(123456789) + ->set('path', '/llama') ->save(); return $node; @@ -171,6 +177,13 @@ protected function getExpectedNormalizedEntity() { ], ], 'revision_log' => [], + 'path' => [ + [ + 'alias' => '/llama', + 'pid' => 1, + 'langcode' => 'en', + ], + ], ]; } diff --git a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php index 698451b58c..f773eee864 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/Term/TermResourceTestBase.php @@ -11,7 +11,7 @@ /** * {@inheritdoc} */ - public static $modules = ['taxonomy']; + public static $modules = ['taxonomy', 'path']; /** * {@inheritdoc} @@ -41,8 +41,12 @@ protected function setUpAuthorization($method) { case 'POST': case 'PATCH': case 'DELETE': + // Grant the 'create url aliases' permission to test the case when + // the path field is accessible, see + // \Drupal\Tests\rest\Functional\EntityResource\Node\NodeResourceTestBase + // for a negative test. // @todo Update once https://www.drupal.org/node/2824408 lands. - $this->grantPermissionsToTestedRole(['administer taxonomy']); + $this->grantPermissionsToTestedRole(['administer taxonomy', 'create url aliases']); break; } } @@ -64,7 +68,8 @@ protected function createEntity() { // Create a "Llama" taxonomy term. $term = Term::create(['vid' => $vocabulary->id()]) ->setName('Llama') - ->setChangedTime(123456789); + ->setChangedTime(123456789) + ->set('path', '/llama'); $term->save(); return $term; @@ -116,6 +121,13 @@ protected function getExpectedNormalizedEntity() { 'value' => TRUE, ], ], + 'path' => [ + [ + 'alias' => '/llama', + 'pid' => 1, + 'langcode' => 'en', + ], + ], ]; }