Skip to content

Commit 00777e3

Browse files
authored
fix(admin/media-lib): deprecated nested_path for parent_field (#1455)
1 parent d26f497 commit 00777e3

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/Core/Component/MediaLibrary/Config/MediaLibraryConfigFactory.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ protected function resolveOptions(array $options): array
7171
'fieldFile' => 'media_file',
7272
'sort' => [
7373
['id' => 'name', 'field' => 'media_path.alpha_order', 'defaultOrder' => 'asc'],
74-
['id' => 'type', 'field' => 'media_file.mimetype', 'nested_path' => 'media_file'],
75-
['id' => 'size', 'field' => 'media_file.filesize', 'nested_path' => 'media_file'],
74+
['id' => 'type', 'field' => 'media_file.mimetype', 'parent_field' => 'media_file'],
75+
['id' => 'size', 'field' => 'media_file.filesize', 'parent_field' => 'media_file'],
7676
],
7777
'defaultValue' => [],
7878
'searchSize' => MediaLibraryConfig::DEFAULT_SEARCH_SIZE,
@@ -105,11 +105,16 @@ protected function resolveOptions(array $options): array
105105
$sorts = [];
106106

107107
foreach ($definitions as $definition) {
108+
if (isset($definition['nested_path'])) {
109+
@\trigger_error('The "nested_path" option is deprecated and will be removed in ems 7. Please use "parent_field" instead.', E_USER_DEPRECATED);
110+
$definition['parent_field'] = $definition['nested_path'];
111+
}
112+
108113
$sorts[$definition['id']] = new MediaLibraryConfigSort(
109114
id: $definition['id'],
110115
field: $definition['field'],
111116
defaultOrder: $definition['defaultOrder'] ?? null,
112-
nestedPath: $definition['nested_path'] ?? null
117+
parentField: $definition['parent_field'] ?? null
113118
);
114119
}
115120

src/Core/Component/MediaLibrary/Config/MediaLibraryConfigSort.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ public function __construct(
1010
public readonly string $id,
1111
public readonly string $field,
1212
public readonly ?string $defaultOrder,
13-
public readonly ?string $nestedPath,
13+
public readonly ?string $parentField,
1414
) {
1515
}
1616

1717
/**
18-
* @return array<string, array{order: string, nested_path?: string}>
18+
* @return array<string, array{order: string, nested?: array{path: string}}>
1919
*/
2020
public function getQuery(string $order): array
2121
{
2222
$query = ['order' => $order];
2323

24-
if ($this->nestedPath) {
25-
$query['nested_path'] = $this->nestedPath;
24+
if ($this->parentField) {
25+
$query['nested'] = ['path' => $this->parentField];
2626
}
2727

2828
return [$this->field => $query];

0 commit comments

Comments
 (0)