kernel update

kernel/modules/user/controllers/UserController.php

@@ -5,9 +5,11 @@ namespace kernel\modules\user\controllers;
 use Exception;
 use JetBrains\PhpStorm\NoReturn;
 use kernel\AdminController;
+use kernel\EntityRelation;
 use kernel\modules\user\models\forms\CreateUserForm;
 use kernel\modules\user\models\User;
 use kernel\modules\user\service\UserService;
+use kernel\Request;
 use Twig\Error\LoaderError;
 use Twig\Error\RuntimeError;
 use Twig\Error\SyntaxError;
@@ -35,6 +37,11 @@ class UserController extends AdminController
         $userForm->load($_REQUEST);
         if ($userForm->validate()){
             $user = $this->userService->create($userForm);
+
+
+            $entityRelation = new EntityRelation();
+            $entityRelation->saveEntityRelation(entity: "user", model: $user, request: new Request());
+
             if ($user){
                 $this->redirect("/admin/user/view/" . $user->id);
             }
@@ -91,8 +98,12 @@ class UserController extends AdminController
         $userForm = new CreateUserForm();
         $userService = new UserService();
         $userForm->load($_REQUEST);
-        if ($userForm->validate()){
+        if ($userForm->validateForUpdate()){
             $user = $userService->update($userForm, $user);
+
+            $entityRelation = new EntityRelation();
+            $entityRelation->saveEntityRelation(entity: "user", model: $user, request: new Request());
+
             if ($user){
                 $this->redirect("/admin/user/view/" . $user->id);
             }
@@ -100,9 +111,20 @@ class UserController extends AdminController
         $this->redirect("/admin/user/update/" . $id);
     }
 
+    /**
+     * @throws Exception
+     */
     #[NoReturn] public function actionDelete($id): void
     {
-        User::find($id)->delete();
+        $user = User::find($id)->first();
+        if (!$user){
+            throw new Exception(message: "The user not found");
+        }
+
+        $entityRelation = new EntityRelation();
+        $entityRelation->deleteEntityRelation(entity: "user", model: $user);
+
+        $user->delete();
         $this->redirect("/admin/user/");
     }
 

kernel/modules/user/manifest.json

@@ -3,6 +3,7 @@
   "version": "0.1",
   "author": "ITGuild",
   "slug": "user",
+  "type": "entity",
   "description": "User module",
   "module_class": "kernel\\modules\\user\\UserModule",
   "module_class_file": "{KERNEL_MODULES}/user/UserModule.php",

kernel/modules/user/models/forms/CreateUserForm.php

@@ -16,4 +16,13 @@ class CreateUserForm extends FormModel
         ];
     }
 
+    public function rulesForUpdate(): array
+    {
+        return [
+            'username' => 'required|min-str-len:5|max-str-len:30',
+            'password' => '',
+            'email' => 'required|email'
+        ];
+    }
+
 }

kernel/modules/user/service/UserService.php

@@ -3,6 +3,7 @@
 namespace kernel\modules\user\service;
 
 use kernel\FormModel;
+use kernel\helpers\Debug;
 use kernel\modules\user\models\User;
 
 class UserService
@@ -25,7 +26,9 @@ class UserService
     {
         $user->username = $form_model->getItem('username');
         $user->email = $form_model->getItem('email');
-        $user->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT);
+        if ($form_model->getItem('password')) {
+            $user->password_hash = password_hash($form_model->getItem('password'), PASSWORD_DEFAULT);
+        }
         if ($user->save()){
             return $user;
         }
@@ -38,7 +41,7 @@ class UserService
      * @param string $value
      * @return mixed
      */
-    public function getByField(string $field, string $value)
+    public static function getByField(string $field, string $value): mixed
     {
         return User::where($field, $value)->first();
     }
@@ -82,4 +85,13 @@ class UserService
         return $this->getByField("access_token", $token);
     }
 
+    public static function createUserByEmailAndPassword(string $email, string $password): void
+    {
+        $user = new User();
+        $user->email = $email;
+        $user->username = $email;
+        $user->password_hash = password_hash($password, PASSWORD_DEFAULT);
+        $user->save();
+    }
+
 }

kernel/modules/user/views/form.php

@@ -6,7 +6,7 @@
 use kernel\modules\user\models\User;
 
 $form = new \itguild\forms\ActiveForm();
