Cleanup static-filters and look & feel of filters

Author: jissereitsma

Component/Grid/GridViewModel.php

@@ -4,6 +4,7 @@
 
 use Loki\AdminComponents\Grid\Column\Column;
 use Loki\AdminComponents\Grid\Filter\FilterFactory;
+use Loki\AdminComponents\Grid\Filter\StaticFilterInterface;
 use Magento\Framework\Data\OptionSourceInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\Model\ResourceModel\Db\AbstractDb;
@@ -95,20 +96,20 @@ public function applyStaticFilters(): void
 
         $filters = [];
         foreach ($staticFilters as $staticFilter) {
-            if ($staticFilter instanceof FilterInterface) {
+            if ($staticFilter instanceof StaticFilterInterface) {
                 $filters[] = [
-                    'field' => $staticFilter->getField(),
+                    'field' => $staticFilter->getCode(),
                     'value' => $staticFilter->getValue(),
                     'condition_type' => $staticFilter->getConditionType(),
                 ];
                 continue;
             }
 
-            $filter = [];
-            $filter['field'] = $staticFilter['field'];
-            $filter['value'] = $staticFilter['value'];
-            $filter['condition_type'] = $staticFilter['condition_type'];
-            $filters[] = $filter;
+            $filters[] = [
+                'field' => $staticFilter['field'],
+                'value' => $staticFilter['value'],
+                'condition_type' => $staticFilter['condition_type'],
+            ];
         }
 
         $this->getState()->setFilters($filters);
@@ -318,40 +319,6 @@ public function getGridFilterValues(): array
         return $gridFilterValues;
     }
 
-    /**
-     * @return Field[]
-     */
-    public function getFilterFields(): array
-    {
-        $filters = (array)$this->getBlock()->getData('grid_filters');
-        if (empty($filters)) {
-            return [];
-        }
-
-        $fields = [];
-        foreach ($filters as $filterCode => $filter) {
-            $filter['code'] = $filterCode;
-
-            if (isset($filter['options']) && false === $filter['options'] instanceof OptionSourceInterface) {
-                $filter['options'] = $this->objectManager->get($filter['options']);
-            }
-
-            if (isset($filter['options']) && false === $filter['options'] instanceof OptionSourceInterface) {
-                throw new RuntimeException('Filter uses wrong options class');
-            }
-
-            $field = $this->fieldFactory->createWithBlock(
-                $filter,
-            );
-
-            $field->getBlock()->addData($filter);
-            $field->getBlock()->setField($field);
-            $fields[] = $field;
-        }
-
-        return $fields;
-    }
-
     public function getCellActions(DataObject $item): array
     {
         if (false === $this->allowActions()) {

Grid/Filter/StaticFilterInterface.php

@@ -0,0 +1,9 @@
+<?php
+declare(strict_types=1);
+
+namespace Loki\AdminComponents\Grid\Filter;
+
+interface StaticFilterInterface extends FilterInterface
+{
+    public function getValue(): string;
+}

view/adminhtml/templates/grid/filters.phtml

@@ -3,16 +3,19 @@ declare(strict_types=1);
 
 /** @version 0.3.2 */
 
+use Magento\Framework\Escaper;
 use Magento\Framework\View\Element\Template;
 use Loki\AdminComponents\Component\Grid\GridViewModel;
 use Loki\Components\Util\Block\TemplateRenderer;
 
 /** @var Template $block */
 /** @var GridViewModel $viewModel */
+/** @var Escaper $escaper */
 /** @var TemplateRenderer $templateRenderer */
 
 $viewModel = $block->getViewModel();
 $gridFilters = $viewModel->getGridFilters();
+$gridFilterValues = $viewModel->getGridFilterValues();
 if (empty($gridFilters)) {
     return;
 }
@@ -25,6 +28,25 @@ if (empty($gridFilters)) {
     </div>
 </div>
 
+<div class="admin__data-grid-filters-current _show">
+    <div class="admin__current-filters-title-wrap">
+        <span class="admin__current-filters-title">
+            <?= $escaper->escapeHtml(__('Active filters:')) ?>
+        </span>
+    </div>
+    <div class="admin__current-filters-list-wrap">
+        <ul class="admin__current-filters-list" data-role="filter-list">
+            <?php foreach ($gridFilterValues as $gridFilterName => $gridFilterValue): ?>
+            <li>
+                <span class="label"><?= $gridFilterName ?></span>: <span class="preview"><?= $gridFilterValue ?></span>
+            </li>
+            <?php endforeach; ?>
+        </ul>
+    </div>
+</div>
+
+
+
 <div x-cloak x-show="showFilters" class="admin__data-grid-filters-wrap _show">
     <fieldset class="admin__fieldset admin__data-grid-filters">
         <?php foreach ($gridFilters as $gridFilter): ?>

view/adminhtml/templates/script/component-partial/filters-component-partial.phtml

@@ -10,7 +10,7 @@ use Magento\Framework\View\Element\Template;
 <script>
     const LokiAdminFiltersComponentPartial = {
         filters: [],
-        showFilters: true,
+        showFilters: false,
         toggleFilters() {
             this.showFilters = !this.showFilters;
         },