Cleaned up preview

Author: rimi-itk

src/Controller/Os2formsFordelingskomponentDistributionObjectPreviewController.php

@@ -95,7 +95,7 @@ public function renderPreview(WebformHandlerSF2900 $handler, HandlerSettings $ha
       'exceptions' => $exceptions,
       'warnings' => $warnings,
       'distribution_object' => $distributionObject,
-      'xml' => $xml,
+      'xml' => $xml->withContextAsArray(),
     ];
   }
 

src/Helper/FordelingskomponentHelper.php

@@ -264,7 +264,12 @@ private function buildDistributionFormularType(
     Attachment $attachment,
   ): DistributionFormular {
     $files = $this->buildFileGroups($handlerSettings, $submission);
-    $xml = $this->renderXml($handlerSettings, $submission, $files)->rendered;
+    $renderResult = $this->renderXml($handlerSettings, $submission, $files);
+    if ($renderResult->exception) {
+      throw $renderResult->exception;
+    }
+
+    $xml = (string) $renderResult->rendered;
     $xsdUrl = $handlerSettings->distributionObject->xsdUrl;
 
     $this->xmlHelper->validateXml($xml);
@@ -319,10 +324,20 @@ public function renderXml(
 
     $context = $this->xmlHelper->getRenderContext($handlerSettings, $submission, $files);
 
+    $rendered = NULL;
+    $exception = NULL;
+    try {
+      $rendered = $this->xmlHelper->render($template, $context, validateXml: $validateXml);
+    }
+    catch (\Exception $e) {
+      $exception = $e;
+    }
+
     return new XmlRenderResult(
-      rendered: $this->xmlHelper->render($template, $context, validateXml: $validateXml),
       template: $template,
       context: $context,
+      rendered: $rendered,
+      exception: $exception,
     );
   }
 
@@ -349,7 +364,7 @@ public function buildFileGroups(HandlerSettings $handlerSettings, WebformSubmiss
       $values = $submission->getData()[$type] ?? NULL;
       if ($values) {
         /** @var \Drupal\file\FileInterface[] $files */
-        $files = $this->fileStorage->loadMultiple($values);
+        $files = $this->fileStorage->loadMultiple((array) $values);
         foreach ($files as $file) {
           $groups[$type][] = [
             'sftp_filename' => $this->getSftpFilename($handlerSettings, $submission, $file->getFilename()),

src/Helper/XmlHelper.php

@@ -70,10 +70,9 @@ public function render(string $template, array $context, bool $validateXml = TRU
    */
   public function getRenderContext(HandlerSettings $handlerSettings, WebformSubmissionInterface $submission, array $files) {
     return [
-      'handler' => ['settings' => $handlerSettings],
       'submission' => $submission,
-      'webform_submission' => $submission,
       'files' => $files,
+      'handler' => ['settings' => $handlerSettings->toArray()],
     ];
   }
 

src/Model/XmlRenderResult.php

@@ -2,6 +2,8 @@
 
 namespace Drupal\os2forms_fordelingskomponent\Model;
 
+use Drupal\webform\WebformSubmissionInterface;
+
 /**
  * The Document class.
  */
@@ -11,10 +13,29 @@
    * Constructor.
    */
   public function __construct(
-    public string $rendered,
     public string $template,
     public array $context,
+    public ?string $rendered,
+    public ?\Exception $exception,
   ) {
   }
 
+  /**
+   * Convert objects in context to arrays.
+   */
+  public function withContextAsArray(): self {
+    $context = $this->context;
+    if (($context['submission'] ?? NULL) instanceof WebformSubmissionInterface) {
+      $context['submission'] = $context['submission']->toArray(TRUE, TRUE);
+    }
+    // @todo Convert 'handler' and 'files'
+    return new self(
+      $this->template,
+      $context,
+      $this->rendered,
+      $this->exception,
+    );
+
+  }
+
 }

src/Settings/AbstractSettings.php

@@ -114,8 +114,18 @@ public function apply(array $values, bool $throwExceptionOnMissingProperty = FAL
   /**
    * Convert settings to array.
    */
-  public function toArray(): array {
-    return $this->values;
+  public function toArray(bool $recursive = true): array {
+    $values = $this->values;
+
+    if ($recursive) {
+      foreach ($values as &$value) {
+        if ($value instanceof self) {
+          $value = $value->toArray($recursive);
+        }
+      }
+    }
+
+    return $values;
   }
 
   /**

templates/base.html.twig

@@ -83,9 +83,11 @@
     <fieldset>
         <legend>{{ label }}</legend>
 
+        {#
         {% set data_url = 'data:application/json,' ~ (value|json_encode|url_encode) %}
         <iframe src="{{ data_url }}"></iframe>
         <a target="_blank" href="{{ data_url }}">{{ 'Open data in new tab'|trans }}</a>
+        #}
 
         <pre><code>{{ value|json_encode(constant('JSON_PRETTY_PRINT') b-or constant('JSON_UNESCAPED_UNICODE')) }}</code></pre>
     </fieldset>
@@ -95,13 +97,12 @@
     <fieldset>
         <legend>{{ label }}</legend>
 
+        {#
         {% set data_url = 'data:text/xml,' ~ (value|url_encode) %}
         <iframe src="{{ data_url }}"></iframe>
         <a target="_blank" href="{{ data_url }}">{{ 'Open data in new tab'|trans }}</a>
+        #}
 
-        <details>
-            <summary>{{ 'Raw content'|trans }}</summary>
-            <pre><code>{{ value }}</code></pre>
-        </details>
+        <pre><code>{{ value }}</code></pre>
     </fieldset>
 {% endmacro %}