-$form->beginForm(isset($model) ? "/admin/user/edit/" . $model->id : "/admin/user");
+$form->beginForm(isset($model) ? "/admin/user/edit/" . $model->id : "/admin/user", enctype: 'multipart/form-data');
 
 $form->field(class: \itguild\forms\inputs\TextInput::class, name: "username", params: [
     'class' => "form-control",
@@ -32,6 +32,11 @@ $form->field(class: \itguild\forms\inputs\TextInput::class, name: "email", param
     ->setLabel("Email")
     ->render();
 
+$entityRelations = new \kernel\EntityRelation();
+if (!isset($model)) {
+    $model = new User();
+}
+$entityRelations->renderEntityAdditionalPropertyFormBySlug("user", $model);
 ?>
     <div class="row">
         <div class="col-sm-2">

kernel/modules/user/views/index.php

@@ -12,6 +12,10 @@ use kernel\IGTabel\action_column\EditActionColumn;
 use kernel\IGTabel\action_column\ViewActionColumn;
 use kernel\IGTabel\btn\PrimaryBtn;
 use kernel\modules\user\models\User;
+use kernel\widgets\IconBtn\IconBtnCreateWidget;
+use kernel\widgets\IconBtn\IconBtnDeleteWidget;
+use kernel\widgets\IconBtn\IconBtnEditWidget;
+use kernel\widgets\IconBtn\IconBtnViewWidget;
 
 $table = new ListEloquentTable(new EloquentDataProvider(User::class, [
     'currentPage' => $page_number,
@@ -20,6 +24,16 @@ $table = new ListEloquentTable(new EloquentDataProvider(User::class, [
     'baseUrl' => "/admin/user",
     'filters' => ['email'],
 ]));
+
+$entityRelation = new \kernel\EntityRelation();
+$additionals = $entityRelation->getEntityRelationsBySlug("user");
+
+foreach ($additionals as $additional) {
+    $table->addColumn($additional, $additional, function ($id) use ($entityRelation, $additional) {
+        return $entityRelation->getAdditionalPropertyByEntityId("user", $id, $additional);
+    });
+}
+
 $table->columns([
     'username' => [
         "filter" => [
@@ -42,11 +56,16 @@ $table->columns([
     }
 ]);
 $table->beforePrint(function () {
-    return PrimaryBtn::create("Создать", "/admin/user/create")->fetch();
-    //return (new PrimaryBtn("Создать", "/admin/user/create"))->fetch();
+    return IconBtnCreateWidget::create(['url' => '/admin/user/create'])->run();
+});
+$table->addAction(function($row) {
+    return IconBtnViewWidget::create(['url' => '/admin/user/view/' . $row['id']])->run();
+});
+$table->addAction(function($row) {
+    return IconBtnEditWidget::create(['url' => '/admin/user/update/' . $row['id']])->run();
+});
+$table->addAction(function($row) {
+    return IconBtnDeleteWidget::create(['url' => '/admin/user/delete/' . $row['id']])->run();
 });
-$table->addAction(ViewActionColumn::class);
-$table->addAction(EditActionColumn::class);
-$table->addAction(DeleteActionColumn::class);
 $table->create();
 $table->render();

kernel/modules/user/views/view.php

@@ -10,17 +10,30 @@ use Itguild\EloquentTable\ViewJsonTableEloquentModel;
 use kernel\IGTabel\btn\DangerBtn;
 use kernel\IGTabel\btn\PrimaryBtn;
 use kernel\IGTabel\btn\SuccessBtn;
+use kernel\widgets\IconBtn\IconBtnDeleteWidget;
+use kernel\widgets\IconBtn\IconBtnEditWidget;
+use kernel\widgets\IconBtn\IconBtnListWidget;
 
 $table = new ViewEloquentTable(new ViewJsonTableEloquentModel($user, [
     'params' => ["class" => "table table-bordered", "border" => "2"],
     'baseUrl' => "/admin/user",
 ]));
 $table->beforePrint(function () use ($user) {
-    $btn = PrimaryBtn::create("Список", "/admin/user")->fetch();
-    $btn .= SuccessBtn::create("Редактировать", "/admin/user/update/" . $user->id)->fetch();
-    $btn .= DangerBtn::create("Удалить", "/admin/user/delete/" . $user->id)->fetch();
+    $btn = IconBtnListWidget::create(['url' => '/admin/user'])->run();
+    $btn .= IconBtnEditWidget::create(['url' => '/admin/user/update/' . $user->id])->run();
+    $btn .= IconBtnDeleteWidget::create(['url' => '/admin/user/delete/' . $user->id])->run();
     return $btn;
 });
+
+$entityRelation = new \kernel\EntityRelation();
+$additionals = $entityRelation->getEntityAdditionalProperty("user", $user);
+
+foreach ($additionals as $key => $additional) {
+    $table->addRow($key, function () use ($additional) {
+        return $additional;
+    }, ['after' => 'email']);
+}
+
 $table->rows([
     'created_at' => function ($data) {
         if (!$data){