Merge pull request #219 from NotFoundNL/develop

feat: model editor settings (#218)
NotFoundNL · Mar 8, 2024 · 4bce578 · 4bce578
2 parents 1cb2a07 + f9c9eb2
commit 4bce578
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 58 deletions.
diff --git a/src/Http/Controllers/Assets/TableEditorController.php b/src/Http/Controllers/Assets/TableEditorController.php
@@ -42,7 +42,7 @@ public function index(Request $request, Table $table, int $recordId, string $lan
 
         $params = sprintf('?page=%d&sort=%s&asc=%s', $request->page ?? 1, $request->sort ?? '', $request->asc ?? '');
 
-        $formUrl = sprintf('/table/%s/%s/%s/%s', $table->url, $recordId ?? 0, urlencode($langUrl), $params.$editor->filterToParams());
+        $formUrl = sprintf('/table/%s/%s/%s/%s', $table->url, $recordId ?? 0, urlencode($langUrl), $params.'&'.$editor->filterParameters());
 
         $form = new LayoutForm($formUrl);
 
@@ -108,7 +108,6 @@ public function update(FormDataRequest $request, Table $table, int $recordId, st
         }
 
         $tableService = new TableService($table, $lang, $recordId);
-
         $tableService->setRequestParameters($request->query());
 
         $editor = $this->customEditor($table, $tableService);
@@ -142,8 +141,8 @@ public function update(FormDataRequest $request, Table $table, int $recordId, st
             // Stay on page
             if ($newTableRecord) {
                 $url = '/table/'.$table->url.'/'.$id;
-                if ($params = $editor->filterToParams()) {
-                    $url .= '?'.ltrim($params, '&');
+                if ($params = $editor->filterParameters()) {
+                    $url .= '?'.$params;
                 }
                 $response->addAction(new Redirect($url));
             } else {
@@ -152,9 +151,11 @@ public function update(FormDataRequest $request, Table $table, int $recordId, st
         } else {
             // Redirect
 
-            $params = sprintf('?page=%d&sort=%s&asc=%s', $request->page ?? 1, $request->sort ?? '', $request->asc ?? '');
-            $params .= $editor->filterToParams();
-            $response->addAction(new Redirect('/table/'.$table->url.'/?'.$params));
+            // Get the overview URL from the editor
+            $editor = $this->customEditor($table, $tableService);
+            $overviewUrl = $editor->getOverviewUrl();
+
+            $response->addAction(new Redirect($overviewUrl));
         }
 
         return $response->build();

diff --git a/src/Http/Controllers/Assets/TableOverviewController.php b/src/Http/Controllers/Assets/TableOverviewController.php
@@ -49,7 +49,7 @@ public function index(Request $request, Table $table)
         $editor = $this->customEditor($table, $tableService);
 
         foreach ($siteTableRowsPaginator as $row) {
-            $link = sprintf('/table/%s/%d/?page=%d&sort=%s&asc=%s', $table->url, $row->id, $request->page ?? 1, $request->sort ?? '', $request->asc ?? '').$editor->filterToParams();
+            $link = sprintf('/table/%s/%d/?page=%d&sort=%s&asc=&%s', $table->url, $row->id, $request->page ?? 1, $request->sort ?? '', $request->asc ?? '').$editor->filterParameters();
             $layoutRow = new LayoutTableRow($row->id, link: $link);
 
             foreach ($components as $component) {

diff --git a/src/Models/Editor/AbstractEditor.php b/src/Models/Editor/AbstractEditor.php
@@ -4,10 +4,8 @@
 
 use NotFound\Framework\Services\Assets\TableService;
 use NotFound\Layout\Elements\LayoutBar;
-use NotFound\Layout\Elements\LayoutBarButton;
 use NotFound\Layout\Elements\LayoutBreadcrumb;
 use NotFound\Layout\Elements\LayoutPager;
-use NotFound\Layout\Elements\LayoutSearchBox;
 
 abstract class AbstractEditor
 {
@@ -23,51 +21,7 @@ abstract public function getBreadCrumbs(): LayoutBreadCrumb;
 
     abstract public function getBreadCrumbsEdit(): LayoutBreadCrumb;
 
-    public function filters(): array
-    {
-        return $this->ts->getRequestParameters('filter') ?? [];
-    }
-
-    public function filterToParams(): string
-    {
-        if (empty($this->filters())) {
-            return '';
-        }
-        $filterParams = '';
-        foreach ($this->filters() as $key => $value) {
-            $filterParams .= '&filter['.$key.']='.$value;
-        }
-
-        return $filterParams;
-    }
-
-    protected function addNewButton(LayoutBar $bar): LayoutBar
-    {
-        $table = $this->ts->getAssetModel();
-
-        if (! $table->allow_create) {
-            return $bar;
-        }
+    abstract public function getOverviewUrl(): string;
 
-        $addNew = new LayoutBarButton('Nieuw');
-        $table = $this->ts->getAssetModel();
-        $addNew->setIcon('plus');
-        $url = '/table/'.$table->url.'/0';
-        if ($params = $this->filterToParams()) {
-            $url .= '?'.ltrim($params, '&');
-        }
-        $addNew->setLink($url);
-
-        return $bar->addBarButton($addNew);
-    }
-
-    protected function addPager(LayoutBar $bar, LayoutPager $pager): LayoutBar
-    {
-        return $bar->addPager($pager);
-    }
-
-    protected function addSearchBox(LayoutBar $bar): LayoutBar
-    {
-        return $bar->addSearchBox(new LayoutSearchBox(''));
-    }
+    abstract public function filterParameters(): string;
 }
diff --git a/src/Models/Editor/DefaultEditor.php b/src/Models/Editor/DefaultEditor.php
@@ -46,7 +46,7 @@ protected function addNewButton(LayoutBar $bar): LayoutBar
         $table = $this->ts->getAssetModel();
         $addNew->setIcon('plus');
         $url = '/table/'.$table->url.'/0';
-        if ($params = $this->filterToParams()) {
+        if ($params = $this->filterParameters()) {
             $url .= '?'.ltrim($params, '&');
         }
         $addNew->setLink($url);
@@ -68,9 +68,34 @@ public function getBreadCrumbsEdit(): LayoutBreadCrumb
     {
         $table = $this->ts->getAssetModel();
         $breadcrumb = $this->getBreadCrumbs();
-        end($breadcrumb->properties->items)->link = '/table/'.$table->url.'/?'.$this->filterToParams();
+        end($breadcrumb->properties->items)->link = '/table/'.$table->url.'/?'.$this->filterParameters();
         $breadcrumb->addItem('edit');
 
         return $breadcrumb;
     }
+
+    public function getOverviewUrl(): string
+    {
+        $table = $this->ts->getAssetModel();
+        $request = $this->ts->getRequestParameters() ?? [];
+        $params = sprintf('page=%d&sort=%s&asc=%s', $request['page'] ?? 1, $request['sort'] ?? '', $request['asc'] ?? '');
+
+        $url = sprintf('/table/%s/?%s&%s', $table->url, $params, $this->filterParameters());
+
+        return $url;
+}
+
+    public function filterParameters(): string
+    {
+        $filters = $this->ts->getRequestParameters('filter') ?? [];
+        if (empty($filters)) {
+            return '';
+        }
+        $filterParams = [];
+        foreach ($filters as $key => $value) {
+            $filterParams[] = 'filter['.$key.']='.urlencode($value);
+        }
+
+        return implode('&', $filterParams);
+    }
 }