update view json table

examples/view.json

@@ -0,0 +1,27 @@
+{
+  "meta": {
+    "rows": {
+      "username": "Логин",
+      "email": "Email",
+      "created_at": "Создан",
+      "updated_at": "Обновлен"
+    },
+    "perPage": 10,
+    "currentPage": 1,
+    "baseUrl": "\/admin\/user",
+    "actions": [],
+    "params": {
+      "class": "table table-bordered",
+      "border": "2"
+    }
+  },
+  "data": {
+    "id": 1,
+    "username": "rrr",
+    "email": "rrr@mail.ru",
+    "password_hash": "sdgh46eyrtghsdret",
+    "role": 1,
+    "created_at": "15.07.2024",
+    "updated_at": null
+  }
+}

examples/view.php

@@ -0,0 +1,11 @@
+<?php
+
+require_once  "../vendor/autoload.php";
+
+use Itguild\Tables\ViewJsonTable;
+
+$json = file_get_contents('view.json');
+
+$table = new ViewJsonTable($json);
+$table->create();
+$table->render();

src/ActionColumn/ActionColumn.php

@@ -8,8 +8,11 @@ abstract class ActionColumn
     protected string $prefix;
 
     protected int $id;
-    public function __construct(string $baseUrl, int $id)
+    public function __construct(string $baseUrl, int $id, string $prefix = '')
     {
+        if (!empty($prefix)){
+            $this->prefix = $prefix;
+        }
         $this->baseUrl = $baseUrl;
         $this->id = $id;
     }

src/ActionColumn/DeleteActionColumn.php

