Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
3ec8867
Squash merge Squash merged v173/20453-fix-more-sql-syntax-issues int …
idseefeld Jan 7, 2026
2a27b4e
replace some column names with constants for use in raw sql statements
idseefeld Jan 7, 2026
41ef0df
fix 2 unit test
idseefeld Jan 7, 2026
d5f4f88
Merge branch 'main' into v173/20453-dto-constants
idseefeld Jan 8, 2026
803041f
Merge branch 'main' into v173/20453-dto-constants
idseefeld Jan 8, 2026
b05db12
Replace nameof(DTO.COLUMN_NAME) by constant, because it leads to casi…
idseefeld Jan 8, 2026
214978d
Merge branch 'main' into v173/20453-dto-constants
idseefeld Jan 8, 2026
66c7d0b
Merge branch 'main' into v173/20453-21303-nameof-in-raw-SQL
idseefeld Jan 8, 2026
ee84947
fix Copilot review comments
idseefeld Jan 8, 2026
6f9bfee
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 8, 2026
2398483
resolve review comments
idseefeld Jan 9, 2026
1390acf
replace more hard coded strings
idseefeld Jan 9, 2026
9bc68dd
fix test
idseefeld Jan 9, 2026
e0eebc7
merge branch v173/20453-dto-constants
idseefeld Jan 9, 2026
9cd2b09
Merge branch 'main' into v173/20453-dto-constants
idseefeld Jan 9, 2026
82aaf6c
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 9, 2026
d2547ef
fix review comments
idseefeld Jan 9, 2026
b90c59f
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 9, 2026
944e16d
fix database schema
idseefeld Jan 10, 2026
d782932
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 10, 2026
bb0dcd4
fix database schema
idseefeld Jan 10, 2026
74c992e
fix merge
idseefeld Jan 10, 2026
44e3d8d
fix database schema and ResultColumn reference names
idseefeld Jan 10, 2026
8118a3f
Update src/Umbraco.Infrastructure/Persistence/Dtos/ContentTypeAllowed…
idseefeld Jan 10, 2026
7e64ceb
add comment from review
idseefeld Jan 10, 2026
fd6465d
fix two reference column names
idseefeld Jan 10, 2026
0e4a963
fix breaking change
idseefeld Jan 10, 2026
327f8dc
fix typo
idseefeld Jan 10, 2026
f54d895
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 10, 2026
34118b6
Merge branch 'main' into v173/20453-dto-constants
idseefeld Jan 12, 2026
8e021c3
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 12, 2026
afeab7f
Remove unnecessary attributes
idseefeld Jan 12, 2026
22f1c01
Merge branch 'main' into v173/20453-dto-constants
idseefeld Jan 13, 2026
143adb9
mark 2 unsused DTO classes as obsolete
idseefeld Jan 13, 2026
8804ba1
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 13, 2026
e88b7fb
Merge branch 'main' into v173/20453-dto-constants
idseefeld Jan 13, 2026
b992e74
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 13, 2026
58b38a0
reverted change of class UnionHelperDto adding [Column("...")] attrib…
idseefeld Jan 13, 2026
f9edc2b
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 13, 2026
f6bbd7a
Merge branch 'main' into v173/20453-dto-constants
idseefeld Jan 13, 2026
9605da6
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 13, 2026
d6ef92d
Merge branch 'main' into v173/20453-dto-constants
idseefeld Jan 14, 2026
de4fae0
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 14, 2026
5d47a41
Merge branch 'main' into v173/20453-dto-constants
idseefeld Jan 15, 2026
8f6e406
replace nameof reference names,
idseefeld Jan 15, 2026
81384f7
Merge branch 'main' into v173/20453-dto-constants
idseefeld Jan 15, 2026
c744b27
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 15, 2026
15c612f
Merge branch 'main' into v173/20453-dto-constants
idseefeld Jan 15, 2026
e207e5c
Merge branch 'v173/20453-dto-constants' into v173/20453-21303-nameof-…
idseefeld Jan 15, 2026
9ac8ece
Merge branch 'main' into v173/20453-21303-nameof-in-raw-SQL
idseefeld Jan 15, 2026
308053b
Merge branch 'main' into v173/20453-21303-nameof-in-raw-SQL
idseefeld Jan 15, 2026
4236e11
merge main into v173/20453-21303-nameof-in-raw-SQL and fix comments
idseefeld Jan 16, 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
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ protected override Ordering ItemOrdering
{
get
{
var ordering = Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.NodeObjectType), Direction.Descending); // We need to override to change direction
ordering.Next = Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.Text));
var ordering = Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.NodeObjectTypeColumnName, Direction.Descending); // We need to override to change direction
ordering.Next = Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.TextColumnName);

return ordering;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ protected DocumentTreeControllerBase(

protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.Document;

protected override Ordering ItemOrdering => Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.SortOrder));
protected override Ordering ItemOrdering => Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.SortOrderColumnName);

protected override DocumentTreeItemResponseModel MapTreeItemViewModel(Guid? parentId, IEntitySlim entity)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ protected override Ordering ItemOrdering
{
get
{
var ordering = Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.NodeObjectType), Direction.Descending); // We need to override to change direction
ordering.Next = Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.Text));
var ordering = Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.NodeObjectTypeColumnName, Direction.Descending); // We need to override to change direction
ordering.Next = Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.TextColumnName);

return ordering;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public MediaTreeControllerBase(

protected override UmbracoObjectTypes ItemObjectType => UmbracoObjectTypes.Media;

protected override Ordering ItemOrdering => Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.SortOrder));
protected override Ordering ItemOrdering => Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.SortOrderColumnName);

protected override MediaTreeItemResponseModel MapTreeItemViewModel(Guid? parentKey, IEntitySlim entity)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ protected virtual IEntitySlim[] GetSiblingEntities(Guid target, int before, int
after,
out totalBefore,
out totalAfter,
ordering: Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.Text)))
ordering: Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.TextColumnName))
.ToArray();

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ protected EntityTreeControllerBase(IEntityService entityService, FlagProviderCol

protected abstract UmbracoObjectTypes ItemObjectType { get; }

protected virtual Ordering ItemOrdering => Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.Text));
protected virtual Ordering ItemOrdering => Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.TextColumnName);

protected async Task<ActionResult<PagedViewModel<TItem>>> GetRoot(int skip, int take)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ protected override Ordering ItemOrdering
get
{
// Override to order by type (folder vs item) before the text
var ordering = Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.NodeObjectType));
ordering.Next = Ordering.By(nameof(Infrastructure.Persistence.Dtos.NodeDto.Text));
var ordering = Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.NodeObjectTypeColumnName);
ordering.Next = Ordering.By(Infrastructure.Persistence.Dtos.NodeDto.TextColumnName);

return ordering;
}
Expand Down
Loading