Merge pull request #17 from itk-dev/hotfix/use-webform-submission-rendering

DW-439: Changed rendering of submission data

Author: rimi-itk

os2forms_digital_post.services.yml

@@ -9,3 +9,4 @@ services:
 
   os2forms_digital_post.webform_helper:
     class: Drupal\os2forms_digital_post\Helper\WebformHelper
+    arguments: ["@entity_type.manager", "@renderer"]

src/Commands/CreatePdf.php

@@ -67,7 +67,6 @@ public function create($template, array $options = [
     'file_location' => '',
     'file_name' => 'test.pdf',
   ]) {
-    $elements[] = [];
     $webform_submission = $this->entityTypeManager->getStorage('webform_submission')->load($options['submission_id']);
 
     if (!$webform_submission) {

src/Helper/WebformHelper.php

@@ -4,33 +4,45 @@
 
 use Drupal\os2forms_cpr_lookup\CPR\CprServiceResult;
 use Drupal\webform\WebformSubmissionInterface;
+use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\Render\Renderer;
 
 /**
  * Webform helper.
  */
 final class WebformHelper {
 
+  /**
+   * The entity type manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
+  /**
+   * The drupal renderer.
+   *
+   * @var Drupal\Core\Render\Renderer
+   */
+  protected $renderer;
+
+  /**
+   * Constructor.
+   */
+  public function __construct(EntityTypeManagerInterface $entity_type_manager, Renderer $renderer) {
+    $this->entityTypeManager = $entity_type_manager;
+    $this->renderer = $renderer;
+  }
+
   /**
    * Get template context.
    */
   public function getTemplateContext(WebformSubmissionInterface $webformSubmission, CprServiceResult $cprServiceResult, array $configuration = []) {
-
-    $elements = [];
-    $blacklistedElements = $configuration['blacklist_elements_for_template'] ?? [];
-    $submissionData = $webformSubmission->getData();
     $webform = $webformSubmission->getWebform();
-    foreach ($submissionData as $key => $value) {
-      if (array_key_exists($key, $blacklistedElements)) {
-        continue;
-      }
-
-      $element = $webform->getElement($key);
 
-      $elements[] = [
-        'name' => $element['#title'],
-        'value' => $element['#return_value'] ?? $value,
-      ];
-    }
+    $view_builder = $this->entityTypeManager->getViewBuilder('webform_submission');
+    $pre_render = $view_builder->view($webformSubmission, 'HTML');
+    $webformSubmissionRendered = $this->renderer->renderPlain($pre_render);
 
     // We cannot use “side” (from address lookup via cpr) as “suiteIdentifier”
     // when sending digital port. Therefore we append it to “floor” instead.
@@ -51,8 +63,8 @@ public function getTemplateContext(WebformSubmissionInterface $webformSubmission
 
     return [
       'label' => $webform->label(),
-      'elements' => $elements,
       'recipient' => $recipient,
+      'submission' => $webformSubmissionRendered
     ];
   }