User Edit improvement

balemy · Dec 2, 2022 · 630a3e8 · 630a3e8
1 parent 7e9b7b8
commit 630a3e8
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 13 deletions.
diff --git a/resources/views/user/edit.php b/resources/views/user/edit.php
@@ -39,7 +39,7 @@
 
         <?= Html::form()->post($urlGenerator->generate('user-edit', ['dn' => $userForm->user->getDn()]))->csrf($csrf)->open() ?>
 
-        <?php foreach ($fieldSet as $row): ?>
+        <?php foreach ($userForm->getFormSchema()->getRows() as $row): ?>
             <div class="row">
                 <?php foreach ($row as $fieldName => $fieldLabel): ?>
                     <div class="col-sm">

diff --git a/resources/views/user/list.php b/resources/views/user/list.php
@@ -12,6 +12,7 @@
  */
 
 use Yiisoft\Html\Html;
+use Yiisoft\Html\Tag\Button;
 
 $this->setTitle($applicationParameters->getName());
 ?>
@@ -24,7 +25,24 @@
         <p class="lead">
             Overview of all users
         </p>
-        <br>
+        <br/>
+
+        <!--
+        <form class="row g-3 alert alert-dark" style="padding-top:0px;"
+              action="#" method="post">
+            <div class="col-auto" style="width:300px">
+                <label for="test">Organizational Unit</label>
+                <?= Html::select('test')
+                    ->optionsData(['foo' => 'bar', 'bla' => 'fuu'])
+                    ->addClass('form-control')
+                ?>
+            </div>
+            <div class="col-auto">
+                <?= Button::submit('Add')->addClass('btn btn-primary')->addAttributes(['style' => 'margin-top:24px']); ?>
+            </div>
+        </form>
+        -->
+
         <table class="table table-striped" data-search="true" data-toggle="table" data-pagination="true"
                data-page-size="100" data-sortable="true" data-click-to-select="true">
             <thead>

diff --git a/src/User/UserController.php b/src/User/UserController.php
@@ -82,7 +82,6 @@ public function edit(ServerRequestInterface $request, WebControllerService $webS
             'dn' => $userForm->user->getDn(),
             'parentDNs' => $this->ldapService->getOrganizationalUnits(),
             'userForm' => $userForm,
-            'fieldSet' => $this->applicationParameters->getUserEditFields()
         ]);
     }
 

diff --git a/src/User/UserForm.php b/src/User/UserForm.php
@@ -3,6 +3,7 @@
 namespace Balemy\LdapCommander\User;
 
 use Balemy\LdapCommander\ApplicationParameters;
+use Yiisoft\Arrays\ArrayHelper;
 use Yiisoft\Form\FormModel;
 
 
@@ -12,12 +13,15 @@ class UserForm extends FormModel
     private array $_attrs = [];
 
     private array $internalAttrs = ['parentDn'];
+    private UserFormSchema $formSchema;
 
 
-    public function __construct(private ApplicationParameters $applicationParameters)
+    public function __construct(ApplicationParameters $applicationParameters)
     {
-        parent::__construct();
+        $this->formSchema = new UserFormSchema($applicationParameters);
         $this->user = new User();
+
+        parent::__construct();
     }
 
     public function setUser(User $user): void
@@ -36,6 +40,14 @@ public function getAttributeCastValue(string $attribute): mixed
         return $this->_attrs[$attribute] ?? '';
     }
 
+    /**
+     * @return UserFormSchema
+     */
+    public function getFormSchema(): UserFormSchema
+    {
+        return $this->formSchema;
+    }
+
 
     private function getEntryValue(string $name): string
     {
@@ -53,9 +65,10 @@ private function getEntryValue(string $name): string
 
     public function getAttributeLabels(): array
     {
-        return [
+        /** @var string[] */
+        return array_merge([
             'parentDn' => 'Organizational Unit'
-        ];
+        ], $this->formSchema->getFields());
     }
 
     /**
@@ -65,12 +78,8 @@ public function getAttributeLabels(): array
     protected function collectAttributes(): array
     {
         $fields = ['parentDn' => 'string'];
-        $rows = $this->applicationParameters->getUserEditFields();
-        /** @var string[] $row */
-        foreach ($rows as $row) {
-            foreach (array_keys($row) as $fieldKey) {
-                $fields[$fieldKey] = 'string';
-            }
+        foreach (array_keys($this->formSchema->getFields()) as $attribute) {
+            $fields[$attribute] = 'string';
         }
         return $fields;
     }

diff --git a/src/User/UserFormSchema.php b/src/User/UserFormSchema.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Balemy\LdapCommander\User;
+
+use Balemy\LdapCommander\ApplicationParameters;
+use Yiisoft\Form\FormModel;
+
+
+final class UserFormSchema
+{
+
+    private array $_fields = [];
+
+    private array $_rows;
+
+    public function __construct(private readonly ApplicationParameters $applicationParameters)
+    {
+        $this->_rows = $this->applicationParameters->getUserEditFields();
+
+        /** @var string[] $row */
+        foreach ($this->_rows as $row) {
+            foreach ($row as $fieldKey => $fieldLabel) {
+                $this->_fields[$fieldKey] = $fieldLabel;
+            }
+        }
+    }
+
+    public function getRows(): array
+    {
+        return $this->_rows;
+    }
+
+    public function getFields(): array
+    {
+        return $this->_fields;
+    }
+}