From d35b8ee7db28e58b5040a2473c506b664b992908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Wed, 16 Aug 2023 02:02:01 +0200
Subject: [PATCH 1/2] Normalize user action args

---
 src/Model/UserAction.php | 43 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/Model/UserAction.php b/src/Model/UserAction.php
index 8cc020ccf..31dc5ce81 100644
--- a/src/Model/UserAction.php
+++ b/src/Model/UserAction.php
@@ -9,6 +9,7 @@
 use Atk4\Core\InitializerTrait;
 use Atk4\Core\TrackableTrait;
 use Atk4\Data\Exception;
+use Atk4\Data\Field;
 use Atk4\Data\Model;
 
 /**
@@ -118,6 +119,46 @@ public function getActionForEntity(Model $entity): self
         throw new Exception('Action instance not found in model');
     }
 
+    /**
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    protected function normalizeArg(string $name, $value)
+    {
+        $argFieldSeed = $this->args[$name];
+        if ($argFieldSeed instanceof Model) {
+            return $value === null
+                ? null
+                : $argFieldSeed::assertInstanceOf($value);
+        }
+
+        $argField = new Field($argFieldSeed);
+
+        return $argField->normalize($value);
+    }
+
+    /**
+     * @param array<int|string, mixed> $args
+     *
+     * @return array<string, mixed>
+     */
+    protected function normalizeArgs($args): array
+    {
+        $argsNames = array_keys($this->args);
+
+        $res = [];
+        foreach ($args as $k => $v) {
+            if (is_int($k)) {
+                $k = $argsNames[$k];
+            }
+
+            $res[$k] = $this->normalizeArg($k, $v);
+        }
+
+        return $res;
+    }
+
     /**
      * Attempt to execute callback of the action.
      *
@@ -142,6 +183,7 @@ public function execute(...$args)
         try {
             $this->validateBeforeExecute();
 
+            $args = $this->normalizeArgs($args);
             if ($passOwner) {
                 array_unshift($args, $this->_getOwner());
             }
@@ -215,6 +257,7 @@ public function preview(...$args)
         try {
             $this->validateBeforeExecute();
 
+            $args = $this->normalizeArgs($args);
             if ($passOwner) {
                 array_unshift($args, $this->_getOwner());
             }

From 6d4eb54a219b96de1c9d7b209b5aae5a01dde473 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
Date: Wed, 16 Aug 2023 02:30:54 +0200
Subject: [PATCH 2/2] TODO

---
 src/Model/UserAction.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Model/UserAction.php b/src/Model/UserAction.php
index 31dc5ce81..a6713e604 100644
--- a/src/Model/UserAction.php
+++ b/src/Model/UserAction.php
@@ -67,7 +67,7 @@ class UserAction
     public $system = false;
 
     /** @var array<string, array<string, mixed>|Model> Argument definition. */
-    public $args = [];
+    public $args = []; // TODO test with positional, named and Model arguments
 
     /** @var array<int, string>|bool Specify which fields may be dirty when invoking action. APPLIES_TO_NO_RECORDS|APPLIES_TO_SINGLE_RECORD scopes for adding/modifying */
     public $fields = [];