Minor fixes

README.md

@@ -34,7 +34,7 @@ composer require mediconesystems/livewire-datatables
 ```
 If you use laravel 9 first execute
 ```bash
-composer require psr/simple-cache:^1.0 maatwebsite/excel
+composer require psr/simple-cache:^1.0
 ```
 
 ### Optional

composer.json

@@ -30,8 +30,8 @@
         "php": "^8.0",
         "illuminate/support": "^7.0|^8.0|^9.0",
         "livewire/livewire": "^2.4.4",
-        "maatwebsite/excel": "^3.1",
-        "reedware/laravel-relation-joins": "^2.4|^3.0"
+        "reedware/laravel-relation-joins": "^2.4|^3.0",
+        "spatie/simple-excel": "^3.0"
     },
     "require-dev": {
         "laravel/legacy-factories": "^1.0.4",

resources/views/livewire/datatables/boolean-non-zero.blade.php

@@ -0,0 +1,13 @@
+<div>
+    @if(filled($value))
+        <div class="relative group">
+            <x-icons.check-circle class="mx-auto text-green-600" />
+
+            <div class="z-10 mt-2 px-2 py-1 rounded-lg bg-base-100 dark:bg-base-900 dark:text-primary-200 border border-{{ $colour ?? 'gray' }}-300 shadow-xl text-{{ $colour ?? 'gray' }}-700 text-left whitespace-normal absolute hidden group-hover:block shadow-xl">
+                {{ $value }}
+            </div>
+        </div>
+    @else
+        <x-icons.x-circle class="mx-auto text-red-300" />
+    @endif
+</div>

resources/views/livewire/datatables/complex-query.blade.php

@@ -16,58 +16,64 @@
         @endif</span>
     </div>
 
-    @if(count($this->rules[0]['content']))
-        <div class="my-4 px-4 py-2 bg-gray-500 whitespace-pre-wrap @if($errors->any())text-red-200 @else text-green-100 @endif rounded">{{ $this->rulesString }}@if($errors->any()) Invalid rules @endif</div>
-    @endif
+    <div>
+        @if(count($this->rules[0]['content']))
+            <div class="my-4 px-4 py-2 bg-gray-500 whitespace-pre-wrap @if($errors->any())text-red-200 @else text-green-100 @endif rounded">{{ $this->rulesString }}@if($errors->any()) Invalid rules @endif</div>
+        @endif
+    </div>
 
     <div>@include('datatables::complex-query-group', ['rules' => $rules, 'parentIndex' => null])</div>
 
-    @if(count($this->rules[0]['content']))
-        @unless($errors->any())
-            <div class="pt-2 sm:flex w-full justify-between">
-                <div>
-                    {{-- <button class="bg-blue-500 px-3 py-2 rounded text-white" wire:click="runQuery">Apply Query</button> --}}
+    <div>
+        @if(count($this->rules[0]['content']))
+            @unless($errors->any())
+                <div class="pt-2 sm:flex w-full justify-between">
+                    <div>
+                        {{-- <button class="bg-blue-500 px-3 py-2 rounded text-white" wire:click="runQuery">Apply Query</button> --}}
+                    </div>
+                    <div class="mt-2 sm:mt-0 sm:flex sm:space-x-2">
+                        @isset($savedQueries)
+                            <div class="flex items-center space-x-2" x-data="{
+                                name: null,
+                                saveQuery() {
+                                    $wire.call('saveQuery', this.name)
+                                    this.name = null
+                                }
+                            }">
+                                <input x-model="name" wire:loading.attr="disabled" x-on:keydown.enter="saveQuery" placeholder="save as..." class="flex-grow px-3 py-3 border text-sm text-gray-900 leading-4 block rounded-md border-gray-300 shadow-sm focus:outline-none focus:border-blue-300 focus:ring focus:ring-blue-200 focus:ring-opacity-50" />
+                                <button x-bind:disabled="! name" x-show="rules" x-on:click="saveQuery" class="flex items-center space-x-2 px-3 py-0.5 border border-green-400 disabled:border-gray-300 rounded-md bg-white text-green-500 disabled:text-gray-300 text-xs leading-4 font-medium uppercase tracking-wider hover:bg-green-200 disabled:hover:bg-white focus:outline-none disabled:pointer-events-none">
+                                    <span>{{ __('Save') }}</span>
+                                    <span wire:loading.remove><x-icons.check-circle class="m-2" /></span>
+                                    <span wire:loading><x-icons.cog class="animate-spin m-2" /></span>
+                                </button>
+                            </div>
+                        @endisset
+                        <button x-show="rules" wire:click="resetQuery" class="flex items-center space-x-2 px-3 border border-red-400 rounded-md bg-white text-red-500 text-xs leading-4 font-medium uppercase tracking-wider hover:bg-red-200 focus:outline-none">
+                            <span>{{ __('Reset') }}</span>
+                            <x-icons.x-circle class="m-2" />
+                        </button>
+                    </div>
                 </div>
-                <div class="mt-2 sm:mt-0 sm:flex sm:space-x-2">
-                    @isset($savedQueries)
-                        <div class="flex items-center space-x-2" x-data="{
-                            name: null,
-                            saveQuery() {
-                                $wire.call('saveQuery', this.name)
-                                this.name = null
-                            }
-                        }">
-                            <input x-model="name" wire:loading.attr="disabled" x-on:keydown.enter="saveQuery" placeholder="save as..." class="flex-grow px-3 py-3 border text-sm text-gray-900 leading-4 block rounded-md border-gray-300 shadow-sm focus:outline-none focus:border-blue-300 focus:ring focus:ring-blue-200 focus:ring-opacity-50" />
-                            <button x-bind:disabled="! name" x-show="rules" x-on:click="saveQuery" class="flex items-center space-x-2 px-3 py-0.5 border border-green-400 disabled:border-gray-300 rounded-md bg-white text-green-500 disabled:text-gray-300 text-xs leading-4 font-medium uppercase tracking-wider hover:bg-green-200 disabled:hover:bg-white focus:outline-none disabled:pointer-events-none">
-                                <span>{{ __('Save') }}</span>
-                                <span wire:loading.remove><x-icons.check-circle class="m-2" /></span>
-                                <span wire:loading><x-icons.cog class="animate-spin m-2" /></span>
+            @endif
+        @endif
+    </div>
+
+    <div>
+        @if(count($savedQueries ?? []))
+            <div>
+                <div class="mt-8 my-4 text-xl uppercase tracking-wide font-medium leading-none">Saved Queries</div>
+                <div class="grid md:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 gap-2">
+                    @foreach($savedQueries as $saved)
+                        <div class="flex" wire:key="{{ $saved['id'] }}">
+                            <button wire:click="loadRules({{ json_encode($saved['rules']) }})" wire:loading.attr="disabled" class="p-2 flex-grow flex items-center space-x-2 px-3 border border-r-0 border-blue-400 rounded-md rounded-r-none bg-white text-blue-500 text-xs leading-4 font-medium uppercase tracking-wider hover:bg-blue-200 focus:outline-none">{{ $saved['name'] }}</button>
+                            <button wire:click="deleteRules({{ $saved['id'] }})" wire:loading.attr="disabled" class="p-2 flex items-center space-x-2 px-3 border border-red-400 rounded-md rounded-l-none bg-white text-red-500 text-xs leading-4 font-medium uppercase tracking-wider hover:bg-red-200 focus:outline-none">
+                                <x-icons.x-circle wire:loading.remove />
+                                <x-icons.cog wire:loading class="h-6 w-6 animate-spin" />
                             </button>
                         </div>
-                    @endisset
-                    <button x-show="rules" wire:click="resetQuery" class="flex items-center space-x-2 px-3 border border-red-400 rounded-md bg-white text-red-500 text-xs leading-4 font-medium uppercase tracking-wider hover:bg-red-200 focus:outline-none">
-                        <span>{{ __('Reset') }}</span>
-                        <x-icons.x-circle class="m-2" />
-                    </button>
+                    @endforeach
                 </div>
             </div>
         @endif
-
-    @endif
-    @if(count($savedQueries ?? []))
-        <div>
-            <div class="mt-8 my-4 text-xl uppercase tracking-wide font-medium leading-none">Saved Queries</div>
-            <div class="grid md:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 gap-2">
-                @foreach($savedQueries as $saved)
-                    <div class="flex" wire:key="{{ $saved['id'] }}">
-                        <button wire:click="loadRules({{ json_encode($saved['rules']) }})" wire:loading.attr="disabled" class="p-2 flex-grow flex items-center space-x-2 px-3 border border-r-0 border-blue-400 rounded-md rounded-r-none bg-white text-blue-500 text-xs leading-4 font-medium uppercase tracking-wider hover:bg-blue-200 focus:outline-none">{{ $saved['name'] }}</button>
-                        <button wire:click="deleteRules({{ $saved['id'] }})" wire:loading.attr="disabled" class="p-2 flex items-center space-x-2 px-3 border border-red-400 rounded-md rounded-l-none bg-white text-red-500 text-xs leading-4 font-medium uppercase tracking-wider hover:bg-red-200 focus:outline-none">
-                            <x-icons.x-circle wire:loading.remove />
-                            <x-icons.cog wire:loading class="h-6 w-6 animate-spin" />
-                        </button>
-                    </div>
-                @endforeach
-            </div>
-        </div>
-    @endif
+    </div>
 </div>

resources/views/livewire/datatables/filters/boolean-non-zero.blade.php

@@ -0,0 +1 @@
+@include('boolean')

src/BooleanNonZeroColumn.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Mediconesystems\LivewireDatatables;
+
+class BooleanNonZeroColumn extends Column
+{
+    public $type = 'boolean-non-zero';
+    public $callback;
+
+    public function __construct()
+    {
+        $this->callback = function ($value) {
+            return view('datatables::boolean-non-zero', ['value' => $value]);
+        };
+
+        $this->exportCallback = function ($value) {
+            return filled($value) ? 1 : 0;
+        };
+    }
+}

src/Column.php

@@ -398,6 +398,20 @@ public function hide()
         return $this;
     }
 
+    public function hideIf($boolean)
+    {
+        $this->hidden = $boolean;
+
+        return $this;
+    }
+
+    public function hideUnless($boolean)
+    {
+        $this->hidden = ! $boolean;
+
+        return $this;
+    }
+
     public function alignRight()
     {
         $this->headerAlign = 'right';

src/Http/Controllers/FileExportController.php

@@ -5,20 +5,20 @@
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Storage;
 
- class FileExportController
- {
-     public function handle($filename)
-     {
-         $response = Response::make(Storage::disk(config('livewire-datatables.file_export.disk') ?: config('filesystems.default'))
-            ->get('datatables/' . $filename), 200, [
-                'Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-                'Content-Disposition' => 'inline; filename="' . $filename . '"',
-                'X-Vapor-Base64-Encode' => 'True',
-            ]);
+class FileExportController
+{
+    public function handle($filename)
+    {
+        $response = Response::make(Storage::disk(config('livewire-datatables.file_export.disk') ?: config('filesystems.default'))
+           ->get('datatables/' . $filename), 200, [
+               'Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+               'Content-Disposition' => 'inline; filename="' . $filename . '"',
+               'X-Vapor-Base64-Encode' => 'True',
+           ]);
 
-         Storage::disk(config('livewire-datatables.file_export.disk') ?: config('filesystems.default'))
+        Storage::disk(config('livewire-datatables.file_export.disk') ?: config('filesystems.default'))
         ->delete('datatables/' . $filename);
 
-         return $response;
-     }
- }
+        return $response;
+    }
+}

src/Http/Livewire/ComplexQuery.php

@@ -209,6 +209,7 @@ public function getOperands($key)
             'date' => ['=', '<>', '<', '<=', '>', '>='],
             'time' => ['=', '<>', '<', '<=', '>', '>='],
             'boolean' => [],
+            'boolean-non-zero' => [],
             'scope' => ['includes'],
         ];