Skip to content

Elements: Fix UdiEntityTypeHelper.ToUmbracoObjectType() for Element entities #22874

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

Merged
AndyButland merged 2 commits into from
May 19, 2026
Merged

Elements: Fix UdiEntityTypeHelper.ToUmbracoObjectType() for Element entities #22874

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
714733c
Elements: Fix UdiEntityTypeHelper.ToUmbracoObjectType() for Element e…
ronaldbarendse May 18, 2026
6c91e8c
Remove UdiEntityTypeHelperTests
ronaldbarendse May 18, 2026
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
4 changes: 4 additions & 0 deletions src/Umbraco.Core/UdiEntityTypeHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@
return UmbracoObjectTypes.FormsDataSource;
case Constants.UdiEntityType.Language:
return UmbracoObjectTypes.Language;
case Constants.UdiEntityType.Element:
return UmbracoObjectTypes.Element;
case Constants.UdiEntityType.ElementContainer:
return UmbracoObjectTypes.ElementContainer;

Check warning on line 117 in src/Umbraco.Core/UdiEntityTypeHelper.cs

View check run for this annotation

CodeScene Delta Analysis / CodeScene Code Health Review (release/18.0)

❌ Getting worse: Complex Method 

ToUmbracoObjectType increases in cyclomatic complexity from 19 to 21, threshold = 9. This function has many conditional statements (e.g. if, for, while), leading to lower code health. Avoid adding more conditionals and code to it without refactoring.
}

throw new NotSupportedException(
Expand Down
64 changes: 64 additions & 0 deletions tests/Umbraco.Tests.UnitTests/Umbraco.Core/UdiEntityTypeHelperTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
// Copyright (c) Umbraco.
// See LICENSE for more details.

using NUnit.Framework;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;

namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core;

[TestFixture]
public class UdiEntityTypeHelperTests
{
[TestCase(UmbracoObjectTypes.Document, Constants.UdiEntityType.Document)]
[TestCase(UmbracoObjectTypes.DocumentBlueprint, Constants.UdiEntityType.DocumentBlueprint)]
[TestCase(UmbracoObjectTypes.Media, Constants.UdiEntityType.Media)]
[TestCase(UmbracoObjectTypes.Member, Constants.UdiEntityType.Member)]
[TestCase(UmbracoObjectTypes.Template, Constants.UdiEntityType.Template)]
[TestCase(UmbracoObjectTypes.DocumentType, Constants.UdiEntityType.DocumentType)]
[TestCase(UmbracoObjectTypes.DocumentTypeContainer, Constants.UdiEntityType.DocumentTypeContainer)]
[TestCase(UmbracoObjectTypes.MediaType, Constants.UdiEntityType.MediaType)]
[TestCase(UmbracoObjectTypes.MediaTypeContainer, Constants.UdiEntityType.MediaTypeContainer)]
[TestCase(UmbracoObjectTypes.DataType, Constants.UdiEntityType.DataType)]
[TestCase(UmbracoObjectTypes.DataTypeContainer, Constants.UdiEntityType.DataTypeContainer)]
[TestCase(UmbracoObjectTypes.MemberType, Constants.UdiEntityType.MemberType)]
[TestCase(UmbracoObjectTypes.MemberGroup, Constants.UdiEntityType.MemberGroup)]
[TestCase(UmbracoObjectTypes.RelationType, Constants.UdiEntityType.RelationType)]
[TestCase(UmbracoObjectTypes.FormsForm, Constants.UdiEntityType.FormsForm)]
[TestCase(UmbracoObjectTypes.FormsPreValue, Constants.UdiEntityType.FormsPreValue)]
[TestCase(UmbracoObjectTypes.FormsDataSource, Constants.UdiEntityType.FormsDataSource)]
[TestCase(UmbracoObjectTypes.Language, Constants.UdiEntityType.Language)]
[TestCase(UmbracoObjectTypes.Element, Constants.UdiEntityType.Element)]
[TestCase(UmbracoObjectTypes.ElementContainer, Constants.UdiEntityType.ElementContainer)]
public void FromUmbracoObjectType_ReturnsExpectedEntityType(UmbracoObjectTypes umbracoObjectType, string expected)
{
string entityType = UdiEntityTypeHelper.FromUmbracoObjectType(umbracoObjectType);
Assert.AreEqual(expected, entityType);
}

[TestCase(Constants.UdiEntityType.Document, UmbracoObjectTypes.Document)]
[TestCase(Constants.UdiEntityType.DocumentBlueprint, UmbracoObjectTypes.DocumentBlueprint)]
[TestCase(Constants.UdiEntityType.Media, UmbracoObjectTypes.Media)]
[TestCase(Constants.UdiEntityType.Member, UmbracoObjectTypes.Member)]
[TestCase(Constants.UdiEntityType.Template, UmbracoObjectTypes.Template)]
[TestCase(Constants.UdiEntityType.DocumentType, UmbracoObjectTypes.DocumentType)]
[TestCase(Constants.UdiEntityType.DocumentTypeContainer, UmbracoObjectTypes.DocumentTypeContainer)]
[TestCase(Constants.UdiEntityType.MediaType, UmbracoObjectTypes.MediaType)]
[TestCase(Constants.UdiEntityType.MediaTypeContainer, UmbracoObjectTypes.MediaTypeContainer)]
[TestCase(Constants.UdiEntityType.DataType, UmbracoObjectTypes.DataType)]
[TestCase(Constants.UdiEntityType.DataTypeContainer, UmbracoObjectTypes.DataTypeContainer)]
[TestCase(Constants.UdiEntityType.MemberType, UmbracoObjectTypes.MemberType)]
[TestCase(Constants.UdiEntityType.MemberGroup, UmbracoObjectTypes.MemberGroup)]
[TestCase(Constants.UdiEntityType.RelationType, UmbracoObjectTypes.RelationType)]
[TestCase(Constants.UdiEntityType.FormsForm, UmbracoObjectTypes.FormsForm)]
[TestCase(Constants.UdiEntityType.FormsPreValue, UmbracoObjectTypes.FormsPreValue)]
[TestCase(Constants.UdiEntityType.FormsDataSource, UmbracoObjectTypes.FormsDataSource)]
[TestCase(Constants.UdiEntityType.Language, UmbracoObjectTypes.Language)]
[TestCase(Constants.UdiEntityType.Element, UmbracoObjectTypes.Element)]
[TestCase(Constants.UdiEntityType.ElementContainer, UmbracoObjectTypes.ElementContainer)]
public void ToUmbracoObjectType_ReturnsExpectedObjectType(string entityType, UmbracoObjectTypes expected)
{
UmbracoObjectTypes umbracoObjectType = UdiEntityTypeHelper.ToUmbracoObjectType(entityType);
Assert.AreEqual(expected, umbracoObjectType);
}
}
Loading