@@ -4,7 +4,7 @@ namespace Itguild\Tables\ActionColumn;
 
 class DeleteActionColumn extends ActionColumn
 {
-    protected string $prefix = "/form-delete/";
+    protected string $prefix = "/delete/";
 
     public function fetch(): string
     {

src/ActionColumn/EditActionColumn.php

@@ -5,7 +5,7 @@ namespace Itguild\Tables\ActionColumn;
 class EditActionColumn extends ActionColumn
 {
 
-    protected string $prefix = "/form-edit/";
+    protected string $prefix = "/edit/";
 
     public function fetch(): string
     {

src/ActionColumn/ViewActionColumn.php

@@ -4,7 +4,7 @@ namespace Itguild\Tables\ActionColumn;
 
 class ViewActionColumn extends ActionColumn
 {
-    protected string $prefix = "/form-item/";
+    protected string $prefix = "/view/";
 
     public function fetch(): string
     {

src/ListJsonTable.php

@@ -2,6 +2,7 @@
 
 namespace Itguild\Tables;
 
+use Itguild\Tables\ActionColumn\ActionColumn;
 use Itguild\Tables\ActionColumn\DeleteActionColumn;
 use Itguild\Tables\ActionColumn\EditActionColumn;
 use Itguild\Tables\ActionColumn\ViewActionColumn;
@@ -21,15 +22,16 @@ class ListJsonTable
     private array $data;
 
     private array $actionsArray = [];
+    private array $customActionsArray = [];
 
     public function __construct(string $json)
     {
         $this->beforePrintCell = false;
-        $this->beforePrint = function (){};
+        $this->beforePrint = function () {
+        };
         $this->json = $json;
         $this->data = json_decode($this->json, true);
         $this->baseUrl = $this->data['meta']['baseUrl'] ?? '';
-        $this->setActions();
     }
 
     public function beginTable(): void
@@ -69,7 +71,7 @@ class ListJsonTable
             foreach ($this->data['data'] as $col) {
                 $this->html .= "<tr>";
                 $this->count += 1;
-                $this->html .= '<td><a href=' . $this->baseUrl . "/form-item/" . $col["id"] . '>' . $this->count . '</a></td>';
+                $this->html .= '<td><a href=' . $this->baseUrl . "/" . $col["id"] . '>' . $this->count . '</a></td>';
                 foreach ($col as $key => $row) {
                     if ($this->issetColumn($key) and $this->is_fillable($key)) {
                         if ($this->beforePrintCell) {
@@ -88,6 +90,11 @@ class ListJsonTable
         }
     }
 
+    public function addAction(string $actionColumn): void
+    {
+        $this->customActionsArray[] = $actionColumn;
+    }
+
     private function setActions(): void
     {
         if (isset($this->data['meta']['actions'])) {
@@ -105,9 +112,10 @@ class ListJsonTable
                 }
             }
         }
+        $this->actionsArray = array_merge($this->actionsArray, $this->customActionsArray);
     }
 
-    private function issetColumn($column)
+    private function issetColumn($column): bool
     {
         if (isset($this->data['meta']['columns'])) {
             foreach ($this->data['meta']['columns'] as $key => $currentColumn) {
@@ -122,12 +130,11 @@ class ListJsonTable
 
     private function is_fillable($column): bool
     {
-        if (isset($this->data['meta']['fillable'])){
+        if (isset($this->data['meta']['fillable'])) {
             if (in_array($column, $this->data['meta']['fillable'])) {
                 return true;
             }
-        }
-        else{
+        } else {
             return true;
         }
 
@@ -145,8 +152,9 @@ class ListJsonTable
         return $actions;
     }
 
-    public function create()
+    public function create(): void
     {
+        $this->setActions();
         $this->beginTable();
         $this->createThead();
         $this->createTbody();

src/ViewJsonTable.php

@@ -23,7 +23,7 @@ class ViewJsonTable
     {
         $this->json = $json;
         $this->data = json_decode($this->json, true);
-        $this->dataJson = json_decode($this->data['data']['data'], true);
+        $this->dataJson = $this->data['data'];
     }
 
 
@@ -31,20 +31,25 @@ class ViewJsonTable
     public function beginTable(): void
     {
         $paramsStr = $this->createParams($this->data['meta']['params']);
-        $hook = $this->beforePrintTable;
-        $this->html = $hook();
+
+        //Хук перед выводом ячейки
+        if (isset($this->beforePrintTable)){
+            $hook = $this->beforePrintTable;
+            $this->html = $hook();
+        }
+
         $this->html .= "<table $paramsStr>";
     }
-    public function createColum(): string
+    public function createRows(): string
     {
-        foreach ($this->data['meta']['columns'] as $key => $column){
-            if ($this->issetColumn($key)){
-                if ($this->beforePrintCell){
+        foreach ($this->data['meta']['rows'] as $key => $row){
+            if ($this->issetRow($key)){
+                if (isset($this->beforePrintCell)){
                     $hook = $this->beforePrintCell;
                     $this->dataJson[$key] = $hook($key, $this->dataJson[$key]);
                 }
 
-                $this->html .= "<tr><th>" . $column . ": </th><td>" . $this->dataJson[$key] . "</td></tr>";
+                $this->html .= "<tr><th>" . $row . ": </th><td>" . $this->dataJson[$key] . "</td></tr>";
 
             }
         }
@@ -53,11 +58,11 @@ class ViewJsonTable
         return $this->html;
     }
 
-    private function issetColumn($column)
+    private function issetRow($column): bool
     {
 
-        if (isset($this->data['meta']['columns'])){
-            foreach ($this->data['meta']['columns'] as $key => $currentColumn){
+        if (isset($this->data['meta']['rows'])){
+            foreach ($this->data['meta']['rows'] as $key => $currentColumn){
                 if ($key === $column){
                     return true;
                 }
@@ -67,18 +72,20 @@ class ViewJsonTable
         return false;
     }
 
-    public function endTable()
+    public function endTable(): void
     {
         $this->html .= "</table>";
-        $hookAfter = $this->afterPrintTable;
-        $this->html .= $hookAfter();
 
+        if(isset($this->afterPrintTable)){
+            $hookAfter = $this->afterPrintTable;
+            $this->html .= $hookAfter();
+        }
     }
 
-    public function create()
+    public function create(): void
     {
         $this->beginTable();
-        $this->createColum();
+        $this->createRows();
         $this->endTable();
     }
 
@@ -93,11 +100,9 @@ class ViewJsonTable
         $this->afterPrintTable = $closure;
     }
 
-    public function render()
+    public function render(): void
     {
-
         echo $this->html;
-
     }
 
     public function setBeforePrintCell(\Closure $closure): void