Merge branch 'def-studio-add-bulk-actions-function' into develop

rappasoft · rappasoft · commit 3ef37ccabb05 · 2021-09-25T22:17:10.000-04:00
diff --git a/resources/views/bootstrap-4/includes/bulk-actions.blade.php b/resources/views/bootstrap-4/includes/bulk-actions.blade.php
@@ -6,12 +6,12 @@
             </button>
 
             <div class="dropdown-menu dropdown-menu-right w-100" aria-labelledby="bulkActions">
-                @foreach($bulkActions as $action => $title)
+                @foreach($this->bulkActions as $action => $title)
                     <a
                         href="#"
-                       wire:click.prevent="{{ $action }}"
-                       wire:key="bulk-action-{{ $action }}"
-                       class="dropdown-item"
+                        wire:click.prevent="{{ $action }}"
+                        wire:key="bulk-action-{{ $action }}"
+                        class="dropdown-item"
                     >
                         {{ $title }}
                     </a>
diff --git a/resources/views/bootstrap-4/includes/bulk-select-row.blade.php b/resources/views/bootstrap-4/includes/bulk-select-row.blade.php
@@ -1,4 +1,4 @@
-@if ($bulkActionsEnabled && count($bulkActions) && (($selectPage && $rows->total() > $rows->count()) || count($selected)))
+@if ($bulkActionsEnabled && count($this->bulkActions) && (($selectPage && $rows->total() > $rows->count()) || count($selected)))
     <x-livewire-tables::bs4.table.row wire:key="row-message">
         <x-livewire-tables::bs4.table.cell colspan="{{ $colspan }}">
             @if (count($selected) && !$selectAll && !$selectPage)
diff --git a/resources/views/bootstrap-4/includes/table.blade.php b/resources/views/bootstrap-4/includes/table.blade.php
@@ -8,7 +8,7 @@
             <x-livewire-tables::bs4.table.heading />
         @endif
 
-        @if ($bulkActionsEnabled && count($bulkActions))
+        @if ($bulkActionsEnabled && count($this->bulkActions))
             <x-livewire-tables::bs4.table.heading>
                 <input
                     wire:model="selectPage"
@@ -41,7 +41,7 @@
     <x-slot name="body">
         @php
             $colspan = count($columns);
-            if ($bulkActionsEnabled && count($bulkActions)) $colspan++;
+            if ($bulkActionsEnabled && count($this->bulkActions)) $colspan++;
             if ($reordering) $colspan++;
         @endphp
 
@@ -66,7 +66,7 @@
                     </x-livewire-tables::bs4.table.cell>
                 @endif
 
-                @if ($bulkActionsEnabled && count($bulkActions))
+                @if ($bulkActionsEnabled && count($this->bulkActions))
                     <x-livewire-tables::bs4.table.cell>
                         <input
                             wire:model="selected"
diff --git a/resources/views/bootstrap-5/includes/bulk-actions.blade.php b/resources/views/bootstrap-5/includes/bulk-actions.blade.php
@@ -6,7 +6,7 @@
             </button>
 
             <div class="dropdown-menu dropdown-menu-end w-100" aria-labelledby="bulkActions">
-                @foreach($bulkActions as $action => $title)
+                @foreach($this->bulkActions as $action => $title)
                     <a
                         href="#"
                         wire:click.prevent="{{ $action }}"
diff --git a/resources/views/bootstrap-5/includes/bulk-select-row.blade.php b/resources/views/bootstrap-5/includes/bulk-select-row.blade.php
@@ -1,4 +1,4 @@
-@if ($bulkActionsEnabled && count($bulkActions) && (($selectPage && $rows->total() > $rows->count()) || count($selected)))
+@if ($bulkActionsEnabled && count($this->bulkActions) && (($selectPage && $rows->total() > $rows->count()) || count($selected)))
     <x-livewire-tables::bs5.table.row wire:key="row-message">
         <x-livewire-tables::bs5.table.cell colspan="{{ $colspan }}">
             @if (count($selected) && !$selectAll && !$selectPage)
diff --git a/resources/views/bootstrap-5/includes/table.blade.php b/resources/views/bootstrap-5/includes/table.blade.php
@@ -8,7 +8,7 @@
             <x-livewire-tables::bs5.table.heading />
         @endif
 
-        @if ($bulkActionsEnabled && count($bulkActions))
+        @if ($bulkActionsEnabled && count($this->bulkActions))
             <x-livewire-tables::bs5.table.heading>
                 <input
                     wire:model="selectPage"
@@ -42,7 +42,7 @@ class="form-check-input"
     <x-slot name="body">
         @php
             $colspan = count($columns);
-            if ($bulkActionsEnabled && count($bulkActions)) $colspan++;
+            if ($bulkActionsEnabled && count($this->bulkActions)) $colspan++;
             if ($reordering) $colspan++;
         @endphp
 
@@ -67,7 +67,7 @@ class="form-check-input"
                     </x-livewire-tables::bs5.table.cell>
                 @endif
 
-                @if ($bulkActionsEnabled && count($bulkActions))
+                @if ($bulkActionsEnabled && count($this->bulkActions))
                     <x-livewire-tables::bs5.table.cell class="align-middle">
                         <input
                             wire:model="selected"
diff --git a/resources/views/tailwind/includes/bulk-actions.blade.php b/resources/views/tailwind/includes/bulk-actions.blade.php
@@ -39,7 +39,7 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l
             >
                 <div class="rounded-md bg-white shadow-xs dark:bg-gray-700 dark:text-white">
                     <div class="py-1" role="menu" aria-orientation="vertical" aria-labelledby="options-menu">
