yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V14: Add clearer error for invalid property type (#16530)

Browse Source 
* Add clearer error for invalid property type

* Update test
This commit is contained in:
Nikolaj Geisle
2024-06-06 08:54:47 +02:00
committed by GitHub
parent 1f8b7f3a35
commit ebf77024ce
4 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Cms.Api.Management/Controllers/DocumentType/DocumentTypeControllerBase.cs
View File

@@ -41,6 +41,10 @@ public abstract class DocumentTypeControllerBase : ManagementApiControllerBase
.WithTitle("Invalid property type alias")
.WithDetail("One or more property type aliases are invalid")
.Build()),
ContentTypeOperationStatus.PropertyTypeAliasCannotEqualContentTypeAlias => new BadRequestObjectResult(problemDetailsBuilder
.WithTitle("Invalid property type alias")
.WithDetail("The property type alias cannot be the same as the content type alias")
.Build()),
ContentTypeOperationStatus.InvalidContainerName => new BadRequestObjectResult(problemDetailsBuilder
.WithTitle("Invalid container name")
.WithDetail("One or more container names are invalid")

9
src/Umbraco.Core/Services/ContentTypeEditing/ContentTypeEditingServiceBase.cs
View File

@@ -200,6 +200,12 @@ internal abstract class ContentTypeEditingServiceBase<TContentType, TContentType
return ContentTypeOperationStatus.InvalidAlias;
}
// Validate content type alias is not in use.
if (model.Properties.Any(propertyType => propertyType.Alias.Equals(model.Alias, StringComparison.OrdinalIgnoreCase)))
{
return ContentTypeOperationStatus.PropertyTypeAliasCannotEqualContentTypeAlias;
}
// Validate properties for reserved aliases.
if (ContainsReservedPropertyTypeAlias(model))
{
@@ -410,8 +416,7 @@ internal abstract class ContentTypeEditingServiceBase<TContentType, TContentType
.Union(typeof(IPublishedContent).GetPublicMethods().Select(x => x.Name))
.ToArray();
return model.Properties.Any(propertyType => propertyType.Alias.Equals(model.Alias, StringComparison.OrdinalIgnoreCase)
|| reservedPropertyTypeNames.InvariantContains(propertyType.Alias));
return model.Properties.Any(propertyType => reservedPropertyTypeNames.InvariantContains(propertyType.Alias));
}
private bool IsUnsafeAlias(string alias) => alias.IsNullOrWhiteSpace()

1
src/Umbraco.Core/Services/OperationStatus/ContentTypeOperationStatus.cs
View File

@@ -6,6 +6,7 @@ public enum ContentTypeOperationStatus
DuplicateAlias,
InvalidAlias,
InvalidPropertyTypeAlias,
PropertyTypeAliasCannotEqualContentTypeAlias,
DuplicatePropertyTypeAlias,
DataTypeNotFound,
InvalidInheritance,

2
tests/Umbraco.Tests.Integration/Umbraco.Core/Services/ContentTypeEditingServiceTests.Create.cs
View File

@@ -774,7 +774,7 @@ public partial class ContentTypeEditingServiceTests
var result = await ContentTypeEditingService.CreateAsync(createModel, Constants.Security.SuperUserKey);
Assert.IsFalse(result.Success);
Assert.AreEqual(ContentTypeOperationStatus.InvalidPropertyTypeAlias, result.Status);
Assert.AreEqual(ContentTypeOperationStatus.PropertyTypeAliasCannotEqualContentTypeAlias, result.Status);
}
[Test]