WIP

Author: jissereitsma

Component/Grid/GridViewModel.php

@@ -2,6 +2,7 @@
 
 namespace Loki\AdminComponents\Component\Grid;
 
+use Hyva\Admin\ViewModel\HyvaGrid\GridFilterInterface;
 use Loki\AdminComponents\Grid\Column\Column;
 use Loki\AdminComponents\Grid\Filter\Filter;
 use Loki\AdminComponents\Grid\Filter\FilterFactory;
@@ -354,6 +355,11 @@ public function getGridFilters(): array
         }
 
         foreach ($gridFilterDefinitions as $gridFilterDefinitionCode => $gridFilterDefinition) {
+            if ($gridFilterDefinition instanceof FilterInterface) {
+                $gridFilterDefinitions[$gridFilterDefinition->getCode()] = $gridFilterDefinition;
+                continue;
+            }
+
             if (!isset($gridFilterDefinition['code'])) {
                 $gridFilterDefinition['code'] = $gridFilterDefinitionCode;
             }

ProviderHandler/CollectionHandler.php

@@ -74,14 +74,16 @@ public function getItems(object $provider, GridState $gridState): array
             }
         }
 
-        foreach ($gridState->getFilters() as $filterData) {
-            if ($filterData['condition_type'] === 'eq') {
-                $provider->addFieldToFilter($filterData['field'], $filterData['value']);
+        foreach ($gridState->getFilters() as $gridFilter) {
+            // @todo: Make this extensible
+
+            if ($gridFilter->getConditionType() === 'eq') {
+                $provider->addFieldToFilter($gridFilter->getField(), $gridFilter->getValue());
                 continue;
             }
 
-            $provider->addFieldToFilter($filterData['field'], [
-                $filterData['condition_type'] => $filterData['value'],
+            $provider->addFieldToFilter($gridFilter->getField(), [
+                $gridFilter->getConditionType() => $gridFilter->getValue(),
             ]);
         }
 

ProviderHandler/RepositoryHandler.php

@@ -183,6 +183,8 @@ private function createFilterFromFilterState(GridState\FilterState $filterState)
 
         $value = $filterState->getValue();
 
+        // @todo: Make this extensible
+
         if ($conditionType === 'like') {
             return $this->filterBuilder
                 ->setValue('%'.$value.'%')

view/adminhtml/templates/script/component-type/grid-component-type.phtml

@@ -1,10 +1,9 @@
 <?php
 declare(strict_types=1);
 
-/** @version 0.3.3 */
-
 use Magento\Framework\View\Element\Template;
 
+/** @version 0.3.3 */
 /** @var Template $block */
 ?>
 <script>