-                        @foreach($bulkActions as $action => $title)
+                        @foreach($this->bulkActions as $action => $title)
                             <button
                                 wire:click="{{ $action }}"
                                 wire:key="bulk-action-{{ $action }}"
diff --git a/resources/views/tailwind/includes/bulk-select-row.blade.php b/resources/views/tailwind/includes/bulk-select-row.blade.php
@@ -1,4 +1,4 @@
-@if ($bulkActionsEnabled && count($bulkActions) && (($selectPage && $rows->total() > $rows->count()) || count($selected)))
+@if ($bulkActionsEnabled && count($this->bulkActions) && (($selectPage && $rows->total() > $rows->count()) || count($selected)))
     <x-livewire-tables::table.row wire:key="row-message" class="bg-indigo-50 dark:bg-gray-900 dark:text-white">
         <x-livewire-tables::table.cell :colspan="$colspan">
             @if (count($selected) && !$selectAll && !$selectPage)
diff --git a/resources/views/tailwind/includes/table.blade.php b/resources/views/tailwind/includes/table.blade.php
@@ -8,7 +8,7 @@
             <x-livewire-tables::table.heading />
         @endif
 
-        @if ($bulkActionsEnabled && count($bulkActions))
+        @if ($bulkActionsEnabled && count($this->bulkActions))
             <x-livewire-tables::table.heading>
                 <div class="inline-flex rounded-md shadow-sm">
                     <input
@@ -44,7 +44,7 @@ class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150
     <x-slot name="body">
         @php
             $colspan = count($columns);
-            if ($bulkActionsEnabled && count($bulkActions)) $colspan++;
+            if ($bulkActionsEnabled && count($this->bulkActions)) $colspan++;
             if ($reordering) $colspan++;
         @endphp
 
@@ -75,7 +75,7 @@ class="rounded border-gray-300 text-indigo-600 shadow-sm transition duration-150
                     </x-livewire-tables::table.cell>
                 @endif
 
-                @if ($bulkActionsEnabled && count($bulkActions))
+                @if ($bulkActionsEnabled && count($this->bulkActions))
                     <x-livewire-tables::table.cell>
                         <div class="inline-flex rounded-md shadow-sm">
                             <input
diff --git a/src/Traits/WithBulkActions.php b/src/Traits/WithBulkActions.php
@@ -15,7 +15,7 @@ trait WithBulkActions
     public bool $selectPage = false;
     public bool $selectAll = false;
     public $selected = [];
-    public array $bulkActions = [];
+
     public bool $hideBulkActionsOnEmpty = false;
 
     public function renderingWithBulkActions(): void
@@ -91,12 +91,26 @@ public function getSelectedKeysProperty(): array
         return $this->selectedKeys();
     }
 
+    public function getBulkActionsProperty(): array
+    {
+        return $this->bulkActions();
+    }
+
+    public function bulkActions(): array
+    {
+        if (property_exists($this, 'bulkActions')) {
+            return $this->bulkActions;
+        }
+
+        return [];
+    }
+
     public function getShowBulkActionsDropdownProperty(): bool
     {
         $showBulkActions = false;
 
         if ($this->bulkActionsEnabled) {
-            if (count($this->bulkActions)) {
+            if (count($this->bulkActions())) {
                 $showBulkActions = true;
             }
 
diff --git a/tests/DataTableComponentTest.php b/tests/DataTableComponentTest.php
@@ -114,4 +114,11 @@ public function search_filter_alt_query_relation()
         $this->tableAltQuery->filters['search'] = 'Cat';
         $this->assertEquals(2, $this->tableAltQuery->rows->total());
     }
+
+    /** @test */
+    public function bulk_actions_defined_with_function()
+    {
+        $this->table->selected[] = 1;
+        $this->assertEquals(1, $this->table->count());
+    }
 }
diff --git a/tests/Http/Livewire/PetsTable.php b/tests/Http/Livewire/PetsTable.php
@@ -9,6 +9,11 @@
 
 class PetsTable extends DataTableComponent
 {
+    public function bulkActions(): array
+    {
+        return ['count' => 'Count selected'];
+    }
+
     /**
      * @return Builder
      */
@@ -36,4 +41,9 @@ public function columns(): array
                 ->searchable(),
         ];
     }
+
+    public function count(): int
+    {
+        return $this->selectedRowsQuery()->count();
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@if ($bulkActionsEnabled && count($bulkActions) && (($selectPage && $rows->total() > $rows->count()) \|\| count($selected)))`
	`1`	`+@if ($bulkActionsEnabled && count($this->bulkActions) && (($selectPage && $rows->total() > $rows->count()) \|\| count($selected)))`
`2`	`2`	`<x-livewire-tables::bs4.table.row wire:key="row-message">`
`3`	`3`	`<x-livewire-tables::bs4.table.cell colspan="{{ $colspan }}">`
`4`	`4`	`@if (count($selected) && !$selectAll && !$selectPage)`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class="origin-top-right absolute right-0 mt-2 w-full md:w-48 rounded-md shadow-l`
`39`	`39`	`>`
`40`	`40`	`<div class="rounded-md bg-white shadow-xs dark:bg-gray-700 dark:text-white">`
`41`	`41`	`<div class="py-1" role="menu" aria-orientation="vertical" aria-labelledby="options-menu">`
`42`		`- @foreach($bulkActions as $action => $title)`
	`42`	`+ @foreach($this->bulkActions as $action => $title)`
`43`	`43`	`<button`
`44`	`44`	`wire:click="{{ $action }}"`
`45`	`45`	`wire:key="bulk-action-{{ $action }}"`