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
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ public function getPropertyConfiguration(): MetaDataPropertyDefinitions
default => MetaDataPropertyType::string,
},
$propertyDefinition['globalScope'] ?? false,
new MetaDataPropertyUiDefinition(
array_key_exists('ui', $propertyDefinition) ? new MetaDataPropertyUiDefinition(
$this->translatePropertyName($propertyName, $propertyDefinition['ui']['label'] ?? null),
MetaDataEditorDefinition::create(
editorType: $propertyDefinition['ui']['inspector']['editor'] ?? null,
options: $propertyDefinition['ui']['inspector']['editorOptions'] ?? [],
)
)
) : null,
);
}
return MetaDataPropertyDefinitions::create(...$propertyDefinitions);
Expand Down
2 changes: 1 addition & 1 deletion Classes/Domain/Dto/MetaDataPropertyDefinition.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public function __construct(
public MetaDataPropertyName $name,
public MetaDataPropertyType $type,
public bool $globalScope,
public MetaDataPropertyUiDefinition $ui,
public ?MetaDataPropertyUiDefinition $ui = null,
) {
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,6 @@ public function anUntranslatedLabelFallsBackToThePropertyName(): void
self::assertSame('caption', $this->definitionFor(['ui' => ['label' => 'i18n']])->ui->label);
}

/**
* @test
*/
public function anOmittedLabelFallsBackToThePropertyName(): void
{
self::assertSame('caption', $this->definitionFor([])->ui->label);
}

/**
* @test
*/
Expand Down Expand Up @@ -137,8 +129,16 @@ public function propertiesWithoutUiConfigurationAreParsed(): void
{
$definition = $this->definitionFor([]);

self::assertSame('caption', $definition->ui->label);
self::assertSame([], $definition->ui->editorDefinition->options);
self::assertSame('caption', $definition->name->value);
}

/**
* @test
*/
public function aMissingUiConfigLeadsToAnEmptyUiDefinition(): void
{
$definition = $this->definitionFor(['type' => 'string']);
self::assertNull($definition->ui);
}

/**
Expand Down