fix sortable

lara-zeus · Jun 2, 2024 · d086a5c · d086a5c
1 parent e656c46
commit d086a5c
Show file tree

Hide file tree

Showing 8 changed files with 221 additions and 222 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Concerns/Designer.php b/src/Concerns/Designer.php
@@ -99,22 +99,23 @@ private static function drawFields(ZeusSection $section, bool $inline, bool $has
 
     private static function drawSections(Form $zeusForm, ZeusSection $section, array $fields): Tab | Step | Section
     {
-        $component = Section::make($section->name)
-            ->description($section->description)
-            ->aside(fn () => $section->aside)
-            ->compact(fn () => $section->compact)
-            ->icon($section->icon ?? null)
-            ->collapsible();
-
         if (optional($zeusForm->options)['show-as'] === 'tabs') {
             $component = Tab::make($section->name)
+              //  ->live()
                 ->icon($section->icon ?? null);
-        }
-
-        if (optional($zeusForm->options)['show-as'] === 'wizard') {
+        } elseif (optional($zeusForm->options)['show-as'] === 'wizard') {
             $component = Step::make($section->name)
+             //   ->live()
                 ->description($section->description)
                 ->icon($section->icon ?? null);
+        } else {
+            $component = Section::make($section->name)
+                //  ->live()
+                ->description($section->description)
+                ->aside(fn () => $section->aside)
+                ->compact(fn () => $section->compact)
+                ->icon($section->icon ?? null)
+                ->collapsible();
         }
 
         $component->visible(function ($record, Get $get) use ($section) {
@@ -138,9 +139,9 @@ private static function drawSections(Form $zeusForm, ZeusSection $section, array
         });
 
         return $component
-            ->id(str($section->name)->slug() . '-' . $section->id)
+            //->id(str($section->name)->slug() . '-' . $section->id)
             ->schema($fields)
-            ->live()
+            //->live()
             ->columns($section->columns);
     }
 }
diff --git a/src/Fields/Classes/FileUpload.php b/src/Fields/Classes/FileUpload.php
@@ -3,14 +3,12 @@
 namespace LaraZeus\Bolt\Fields\Classes;
 
 use Filament\Forms\Components\Hidden;
-use Filament\Tables\Columns\TextColumn;
 use LaraZeus\Accordion\Forms\Accordion;
 use LaraZeus\Accordion\Forms\Accordions;
 use LaraZeus\Bolt\Facades\Bolt;
 use LaraZeus\Bolt\Fields\FieldsContract;
 use LaraZeus\Bolt\Models\Field;
 use LaraZeus\Bolt\Models\FieldResponse;
-use LaraZeus\Bolt\Models\Response;
 
 class FileUpload extends FieldsContract
 {
@@ -79,18 +77,6 @@ public function getResponse(Field $field, FieldResponse $resp): string
     public function TableColumn(Field $field): ?\Filament\Tables\Columns\Column
     {
         return null;
-        /*return TextColumn::make('zeusData.' . $field->id)
-            ->label($field->name)
-            ->url(null)
-            ->searchable(query: function (Builder $query, string $search): Builder {
-                return $query
-                    ->whereHas('fieldsResponses', function ($query) use ($search) {
-                        $query->where('response', 'like', '%' . $search . '%');
-                    });
-            })
-            ->getStateUsing(fn (Response $record) => $this->getFieldResponseValue($record, $field))
-            ->html()
-            ->toggleable();*/
     }
 
     // @phpstan-ignore-next-line

diff --git a/src/Fields/Classes/Textarea.php b/src/Fields/Classes/Textarea.php
@@ -117,6 +117,7 @@ public function getResponse(Field $field, FieldResponse $resp): string
     public function TableColumn(Field $field): ?Column
     {
         return TextColumn::make('zeusData.' . $field->id)
+            ->sortable(false)
             ->label($field->name)
             ->searchable(query: function (Builder $query, string $search): Builder {
                 return $query

diff --git a/src/Fields/Classes/Toggle.php b/src/Fields/Classes/Toggle.php
@@ -132,6 +132,7 @@ public function appendFilamentComponentsOptions($component, $zeusField, bool $ha
     public function TableColumn(Field $field): ?Column
     {
         return IconColumn::make('zeusData.' . $field->id)
+            ->sortable(false)
             ->label($field->name)
             ->boolean()
             ->searchable(query: function (Builder $query, string $search): Builder {

diff --git a/src/Fields/FieldsContract.php b/src/Fields/FieldsContract.php
@@ -243,6 +243,7 @@ public function TableColumn(Field $field): ?Column
     {
         return TextColumn::make('zeusData.' . $field->id)
             ->label($field->name)
+            ->sortable(false)
             ->searchable(query: function (Builder $query, string $search): Builder {
                 return $query
                     ->whereHas('fieldsResponses', function ($query) use ($search) {

diff --git a/src/Filament/Resources/FormResource/Pages/ManageResponses.php b/src/Filament/Resources/FormResource/Pages/ManageResponses.php
@@ -34,6 +34,8 @@ public function table(Table $table): Table
 
         $mainColumns = [
             ImageColumn::make('user.avatar')
+                ->sortable(false)
+                ->searchable(false)
                 ->label(__('Avatar'))
                 ->circular()
                 ->toggleable(),

diff --git a/src/Models/Category.php b/src/Models/Category.php
@@ -3,6 +3,7 @@
 namespace LaraZeus\Bolt\Models;
 
 use Illuminate\Database\Eloquent\Casts\Attribute;
+use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -33,7 +34,7 @@ public function getTable()
         return config('zeus-bolt.table-prefix') . 'categories';
     }
 
-    protected static function newFactory(): CategoryFactory
+    protected static function newFactory(): Factory
     {
         return CategoryFactory::new();
     }