introduce ability to make i18nable custom column category labels

Author: Herbert Maschke

resources/views/livewire/datatables/datatable.blade.php

@@ -53,7 +53,7 @@
                 @endif
 
                 @foreach ($columnGroups as $name => $group)
-                    <button wire:click="toggleGroup('{{ $name }}')" class="px-3 py-2 border border-green-400 rounded-md bg-white text-green-500 text-xs leading-4 font-medium uppercase tracking-wider hover:bg-green-200 focus:outline-none"><span class="flex items-center h-5">{{ __('Toggle :group', ['group' => $name]) }}</span>
+                    <button wire:click="toggleGroup('{{ $name }}')" class="px-3 py-2 border border-green-400 rounded-md bg-white text-green-500 text-xs leading-4 font-medium uppercase tracking-wider hover:bg-green-200 focus:outline-none"><span class="flex items-center h-5">{{ $group['label'] ? __($group['label']) : __('Toggle :group', ['group' => $name]) }}</span>
                         </button>
                 @endforeach
             </div>

src/Column.php

@@ -10,6 +10,7 @@ class Column
     public $type = 'string';
     public $label;
     public $group;
+    public $groupLabel;
     public $name;
     public $select;
     public $joins;
@@ -336,10 +337,13 @@ public function field()
 
     /**
      * You can use group(null) to revoke a column from a group, if necessary.
+     * The label can be a i18n placeholder like 'app.my_string' and it will be
+     * automatically translated via __().
      */
-    public function group($group)
+    public function group($group, $label = null)
     {
         $this->group = $group;
+        $this->groupLabel = $label;
 
         return $this;
     }

src/Http/Livewire/LivewireDatatable.php

@@ -192,6 +192,7 @@ public function getViewColumns()
                 'hidden',
                 'label',
                 'group',
+                'groupLabel',
                 'content',
                 'align',
                 'type',
@@ -278,7 +279,7 @@ public function resolveAdditionalSelects($column)
         return $selects->count() > 1
             ? new Expression("CONCAT_WS('" . static::SEPARATOR . "' ," .
                 collect($selects)->map(function ($select) {
-                    return "IF($select, $select, '')";
+                    return "COALESCE($select, NULL)";
                 })->join(', ') . ')')
             : $selects->first();
     }
@@ -543,8 +544,12 @@ public function initialisePerPage()
     public function initialiseColumnGroups()
     {
         array_map(function ($column) {
-            if ($column['group'] ?? false) {
-                $this->columnGroups[$column['group']][] = $column['name'] ?? $column['label'];
+            if (isset ($column['group']) && isset($column['groupLabel'])) {
+                $this->columnGroups[$column['group']]['label'] = $column['groupLabel'];
+            }
+
+            if (isset ($column['group'])) {
+                $this->columnGroups[$column['group']]['columns'][] = $column['label'] ?? $column['name'];
             }
         }, $this->columns);
     }