WIP on from_to filter

Author: jissereitsma

Component/Grid/GridViewModel.php

@@ -3,6 +3,7 @@
 namespace Loki\AdminComponents\Component\Grid;
 
 use Loki\AdminComponents\Grid\Column\Column;
+use Loki\AdminComponents\Grid\Filter\Filter;
 use Loki\AdminComponents\Grid\Filter\FilterFactory;
 use Loki\AdminComponents\Grid\Filter\StaticFilterInterface;
 use Loki\AdminComponents\Grid\State\FilterState;
@@ -356,8 +357,19 @@ public function getGridFilterStates(): array
     private function getGridFilterStateValues(): array
     {
         $values = [];
-        foreach ($this->getGridFilterStates() as $gridFilterState) {
-            $values[$gridFilterState->getField()] = $gridFilterState->getValue();
+        foreach ($this->getGridFilters() as $gridFilter) {
+            $gridFilterState = $this->getState()->getFilterState($gridFilter->getCode());
+            $value = $gridFilterState instanceof FilterState ? $gridFilterState->getValue() : null;
+
+            // @todo: This needs to be moved elsewhere, perhaps default value of Filter class?
+            if ($gridFilter->getConditionType() === 'from_to' && $value === null) {
+                $value = [
+                    'from' => null,
+                    'to' => null
+                ];
+            }
+
+            $values[$gridFilter->getCode()] = $value;
         }
 
         return $values;

Grid/State/FilterState.php

@@ -7,7 +7,7 @@ class FilterState implements \JsonSerializable
 {
     public function __construct(
         private string $field,
-        private string $value,
+        private string|array|null $value,
         private string $conditionType,
     ) {
     }
@@ -17,7 +17,7 @@ public function getField(): string
         return $this->field;
     }
 
-    public function getValue(): string
+    public function getValue(): string|array|null
     {
         return $this->value;
     }

view/adminhtml/templates/form/field_type/from_to.phtml

@@ -20,19 +20,22 @@ $fieldType = $field->getFieldType();
 ?>
 <div class="">
     <div class="admin__form-field">
-        <label class="admin__form-field-label">
+        <label
+            for="<?= $escaper->escapeHtml($field->getScope()) ?>.<?= $escaper->escapeHtml($field->getCode()) ?>"
+            class="admin__form-field-label">
             <span>from</span>
         </label>
 
         <div class="admin__form-field-control">
             <input
+                id="<?= $escaper->escapeHtml($field->getScope()) ?>.<?= $escaper->escapeHtml($field->getCode()) ?>"
                 class="admin__control-text"
                 type="text"
                 data-name="<?= $escaper->escapeHtml($field->getCode()) ?>"
                 maxlength="<?= $escaper->escapeHtml(
                     $fieldType->getMaximumLength()
                 ) ?>"
-                :value="<?= $escaper->escapeHtml($field->getScope()) ?>.<?= $escaper->escapeHtml($field->getCode()) ?>"
+                :value="<?= $escaper->escapeHtml($field->getScope()) ?>.<?= $escaper->escapeHtml($field->getCode()) ?>.from"
                 @change="<?= $escaper->escapeHtml($field->getAlpineSetter()) ?>"
                 placeholder="<?= $escaper->escapeHtml(
                     $field->getBlock()->getPlaceholder()
@@ -54,8 +57,8 @@ $fieldType = $field->getFieldType();
                 maxlength="<?= $escaper->escapeHtml(
                     $fieldType->getMaximumLength()
                 ) ?>"
-                :value="<?= $escaper->escapeHtml($field->getScope()) ?>.<?= $escaper->escapeHtml($field->getCode()) ?>"
-                @change="setValue"
+                :value="<?= $escaper->escapeHtml($field->getScope()) ?>.<?= $escaper->escapeHtml($field->getCode()) ?>.to"
+                @change="<?= $escaper->escapeHtml($field->getAlpineSetter()) ?>"
                 placeholder="<?= $escaper->escapeHtml(
                     $field->getBlock()->getPlaceholder()
                 ) ?>"