rm JsExpression hack

atk4 · Feb 13, 2024 · c8db488 · c8db488
1 parent 1dccdc1
commit c8db488
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/src/Form/Control/DropdownCascade.php b/src/Form/Control/DropdownCascade.php
@@ -82,7 +82,7 @@ public function getNewValues($id): array
                 $res = ($this->renderRowFunction)($row); // @phpstan-ignore-line
                 $values[] = ['value' => $res['value'], 'text' => $res['title'], 'name' => $res['title']];
             } else {
-                $values[] = ['value' => $row->getId(), 'text' => $row->get($model->titleField), 'name' => $row->get($model->titleField)];
+                $values[] = ['value' => $this->getApp()->uiPersistence->typecastAttributeSaveField($model->getField($model->idField), $row->getId()), 'text' => $row->get($model->titleField), 'name' => $row->get($model->titleField)];
             }
         }
 
@@ -93,12 +93,15 @@ public function getNewValues($id): array
      * Will mark current value as selected from a list
      * of possible values.
      *
-     * @param string|int $value the current field value
+     * @param mixed $value the current field value
      */
     private function getJsValues(array $values, $value): array
     {
+        $model = $this->cascadeFrom->model->ref($this->reference);
+        $valueStr = $this->getApp()->uiPersistence->typecastAttributeSaveField($model->getField($model->idField), $value);
+
         foreach ($values as $k => $v) {
-            if ($v['value'] === $value) {
+            if ($v['value'] === $valueStr) {
                 $values[$k]['selected'] = true;
 
                 break;

diff --git a/src/Js/JsExpression.php b/src/Js/JsExpression.php
@@ -5,12 +5,8 @@
 namespace Atk4\Ui\Js;
 
 use Atk4\Core\DiContainerTrait;
-use Atk4\Data\Field;
 use Atk4\Data\Persistence;
-use Atk4\Ui\Demos\WrappedId;
-use Atk4\Ui\Demos\WrappedIdType;
 use Atk4\Ui\Exception;
-use Atk4\Ui\Persistence\Ui as UiPersistence;
 use Atk4\Ui\View;
 
 class JsExpression implements JsExpressionable
@@ -111,10 +107,6 @@ protected function _jsEncode($value): string
             $res = Persistence\Sql\Expression::castFloatToString($value);
         } elseif ($value === null) {
             $res = 'null';
-        } elseif ($value instanceof WrappedId) {
-            // HACK for debug
-            $uiPersistence = new UiPersistence();
-            $res = $this->_jsEncode($uiPersistence->typecastAttributeSaveField(new Field(['type' => WrappedIdType::NAME]), $value));
         } else {
             throw (new Exception('Argument is not renderable to JS'))
                 ->addMoreInfo('arg', $value);

diff --git a/src/UserAction/ConfirmationExecutor.php b/src/UserAction/ConfirmationExecutor.php
@@ -138,7 +138,7 @@ public function doConfirmation(View $modal): void
                 $this->loader->jsLoad(
                     [
                         'step' => 'execute',
-                        $this->name => $this->action->getEntity()->getId(),
+                        $this->name => $this->getApp()->uiPersistence->typecastAttributeSaveField($this->action->getModel()->getField($this->action->getModel()->idField), $this->action->getEntity()->getId()),
                     ],
                     ['method' => 'POST']
                 ),

diff --git a/src/UserAction/StepExecutorTrait.php b/src/UserAction/StepExecutorTrait.php
@@ -187,7 +187,7 @@ protected function doPreview(View $page): void
             $chain = $this->loader->jsLoad(
                 [
                     'step' => $this->getPreviousStep($this->step),
-                    $this->name => $this->action->getEntity()->getId(),
+                    $this->name => $this->getApp()->uiPersistence->typecastAttributeSaveField($this->action->getModel()->getField($this->action->getModel()->idField), $this->action->getEntity()->getId()),
                 ],
                 ['method' => 'POST'],
                 $this->loader->name
@@ -203,7 +203,7 @@ protected function doPreview(View $page): void
                 $this->loader->jsLoad(
                     [
                         'step' => 'final',
-                        $this->name => $this->action->getEntity()->getId(),
+                        $this->name => $this->getApp()->uiPersistence->typecastAttributeSaveField($this->action->getModel()->getField($this->action->getModel()->idField), $this->action->getEntity()->getId()),
                     ],
                     ['method' => 'POST'],
                     $this->loader->name
@@ -363,7 +363,7 @@ protected function jsSetPreviousHandler(View $view, string $step): void
             $chain = $this->loader->jsLoad(
                 [
                     'step' => $this->getPreviousStep($step),
-                    $this->name => $this->action->getEntity()->getId(),
+                    $this->name => $this->getApp()->uiPersistence->typecastAttributeSaveField($this->action->getModel()->getField($this->action->getModel()->idField), $this->action->getEntity()->getId()),
                 ],
                 ['method' => 'POST'],
                 $this->loader->name
@@ -401,7 +401,7 @@ protected function jsStepSubmit(string $step): JsBlock
                 $this->loader->jsLoad(
                     [
                         'step' => $this->isLastStep($step) ? 'final' : $this->getNextStep($step),
-                        $this->name => $this->action->getEntity()->getId(),
+                        $this->name => $this->getApp()->uiPersistence->typecastAttributeSaveField($this->action->getModel()->getField($this->action->getModel()->idField), $this->action->getEntity()->getId()),
                     ],
                     ['method' => 'POST'],
                     $this->loader->name

diff --git a/src/View.php b/src/View.php
@@ -1007,7 +1007,7 @@ public function jsRender(): string
         } elseif ($action instanceof UserAction\ExecutorInterface || $action instanceof UserAction\SharedExecutor || $action instanceof Model\UserAction) {
             $ex = $action instanceof Model\UserAction ? $this->getExecutorFactory()->createExecutor($action, $this) : $action;
 
-            $setupNonSharedExecutorFx = static function (UserAction\ExecutorInterface $ex) use (&$defaults, &$arguments): void {
+            $setupNonSharedExecutorFx = function (UserAction\ExecutorInterface $ex) use (&$defaults, &$arguments): void {
                 /** @var AbstractView&UserAction\ExecutorInterface $ex https://github.com/phpstan/phpstan/issues/3770 */
                 $ex = $ex;
 
@@ -1020,6 +1020,11 @@ public function jsRender(): string
                     unset($arguments[0]);
                 }
 
+                if (isset($arguments[$ex->name]) && !$arguments[$ex->name] instanceof JsExpressionable) {
+                    $exModel = $ex->getAction()->getModel();
+                    $arguments[$ex->name] = $this->getApp()->uiPersistence->typecastAttributeSaveField($exModel->getField($exModel->idField), $arguments[$ex->name]);
+                }
+
                 if ($ex instanceof UserAction\JsCallbackExecutor) {
                     $confirmation = $ex->getAction()->getConfirmation();
                     if ($confirmation) {