Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PropertyEditor(UI)Alias name refactor #15408

Merged
merged 3 commits into from Dec 13, 2023
Merged

PropertyEditor(UI)Alias name refactor #15408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b108e0
PropertyEditor(UI)Alias name refactor
Dec 8, 2023
25fc03f
Merge remote-tracking branch 'origin/v14/dev' into v14/fix/data-type-…
bergmania Dec 13, 2023
10b5b41
Updated OpenApi.json
bergmania Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Umbraco.Cms.Api.Management/Factories/DataTypePresentationFactory.cs
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ public class DataTypePresentationFactory : IDataTypePresentationFactory
/// <inheritdoc />
public async Task<Attempt<IDataType, DataTypeOperationStatus>> CreateAsync(CreateDataTypeRequestModel requestModel)
{
if (!_propertyEditorCollection.TryGet(requestModel.PropertyEditorAlias, out IDataEditor? editor))
if (!_propertyEditorCollection.TryGet(requestModel.EditorAlias, out IDataEditor? editor))
{
return Attempt.FailWithStatus<IDataType, DataTypeOperationStatus>(DataTypeOperationStatus.PropertyEditorNotFound, new DataType(new VoidEditor(_dataValueEditorFactory), _configurationEditorJsonSerializer));
}
Expand All @@ -47,7 +47,7 @@ public class DataTypePresentationFactory : IDataTypePresentationFactory
var dataType = new DataType(editor, _configurationEditorJsonSerializer)
{
Name = requestModel.Name,
EditorUiAlias = requestModel.PropertyEditorUiAlias,
EditorUiAlias = requestModel.EditorUiAlias,
DatabaseType = GetEditorValueStorageType(editor),
ConfigurationData = MapConfigurationData(requestModel, editor),
ParentId = parentAttempt.Result,
Expand Down Expand Up @@ -86,7 +86,7 @@ public class DataTypePresentationFactory : IDataTypePresentationFactory

public Task<Attempt<IDataType, DataTypeOperationStatus>> CreateAsync(UpdateDataTypeRequestModel requestModel, IDataType current)
{
if (!_propertyEditorCollection.TryGet(requestModel.PropertyEditorAlias, out IDataEditor? editor))
if (!_propertyEditorCollection.TryGet(requestModel.EditorAlias, out IDataEditor? editor))
{
return Task.FromResult(Attempt.FailWithStatus<IDataType, DataTypeOperationStatus>(DataTypeOperationStatus.PropertyEditorNotFound, new DataType(new VoidEditor(_dataValueEditorFactory), _configurationEditorJsonSerializer) ));
}
Expand All @@ -95,7 +95,7 @@ public class DataTypePresentationFactory : IDataTypePresentationFactory

dataType.Name = requestModel.Name;
dataType.Editor = editor;
dataType.EditorUiAlias = requestModel.PropertyEditorUiAlias;
dataType.EditorUiAlias = requestModel.EditorUiAlias;
dataType.DatabaseType = GetEditorValueStorageType(editor);
dataType.ConfigurationData = MapConfigurationData(requestModel, editor);

Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Cms.Api.Management/Mapping/DataType/DataTypeViewModelMapDefinition.cs
View file
Open in desktop
Expand Up @@ -30,8 +30,8 @@ private void Map(IDataType source, DataTypeResponseModel target, MapperContext c
target.Id = source.Key;
target.ParentId = _dataTypeService.GetContainer(source.ParentId)?.Key;
target.Name = source.Name ?? string.Empty;
target.PropertyEditorAlias = source.EditorAlias;
target.PropertyEditorUiAlias = source.EditorUiAlias;
target.EditorAlias = source.EditorAlias;
target.EditorUiAlias = source.EditorUiAlias;

IConfigurationEditor? configurationEditor = source.Editor?.GetConfigurationEditor();
IDictionary<string, object> configuration = configurationEditor?.ToConfigurationEditor(source.ConfigurationData)
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Cms.Api.Management/OpenApi.json
View file
Open in desktop
Expand Up @@ -19572,10 +19572,10 @@
"name": {
"type": "string"
},
"propertyEditorAlias": {
"editorAlias": {
"type": "string"
},
"propertyEditorUiAlias": {
"editorUiAlias": {
"type": "string",
"nullable": true
},
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Cms.Api.Management/ViewModels/DataType/DataTypeModelBase.cs
View file
Open in desktop
Expand Up @@ -4,9 +4,9 @@ public abstract class DataTypeModelBase
{
public string Name { get; set; } = string.Empty;

public string PropertyEditorAlias { get; set; } = string.Empty;
public string EditorAlias { get; set; } = string.Empty;

public string? PropertyEditorUiAlias { get; set; }
public string? EditorUiAlias { get; set; }

public IEnumerable<DataTypePropertyPresentationModel> Values { get; set; } = null!;
}