deniskoronets / Laravel-GridView

src/GridViewServiceProvider.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 		require_once __DIR__ . '/functions.php';
 
-        \Blade::directive('grid', function ($expression) {
+        \Blade::directive('grid', function($expression) {
             return "<?php echo grid($expression) ?>";
         });
 

Indentation +9 added lines, -9 removed lines

@@ -19,17 +19,17 @@
 
 		require_once __DIR__ . '/functions.php';
 
-        \Blade::directive('grid', function ($expression) {
-            return "<?php echo grid($expression) ?>";
-        });
+		\Blade::directive('grid', function ($expression) {
+			return "<?php echo grid($expression) ?>";
+		});
 
-        $this->publishes([
-            __DIR__ . '/../public' => 'public/vendor/grid-view',
-        ], 'public');
+		$this->publishes([
+			__DIR__ . '/../public' => 'public/vendor/grid-view',
+		], 'public');
 
-        if (!File::isDirectory(public_path('vendor/grid-view'))) {
-            Artisan::call('vendor:publish', ['--tag' => 'public', '--force' => '']);
-        }
+		if (!File::isDirectory(public_path('vendor/grid-view'))) {
+			Artisan::call('vendor:publish', ['--tag' => 'public', '--force' => '']);
+		}
 	}
 
 	public function register()

src/functions.php

Indentation +1 added lines, -1 removed lines

@@ -7,5 +7,5 @@
  * @throws \Woo\GridView\Exceptions\GridViewConfigException
  */
 function grid(array $config) {
-    return (new \Woo\GridView\GridView($config))->render();
+	return (new \Woo\GridView\GridView($config))->render();
 }
\ No newline at end of file

src/Traits/Configurable.php

Indentation +84 added lines, -84 removed lines

@@ -7,88 +7,88 @@
 
 trait Configurable
 {
-    /**
-     * Allows to load config into object properties
-     * @param array $config
-     * @throws GridViewConfigException
-     */
-    public function loadConfig(array $config)
-    {
-        foreach ($config as $key => $value) {
-
-            if (property_exists($this, $key)) {
-                $this->$key = $value;
-            }
-        }
-
-        $this->testConfig();
-    }
-
-    /**
-     * Should specify tests
-     * @return array
-     */
-    abstract protected function configTests() : array;
-
-    /**
-     * Allows to test attributes and types in config
-     * @throws GridViewConfigException
-     */
-    protected function testConfig()
-    {
-        foreach ($this->configTests() as $property => $tests) {
-
-            if (!property_exists($this, $property)) {
-                throw new GridViewConfigException(
-                    'Unable to test ' . get_class($this) . ': property ' . $property . ' does not exist'
-                );
-            }
-
-            $testPassed = true;
-            $testMessage = 'Validation failed';
-
-            foreach (explode('|', $tests) as $test) {
-
-                switch ($test) {
-                    case 'int':
-                        $testPassed = is_numeric($this->$property);
-                        $testMessage = 'Property should be numeric';
-                        break;
-
-                    case 'string':
-                        $testPassed = is_string($this->$property);
-                        $testMessage = 'Property should be a string';
-                        break;
-
-                    case 'array':
-                        $testPassed = is_array($this->$property);
-                        $testMessage = 'Property should be an array';
-                        break;
-
-                    case 'closure':
-                        $testPassed = $this->$property instanceof Closure;
-                        $testMessage = 'Property should be a valid callback (Closure instance)';
-                        break;
-
-                    case 'boolean':
-                        $testPassed = is_bool($this->$property);
-                        $testMessage = 'Property should be boolean';
-                        break;
-
-                    case 'any':
-                        break;
-
-                    default:
-                        $testPassed = $testPassed || is_a($this->$property, $test) || is_subclass_of($this->$property, $test);
-                        $testMessage = 'Property should be ' . $test . ' instance/class reference, check ' . $property;
-                }
-            }
-
-            if (!$testPassed) {
-                throw new GridViewConfigException(
-                    'Tests ' . $tests . ' has failed on ' . get_class($this) . '::' . $property . ': ' . $testMessage
-                );
-            }
-        }
-    }
+	/**
+	 * Allows to load config into object properties
+	 * @param array $config
+	 * @throws GridViewConfigException
+	 */
+	public function loadConfig(array $config)
+	{
+		foreach ($config as $key => $value) {
+
+			if (property_exists($this, $key)) {
+				$this->$key = $value;
+			}
+		}
+
+		$this->testConfig();
+	}
+
+	/**
+	 * Should specify tests
+	 * @return array
+	 */
+	abstract protected function configTests() : array;
+
+	/**
+	 * Allows to test attributes and types in config
+	 * @throws GridViewConfigException
+	 */
+	protected function testConfig()
+	{
+		foreach ($this->configTests() as $property => $tests) {
+
+			if (!property_exists($this, $property)) {
+				throw new GridViewConfigException(
+					'Unable to test ' . get_class($this) . ': property ' . $property . ' does not exist'
+				);
+			}
+
+			$testPassed = true;
+			$testMessage = 'Validation failed';
+
+			foreach (explode('|', $tests) as $test) {
+
+				switch ($test) {
+					case 'int':
+						$testPassed = is_numeric($this->$property);
+						$testMessage = 'Property should be numeric';
+						break;
+
+					case 'string':
+						$testPassed = is_string($this->$property);
+						$testMessage = 'Property should be a string';
+						break;
+
+					case 'array':
+						$testPassed = is_array($this->$property);
+						$testMessage = 'Property should be an array';
+						break;
+
+					case 'closure':
+						$testPassed = $this->$property instanceof Closure;
+						$testMessage = 'Property should be a valid callback (Closure instance)';
+						break;
+
+					case 'boolean':
+						$testPassed = is_bool($this->$property);
+						$testMessage = 'Property should be boolean';
+						break;
+
+					case 'any':
+						break;
+
+					default:
+						$testPassed = $testPassed || is_a($this->$property, $test) || is_subclass_of($this->$property, $test);
+						$testMessage = 'Property should be ' . $test . ' instance/class reference, check ' . $property;
+				}
+			}
+
+			if (!$testPassed) {
+				throw new GridViewConfigException(
+					'Tests ' . $tests . ' has failed on ' . get_class($this) . '::' . $property . ': ' . $testMessage
+				);
+			}
+		}
+	}
 }
\ No newline at end of file

src/Formatters/BooleanFormatter.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 class BooleanFormatter implements IFormatter
 {
-    public function format($value): string
-    {
-        return $value ? 'Yes' : 'No';
-    }
+	public function format($value): string
+	{
+		return $value ? 'Yes' : 'No';
+	}
 }
\ No newline at end of file

src/Formatters/RawFormatter.php

Indentation +4 added lines, -4 removed lines

@@ -4,8 +4,8 @@
 
 class RawFormatter implements IFormatter
 {
-    public function format($value): string
-    {
-        return $value;
-    }
+	public function format($value): string
+	{
+		return $value;
+	}
 }
\ No newline at end of file

src/Columns/CallbackColumn.php

Indentation +24 added lines, -24 removed lines

@@ -4,31 +4,31 @@
 
 class CallbackColumn extends BaseColumn
 {
-    /**
-     * @var string
-     */
-    public $formatters = ['raw'];
+	/**
+	 * @var string
+	 */
+	public $formatters = ['raw'];
 
-    /**
-     * @var bool
-     */
-    public $sortable = false;
+	/**
+	 * @var bool
+	 */
+	public $sortable = false;
 
-    /**
-     * @return array
-     */
-    protected function configTests(): array
-    {
-        return array_merge(parent::configTests(), [
-            'value' => 'closure',
-        ]);
-    }
+	/**
+	 * @return array
+	 */
+	protected function configTests(): array
+	{
+		return array_merge(parent::configTests(), [
+			'value' => 'closure',
+		]);
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function _renderValue($row)
-    {
-        return call_user_func($this->value, $row);
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function _renderValue($row)
+	{
+		return call_user_func($this->value, $row);
+	}
 }
\ No newline at end of file

src/GridView.php

Indentation +222 added lines, -222 removed lines

@@ -15,226 +15,226 @@
 
 class GridView
 {
-    use Configurable;
-
-    /**
-     * Counter for ids
-     * @var int
-     */
-    private static $counter = 0;
-
-    /**
-     * Grid id (used for request handling, for
-     * @var int
-     */
-    private $id;
-
-    /**
-     * DataProvider provides gridview with the data for representation
-     * @var BaseDataProvider
-     */
-    public $dataProvider;
-
-    /**
-     * Columns config. You may specify array or GridColumn instance
-     * @var BaseColumn[]
-     */
-    public $columns = [];
-
-    /**
-     * Common options for all columns, will be appended to all columns configs
-     * @var array
-     */
-    public $columnOptions = [
-        'class' => AttributeColumn::class,
-    ];
-
-    /**
-     * Renders the final UI
-     * @var string|BaseRenderer
-     */
-    public $renderer = DefaultRenderer::class;
-
-    /**
-     * Allows to pass some options into renderer/customize rendered behavior
-     * @var array
-     */
-    public $rendererOptions = [];
-
-    /**
-     * Controls amount of data per page
-     * @var int
-     */
-    public $rowsPerPage = 25;
-
-    /**
-     * Allows to tune the <table> tag with html options
-     * @var array
-     */
-    public $tableHtmlOptions = [
-        'class' => 'table table-bordered gridview-table',
-    ];
-
-    /**
-     * Indicate if filters will be shown or not
-     * @var bool
-     */
-    public $showFilters = true;
-
-    /**
-     * Flags allow to change standalone vue to. If false, GridView component should be included in your root Vue instance
-     * @var bool
-     */
-    public $standaloneVue = true;
-
-    /**
-     * @var Paginator
-     */
-    protected $pagination;
-
-    /**
-     * @var GridViewRequest
-     */
-    protected $request;
-
-    /**
-     * GridView constructor.
-     * @param array $config
-     * @throws Exceptions\GridViewConfigException
-     */
-    public function __construct(array $config)
-    {
-        $this->id = self::$counter++;
-
-        $this->loadConfig($config);
-
-        /**
-         * Making renderer
-         */
-        if (!is_object($this->renderer)) {
-            $className = GridViewHelper::resolveAlias('renderer', $this->renderer);
-            $this->renderer = new $className(array_merge(
-                $this->rendererOptions, [
-                    'gridView' => $this,
-                ]
-            ));
-        }
-
-        /**
-         * Build columns from config
-         */
-        $this->buildColumns();
-
-        $this->request = GridViewRequest::parse($this->id);
-        $this->request->perPage = $this->rowsPerPage;
-
-        $this->pagination = new LengthAwarePaginator(
-            $this->dataProvider->getData($this->request),
-            $this->dataProvider->getCount($this->request),
-            $this->rowsPerPage,
-            $this->request->page
-        );
-    }
-
-    /**
-     * @return array
-     */
-    protected function configTests(): array
-    {
-        return [
-            'dataProvider' => BaseDataProvider::class,
-            'columns' => 'array',
-            'renderer' => BaseRenderer::class,
-            'rowsPerPage' => 'int',
-            'tableHtmlOptions' => 'array',
-            'showFilters' => 'boolean',
-        ];
-    }
-
-    /**
-     * Build columns into objects
-     */
-    protected function buildColumns()
-    {
-        foreach ($this->columns as $key => &$columnOptions) {
-
-            /**
-             * In case of when column is already build
-             */
-            if (is_object($columnOptions)) {
-                continue;
-            }
-
-            /**
-             * When only attribute name/value passed
-             */
-            if (is_string($columnOptions)) {
-                $columnOptions = [
-                    'value' => $columnOptions,
-                ];
-            }
-
-            if ($columnOptions instanceof Closure) {
-                $columnOptions = [
-                    'class' => CallbackColumn::class,
-                    'value' => $columnOptions,
-                    'title' => GridViewHelper::columnTitle($key),
-                ];
-            }
-
-            /**
-             * Inline column declaration detector
-             */
-            if (is_string($columnOptions['value']) && strpos($columnOptions['value'], 'view:') === 0) {
-                $columnOptions['class'] = 'view';
-                $columnOptions['value'] = str_replace('view:', '', $columnOptions['value']);
-            }
-
-            $columnOptions = array_merge($this->columnOptions, $columnOptions);
-
-            $className = GridViewHelper::resolveAlias('column', $columnOptions['class']);
-            $columnOptions = new $className($columnOptions);
-        }
-    }
-
-    /**
-     * Draws widget and return html code
-     * @return string
-     */
-    public function render()
-    {
-        return $this->renderer->render($this);
-    }
-
-    /**
-     * @return LengthAwarePaginator|Paginator
-     */
-    public function getPagination()
-    {
-        return $this->pagination;
-    }
-
-    /**
-     * @return GridViewRequest
-     */
-    public function getRequest()
-    {
-        return $this->request;
-    }
-
-    /**
-     * @return int
-     */
-    public function getId() : int
-    {
-        return $this->id;
-    }
-
-    /**
-     * @return string
-     */
-    public function compileTableHtmlOptions() : string
-    {
-        return GridViewHelper::htmlOptionsToString($this->tableHtmlOptions);
-    }
+	use Configurable;
+
+	/**
+	 * Counter for ids
+	 * @var int
+	 */
+	private static $counter = 0;
+
+	/**
+	 * Grid id (used for request handling, for
+	 * @var int
+	 */
+	private $id;
+
+	/**
+	 * DataProvider provides gridview with the data for representation
+	 * @var BaseDataProvider
+	 */
+	public $dataProvider;
+
+	/**
+	 * Columns config. You may specify array or GridColumn instance
+	 * @var BaseColumn[]
+	 */
+	public $columns = [];
+
+	/**
+	 * Common options for all columns, will be appended to all columns configs
+	 * @var array
+	 */
+	public $columnOptions = [
+		'class' => AttributeColumn::class,
+	];
+
+	/**
+	 * Renders the final UI
+	 * @var string|BaseRenderer
+	 */
+	public $renderer = DefaultRenderer::class;
+
+	/**
+	 * Allows to pass some options into renderer/customize rendered behavior
+	 * @var array
+	 */
+	public $rendererOptions = [];
+
+	/**
+	 * Controls amount of data per page
+	 * @var int
+	 */
+	public $rowsPerPage = 25;
+
+	/**
+	 * Allows to tune the <table> tag with html options
+	 * @var array
+	 */
+	public $tableHtmlOptions = [
+		'class' => 'table table-bordered gridview-table',
+	];
+
+	/**
+	 * Indicate if filters will be shown or not
+	 * @var bool
+	 */
+	public $showFilters = true;
+
+	/**
+	 * Flags allow to change standalone vue to. If false, GridView component should be included in your root Vue instance
+	 * @var bool
+	 */
+	public $standaloneVue = true;
+
+	/**
+	 * @var Paginator
+	 */
+	protected $pagination;
+
+	/**
+	 * @var GridViewRequest
+	 */
+	protected $request;
+
+	/**
+	 * GridView constructor.
+	 * @param array $config
+	 * @throws Exceptions\GridViewConfigException
+	 */
+	public function __construct(array $config)
+	{
+		$this->id = self::$counter++;
+
+		$this->loadConfig($config);
+
+		/**
+		 * Making renderer
+		 */
+		if (!is_object($this->renderer)) {
+			$className = GridViewHelper::resolveAlias('renderer', $this->renderer);
+			$this->renderer = new $className(array_merge(
+				$this->rendererOptions, [
+					'gridView' => $this,
+				]
+			));
+		}
+
+		/**
+		 * Build columns from config
+		 */
+		$this->buildColumns();
+
+		$this->request = GridViewRequest::parse($this->id);
+		$this->request->perPage = $this->rowsPerPage;
+
+		$this->pagination = new LengthAwarePaginator(
+			$this->dataProvider->getData($this->request),
+			$this->dataProvider->getCount($this->request),
+			$this->rowsPerPage,
+			$this->request->page
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function configTests(): array
+	{
+		return [
+			'dataProvider' => BaseDataProvider::class,
+			'columns' => 'array',
+			'renderer' => BaseRenderer::class,
+			'rowsPerPage' => 'int',
+			'tableHtmlOptions' => 'array',
+			'showFilters' => 'boolean',
+		];
+	}
+
+	/**
+	 * Build columns into objects
+	 */
+	protected function buildColumns()
+	{
+		foreach ($this->columns as $key => &$columnOptions) {
+
+			/**
+			 * In case of when column is already build
+			 */
+			if (is_object($columnOptions)) {
+				continue;
+			}
+
+			/**
+			 * When only attribute name/value passed
+			 */
+			if (is_string($columnOptions)) {
+				$columnOptions = [
+					'value' => $columnOptions,
+				];
+			}
+
+			if ($columnOptions instanceof Closure) {
+				$columnOptions = [
+					'class' => CallbackColumn::class,
+					'value' => $columnOptions,
+					'title' => GridViewHelper::columnTitle($key),
+				];
+			}
+
+			/**
+			 * Inline column declaration detector
+			 */
+			if (is_string($columnOptions['value']) && strpos($columnOptions['value'], 'view:') === 0) {
+				$columnOptions['class'] = 'view';
+				$columnOptions['value'] = str_replace('view:', '', $columnOptions['value']);
+			}
+
+			$columnOptions = array_merge($this->columnOptions, $columnOptions);
+
+			$className = GridViewHelper::resolveAlias('column', $columnOptions['class']);
+			$columnOptions = new $className($columnOptions);
+		}
+	}
+
+	/**
+	 * Draws widget and return html code
+	 * @return string
+	 */
+	public function render()
+	{
+		return $this->renderer->render($this);
+	}
+
+	/**
+	 * @return LengthAwarePaginator|Paginator
+	 */
+	public function getPagination()
+	{
+		return $this->pagination;
+	}
+
+	/**
+	 * @return GridViewRequest
+	 */
+	public function getRequest()
+	{
+		return $this->request;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getId() : int
+	{
+		return $this->id;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function compileTableHtmlOptions() : string
+	{
+		return GridViewHelper::htmlOptionsToString($this->tableHtmlOptions);
+	}
 }

src/GridViewHelper.php

Indentation +140 added lines, -140 removed lines

@@ -23,144 +23,144 @@
 
 class GridViewHelper
 {
-    /**
-     * A list of grid aliases
-     * @var array
-     */
-    private static $aliases = [
-        'column' => [
-            'attribute' => AttributeColumn::class,
-            'raw' => CallbackColumn::class,
-            'callback' => CallbackColumn::class,
-            'actions' => ActionsColumn::class,
-            'view' => ViewColumn::class,
-        ],
-        'formatter' => [
-            'email' => EmailFormatter::class,
-            'image' => ImageFormatter::class,
-            'text' => TextFormatter::class,
-            'url' => UrlFormatter::class,
-            'raw' => RawFormatter::class,
-        ],
-        'filter' => [
-            'text' => TextFilter::class,
-            'dropdown' => DropdownFilter::class,
-        ],
-        'renderer' => [
-            'default' => DefaultRenderer::class,
-        ],
-        'action' => [
-            'delete' => DeleteAction::class,
-            'update' => EditAction::class,
-            'edit' => EditAction::class,
-            'show' => ShowAction::class,
-            'view' => ShowAction::class,
-            'action' => Action::class,
-        ]
-    ];
-
-    private function __construct() {}
-
-    /**
-     * Useful in case you want to register a new alias for your project
-     * @param string $context
-     * @param string $alias
-     * @param string $aliasTo
-     */
-    public static function registerAlias(string $context, string $alias, string $aliasTo)
-    {
-        self::$aliases[$context][$alias] = $aliasTo;
-    }
-
-    /**
-     * Allows to resolve class name by its alias
-     * @param string $context
-     * @param string $alias
-     * @return mixed
-     */
-    public static function resolveAlias(string $context, string $alias)
-    {
-        return self::$aliases[$context][$alias] ?? $alias;
-    }
-
-    /**
-     * Allows to convert options array to html string
-     * @param array $htmlOptions
-     * @param array $context - context is variables, which are allowed to use when property value calculated dynamically
-     * @return string
-     */
-    public static function htmlOptionsToString(array $htmlOptions, array $context = []) : string
-    {
-        if (empty($htmlOptions)) {
-            return '';
-        }
-
-        $out = [];
-
-        foreach ($htmlOptions as $k => $v) {
-
-            if ($v instanceof \Closure) {
-                $v = call_user_func_array($v, $context);
-            }
-
-            $out[] = htmlentities($k) . '="' . htmlentities($v, ENT_COMPAT) . '"';
-        }
-
-        return implode(' ', $out);
-    }
-
-    /**
-     * Allows to make column title by it key or attribute name
-     * @param string|int $key
-     * @return string
-     */
-    public static function columnTitle($key) : string
-    {
-        if (is_numeric($key)) {
-            return 'Column';
-        }
-
-        return ucwords(
-            trim(
-                preg_replace_callback(
-                    '/([A-Z]|_|\.)/',
-                    function($word) {
-                        $word = $word[0];
-
-                        if ($word == '_' || $word == '.') {
-                            return ' ';
-                        }
-
-                        return ' ' . strtolower($word);
-                    },
-                    $key
-                )
-            )
-        );
-    }
-
-    /**
-     * Helper for internal purposes
-     * @param $id
-     * @param $component
-     * @return string
-     */
-    public static function gridIdFormatter($id, $component)
-    {
-        if ($id == 0) {
-            return $component;
-        }
-
-        return 'grid[' . $id . '][' . $component . ']';
-    }
-
-    /**
-     * Generates page url with all requested params from request
-     * @param $gridId
-     * @param $page
-     */
-    public static function pageUrl($gridId, $page)
-    {
-        return url()->current() . '?' . Arr::query([\Woo\GridView\GridViewHelper::gridIdFormatter($gridId, 'page') => $page] + request()->query());
-    }
+	/**
+	 * A list of grid aliases
+	 * @var array
+	 */
+	private static $aliases = [
+		'column' => [
+			'attribute' => AttributeColumn::class,
+			'raw' => CallbackColumn::class,
+			'callback' => CallbackColumn::class,
+			'actions' => ActionsColumn::class,
+			'view' => ViewColumn::class,
+		],
+		'formatter' => [
+			'email' => EmailFormatter::class,
+			'image' => ImageFormatter::class,
+			'text' => TextFormatter::class,
+			'url' => UrlFormatter::class,
+			'raw' => RawFormatter::class,
+		],
+		'filter' => [
+			'text' => TextFilter::class,
+			'dropdown' => DropdownFilter::class,
+		],
+		'renderer' => [
+			'default' => DefaultRenderer::class,
+		],
+		'action' => [
+			'delete' => DeleteAction::class,
+			'update' => EditAction::class,
+			'edit' => EditAction::class,
+			'show' => ShowAction::class,
+			'view' => ShowAction::class,
+			'action' => Action::class,
+		]
+	];
+
+	private function __construct() {}
+
+	/**
+	 * Useful in case you want to register a new alias for your project
+	 * @param string $context
+	 * @param string $alias
+	 * @param string $aliasTo
+	 */
+	public static function registerAlias(string $context, string $alias, string $aliasTo)
+	{
+		self::$aliases[$context][$alias] = $aliasTo;
+	}
+
+	/**
+	 * Allows to resolve class name by its alias
+	 * @param string $context
+	 * @param string $alias
+	 * @return mixed
+	 */
+	public static function resolveAlias(string $context, string $alias)
+	{
+		return self::$aliases[$context][$alias] ?? $alias;
+	}
+
+	/**
+	 * Allows to convert options array to html string
+	 * @param array $htmlOptions
+	 * @param array $context - context is variables, which are allowed to use when property value calculated dynamically
+	 * @return string
+	 */
+	public static function htmlOptionsToString(array $htmlOptions, array $context = []) : string
+	{
+		if (empty($htmlOptions)) {
+			return '';
+		}
+
+		$out = [];
+
+		foreach ($htmlOptions as $k => $v) {
+
+			if ($v instanceof \Closure) {
+				$v = call_user_func_array($v, $context);
+			}
+
+			$out[] = htmlentities($k) . '="' . htmlentities($v, ENT_COMPAT) . '"';
+		}
+
+		return implode(' ', $out);
+	}
+
+	/**
+	 * Allows to make column title by it key or attribute name
+	 * @param string|int $key
+	 * @return string
+	 */
+	public static function columnTitle($key) : string
+	{
+		if (is_numeric($key)) {
+			return 'Column';
+		}
+
+		return ucwords(
+			trim(
+				preg_replace_callback(
+					'/([A-Z]|_|\.)/',
+					function($word) {
+						$word = $word[0];
+
+						if ($word == '_' || $word == '.') {
+							return ' ';
+						}
+
+						return ' ' . strtolower($word);
+					},
+					$key
+				)
+			)
+		);
+	}
+
+	/**
+	 * Helper for internal purposes
+	 * @param $id
+	 * @param $component
+	 * @return string
+	 */
+	public static function gridIdFormatter($id, $component)
+	{
+		if ($id == 0) {
+			return $component;
+		}
+
+		return 'grid[' . $id . '][' . $component . ']';
+	}
+
+	/**
+	 * Generates page url with all requested params from request
+	 * @param $gridId
+	 * @param $page
+	 */
+	public static function pageUrl($gridId, $page)
+	{
+		return url()->current() . '?' . Arr::query([\Woo\GridView\GridViewHelper::gridIdFormatter($gridId, 'page') => $page] + request()->query());
+	}
 }

src/DataProviders/EloquentDataProvider.php

Indentation +44 added lines, -44 removed lines

@@ -7,58 +7,58 @@
 
 class EloquentDataProvider extends BaseDataProvider
 {
-    protected $query;
+	protected $query;
 
-    /**
-     * EloquentDataProvider constructor.
-     * @param Builder $query
-     */
-    public function __construct(Builder $query)
-    {
-        $this->query = clone $query;
-    }
+	/**
+	 * EloquentDataProvider constructor.
+	 * @param Builder $query
+	 */
+	public function __construct(Builder $query)
+	{
+		$this->query = clone $query;
+	}
 
 
-    /**
-     * @param GridViewRequest $request
-     * @return Builder
-     */
-    protected function baseQuery(GridViewRequest $request)
-    {
-        $query = clone $this->query;
+	/**
+	 * @param GridViewRequest $request
+	 * @return Builder
+	 */
+	protected function baseQuery(GridViewRequest $request)
+	{
+		$query = clone $this->query;
 
-        foreach ($request->filters as $field => $value) {
-            $query->where($field, 'LIKE', '%' . $value . '%');
-        }
+		foreach ($request->filters as $field => $value) {
+			$query->where($field, 'LIKE', '%' . $value . '%');
+		}
 
-        if ($request->sortColumn) {
-            $query->orderBy($request->sortColumn, $request->sortOrder);
-        }
+		if ($request->sortColumn) {
+			$query->orderBy($request->sortColumn, $request->sortOrder);
+		}
 
-        return $query;
-    }
+		return $query;
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function getCount(GridViewRequest $request) : int
-    {
-        return $this->baseQuery($request)->count();
-    }
+	/**
+	 * @inheritdoc
+	 */
+	public function getCount(GridViewRequest $request) : int
+	{
+		return $this->baseQuery($request)->count();
+	}
 
-    /**
-     * @inheritdoc
-     */
-    public function getData(GridViewRequest $request)
-    {
-        $query = $this->baseQuery($request);
+	/**
+	 * @inheritdoc
+	 */
+	public function getData(GridViewRequest $request)
+	{
+		$query = $this->baseQuery($request);
 
-        if ($request->perPage == 0) {
-            return $query->get();
-        }
+		if ($request->perPage == 0) {
+			return $query->get();
+		}
 
-        return $query->offset(($request->page - 1) * $request->perPage)
-            ->limit($request->perPage)
-            ->get();
-    }
+		return $query->offset(($request->page - 1) * $request->perPage)
+			->limit($request->perPage)
+			->get();
+	}
 }