wip - not reviewed!

README.md

@@ -58,7 +58,7 @@ $form->addField('email');
 $form->onSubmit(function (Form $form) {
     // implement subscribe here
 
-    return $form->jsSuccess('Subscribed ' . $form->model->get('email') . ' to newsletter.');
+    return $form->jsSuccess('Subscribed ' . $form->entity->get('email') . ' to newsletter.');
 });
 
 // decorate anything

demos/_unit-test/callback.php

@@ -33,7 +33,7 @@
 $button->on('click', new JsModal('Edit First Record', $vp));
 
 $form->onSubmit(static function (Form $form) use ($table) {
-    $form->model->save();
+    $form->entity->save();
 
     return new JsBlock([
         $table->jsReload(),

demos/_unit-test/lookup-virtual-page.php

@@ -22,7 +22,7 @@
     $form = Form::addTo($vp);
     $form->addControl('category', [Form\Control\Lookup::class, 'model' => new Category($vp->getApp()->db)]);
     $form->onSubmit(static function (Form $form) {
-        $category = $form->getControl('category')->model->load($form->model->get('category'));
+        $category = $form->getControl('category')->model->load($form->entity->get('category'));
 
         return new JsToast($category->getTitle());
     });

demos/_unit-test/scope-builder.php

@@ -36,7 +36,7 @@
 $form->addControl('qb', [Form\Control\ScopeBuilder::class, 'model' => $model], ['type' => 'object']);
 
 $form->onSubmit(static function (Form $form) use ($model) {
-    $message = $form->model->get('qb')->toWords($model);
+    $message = $form->entity->get('qb')->toWords($model);
     $view = View::addTo($form)->addClass('atk-scope-builder-response');
     $view->set($message);
 

demos/_unit-test/virtual-page.php

@@ -26,7 +26,7 @@
             $form = Form::addTo($thirdPage);
             $form->addControl('category', [Form\Control\Lookup::class, 'model' => new Category($thirdPage->getApp()->db)]);
             $form->onSubmit(static function (Form $form) {
-                $category = $form->getControl('category')->model->load($form->model->get('category'));
+                $category = $form->getControl('category')->model->load($form->entity->get('category'));
 
                 return new JsToast($category->getTitle());
             });

demos/form-control/calendar.php

@@ -52,8 +52,8 @@
 
 $form->onSubmit(static function (Form $form) use ($app) {
     $data = [];
-    foreach ($form->model->get() as $k => $v) {
-        $data[$k] = $app->uiPersistence->typecastSaveField($form->model->getField($k), $v) ?? 'empty';
+    foreach ($form->entity->get() as $k => $v) {
+        $data[$k] = $app->uiPersistence->typecastSaveField($form->entity->getField($k), $v) ?? 'empty';
     }
 
     return new JsToast(implode(', ', $data));

demos/form-control/checkbox.php

@@ -36,5 +36,5 @@
 $form->addControl('also_checked', ['caption' => 'Also checked by default'], ['type' => 'boolean'])->set(true);
 
 $form->onSubmit(static function (Form $form) use ($app) {
-    return new JsToast($app->encodeJson($form->model->get()));
+    return new JsToast($app->encodeJson($form->entity->get()));
 });

demos/form-control/dropdown-plus.php

@@ -27,7 +27,7 @@
 $form->addControl('product_id', [Form\Control\DropdownCascade::class, 'cascadeFrom' => 'sub_category_id', 'reference' => SubCategory::hinting()->fieldName()->Products]);
 
 $form->onSubmit(static function (Form $form) use ($app) {
-    $message = $app->encodeJson($app->uiPersistence->typecastSaveRow($form->model, $form->model->get()));
+    $message = $app->encodeJson($app->uiPersistence->typecastSaveRow($form->entity, $form->entity->get()));
 
     $view = new Message('Values: ');
     $view->setApp($form->getApp());
@@ -105,7 +105,7 @@
 ]);
 
 $form->onSubmit(static function (Form $form) use ($app) {
-    $message = $app->encodeJson($form->model->get());
+    $message = $app->encodeJson($form->entity->get());
 
     $view = new Message('Values:');
     $view->setApp($form->getApp());

demos/form-control/form6.php

@@ -34,5 +34,5 @@
 $form->addControl('string_r', [Form\Control\Radio::class], ['values' => ['F' => 'female', 'M' => 'male']])->set('M');
 
 $form->onSubmit(static function (Form $form) use ($app) {
-    return new JsToast($app->encodeJson($form->getApp()->uiPersistence->typecastSaveRow($form->model, $form->model->get())));
+    return new JsToast($app->encodeJson($form->getApp()->uiPersistence->typecastSaveRow($form->entity, $form->entity->get())));
 });

demos/form-control/input2.php

@@ -126,7 +126,7 @@
 ]));
 
 $form->onSubmit(static function (Form $form) {
-    return $form->model->get('name');
+    return $form->entity->get('name');
 });
 
 Header::addTo($app, ['Multiple Form Layouts']);
@@ -142,7 +142,7 @@
 $formPage->addControl('age', new Form\Control\Line());
 
 $form->onSubmit(static function (Form $form) {
-    return $form->model->get('name') . ' has age ' . $form->model->get('age');
+    return $form->entity->get('name') . ' has age ' . $form->entity->get('age');
 });
 
 Header::addTo($app, ['onChange event', 'subHeader' => 'see in browser console']);

demos/form-control/lookup-dep.php

@@ -56,7 +56,7 @@
 ]);
 
 $form->onSubmit(static function (Form $form) {
-    return 'Submitted: ' . print_r($form->model->get(), true);
+    return 'Submitted: ' . print_r($form->entity->get(), true);
 });
 
 Header::addTo($app, ['Lookup multiple values']);
@@ -92,5 +92,5 @@
 ]);
 
 $form->onSubmit(static function (Form $form) {
-    return 'Submitted: ' . print_r($form->model->get(), true);
+    return 'Submitted: ' . print_r($form->entity->get(), true);
 });

demos/form-control/lookup.php

@@ -53,10 +53,10 @@
     $view = new Message('Select:');
     $view->setApp($form->getApp());
     $view->invokeInit();
-    $view->text->addParagraph(Country::assertInstanceOf($form->model->ref('country1'))->name ?? 'null');
-    $view->text->addParagraph(Country::assertInstanceOf($form->model->ref('country2'))->name ?? 'null');
-    $view->text->addParagraph($form->model->get('country3') !== '' // related with https://github.com/atk4/ui/pull/1805
-        ? (new Country($form->getApp()->db))->load($form->model->get('country3'))->name
+    $view->text->addParagraph(Country::assertInstanceOf($form->entity->ref('country1'))->name ?? 'null');
+    $view->text->addParagraph(Country::assertInstanceOf($form->entity->ref('country2'))->name ?? 'null');
+    $view->text->addParagraph($form->entity->get('country3') !== '' // related with https://github.com/atk4/ui/pull/1805
+        ? (new Country($form->getApp()->db))->load($form->entity->get('country3'))->name
         : 'null');
 
     return $view;

demos/form-control/scope-builder.php

@@ -19,5 +19,5 @@
 $form->addControl('qb', [Form\Control\ScopeBuilder::class, 'model' => $model, 'options' => ['debug' => true]]);
 
 $form->onSubmit(static function (Form $form) use ($model) {
-    return "Scope selected:\n\n" . $form->model->get('qb')->toWords($model);
+    return "Scope selected:\n\n" . $form->entity->get('qb')->toWords($model);
 });

demos/form-control/tree-item-selector.php

@@ -72,8 +72,8 @@
 
 $form->onSubmit(static function (Form $form) use ($app) {
     $response = [
-        'multiple' => $form->model->get('tree'),
-        'single' => $form->model->get('tree1'),
+        'multiple' => $form->entity->get('tree'),
+        'single' => $form->entity->get('tree1'),
     ];
 
     $view = new Message('Items:');

demos/form-control/upload.php

@@ -87,5 +87,5 @@
 
 $form->onSubmit(static function (Form $form) {
     // implement submission here
-    return $form->jsSuccess('Thanks for submitting file: ' . $form->model->get('img') . ' / ' . $form->model->get('file'));
+    return $form->jsSuccess('Thanks for submitting file: ' . $form->entity->get('img') . ' / ' . $form->entity->get('file'));
 });

demos/form/form-section.php

@@ -22,11 +22,11 @@
 $model = $model->loadAny();
 
 $saveAndDumpValues = static function (Form $form) {
-    $form->model->save();
+    $form->entity->save();
 
     return new JsToast([
         'title' => 'POSTed field values',
-        'message' => '<pre>' . $form->getApp()->encodeJson($form->model->get()) . '</pre>',
+        'message' => '<pre>' . $form->getApp()->encodeJson($form->entity->get()) . '</pre>',
         'class' => 'success',
         'displayTime' => 5000,
     ]);

demos/form/form.php

@@ -59,7 +59,7 @@
 $form->addControl('status_integer_required', [Form\Control\Dropdown::class], ['type' => 'integer', 'values' => $values, 'required' => true]);
 
 $form->onSubmit(static function (Form $form) use ($app) {
-    return new JsToast($app->encodeJson($form->model->get()));
+    return new JsToast($app->encodeJson($form->entity->get()));
 });
 
 Header::addTo($tab, ['Comparing Field type vs Form control class']);
@@ -69,7 +69,7 @@
 $form->buttonSave->set('Compare Date');
 
 $form->onSubmit(static function (Form $form) {
-    $message = 'field = ' . print_r($form->model->get('field'), true) . '; <br> control = ' . print_r($form->model->get('control'), true);
+    $message = 'field = ' . print_r($form->entity->get('field'), true) . '; <br> control = ' . print_r($form->entity->get('control'), true);
     $view = new Message('Date field vs control:');
     $view->setApp($form->getApp());
     $view->invokeInit();
@@ -194,8 +194,8 @@
 $form->setModel($modelRegister);
 
 $form->onSubmit(static function (Form $form) {
-    if ($form->model->get('name') !== 'John') {
-        return $form->jsError('name', 'Your name is not John! It is "' . $form->model->get('name') . '". It should be John. Pleeease!');
+    if ($form->entity->get('name') !== 'John') {
+        return $form->jsError('name', 'Your name is not John! It is "' . $form->entity->get('name') . '". It should be John. Pleeease!');
     }
 
     return new JsBlock([
@@ -233,13 +233,13 @@
 
 $form->onSubmit(static function (Form $form) {
     $errors = [];
-    foreach ($form->model->getFields() as $name => $ff) {
+    foreach ($form->entity->getFields() as $name => $ff) {
         if ($name === 'id') {
             continue;
         }
 
-        if ($form->model->get($name) !== 'a') {
-            $errors[] = $form->jsError($name, 'Field ' . $name . ' should contain exactly "a", but contains ' . $form->model->get($name));
+        if ($form->entity->get($name) !== 'a') {
+            $errors[] = $form->jsError($name, 'Field ' . $name . ' should contain exactly "a", but contains ' . $form->entity->get($name));
         }
     }
 

demos/form/form2.php

@@ -58,18 +58,18 @@
 $form->onSubmit(static function (Form $form) {
     $countryEntity = (new Country($form->getApp()->db))->createEntity();
     // Model will have some validation too
-    foreach ($form->model->getFields('editable') as $k => $field) {
+    foreach ($form->entity->getFields('editable') as $k => $field) {
         if ($countryEntity->hasField($k)) {
-            $countryEntity->set($k, $form->model->get($k));
+            $countryEntity->set($k, $form->entity->get($k));
         }
     }
 
     // in-form validation
     $errors = [];
-    if (mb_strlen($form->model->get('first_name')) < 3) {
-        $errors[] = $form->jsError('first_name', 'too short, ' . $form->model->get('first_name'));
+    if (mb_strlen($form->entity->get('first_name')) < 3) {
+        $errors[] = $form->jsError('first_name', 'too short, ' . $form->entity->get('first_name'));
     }
-    if (mb_strlen($form->model->get('last_name')) < 5) {
+    if (mb_strlen($form->entity->get('last_name')) < 5) {
         $errors[] = $form->jsError('last_name', 'too short');
     }
 

demos/form/form3.php

@@ -36,12 +36,12 @@
 $form->onSubmit(static function (Form $form) {
     $errors = [];
     $modelDirty = \Closure::bind(static function () use ($form): array { // TODO Model::dirty property is private
-        return $form->model->dirty;
+        return $form->entity->dirty;
     }, null, Model::class)();
     foreach ($modelDirty as $field => $value) {
         // we should care only about editable fields
-        if ($form->model->getField($field)->isEditable()) {
-            $errors[] = $form->jsError($field, 'Value was changed, ' . $form->getApp()->encodeJson($value) . ' to ' . $form->getApp()->encodeJson($form->model->get($field)));
+        if ($form->entity->getField($field)->isEditable()) {
+            $errors[] = $form->jsError($field, 'Value was changed, ' . $form->getApp()->encodeJson($value) . ' to ' . $form->getApp()->encodeJson($form->entity->get($field)));
         }
     }
 

demos/form/form5.php

@@ -21,7 +21,7 @@
 ]);
 
 $formSubmit = static function (Form $form) use ($app) {
-    return new JsToast($app->encodeJson($form->model->get()));
+    return new JsToast($app->encodeJson($form->entity->get()));
 };
 
 $cc = Columns::addTo($app);

demos/interactive/accordion-nested.php

@@ -42,7 +42,7 @@
         $form = Form::addTo($vp);
         $form->addControl('email');
         $form->onSubmit(static function (Form $form) {
-            return $form->jsSuccess('Subscribed ' . $form->model->get('email') . ' to newsletter.');
+            return $form->jsSuccess('Subscribed ' . $form->entity->get('email') . ' to newsletter.');
         });
 
         $addAccordionFx($vp, $maxDepth, $level + 1);

demos/interactive/accordion.php

@@ -50,7 +50,7 @@
     $form = Form::addTo($vp);
     $form->addControl('Email');
     $form->onSubmit(static function (Form $form) {
-        return $form->jsSuccess('Subscribed ' . $form->model->get('Email') . ' to newsletter.');
+        return $form->jsSuccess('Subscribed ' . $form->entity->get('Email') . ' to newsletter.');
     });
 });
 

demos/interactive/console.php

@@ -128,11 +128,10 @@ public function generateReport()
 
     $console = Console::addTo($vp, ['event' => false]);
     $console->set(static function (Console $console) use ($form) {
-        $entity = $form->model;
-        $entity->setMulti($_SESSION['atk4_ui_console_demo']);
+        $form->entity->setMulti($_SESSION['atk4_ui_console_demo']);
 
         $console->output('Executing process...');
-        $console->info(var_export($entity->get(), true));
+        $console->info(var_export($form->entity->get(), true));
         sleep(1);
         $console->output('Wait...');
         sleep(3);
@@ -141,7 +140,7 @@ public function generateReport()
     $console->js(true)->hide();
 
     $form->onSubmit(static function (Form $form) use ($console) {
-        $_SESSION['atk4_ui_console_demo'] = $form->model->get();
+        $_SESSION['atk4_ui_console_demo'] = $form->entity->get();
 
         return new JsBlock([
             $console->js()->show(),

demos/interactive/modal.php

@@ -92,7 +92,7 @@
     $form = Form::addTo($p);
     $form->addControl('color', [], ['enum' => ['red', 'green', 'blue'], 'default' => 'green']);
     $form->onSubmit(static function (Form $form) use ($vp2Modal) {
-        return $vp2Modal->jsShow(['color' => $form->model->get('color')]);
+        return $vp2Modal->jsShow(['color' => $form->entity->get('color')]);
     });
 });
 
@@ -208,15 +208,15 @@
         $form->setModel($modelRegister->createEntity());
 
         $form->onSubmit(static function (Form $form) use ($nextAction, $session) {
-            if ($form->model->get('name') !== 'John') {
-                return $form->jsError('name', 'Your name is not John! It is "' . $form->model->get('name') . '". It should be John. Pleeease!');
+            if ($form->entity->get('name') !== 'John') {
+                return $form->jsError('name', 'Your name is not John! It is "' . $form->entity->get('name') . '". It should be John. Pleeease!');
             }
 
             $session->memorize('success', true);
-            $session->memorize('name', $form->model->get('name'));
+            $session->memorize('name', $form->entity->get('name'));
 
             $js = [];
-            $js[] = $form->jsSuccess('Thank you, ' . $form->model->get('name') . ' you can go on!');
+            $js[] = $form->jsSuccess('Thank you, ' . $form->entity->get('name') . ' you can go on!');
             $js[] = $nextAction->js()->removeClass('disabled');
 
             return $js;

demos/interactive/popup.php

@@ -256,13 +256,13 @@ public function linkCart(View $cart, ?JsExpressionable $jsAction = null): void
         // popup handles callbacks properly, so dynamic element such as form works
         // perfectly inside a popup.
         $form->onSubmit(static function (Form $form) {
-            if ($form->model->get('password') !== '123') {
+            if ($form->entity->get('password') !== '123') {
                 return $form->jsError('password', 'Please use password "123"');
             }
 
             // refreshes entire page
-            return $form->getApp()->jsRedirect(['logged' => $form->model->get('email')]);
-            // return new JsExpression('alert([])', ['Thank you ' . $form->model->get('email')]);
+            return $form->getApp()->jsRedirect(['logged' => $form->entity->get('email')]);
+            // return new JsExpression('alert([])', ['Thank you ' . $form->entity->get('email')]);
         });
     }
 });

demos/interactive/tabs.php

@@ -57,8 +57,8 @@
     $form = Form::addTo($vp, ['class.segment' => true]);
     $form->setModel($modelRegister->createEntity());
     $form->onSubmit(static function (Form $form) {
-        if ($form->model->get('name') !== 'John') {
-            return $form->jsError('name', 'Your name is not John! It is "' . $form->model->get('name') . '". It should be John. Pleeease!');
+        if ($form->entity->get('name') !== 'John') {
+            return $form->jsError('name', 'Your name is not John! It is "' . $form->entity->get('name') . '". It should be John. Pleeease!');
         }
     });
 });

demos/interactive/wizard.php

@@ -43,7 +43,7 @@
 
     $form->addControl('dsn', ['caption' => 'Connect DSN'], ['required' => true])->placeholder = 'mysql://user:[email protected]/mydb';
     $form->onSubmit(static function (Form $form) use ($wizard) {
-        $wizard->memorize('dsn', $form->model->get('dsn'));
+        $wizard->memorize('dsn', $form->entity->get('dsn'));
 
         return $wizard->jsNext();
     });

demos/layout/layouts_admin.php

@@ -58,7 +58,7 @@
 $form->onSubmit(static function (Form $form) {
     $errors = [];
     foreach (['first_name', 'last_name', 'address'] as $field) {
-        if (!$form->model->get($field)) {
+        if (!$form->entity->get($field)) {
             $errors[] = $form->jsError($field, 'Field ' . $field . ' is mandatory');
         }
     }

demos/tutorial/intro.php

@@ -154,7 +154,7 @@ protected function init(): void
         $form->setModel($entity);
 
         $form->onSubmit(static function (Form $form) {
-            $form->model->save();
+            $form->entity->save();
 
             return new JsToast('Saved!');
         });