Move preparing the embed context to EntityHelperTrait::prepareEmbedContext.

Author: davereid

src/EntityHelperTrait.php

@@ -162,25 +162,7 @@ protected function renderEntity(EntityInterface $entity, $view_mode, $langcode =
    *   The HTML of the entity rendered with the display plugin.
    */
   protected function renderEntityEmbed(EntityInterface $entity, array $context = array()) {
-    // Support the deprecated view-mode data attribute.
-    if (isset($context['data-view-mode']) && !isset($context['data-entity-embed-display']) && !isset($context['data-entity-embed-settings'])) {
-      $context['data-entity-embed-display'] = 'entity_reference:entity_reference_entity_view';
-      $context['data-entity-embed-settings'] = ['view_mode' => &$context['data-view-mode']];
-    }
-
-    // Merge in default attributes.
-    $context += array(
-      'data-entity-id' => $entity->id(),
-      'data-entity-type' => $entity->getEntityTypeId(),
-      'data-entity-embed-display' => 'entity_reference:entity_reference_entity_view',
-      'data-entity-embed-settings' => array(),
-    );
-
-    // The default display plugin has been deprecated by the rendered entity
-    // field formatter.
-    if ($context['data-entity-embed-display'] === 'default') {
-      $context['data-entity-embed-display'] = 'entity_reference:entity_reference_entity_view';
-    }
+    $this->prepareEmbedContext($context, $entity);
 
     // Allow modules to alter the entity prior to embed rendering.
     $this->moduleHandler()->alter(array("{$context['data-entity-type']}_embed_context", 'entity_embed_context'), $context, $entity);
@@ -200,6 +182,27 @@ protected function renderEntityEmbed(EntityInterface $entity, array $context = a
     return $entity_output;
   }
 
+  protected function prepareEmbedContext(array &$context, EntityInterface $entity = null) {
+    // Merge in default attributes.
+    $context += array(
+      'data-entity-embed-display' => EntityEmbedDisplayManagerInterface::DEFAULT_PLUGIN_ID,
+      'data-entity-embed-settings' => array(),
+      'data-entity-id' => $entity ? $entity->id() : '',
+      'data-entity-uuid' => $entity ? $entity->uuid() : '',
+      'data-entity-type' => $entity ? $entity->getEntityTypeId() : '',
+    );
+
+    if ($context['data-entity-embed-display'] === 'default') {
+      // The default display plugin has been deprecated by the rendered entity
+      // field formatter.
+      $context['data-entity-embed-display'] = EntityEmbedDisplayManagerInterface::DEFAULT_PLUGIN_ID;
+    }
+    elseif ($context['data-entity-embed-display'] === EntityEmbedDisplayManagerInterface::DEFAULT_PLUGIN_ID && isset($context['data-view-mode']) && empty($context['data-entity-embed-settings'])) {
+      // Support the deprecated view-mode data attribute.
+      $context['data-entity-embed-settings']['view_mode'] = &$context['data-view-mode'];
+    }
+  }
+
   /**
    * Renders an entity using an EntityEmbedDisplay plugin.
    *

src/Form/EntityEmbedDialog.php

@@ -76,10 +76,7 @@ public function getFormId() {
   public function buildForm(array $form, FormStateInterface $form_state, EditorInterface $editor = NULL, EmbedButtonInterface $embed_button = NULL) {
     $values = $form_state->getValues();
     $input = $form_state->getUserInput();
-    // Set embed button element in form state, so that it can be used later in
-    // validateForm() function.
-    $form_state->set('embed_button', $embed_button);
-    $form_state->set('editor', $editor);
+
     // Initialize entity element with form attributes, if present.
     $entity_element = empty($values['attributes']) ? array() : $values['attributes'];
     // The default values are set directly from \Drupal::request()->request,
@@ -90,14 +87,14 @@ public function buildForm(array $form, FormStateInterface $form_state, EditorInt
     $entity_element += $form_state->get('entity_element');
     $entity_element += array(
       'data-entity-type' => $embed_button->getTypeSetting('entity_type'),
-      'data-entity-uuid' => '',
-      'data-entity-id' => '',
-      'data-entity-embed-display' => 'entity_reference:entity_reference_entity_view',
-      'data-entity-embed-settings' => array(),
       'data-align' => '',
     );
-    $form_state->set('entity_element', $entity_element);
+    $this->prepareEmbedContext($entity_element, $form_state->get('entity'));
+
+    $form_state->set('embed_button', $embed_button);
+    $form_state->set('editor', $editor);
     $form_state->set('entity', $this->loadEntity($entity_element['data-entity-type'], $entity_element['data-entity-uuid'] ?: $entity_element['data-entity-id']));
+    $form_state->set('entity_element', $entity_element);
 
     if (!$form_state->get('step')) {
       // If an entity has been selected, then always skip to the embed options.
@@ -250,12 +247,6 @@ public function buildEmbedStep(array $form, FormStateInterface $form_state) {
       $entity_element['data-entity-embed-display'] = key($display_plugin_options);
     }
 
-    // The default display plugin has been deprecated by the rendered entity
-    // field formatter.
-    if ($entity_element['data-entity-embed-display'] === 'default') {
-      $entity_element['data-entity-embed-display'] = 'entity_reference:entity_reference_entity_view';
-    }
-
     $form['attributes']['data-entity-embed-display'] = array(
       '#type' => 'select',
       '#title' => $this->t('Display as'),