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
155 changes: 153 additions & 2 deletions config/grid.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ services:
Pimcore\Bundle\StudioBackendBundle\Grid\Service\UpdateConfigurationServiceInterface:
class: Pimcore\Bundle\StudioBackendBundle\Grid\Service\UpdateConfigurationService

Pimcore\Bundle\StudioBackendBundle\Grid\Service\GridSearchServiceInterface:
class: Pimcore\Bundle\StudioBackendBundle\Grid\Service\GridSearchService

#
# Repository
#
Expand Down Expand Up @@ -123,8 +126,156 @@ services:
Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\Metadata\DataObjectDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Service\GridSearchServiceInterface:
class: Pimcore\Bundle\StudioBackendBundle\Grid\Service\GridSearchService
Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\InputDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\TextareaDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\WysiwygDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\PasswordDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\InputQuantityValueDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\NumericDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\NumericRangeDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\SliderDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\QuantityValueDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\QuantityValueRangeDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\BooleanSelectDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\SelectDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\UserDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\CountryDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\LanguageDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\MultiselectDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\CountryMultiselectDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\LanguageMultiselectDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\DateDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\DateTimeDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\DateRangeDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\TimeDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\ImageDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\HotSpotImageDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\ImageGalleryDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\ExternalImageDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\VideoDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\ManyToOneRelationDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\ManyToManyRelationDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\ManyToManyObjectRelationDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\AdvancedManyToManyRelationDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\AdvancedManyToManyObjectRelationDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\ReverseObjectRelationDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\GeopointDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\GeoboundsDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\GeopolygonDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\GeopolylineDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\ConsentDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\FirstnameDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\LastnameDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\EmailDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\GenderDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\TableDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\StructuredTableDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\RgbaColorDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\EncryptedFieldDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\UrlSlugDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\CheckboxDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\LinkDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]

Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject\CalculatedValueDefinition:
tags: [ 'pimcore.studio_backend.grid_column_definition' ]


