Skip to content

Commit

Permalink
removed dependency to Illuminate\Request and modified tests| configur…
Browse files Browse the repository at this point in the history
…ed install command
  • Loading branch information
hamidrezarj committed Aug 7, 2024
1 parent 823d39f commit 47caebb
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 98 deletions.
26 changes: 26 additions & 0 deletions resources/stubs/DatatableServiceProvider.php.stub
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

namespace App\Providers;

use HamidRrj\LaravelDatatable\Facades\Datatable;
use Illuminate\Support\ServiceProvider;

class DatatableServiceProvider extends ServiceProvider
{
/**
* Register services.
*/
public function register(): void
{
$this->app->bind('datatable', function () {
return new Datatable();
});
}

/**
* Bootstrap services.
*/
public function boot(): void
{
}
}
10 changes: 5 additions & 5 deletions src/DatatableInput.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ public function getFilters(): array

foreach ($this->filters as $filter) {
$filters[] = new Filter(
$filter->id,
$filter->value,
$filter->fn,
$filter->datatype,
$filter['id'],
$filter['value'],
$filter['fn'],
$filter['datatype'],
$this->allowedFilters
);
}
Expand All @@ -50,7 +50,7 @@ public function getFilters(): array
public function getSorting(): ?Sort
{
return ! empty($this->sorting) ?
new Sort($this->sorting[0]->id, $this->sorting[0]->desc, $this->allowedSortings) : null;
new Sort($this->sorting[0]['id'], $this->sorting[0]['desc'], $this->allowedSortings) : null;
}

public function getRelations(): array
Expand Down
9 changes: 8 additions & 1 deletion src/DatatableServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace HamidRrj\LaravelDatatable;

use Spatie\LaravelPackageTools\Commands\InstallCommand;
use Spatie\LaravelPackageTools\Package;
use Spatie\LaravelPackageTools\PackageServiceProvider;

Expand All @@ -16,6 +17,12 @@ public function configurePackage(Package $package): void
*/
$package
->name('laravel-datatable')
->hasConfigFile();
->hasConfigFile()
->publishesServiceProvider('DatatableServiceProvider')
->hasInstallCommand(function(InstallCommand $command){
$command
->copyAndRegisterServiceProviderInApp()
->askToStarRepoOnGitHub('hamidrezarj/laravel-datatable');
});
}
}
8 changes: 4 additions & 4 deletions src/Facades/Datatable.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ public function run(
): array
{

$filters = json_decode($requestParameters['filters']);
$sorting = json_decode($requestParameters['sorting']);
// $filters = json_decode($requestParameters['filters']);
// $sorting = json_decode($requestParameters['sorting']);
$rels = array_key_exists('rels', $requestParameters) ? $requestParameters['rels'] : array();

$dataTableInput = new DataTableInput(
$requestParameters['start'],
$requestParameters['size'],
$filters,
$sorting,
$requestParameters['filters'],
$requestParameters['sorting'],
$rels,
$allowedFilters,
$allowedSortings
Expand Down
2 changes: 1 addition & 1 deletion src/Facades/DatatableFacade.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ class DatatableFacade extends Facade
{
protected static function getFacadeAccessor(): string
{
return \HamidRrj\LaravelDatatable\Facades\Datatable::class;
return 'datatable';
}
}
Loading

0 comments on commit 47caebb

Please sign in to comment.