Migrate more methods into traits

Author: lrljoe

src/Views/Columns/Traits/Configuration/ColumnConfiguration.php

@@ -2,25 +2,9 @@
 
 namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Configuration;
 
-use Rappasoft\LaravelLivewireTables\Views\Column;
 
 trait ColumnConfiguration
 {
-    public function label(callable $callback): self
-    {
-        $this->from = null;
-        $this->field = null;
-        $this->labelCallback = $callback;
-
-        return $this;
-    }
-
-    public function format(callable $callable): Column
-    {
-        $this->formatCallback = $callable;
-
-        return $this;
-    }
 
     public function html(): self
     {
@@ -36,13 +20,6 @@ public function setTable(string $table): self
         return $this;
     }
 
-    public function eagerLoadRelations(): self
-    {
-        $this->eagerLoadRelations = true;
-
-        return $this;
-    }
-
     public function unclickable(): self
     {
         $this->clickable = false;

src/Views/Columns/Traits/HasLabelFormat.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits;
+
+use Rappasoft\LaravelLivewireTables\Views\Column;
+
+trait HasLabelFormat
+{
+    protected mixed $labelCallback = null;
+
+    protected mixed $formatCallback = null;
+
+    public function hasFormatter(): bool
+    {
+        return $this->formatCallback !== null;
+    }
+
+    public function getFormatCallback(): ?callable
+    {
+        return $this->formatCallback;
+    }
+
+    // TODO
+    public function getLabelCallback(): ?callable
+    {
+        return $this->labelCallback;
+    }
+    
+    public function label(callable $callback): self
+    {
+        $this->from = null;
+        $this->field = null;
+        $this->labelCallback = $callback;
+
+        return $this;
+    }
+
+    public function format(callable $callable): Column
+    {
+        $this->formatCallback = $callable;
+
+        return $this;
+    }
+}

src/Views/Columns/Traits/Helpers/RelationshipHelpers.php renamed to src/Views/Columns/Traits/HasRelations.php

@@ -1,11 +1,16 @@
 <?php
 
-namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Helpers;
+namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits;
 
 use Illuminate\Support\Collection;
 
-trait RelationshipHelpers
+trait HasRelations
 {
+    // An array of relationships: i.e. address.group.name => ['address', 'group']
+    protected array $relations = [];
+
+    protected bool $eagerLoadRelations = false;
+
     public function isBaseColumn(): bool
     {
         return ! $this->hasRelations() && $this->hasField();
@@ -29,4 +34,17 @@ public function getRelationString(): ?string
 
         return null;
     }
-}
+
+    public function eagerLoadRelations(): self
+    {
+        $this->eagerLoadRelations = true;
+
+        return $this;
+    }
+
+    public function eagerLoadRelationsIsEnabled(): bool
+    {
+        return $this->eagerLoadRelations === true;
+    }
+
+}

src/Views/Columns/Traits/HasCustomSlug.php renamed to src/Views/Columns/Traits/HasSlug.php

@@ -2,10 +2,17 @@
 
 namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits;
 
-trait HasCustomSlug
+use Illuminate\Support\Str;
+
+trait HasSlug
 {
     protected ?string $customSlug = null;
 
+    public function getSlug(): string
+    {
+        return Str::slug($this->hasCustomSlug() ? $this->getCustomSlug() : $this->getTitle());
+    }
+
     public function getCustomSlug(): string
     {
         return $this->customSlug;
@@ -22,4 +29,10 @@ public function setCustomSlug(string $customSlug): self
 
         return $this;
     }
+
+    public function isColumnBySlug(string $slug): bool
+    {
+        return $this->getSlug() === $slug;
+    }
+
 }

src/Views/Columns/Traits/Helpers/ColumnHelpers.php

@@ -3,7 +3,7 @@
 namespace Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Helpers;
 
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\{HtmlString,Str};
+use Illuminate\Support\HtmlString;
 use Rappasoft\LaravelLivewireTables\Exceptions\DataTableConfigurationException;
 use Rappasoft\LaravelLivewireTables\Views\Column;
 use Rappasoft\LaravelLivewireTables\Views\Columns\LinkColumn;
@@ -25,11 +25,6 @@ public function getTitle(): string
         return $this->title;
     }
 
-    public function getSlug(): string
-    {
-        return Str::slug($this->hasCustomSlug() ? $this->getCustomSlug() : $this->getTitle());
-    }
-
     public function getField(): ?string
     {
         return $this->field;
@@ -50,11 +45,6 @@ public function isColumnBySelectName(string $name): bool
         return $this->getColumnSelectName() === $name;
     }
 
-    public function isColumnBySlug(string $slug): bool
-    {
-        return $this->getSlug() === $slug;
-    }
-
     public function hasField(): bool
     {
         return $this->getField() !== null;
@@ -132,31 +122,12 @@ public function getValue(Model $row): mixed
         return $row->{$this->getRelationString().'.'.$this->getField()};
     }
 
-    public function eagerLoadRelationsIsEnabled(): bool
-    {
-        return $this->eagerLoadRelations === true;
-    }
 
     public function isReorderColumn(): bool
     {
         return $this->isReorderColumn;
     }
 
-    public function hasFormatter(): bool
-    {
-        return $this->formatCallback !== null;
-    }
-
-    public function getFormatCallback(): ?callable
-    {
-        return $this->formatCallback;
-    }
-
-    // TODO
-    public function getLabelCallback(): ?callable
-    {
-        return $this->labelCallback;
-    }
 
     public function isHtml(): bool
     {

src/Views/Columns/Traits/IsColumn.php

@@ -4,17 +4,18 @@
 
 use Rappasoft\LaravelLivewireTables\Traits\Core\HasLocalisations;
 use Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Configuration\ColumnConfiguration;
-use Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Helpers\{ColumnHelpers,RelationshipHelpers};
+use Rappasoft\LaravelLivewireTables\Views\Columns\Traits\Helpers\{ColumnHelpers};
 use Rappasoft\LaravelLivewireTables\Views\Traits\Core\{HasAttributes, HasLabelAttributes, HasTheme};
 
 trait IsColumn
 {
     use HasLocalisations,
         HasDataTableComponent,
-        HasCustomSlug,
+        HasRelations,
+        HasLabelFormat,
+        HasSlug,
         ColumnConfiguration,
         ColumnHelpers,
-        RelationshipHelpers,
         IsCollapsible,
         IsSearchable,
         IsSelectable,
@@ -42,17 +43,8 @@ trait IsColumn
     // The table of the columns or relationship
     protected ?string $table = null;
 
-    // An array of relationships: i.e. address.group.name => ['address', 'group']
-    protected array $relations = [];
-
-    protected bool $eagerLoadRelations = false;
-
-    protected mixed $formatCallback = null;
-
     protected bool $html = false;
 
-    protected mixed $labelCallback = null;
-
     protected bool $clickable = true;
 
     protected bool $hasTableRowUrl = false;