#
# Column Resolver
Expand Down
2 changes: 2 additions & 0 deletions src/Grid/Column/Collector/Asset/MetadataCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ private function getDefaultMetadata(): array
sortable: true,
editable: true,
exportable: true,
filterable: true,
localizable: true,
locale: null,
type: 'metadata.input',
Expand Down Expand Up @@ -101,6 +102,7 @@ private function getPredefinedMetadata(array $availableColumnDefinitions): array
sortable: $availableColumnDefinitions[$type]->isSortable(),
editable: true,
exportable: $availableColumnDefinitions[$type]->isExportable(),
filterable: $availableColumnDefinitions[$type]->isFilterable(),
localizable: true,
locale: null,
type: $type,
Expand Down
1 change: 1 addition & 0 deletions src/Grid/Column/Collector/Asset/SystemFieldCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public function getColumnConfigurations(array $availableColumnDefinitions): arra
sortable: $availableColumnDefinitions[$type]->isSortable(),
editable: false,
exportable: $availableColumnDefinitions[$type]->isExportable(),
filterable: $availableColumnDefinitions[$type]->isFilterable(),
localizable: false,
locale: null,
type: $availableColumnDefinitions[$type]->getType(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ private function buildColumnConfigurations(array $simpleFields, array $relationF
sortable: false,
editable: false,
exportable: true,
filterable: false,
localizable: true,
locale: null,
type: 'dataobject.advanced',
Expand Down Expand Up @@ -233,6 +234,10 @@ private function buildFieldForClassName(string $className): array
throw new NotFoundException('Class definition', $className);
}

if ($definitionOfTheRelation === null) {
throw new NotFoundException('Class definition', $className);
}

$test = $this->classDefinitionService->getFilteredLayoutDefinitions(
$definitionOfTheRelation->getId(),
$this->getFolderId()
Expand Down
20 changes: 15 additions & 5 deletions src/Grid/Column/Collector/DataObject/FieldDefinitionCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

namespace Pimcore\Bundle\StudioBackendBundle\Grid\Column\Collector\DataObject;

use Pimcore\Bundle\StudioBackendBundle\Exception\Api\InvalidArgumentException;
use Pimcore\Bundle\StudioBackendBundle\Grid\Column\ClassIdInterface;
use Pimcore\Bundle\StudioBackendBundle\Grid\Column\ColumnCollectorInterface;
use Pimcore\Bundle\StudioBackendBundle\Grid\Column\FolderIdInterface;
Expand All @@ -30,6 +31,7 @@
use Pimcore\Model\DataObject\ClassDefinition\Data\Localizedfields;
use Pimcore\Model\DataObject\ClassDefinition\Data\Objectbricks;
use Pimcore\Model\DataObject\ClassDefinition\Layout;
use Psr\Log\LoggerInterface;

/**
* @internal
Expand All @@ -46,7 +48,8 @@ final class FieldDefinitionCollector implements ColumnCollectorInterface, ClassI

public function __construct(
private readonly ClassDefinitionServiceInterface $classDefinitionService,
private readonly ColumnConfigurationServiceInterface $columnConfigurationService
private readonly ColumnConfigurationServiceInterface $columnConfigurationService,
private readonly LoggerInterface $logger
) {
}

Expand Down Expand Up @@ -122,10 +125,17 @@ private function buildColumnConfigurations(): array
{
$columns = [];
foreach ($this->groupedDefinitions as $definition) {
$columns[] = $this->columnConfigurationService->buildDataObjectAdapterColumnConfiguration(
$definition,
'dataobject.adapter'
);
try {
$columns[] = $this->columnConfigurationService->buildDataObjectAdapterColumnConfiguration(
$definition,
'dataobject.adapter'
);
} catch (InvalidArgumentException $exception) {
$this->logger->info($exception->getMessage());

continue;
}

}

return $columns;
Expand Down
30 changes: 19 additions & 11 deletions src/Grid/Column/Collector/DataObject/ObjectBrickCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
use Pimcore\Model\DataObject\ClassDefinition\Layout;
use Pimcore\Model\DataObject\Objectbrick\Definition as ObjectBrickDefinition;
use Pimcore\Model\DataObject\Objectbrick\Definition\Listing as ObjectBrickListing;
use Psr\Log\LoggerInterface;
use function array_key_exists;

/**
Expand All @@ -50,7 +51,8 @@ final class ObjectBrickCollector implements ColumnCollectorInterface, ClassIdInt

public function __construct(
private readonly ClassDefinitionServiceInterface $classDefinitionService,
private readonly ColumnConfigurationServiceInterface $columnConfigurationService
private readonly ColumnConfigurationServiceInterface $columnConfigurationService,
private readonly LoggerInterface $logger
) {
}

Expand Down Expand Up @@ -104,16 +106,22 @@ private function buildColumnConfigurations(ObjectBrickDefinition $objectBrick, s
foreach ($dataFields as $dataField) {
$groupName = $objectBrick->getTitle() !== '' ? $objectBrick->getTitle() : $objectBrick->getKey();

$this->configurations[] = $this->columnConfigurationService->buildDataObjectAdapterColumnConfiguration(
new ColumnFieldDefinition($dataField, $groupName, false),
'dataobject.objectbrick',
$fieldname . '.'. $objectBrick->getKey() . '.'. $dataField->getName(),
[
'field' => $fieldname,
'objectBrick' => $objectBrick->getKey(),
'attribute' => $dataField->getName(),
]
);
try {
$this->configurations[] = $this->columnConfigurationService->buildDataObjectAdapterColumnConfiguration(
new ColumnFieldDefinition($dataField, $groupName, false),
'dataobject.objectbrick',
$fieldname . '.'. $objectBrick->getKey() . '.'. $dataField->getName(),
[
'field' => $fieldname,
'objectBrick' => $objectBrick->getKey(),
'attribute' => $dataField->getName(),
]
);
} catch (InvalidArgumentException $exception) {
$this->logger->info($exception->getMessage());

continue;
}
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public function getColumnConfigurations(array $availableColumnDefinitions): arra
sortable: $availableColumnDefinitions[$type]->isSortable(),
editable: false,
exportable: $availableColumnDefinitions[$type]->isExportable(),
filterable: $availableColumnDefinitions[$type]->isFilterable(),
localizable: false,
locale: null,
type: $availableColumnDefinitions[$type]->getType(),
Expand Down
2 changes: 2 additions & 0 deletions src/Grid/Column/ColumnDefinitionInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public function getConfig(mixed $config): array;

public function isSortable(): bool;

public function isFilterable(): bool;

public function getFrontendType(): string;

public function isExportable(): bool;
Expand Down
49 changes: 49 additions & 0 deletions src/Grid/Column/Definition/DataObject/AbstractDefinition.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?php
declare(strict_types=1);

/**
* Pimcore
*
* This source file is available under two different licenses:
* - GNU General Public License version 3 (GPLv3)
* - Pimcore Commercial License (PCL)
* Full copyright and license information is available in
* LICENSE.md which is distributed with this source code.
*
* @copyright Copyright (c) Pimcore GmbH (http://www.pimcore.org)
* @license http://www.pimcore.org/license GPLv3 and PCL
*/

namespace Pimcore\Bundle\StudioBackendBundle\Grid\Column\Definition\DataObject;

use Pimcore\Bundle\StudioBackendBundle\Grid\Column\ColumnDefinitionInterface;

/**
* @internal
*/
abstract readonly class AbstractDefinition implements ColumnDefinitionInterface
{
abstract public function getType(): string;

public function getConfig(mixed $config): array
{
return [];
}

public function isSortable(): bool
{
return true;
}

public function isFilterable(): bool
{
return true;
}

abstract public function getFrontendType(): string;

public function isExportable(): bool
{
return true;
}
}
Loading
Loading