Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/UI/Components/Grids/Account/AccountGridTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@
use ADT\FancyAdmin\Model\Entities\Account;
use ADT\FancyAdmin\Model\Queries\Factories\AccountQueryFactory;
use ADT\FancyAdmin\UI\Components\Grids\Traits\Editable\Editable;
use ADT\FancyAdmin\UI\Components\Grids\Traits\SearchFilter;

trait AccountGridTrait
{
use Editable;
use FancyAdminInject;
use SearchFilter;

public function initGrid(DataGrid $grid): void
{
$grid->addFilterText('search', '', ['name']);
$this->addSearchFilter($grid, ['name']);

$grid->addColumnText('name', 'fcadmin.grids.account.name');

Expand Down
5 changes: 4 additions & 1 deletion src/UI/Components/Grids/ChangeLog/ChangeLogGridTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@
use ADT\FancyAdmin\Model\Attributes\Label;
use ADT\FancyAdmin\Model\Entities\Identity;
use ADT\FancyAdmin\Model\Queries\Factories\ChangeLogQueryFactory;
use ADT\FancyAdmin\UI\Components\Grids\Traits\SearchFilter;
use Nette\Utils\Html;
use Nette\Utils\Strings;
use ReflectionClass;

trait ChangeLogGridTrait
{
use SearchFilter;

public function initGrid(DataGrid $grid): void
{
$this->withoutIsActiveColumn = true;
Expand Down Expand Up @@ -53,7 +56,7 @@ public function initGrid(DataGrid $grid): void
return $this->renderChangeSet($changeLog);
});

$grid->addFilterText('search', '', ['objectClass', 'objectId']);
$this->addSearchFilter($grid, ['objectClass', 'objectId']);

$grid->addFilterSelect('action', 'fcadmin.grids.changeLog.action', [
'create' => $this->getTranslator()->translate('fcadmin.grids.changeLog.actions.create'),
Expand Down
8 changes: 0 additions & 8 deletions src/UI/Components/Grids/Identity/IdentityGridTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,13 @@
namespace ADT\FancyAdmin\UI\Components\Grids\Identity;

use ADT\Datagrid\Component\DataGrid;
use ADT\FancyAdmin\DI\Injects\EntityManagerInject;
use ADT\FancyAdmin\DI\Injects\IdentityQueryFactoryInject;
use ADT\FancyAdmin\DI\Injects\MailerInject;
use ADT\FancyAdmin\DI\Injects\SecurityUserInject;
use ADT\FancyAdmin\Model\Entities\Enums\AclResourceNameEnum;
use ADT\FancyAdmin\Model\Entities\Identity;
use ADT\FancyAdmin\Model\Queries\Factories\IdentityQueryFactory;
use ADT\FancyAdmin\UI\Components\Grids\Traits\AnonymizeIdentity\AnonymizeIdentity;
use ADT\FancyAdmin\UI\Components\Grids\Traits\Editable\Editable;
use ADT\FancyAdmin\UI\Components\Grids\Traits\IdentityData;
use ADT\FancyAdmin\UI\Components\Grids\Traits\ResetPassword\ResetPassword;
use ADT\FancyAdmin\UI\Components\Grids\Traits\SignInAsIdentity\SignInAsIdentity;
use ADT\FancyAdmin\UI\Presenters\SecurityCheckAttribute;
use Exception;
use ReflectionException;

trait IdentityGridTrait
{
Expand Down
2 changes: 1 addition & 1 deletion src/UI/Components/Grids/Profile/ProfileGridTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ trait ProfileGridTrait

public function initGrid(DataGrid $grid): void
{
$this->addIdentityData($grid, 'identity.');
$this->addIdentityData($grid, columnPrefix: 'identity.');

$grid->addColumnText('roles', 'fcadmin.grids.user.labels.roles')
->setRenderer(function (Profile $profile) {
Expand Down
4 changes: 3 additions & 1 deletion src/UI/Components/Grids/Traits/IdentityData.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@

trait IdentityData
{
use SearchFilter;

protected function addIdentityData(DataGrid $grid, string $columnPrefix = ''): void
{
$grid->addFilterText('search', '', [$columnPrefix . 'firstName', $columnPrefix . 'lastName', $columnPrefix . 'email', $columnPrefix . 'phoneNumber']);
$this->addSearchFilter($grid, [$columnPrefix . 'firstName', $columnPrefix . 'lastName', $columnPrefix . 'email', $columnPrefix . 'phoneNumber']);
$grid->addColumnText('fullName', 'fcadmin.grids.user.labels.fullName', $columnPrefix . 'fullName');
$grid->addColumnText('email', 'fcadmin.grids.user.labels.email', $columnPrefix . 'email');
$grid->addColumnText('phoneNumber', 'fcadmin.grids.user.labels.phoneNumber', $columnPrefix . 'phoneNumber');
Expand Down
63 changes: 63 additions & 0 deletions src/UI/Components/Grids/Traits/SearchFilter.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<?php

declare(strict_types=1);

namespace ADT\FancyAdmin\UI\Components\Grids\Traits;

use ADT\Datagrid\Component\DataGrid;

trait SearchFilter
{
/** @var string[]
*
* Dodatečná pole pro fulltextový filtr "search"; lze nastavit třemi způsoby:
*
* A) Override initGrid v komponentě (nejexplicitnější):
* use ProfileGridTrait {
* ProfileGridTrait::initGrid as traitInitGrid;
* }
*
* public function initGrid(DataGrid $grid): void
* {
* $this->searchFields = ['identity.username'];
* $this->traitInitGrid($grid);
* }
*
* B) Přes setter při vytváření komponenty (před
* připojením k presenteru):
* protected function createComponentProfileGrid(): ProfileGrid
* {
* $grid = $this->profileGridFactory->create();
* $grid->setSearchFields(['identity.username']);
* return $grid;
* }
*
* C) V konstruktoru komponenty (jen zaregistruje monitor, initGrid ještě neběží):
* public function __construct()
* {
* parent::__construct();
* $this->searchFields = ['identity.username'];
* }
*
*/
protected array $searchFields = [];

/**
* Přidá fulltextový filtr "search" sloučený z výchozích polí gridu a případných polí nastavených přes setSearchFields().
*
* @param string[] $defaultSearchFields výchozí pole, která prohledává daný grid
*/
protected function addSearchFilter(DataGrid $grid, array $defaultSearchFields = []): void
{
$grid->addFilterText('search', '', array_unique(array_merge($defaultSearchFields, $this->searchFields)));
}

/**
* @param string[] $searchFields
*/
public function setSearchFields(array $searchFields): static
{
$this->searchFields = $searchFields;
return $this;
}
}