diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Apps/MongoAppRepository.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Apps/MongoAppRepository.cs index db10c7f1c..c9d95089c 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Apps/MongoAppRepository.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Apps/MongoAppRepository.cs @@ -50,7 +50,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Apps using (Telemetry.Activities.StartActivity("MongoAppRepository/QueryAllAsync")) { var entities = - await Collection.Find(x => (x.IndexedUserIds.Contains(contributorId) || names.Contains(x.IndexedName)) && !x.IndexedDeleted).SortBy(x => x.IndexedCreated) + await Collection.Find(x => (x.IndexedUserIds.Contains(contributorId) || names.Contains(x.IndexedName)) && !x.IndexedDeleted) .ToListAsync(ct); return RemoveDuplcateNames(entities); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Apps/DomainObject/AppDomainObject.cs b/backend/src/Squidex.Domain.Apps.Entities/Apps/DomainObject/AppDomainObject.cs index e72706fa4..6455cb85e 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Apps/DomainObject/AppDomainObject.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Apps/DomainObject/AppDomainObject.cs @@ -307,7 +307,6 @@ namespace Squidex.Domain.Apps.Entities.Apps.DomainObject return new PlanChangedResult(c.PlanId); } - }, ct); default: diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs index 55efd3903..021c3bc38 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryParser.cs @@ -104,6 +104,8 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries private static void WithSorting(ClrQuery query) { + query.Sort ??= new List(); + if (query.Sort.Count == 0) { query.Sort.Add(new SortNode(new List { "lastModified" }, SortOrder.Descending)); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs index 9f35a2acb..c9aba42fd 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs @@ -143,6 +143,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries private static void WithSorting(ClrQuery query) { + query.Sort ??= new List(); + if (query.Sort.Count == 0) { query.Sort.Add(new SortNode(new List { "lastModified" }, SortOrder.Descending)); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Teams/DomainObject/TeamDomainObject.cs b/backend/src/Squidex.Domain.Apps.Entities/Teams/DomainObject/TeamDomainObject.cs index b0740ebb6..f50a6b3cc 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Teams/DomainObject/TeamDomainObject.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Teams/DomainObject/TeamDomainObject.cs @@ -128,7 +128,6 @@ namespace Squidex.Domain.Apps.Entities.Teams.DomainObject return new PlanChangedResult(c.PlanId); } - }, ct); default: diff --git a/backend/src/Squidex.Infrastructure.MongoDb/MongoDb/Queries/SortBuilder.cs b/backend/src/Squidex.Infrastructure.MongoDb/MongoDb/Queries/SortBuilder.cs index e99a084b6..e5fdfa9c7 100644 --- a/backend/src/Squidex.Infrastructure.MongoDb/MongoDb/Queries/SortBuilder.cs +++ b/backend/src/Squidex.Infrastructure.MongoDb/MongoDb/Queries/SortBuilder.cs @@ -14,7 +14,7 @@ namespace Squidex.Infrastructure.MongoDb.Queries { public static SortDefinition? BuildSort(this ClrQuery query) { - if (query.Sort.Count > 0) + if (query is { Sort: not null, Sort: { Count: > 0 } }) { var sorts = query.Sort.Select(OrderBy).ToList(); diff --git a/backend/src/Squidex.Infrastructure/Queries/OData/SortBuilder.cs b/backend/src/Squidex.Infrastructure/Queries/OData/SortBuilder.cs index b8a67ab50..919e1671f 100644 --- a/backend/src/Squidex.Infrastructure/Queries/OData/SortBuilder.cs +++ b/backend/src/Squidex.Infrastructure/Queries/OData/SortBuilder.cs @@ -19,6 +19,7 @@ namespace Squidex.Infrastructure.Queries.OData { while (orderBy != null) { + result.Sort ??= new List(); result.Sort.Add(OrderBy(orderBy)); orderBy = orderBy.ThenBy; diff --git a/backend/src/Squidex.Infrastructure/Queries/Query.cs b/backend/src/Squidex.Infrastructure/Queries/Query.cs index e3c9e0121..3529cfc24 100644 --- a/backend/src/Squidex.Infrastructure/Queries/Query.cs +++ b/backend/src/Squidex.Infrastructure/Queries/Query.cs @@ -22,7 +22,7 @@ namespace Squidex.Infrastructure.Queries set => Take = value; } - public List Sort { get; set; } = new List(); + public List? Sort { get; set; } = new List(); public HashSet GetAllFields() { @@ -65,7 +65,7 @@ namespace Squidex.Infrastructure.Queries parts.Add($"Take: {Take}"); } - if (Sort.Count > 0) + if (Sort != null && Sort.Count > 0) { parts.Add($"Sort: {string.Join(", ", Sort)}"); } diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/MongoDb/AssetsQueryIntegrationTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/MongoDb/AssetsQueryIntegrationTests.cs index 1907991a0..a387cb3bb 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/MongoDb/AssetsQueryIntegrationTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/MongoDb/AssetsQueryIntegrationTests.cs @@ -138,10 +138,9 @@ namespace Squidex.Domain.Apps.Entities.Assets.MongoDb private async Task> QueryAsync(DomainId? parentId, ClrQuery clrQuery) { clrQuery.Top = 1000; - clrQuery.Skip = 100; - if (clrQuery.Sort.Count == 0) + if (clrQuery.Sort == null || clrQuery.Sort.Count == 0) { clrQuery.Sort = new List { diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/ContentsQueryIntegrationTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/ContentsQueryIntegrationTests.cs index a4bd9af9c..ec62a7b1f 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/ContentsQueryIntegrationTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/ContentsQueryIntegrationTests.cs @@ -216,7 +216,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.MongoDb clrQuery.Skip = skip; } - if (clrQuery.Sort.Count == 0) + if (clrQuery.Sort == null || clrQuery.Sort.Count == 0) { clrQuery.Sort = new List {