Merge pull request #20 from cleverage/16_context_bug

#16 Fix context field on nested array

Author: njoubert-cleverage

src/Admin/Field/ContextField.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * This file is part of the CleverAge/UiProcessBundle package.
+ *
+ * Copyright (c) Clever-Age
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace CleverAge\UiProcessBundle\Admin\Field;
+
+use EasyCorp\Bundle\EasyAdminBundle\Contracts\Field\FieldInterface;
+use EasyCorp\Bundle\EasyAdminBundle\Field\FieldTrait;
+
+class ContextField implements FieldInterface
+{
+    use FieldTrait;
+
+    public static function new(string $propertyName, ?string $label = null): self
+    {
+        return (new self())
+            ->setProperty($propertyName)
+            ->setLabel($label)
+            ->setTemplatePath('@CleverAgeUiProcess/admin/field/array.html.twig');
+    }
+}

src/Controller/Admin/LogRecordCrudController.php

@@ -14,6 +14,7 @@
 namespace CleverAge\UiProcessBundle\Controller\Admin;
 
 use CleverAge\ProcessBundle\Configuration\ProcessConfiguration;
+use CleverAge\UiProcessBundle\Admin\Field\ContextField;
 use CleverAge\UiProcessBundle\Admin\Field\LogLevelField;
 use CleverAge\UiProcessBundle\Admin\Filter\LogProcessFilter;
 use CleverAge\UiProcessBundle\Entity\LogRecord;
@@ -23,7 +24,6 @@
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Filters;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
-use EasyCorp\Bundle\EasyAdminBundle\Field\ArrayField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\BooleanField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\DateTimeField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
@@ -52,8 +52,7 @@ public function configureFields(string $pageName): iterable
             LogLevelField::new('level'),
             TextField::new('message')->setMaxLength(512),
             DateTimeField::new('createdAt')->setFormat('Y/M/dd H:mm:ss'),
-            ArrayField::new('context')
-                ->setTemplatePath('@CleverAgeUiProcess/admin/field/array.html.twig')
+            ContextField::new('context')
                 ->onlyOnDetail(),
             BooleanField::new('contextIsEmpty', 'Has context info ?')
                 ->onlyOnIndex()

src/Controller/Admin/ProcessExecutionCrudController.php

@@ -13,6 +13,7 @@
 
 namespace CleverAge\UiProcessBundle\Controller\Admin;
 
+use CleverAge\UiProcessBundle\Admin\Field\ContextField;
 use CleverAge\UiProcessBundle\Admin\Field\EnumField;
 use CleverAge\UiProcessBundle\Entity\ProcessExecution;
 use CleverAge\UiProcessBundle\Repository\ProcessExecutionRepository;
@@ -58,7 +59,7 @@ public function configureFields(string $pageName): iterable
                 return $entity->duration(); // returned format can be changed here
             }),
             ArrayField::new('report')->setTemplatePath('@CleverAgeUiProcess/admin/field/report.html.twig'),
-            ArrayField::new('context')->setTemplatePath('@CleverAgeUiProcess/admin/field/report.html.twig'),
+            ContextField::new('context'),
         ];
     }