Merge pull request #460 from Power-Components/revert-459-bugfix/enum-…

…select Revert "fix enum select"
Power-Components · Jun 2, 2022 · 8ccf07b · 8ccf07b
2 parents e4627cb + 48d929a
commit 8ccf07b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/resources/views/components/frameworks/bootstrap5/filters/select.blade.php b/resources/views/components/frameworks/bootstrap5/filters/select.blade.php
@@ -13,9 +13,7 @@ class="power_grid {{ $theme->selectClass }} {{ $class }} {{ data_get($column, 'h
                     style="{{ data_get($column, 'headerStyle') }}"
                     wire:input.debounce.500ms="filterSelect('{{ data_get($select, 'dataField') }}','{{ data_get($select, 'label')  }}')"
                     wire:model.debounce.500ms="filters.select.{{ data_get($select, 'dataField')  }}">
-                @if(!boolval(data_get($select, 'isEnum')))
-                    <option value="">{{ trans('livewire-powergrid::datatable.select.all') }}</option>
-                @endif
+                <option>{{ trans('livewire-powergrid::datatable.select.all') }}</option>
                 @foreach(data_get($select, 'data_source') as $relation)
                     @php
                         $key = isset($relation['id']) ? 'id' : 'value';

diff --git a/resources/views/components/frameworks/tailwind/filters/select.blade.php b/resources/views/components/frameworks/tailwind/filters/select.blade.php
@@ -19,9 +19,7 @@
                             style="{{ data_get($column, 'headerStyle') }}"
                             wire:input.debounce.500ms="filterSelect('{{ data_get($select, 'dataField') }}','{{ data_get($select, 'label')  }}')"
                             wire:model.debounce.500ms="filters.select.{{ data_get($select, 'dataField')  }}">
-                        @if(!boolval(data_get($select, 'isEnum')))
-                            <option value="">{{ trans('livewire-powergrid::datatable.select.all') }}</option>
-                        @endif
+                        <option value="">{{ trans('livewire-powergrid::datatable.select.all') }}</option>
                         @foreach(data_get($select, 'data_source') as $relation)
                             @php
                                 $key = isset($relation['id']) ? 'id' : 'value';

diff --git a/src/Column.php b/src/Column.php
@@ -297,9 +297,8 @@ public function makeInputSelect(
         $this->editable                         = false;
         $this->inputs['select']['data_source']  = $datasource;
         $this->inputs['select']['displayField'] = $displayField;
-        $this->inputs['select']['dataField']    = $dataField          ?? $displayField;
-        $this->inputs['select']['class']        = $settings['class']  ?? '';
-        $this->inputs['select']['isEnum']       = $settings['isEnum'] ?? false;
+        $this->inputs['select']['dataField']    = $dataField         ?? $displayField;
+        $this->inputs['select']['class']        = $settings['class'] ?? '';
 
         return $this;
     }
@@ -363,8 +362,6 @@ public function makeInputEnumSelect(array $enumCases, string $dataField = null,
 
         $dataField ??= Str::snake(class_basename($enumCases[0]));
 
-        $settings['isEnum'] = true;
-
         return $this->makeInputSelect($dataSource, $displayField, $dataField, $settings);
     }