fix to pass original entity for table column render

Author: mvorisek

demos/init-db.php

@@ -270,10 +270,15 @@ protected function init(): void
             'type' => 'string',
             'ui' => [
                 'form' => [Form\Control\Line::class],
-                'table' => [Table\Column\CountryFlag::class],
+                'table' => [Table\Column\CountryFlag::class, 'nameField' => $this->fieldName()->client_country],
             ],
         ])
-            ->addField($this->fieldName()->client_country, Country::hinting()->fieldName()->name);
+            ->addField($this->fieldName()->client_country, Country::hinting()->fieldName()->name, [
+                // caption needs to be set explicitly because HasOneSql::addField() uses the value from referenced field
+                // https://github.com/atk4/data/blob/4.0.0/src/Reference/HasOneSql.php#L87
+                // https://github.com/atk4/data/pull/447/files#r1063408315
+                'caption' => 'Client Country Name',
+            ]);
 
         $this->addField($this->fieldName()->is_commercial, ['type' => 'boolean']);
         $this->addField($this->fieldName()->currency, ['values' => ['EUR' => 'Euro', 'USD' => 'US Dollar', 'GBP' => 'Pound Sterling']]);

src/Table.php

@@ -392,7 +392,7 @@ public function setModel(Model $model, array $columns = null): void
 
     public function setSource(array $data, $fields = null): Model
     {
-        // mainly for CardTable to support different field type for different row 1/2
+        // mainly for CardTable to support different field type for different row
         // related with https://github.com/atk4/data/blob/4.0.0/tests/Persistence/StaticTest.php#L142
         $dataWithObjects = [];
         if (is_array(reset($data))) {
@@ -455,26 +455,9 @@ protected function renderView(): void
         // the same in Lister class
         $modelBackup = $this->model;
         try {
-            foreach ($this->model as $entityOrig) {
-                // mainly for CardTable to support different field type for different row 2/2
-                $entityCloned = (clone $entityOrig->getModel())->createEntity();
-                $entityCloned->setId($entityOrig->getId());
-                \Closure::bind(function () use ($entityOrig, $entityCloned) {
-                    foreach ($entityOrig->data as $k => $v) {
-                        $field = $entityCloned->getField($k);
-                        if ($field->type === 'atk4_local_object' && $v instanceof EntityFieldPair) {
-                            $field->type = $v->getField()->type;
-                            $field->enum = $v->getField()->enum;
-                            $field->values = $v->getField()->values;
-                            $field->ui = $v->getField()->ui;
-                            $v = $v->get();
-                        }
-                        $entityCloned->data[$k] = $v;
-                    }
-                }, null, Model::class)();
-
-                $this->model = $entityCloned;
-                $this->currentRow = $entityCloned; // TODO we should either drop currentRow property or never update model property
+            foreach ($this->model as $entity) {
+                $this->model = $entity;
+                $this->currentRow = $entity; // TODO we should either drop currentRow property or never update model property
                 if ($this->hook(self::HOOK_BEFORE_ROW) === false) {
                     continue;
                 }

src/Table/Column/Multiformat.php

@@ -31,6 +31,13 @@ public function getDataCellHtml(Field $field = null, array $attr = []): string
 
     public function getHtmlTags(Model $row, ?Field $field): array
     {
+        // mainly for CardTable to support different field type for different row
+        $fieldValue = $field->get($row);
+        if ($fieldValue instanceof Model\EntityFieldPair) {
+            $row = $fieldValue->getEntity();
+            $field = $fieldValue->getField();
+        }
+
         $decorators = ($this->callback)($row, $field);
         // we need to smartly wrap things up
         $name = $field->shortName;