Skip to content

Commit 4c5756e

Browse files
authored
[Reports]: Cannot open configuration editor when data config is incorrect (#1425)
* catch exception of invalid columns * Apply php-cs-fixer changes
1 parent 9907ce4 commit 4c5756e

1 file changed

Lines changed: 13 additions & 7 deletions

File tree

src/Bundle/CustomReport/Hydrator/ColumnHydrator.php

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
namespace Pimcore\Bundle\StudioBackendBundle\Bundle\CustomReport\Hydrator;
1515

16+
use Exception;
1617
use Pimcore\Bundle\CustomReportsBundle\Tool\Config;
1718
use Pimcore\Bundle\CustomReportsBundle\Tool\Config\ColumnInformation;
1819
use Pimcore\Bundle\StudioBackendBundle\Bundle\CustomReport\Schema\CustomReportColumnConfiguration;
@@ -61,10 +62,10 @@ public function getCustomReportColumnConfiguration(Config $report): array
6162
$column['displayType'] ?? null,
6263
$column['filter'] ?? null,
6364
$column['filter_drilldown'] ?? null,
64-
$metadata?->isDisableOrderBy(),
65-
$metadata?->isDisableFilterable(),
66-
$metadata?->isDisableDropdownFilterable(),
67-
$metadata?->isDisableLabel()
65+
$metadata && $metadata->isDisableOrderBy(),
66+
$metadata && $metadata->isDisableFilterable(),
67+
$metadata && $metadata->isDisableDropdownFilterable(),
68+
$metadata && $metadata->isDisableLabel()
6869
);
6970
}
7071

@@ -74,9 +75,14 @@ public function getCustomReportColumnConfiguration(Config $report): array
7475
private function getMetadataMap(Config $report): array
7576
{
7677
$adapter = $this->adapterService->getAdapter($report);
77-
$metadata = $adapter->getColumnsWithMetadata($report->getDataSourceConfig());
78-
$columnNames = array_map(static fn ($column) => $column->getName(), $metadata);
7978

80-
return array_combine($columnNames, $metadata);
79+
try {
80+
$metadata = $adapter->getColumnsWithMetadata($report->getDataSourceConfig());
81+
$columnNames = array_map(static fn ($column) => $column->getName(), $metadata);
82+
83+
return array_combine($columnNames, $metadata);
84+
} catch (Exception) {
85+
return [];
86+
}
8187
}
8288
}

0 commit comments

Comments
 (0)