diff --git a/backend/extensions/Squidex.Extensions/APM/Datadog/DatadogPlugin.cs b/backend/extensions/Squidex.Extensions/APM/Datadog/DatadogPlugin.cs index 099eb2be4..b7fe2f8be 100644 --- a/backend/extensions/Squidex.Extensions/APM/Datadog/DatadogPlugin.cs +++ b/backend/extensions/Squidex.Extensions/APM/Datadog/DatadogPlugin.cs @@ -15,7 +15,7 @@ using Microsoft.Extensions.DependencyInjection; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Plugins; -namespace Squidex.Extensions.APM.Datadoq +namespace Squidex.Extensions.APM.Datadog { public sealed class DatadogPlugin : IPlugin, IStartupFilter { diff --git a/backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs b/backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs index 499f2f75d..f10d48796 100644 --- a/backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs +++ b/backend/extensions/Squidex.Extensions/Actions/Email/EmailActionHandler.cs @@ -69,13 +69,13 @@ namespace Squidex.Extensions.Actions.Email return Result.Complete(); } - private async Task CheckConnectionAsync(EmailJob job, CancellationToken ct) + private static async Task CheckConnectionAsync(EmailJob job, CancellationToken ct) { using (var socket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp)) { var tcs = new TaskCompletionSource(); - var state = socket.BeginConnect(job.ServerHost, job.ServerPort, tcs.SetResult, null); + socket.BeginConnect(job.ServerHost, job.ServerPort, tcs.SetResult, null); using (ct.Register(() => { diff --git a/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaProducer.cs b/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaProducer.cs index b347cbf09..271d283ae 100644 --- a/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaProducer.cs +++ b/backend/extensions/Squidex.Extensions/Actions/Kafka/KafkaProducer.cs @@ -131,7 +131,7 @@ namespace Squidex.Extensions.Actions.Kafka } } - private async Task ProduceAsync(IProducer producer, Message message, KafkaJob job, CancellationToken ct) + private static async Task ProduceAsync(IProducer producer, Message message, KafkaJob job, CancellationToken ct) { message.Key = job.MessageKey; @@ -161,7 +161,7 @@ namespace Squidex.Extensions.Actions.Kafka { try { - var schema = (RecordSchema)Avro.Schema.Parse(avroSchema); + var schema = (RecordSchema)Schema.Parse(avroSchema); var jsonObject = jsonSerializer.Deserialize(json); @@ -181,7 +181,7 @@ namespace Squidex.Extensions.Actions.Kafka avroProducer?.Dispose(); } - private object GetValue(IJsonValue value, Schema schema) + private static object GetValue(IJsonValue value, Schema schema) { switch (value) { diff --git a/backend/extensions/Squidex.Extensions/Validation/CompositeUniqueValidator.cs b/backend/extensions/Squidex.Extensions/Validation/CompositeUniqueValidator.cs index 47f2f0812..b1eb3c71a 100644 --- a/backend/extensions/Squidex.Extensions/Validation/CompositeUniqueValidator.cs +++ b/backend/extensions/Squidex.Extensions/Validation/CompositeUniqueValidator.cs @@ -78,15 +78,15 @@ namespace Squidex.Extensions.Validation { case BooleanFieldProperties _ when value is JsonBoolean boolean: return boolean.Value; - case BooleanFieldProperties _ when value is JsonNull _: + case BooleanFieldProperties _ when value is JsonNull: return ClrValue.Null; case NumberFieldProperties _ when value is JsonNumber number: return number.Value; - case NumberFieldProperties _ when value is JsonNull _: + case NumberFieldProperties _ when value is JsonNull: return ClrValue.Null; case StringFieldProperties _ when value is JsonString @string: return @string.Value; - case StringFieldProperties _ when value is JsonNull _: + case StringFieldProperties _ when value is JsonNull: return ClrValue.Null; case ReferencesFieldProperties _ when value is JsonArray array && array.FirstOrDefault() is JsonString @string: return @string.Value; diff --git a/backend/i18n/source/backend_en.json b/backend/i18n/source/backend_en.json index e6fddd35e..cd11ee5b7 100644 --- a/backend/i18n/source/backend_en.json +++ b/backend/i18n/source/backend_en.json @@ -66,7 +66,7 @@ "common.httpValidationError": "Validation error", "common.initialStep": "Initial step", "common.jsError": "Failed to execute script with Javascript error: {message}", - "common.jsNotAlloweed": "Script has forbidden the operation.", + "common.jsNotAllowed": "Script has forbidden the operation.", "common.jsParseError": "Failed to execute script with Javascript syntax error: {message}", "common.jsRejected": "Script rejected the operation.", "common.language": "Language code", diff --git a/backend/i18n/source/backend_it.json b/backend/i18n/source/backend_it.json index 34cbb4dea..5c7236d20 100644 --- a/backend/i18n/source/backend_it.json +++ b/backend/i18n/source/backend_it.json @@ -66,7 +66,7 @@ "common.httpValidationError": "Errore di validazione", "common.initialStep": "Step iniziale", "common.jsError": "Esecuzione dello script fallita, Errore Javascript: {message}", - "common.jsNotAlloweed": "Uno script ha proibito l'operazione.", + "common.jsNotAllowed": "Uno script ha proibito l'operazione.", "common.jsParseError": "Esecuzione dello script fallita, errore di sintassi nel Javascript: {message}", "common.jsRejected": "Lo script ha rifiutato l'operazione.", "common.language": "Codice della lingua", diff --git a/backend/i18n/source/backend_nl.json b/backend/i18n/source/backend_nl.json index 3f8a2ba2e..4ece5235e 100644 --- a/backend/i18n/source/backend_nl.json +++ b/backend/i18n/source/backend_nl.json @@ -61,7 +61,7 @@ "common.httpValidationError": "Validatiefout", "common.initialStep": "Eerste stap", "common.jsError": "Kan script niet uitvoeren met Javascript-fout: {message}", - "common.jsNotAlloweed": "Script heeft de bewerking verboden.", + "common.jsNotAllowed": "Script heeft de bewerking verboden.", "common.jsParseError": "Kan script niet uitvoeren met Javascript-syntaxisfout: {message}", "common.jsRejected": "Script heeft de bewerking afgewezen.", "common.language": "Taalcode", diff --git a/backend/src/Squidex.Domain.Apps.Core.Model/Apps/Json/RolesConverter.cs b/backend/src/Squidex.Domain.Apps.Core.Model/Apps/Json/RolesConverter.cs index e7700d066..d098b5f4a 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Model/Apps/Json/RolesConverter.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Model/Apps/Json/RolesConverter.cs @@ -25,7 +25,7 @@ namespace Squidex.Domain.Apps.Core.Apps.Json json.Add(role.Name, new JsonRole { Permissions = role.Permissions.ToIds().ToArray(), - Properties = role.Properties, + Properties = role.Properties }); } diff --git a/backend/src/Squidex.Domain.Apps.Core.Model/Apps/Roles.cs b/backend/src/Squidex.Domain.Apps.Core.Model/Apps/Roles.cs index 0851e72b2..ff3c7577d 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Model/Apps/Roles.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Model/Apps/Roles.cs @@ -55,7 +55,7 @@ namespace Squidex.Domain.Apps.Core.Apps Clean(Permissions.AppRules), Clean(Permissions.AppSchemas), Clean(Permissions.AppWorkflows)), - JsonValue.Object()), + JsonValue.Object()) }; public static readonly Roles Empty = new Roles(new ImmutableDictionary()); diff --git a/backend/src/Squidex.Domain.Apps.Core.Model/Contents/Status.cs b/backend/src/Squidex.Domain.Apps.Core.Model/Contents/Status.cs index a275cf051..e3ac0a3fc 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Model/Contents/Status.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Model/Contents/Status.cs @@ -12,7 +12,7 @@ using System.Diagnostics.CodeAnalysis; namespace Squidex.Domain.Apps.Core.Contents { [TypeConverter(typeof(StatusConverter))] - public struct Status : IEquatable, IComparable + public readonly struct Status : IEquatable, IComparable { public static readonly Status Archived = new Status("Archived"); public static readonly Status Draft = new Status("Draft"); diff --git a/backend/src/Squidex.Domain.Apps.Core.Model/Schemas/NestedField{T}.cs b/backend/src/Squidex.Domain.Apps.Core.Model/Schemas/NestedField{T}.cs index c0c9b1be5..d338789d6 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Model/Schemas/NestedField{T}.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Model/Schemas/NestedField{T}.cs @@ -55,7 +55,7 @@ namespace Squidex.Domain.Apps.Core.Schemas properties.Freeze(); } - private T ValidateProperties(FieldProperties newProperties) + private static T ValidateProperties(FieldProperties newProperties) { Guard.NotNull(newProperties, nameof(newProperties)); diff --git a/backend/src/Squidex.Domain.Apps.Core.Model/Schemas/RootField{T}.cs b/backend/src/Squidex.Domain.Apps.Core.Model/Schemas/RootField{T}.cs index 460540181..1365bfaf9 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Model/Schemas/RootField{T}.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Model/Schemas/RootField{T}.cs @@ -53,7 +53,7 @@ namespace Squidex.Domain.Apps.Core.Schemas properties.Freeze(); } - private T ValidateProperties(FieldProperties newProperties) + private static T ValidateProperties(FieldProperties newProperties) { Guard.NotNull(newProperties, nameof(newProperties)); diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleEventFormatter.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleEventFormatter.cs index 8abfe30a8..820d25176 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleEventFormatter.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleEventFormatter.cs @@ -137,7 +137,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules return CombineParts(text, parts); } - private string CombineParts(string text, List parts) + private static string CombineParts(string text, List parts) { var span = text.AsSpan(); @@ -225,7 +225,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules return default; } - private (bool IsNew, Match) Match(string test) + private static (bool IsNew, Match) Match(string test) { var match = RegexPatternNew.Match(test); diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/Extensions/HttpJintExtension.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/Extensions/HttpJintExtension.cs index adf4ea1d8..1e805ae3b 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/Extensions/HttpJintExtension.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/Extensions/HttpJintExtension.cs @@ -102,7 +102,7 @@ namespace Squidex.Domain.Apps.Core.Scripting.Extensions return request; } - private async Task ParseResponse(ExecutionContext context, HttpResponseMessage response) + private static async Task ParseResponse(ExecutionContext context, HttpResponseMessage response) { var responseString = await response.Content.ReadAsStringAsync(); diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptOperations.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptOperations.cs index 6f8b684d8..a7a320416 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptOperations.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptOperations.cs @@ -16,19 +16,19 @@ namespace Squidex.Domain.Apps.Core.Scripting { private delegate void MessageDelegate(string? message); - private static readonly MessageDelegate Disallow = new MessageDelegate(message => + private static readonly MessageDelegate Disallow = message => { - message = !string.IsNullOrWhiteSpace(message) ? message : T.Get("common.jsNotAlloweed"); + message = !string.IsNullOrWhiteSpace(message) ? message : T.Get("common.jsNotAllowed"); throw new DomainForbiddenException(message); - }); + }; - private static readonly MessageDelegate Reject = new MessageDelegate(message => + private static readonly MessageDelegate Reject = message => { message = !string.IsNullOrWhiteSpace(message) ? message : T.Get("common.jsRejected"); throw new ValidationException(message); - }); + }; public static Engine AddDisallow(this Engine engine) { diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoTextIndex.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoTextIndex.cs index b62c1d59e..00e1e4c9c 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoTextIndex.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/FullText/MongoTextIndex.cs @@ -55,7 +55,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.FullText { switch (command) { - case DeleteIndexEntry delete: + case DeleteIndexEntry _: writes.Add( new DeleteOneModel( Filter.Eq(x => x.DocId, command.DocId))); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppContributors.cs b/backend/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppContributors.cs index 8fb63148c..ad1d43d3b 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppContributors.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppContributors.cs @@ -51,7 +51,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Guards throw new DomainForbiddenException(T.Get("apps.contributors.cannotChangeYourself")); } - if (!contributors.TryGetValue(command.ContributorId, out var role)) + if (!contributors.TryGetValue(command.ContributorId, out _)) { if (plan != null && plan.MaxContributors > 0 && contributors.Count >= plan.MaxContributors) { diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/FileTagAssetMetadataSource.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/FileTagAssetMetadataSource.cs index ee54868d1..054c887f5 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/FileTagAssetMetadataSource.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/FileTagAssetMetadataSource.cs @@ -59,7 +59,7 @@ namespace Squidex.Domain.Apps.Entities.Assets return Task.CompletedTask; } - private void Enhance(UploadAssetCommand command) + private static void Enhance(UploadAssetCommand command) { try { diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/BulkUpdateCommandMiddleware.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/BulkUpdateCommandMiddleware.cs index c78165ee5..167e0a186 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/BulkUpdateCommandMiddleware.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/BulkUpdateCommandMiddleware.cs @@ -102,7 +102,7 @@ namespace Squidex.Domain.Apps.Entities.Contents case BulkUpdateType.Delete: { - if (id == null || id == default) + if (id == null || id.Value == default) { throw new DomainObjectNotFoundException("undefined"); } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs index 7c7fb62b2..5ee6bfd46 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs @@ -114,7 +114,7 @@ namespace Squidex.Domain.Apps.Entities.Contents CheckErrors(validator); } - private void CheckErrors(ContentValidator validator) + private static void CheckErrors(ContentValidator validator) { if (validator.Errors.Count > 0) { diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentsSearchSource.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentsSearchSource.cs index 77f5a415b..d63c5c0ba 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentsSearchSource.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/ContentsSearchSource.cs @@ -109,7 +109,7 @@ namespace Squidex.Domain.Apps.Entities.Contents return context.Permissions.Allows(permission); } - private string FormatName(IEnrichedContentEntity content, string masterLanguage) + private static string FormatName(IEnrichedContentEntity content, string masterLanguage) { var sb = new StringBuilder(); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLExecutionContext.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLExecutionContext.cs index 7510ad28a..ae90b2f34 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLExecutionContext.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLExecutionContext.cs @@ -33,8 +33,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL public ICommandBus CommandBus { get; } - public ISemanticLog Log { get; } - public GraphQLExecutionContext(Context context, IServiceProvider resolver) : base(context .WithoutCleanup() diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentActions.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentActions.cs index 8b93e9e91..6637ffacd 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentActions.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentActions.cs @@ -37,7 +37,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types } }; - public static readonly ValueResolver Resolver = new ValueResolver((value, c) => + public static readonly ValueResolver Resolver = (value, c) => { if (c.Arguments.TryGetValue("path", out var p) && p is string path) { @@ -47,7 +47,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types } return value; - }); + }; } public static readonly QueryArguments JsonPath = new QueryArguments @@ -124,7 +124,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types Description = "Optional OData full text search.", DefaultValue = string.Empty, ResolvedType = AllTypes.String - }, + } }; } @@ -152,7 +152,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types Name = "data", Description = "The data for the content.", DefaultValue = null, - ResolvedType = new NonNullGraphType(inputType), + ResolvedType = new NonNullGraphType(inputType) }, new QueryArgument(AllTypes.None) { @@ -194,7 +194,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types Name = "data", Description = "The data for the content.", DefaultValue = null, - ResolvedType = new NonNullGraphType(inputType), + ResolvedType = new NonNullGraphType(inputType) }, new QueryArgument(AllTypes.None) { diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ConvertData.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ConvertData.cs index 698adb036..661ad32a2 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ConvertData.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ConvertData.cs @@ -38,8 +38,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries.Steps public async Task EnrichAsync(Context context, IEnumerable contents, ProvideSchema schemas) { - var resolveDataDraft = context.ShouldProvideUnpublished() || context.IsFrontendClient; - var referenceCleaner = await CleanReferencesAsync(context, contents, schemas); var converters = GenerateConverters(context, referenceCleaner).ToArray(); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ResolveAssets.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ResolveAssets.cs index e41056e11..b03294697 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ResolveAssets.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ResolveAssets.cs @@ -125,7 +125,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries.Steps return assets.ToLookup(x => x.Id); } - private void AddAssetIds(HashSet ids, ISchemaEntity schema, IEnumerable contents) + private static void AddAssetIds(HashSet ids, ISchemaEntity schema, IEnumerable contents) { foreach (var content in contents) { diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ResolveReferences.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ResolveReferences.cs index d2ed3f649..d88b61e39 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ResolveReferences.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ResolveReferences.cs @@ -141,7 +141,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries.Steps return value; } - private void AddReferenceIds(HashSet ids, ISchemaEntity schema, IEnumerable contents) + private static void AddReferenceIds(HashSet ids, ISchemaEntity schema, IEnumerable contents) { foreach (var content in contents) { diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ScriptContent.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ScriptContent.cs index 2baecf6a9..c67fb4691 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ScriptContent.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/Steps/ScriptContent.cs @@ -36,8 +36,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries.Steps if (!string.IsNullOrWhiteSpace(script)) { - var results = new List(); - await Task.WhenAll(group.Select(x => TransformAsync(context, script, x))); } } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Elastic/ElasticSearchTextIndex.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Elastic/ElasticSearchTextIndex.cs index c031b44e4..c09116f81 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Elastic/ElasticSearchTextIndex.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Text/Elastic/ElasticSearchTextIndex.cs @@ -76,7 +76,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text.Elastic schemaName = upsert.SchemaId.Name, serveAll = upsert.ServeAll, servePublished = upsert.ServePublished, - texts = upsert.Texts, + texts = upsert.Texts }; var result = await client.IndexAsync(indexName, upsert.DocId, CreatePost(data)); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Context.cs b/backend/src/Squidex.Domain.Apps.Entities/Context.cs index d4482fc6b..335250bff 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Context.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Context.cs @@ -26,9 +26,9 @@ namespace Squidex.Domain.Apps.Entities public ClaimsPrincipal User { get; } - public ClaimsPermissions Permissions { get; } = ClaimsPermissions.Empty; + public ClaimsPermissions Permissions { get; } - public bool IsFrontendClient { get; private set; } + public bool IsFrontendClient { get; } public Context(ClaimsPrincipal user) { diff --git a/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuerGrain.cs b/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuerGrain.cs index dcbe3a8e1..cb8a15375 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuerGrain.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuerGrain.cs @@ -112,7 +112,7 @@ namespace Squidex.Domain.Apps.Entities.Rules ExecutionResult = response.Status, Finished = now, JobNext = jobDelay, - JobResult = ComputeJobResult(response.Status, jobDelay) + JobResult = jobResult }; await ruleEventRepository.UpdateAsync(@event.Job, update); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Schemas/Indexes/SchemasIndex.cs b/backend/src/Squidex.Domain.Apps.Entities/Schemas/Indexes/SchemasIndex.cs index 04a485c07..a9a1646ab 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Schemas/Indexes/SchemasIndex.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Schemas/Indexes/SchemasIndex.cs @@ -211,12 +211,12 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Indexes return schema; } - private string GetCacheKey(Guid appId, string name) + private static string GetCacheKey(Guid appId, string name) { return $"SCHEMAS_NAME_{appId}_{name}"; } - private string GetCacheKey(Guid appId, Guid id) + private static string GetCacheKey(Guid appId, Guid id) { return $"SCHEMAS_ID_{appId}_{id}"; } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Schemas/SchemaDomainObject.cs b/backend/src/Squidex.Domain.Apps.Entities/Schemas/SchemaDomainObject.cs index 56557a005..23f39952c 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Schemas/SchemaDomainObject.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Schemas/SchemaDomainObject.cs @@ -45,17 +45,6 @@ namespace Squidex.Domain.Apps.Entities.Schemas Add(c); - long id; - - if (c.ParentFieldId == null) - { - id = Snapshot.SchemaDef.FieldsByName[c.Name].Id; - } - else - { - id = ((IArrayField)Snapshot.SchemaDef.FieldsById[c.ParentFieldId.Value]).FieldsByName[c.Name].Id; - } - return Snapshot; }); diff --git a/backend/src/Squidex.Domain.Users.MongoDb/MongoKeyStore.cs b/backend/src/Squidex.Domain.Users.MongoDb/MongoKeyStore.cs index db6b2873d..dcc092a5f 100644 --- a/backend/src/Squidex.Domain.Users.MongoDb/MongoKeyStore.cs +++ b/backend/src/Squidex.Domain.Users.MongoDb/MongoKeyStore.cs @@ -93,7 +93,7 @@ namespace Squidex.Domain.Users.MongoDb } else { - throw ex; + throw; } } } diff --git a/backend/src/Squidex.Domain.Users/DefaultUserResolver.cs b/backend/src/Squidex.Domain.Users/DefaultUserResolver.cs index 6dcc88e57..abacbaa8e 100644 --- a/backend/src/Squidex.Domain.Users/DefaultUserResolver.cs +++ b/backend/src/Squidex.Domain.Users/DefaultUserResolver.cs @@ -94,7 +94,6 @@ namespace Squidex.Domain.Users using (var scope = serviceProvider.CreateScope()) { - var userFactory = scope.ServiceProvider.GetRequiredService(); var userManager = scope.ServiceProvider.GetRequiredService>(); return await userManager.FindByIdWithClaimsAsync(id); diff --git a/backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3AssetStore.cs b/backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3AssetStore.cs index 6e5462c2f..6b8e9b881 100644 --- a/backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3AssetStore.cs +++ b/backend/src/Squidex.Infrastructure.Amazon/Assets/AmazonS3AssetStore.cs @@ -193,7 +193,7 @@ namespace Squidex.Infrastructure.Assets using (tempStream) { - await stream.CopyToAsync(tempStream); + await stream.CopyToAsync(tempStream, ct); request.InputStream = tempStream; diff --git a/backend/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs b/backend/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs index 63194eacb..780b083ef 100644 --- a/backend/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs +++ b/backend/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs @@ -38,7 +38,7 @@ namespace Squidex.Infrastructure.Assets var blobClient = storageAccount.CreateCloudBlobClient(); var blobReference = blobClient.GetContainerReference(containerName); - await blobReference.CreateIfNotExistsAsync(); + await blobReference.CreateIfNotExistsAsync(ct); blobContainer = blobReference; } @@ -70,7 +70,7 @@ namespace Squidex.Infrastructure.Assets { var blob = blobContainer.GetBlockBlobReference(fileName); - await blob.FetchAttributesAsync(); + await blob.FetchAttributesAsync(ct); return blob.Properties.Length; } diff --git a/backend/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs b/backend/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs index b3356a1a2..9116f1475 100644 --- a/backend/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs +++ b/backend/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs @@ -34,7 +34,7 @@ namespace Squidex.Infrastructure.Assets { try { - storageClient = StorageClient.Create(); + storageClient = await StorageClient.CreateAsync(); await storageClient.GetBucketAsync(bucketName, cancellationToken: ct); } diff --git a/backend/src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs b/backend/src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs index 79f45275a..13835a460 100644 --- a/backend/src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs +++ b/backend/src/Squidex.Infrastructure.MongoDb/Assets/MongoGridFsAssetStore.cs @@ -49,7 +49,9 @@ namespace Squidex.Infrastructure.Assets { var name = GetFileName(fileName, nameof(fileName)); - var file = await bucket.Find(Builders>.Filter.Eq(x => x.Id, name)).FirstOrDefaultAsync(); + var query = await bucket.FindAsync(Builders>.Filter.Eq(x => x.Id, name), cancellationToken: ct); + + var file = await query.FirstOrDefaultAsync(cancellationToken: ct); if (file == null) { diff --git a/backend/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoExtensions.cs b/backend/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoExtensions.cs index ac190e8f1..65914372f 100644 --- a/backend/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoExtensions.cs +++ b/backend/src/Squidex.Infrastructure.MongoDb/MongoDb/MongoExtensions.cs @@ -31,7 +31,7 @@ namespace Squidex.Infrastructure.MongoDb Filter = new BsonDocument("name", collectionName) }; - return (await database.ListCollectionNamesAsync(options)).Any(); + return await (await database.ListCollectionNamesAsync(options)).AnyAsync(); } public static async Task InsertOneIfNotExistsAsync(this IMongoCollection collection, T document, CancellationToken ct = default) diff --git a/backend/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs b/backend/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs index 4c62c5f39..5252fe795 100644 --- a/backend/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs +++ b/backend/src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs @@ -34,7 +34,7 @@ namespace Squidex.Infrastructure.Assets.ImageSharp if (!options.IsValid) { - source.CopyTo(destination); + await source.CopyToAsync(destination); return; } @@ -84,7 +84,7 @@ namespace Squidex.Infrastructure.Assets.ImageSharp image.Mutate(x => x.Resize(resizeOptions)); } - image.Save(destination, encoder); + await image.SaveAsync(destination, encoder); } } finally @@ -93,7 +93,7 @@ namespace Squidex.Infrastructure.Assets.ImageSharp } } - private static IImageEncoder GetEncoder(ResizeOptions options, SixLabors.ImageSharp.Formats.IImageFormat? format) + private static IImageEncoder GetEncoder(ResizeOptions options, IImageFormat? format) { var encoder = Configuration.Default.ImageFormatsManager.FindEncoder(format); diff --git a/backend/src/Squidex.Infrastructure/BytesRange.cs b/backend/src/Squidex.Infrastructure/BytesRange.cs index 48585785b..66f8d09e5 100644 --- a/backend/src/Squidex.Infrastructure/BytesRange.cs +++ b/backend/src/Squidex.Infrastructure/BytesRange.cs @@ -9,7 +9,7 @@ using System; namespace Squidex.Infrastructure { - public struct BytesRange + public readonly struct BytesRange { public readonly long? From; diff --git a/backend/src/Squidex.Infrastructure/Email/SmtpEmailSender.cs b/backend/src/Squidex.Infrastructure/Email/SmtpEmailSender.cs index 214fd37e6..4cb3b8323 100644 --- a/backend/src/Squidex.Infrastructure/Email/SmtpEmailSender.cs +++ b/backend/src/Squidex.Infrastructure/Email/SmtpEmailSender.cs @@ -88,7 +88,7 @@ namespace Squidex.Infrastructure.Email { var tcs = new TaskCompletionSource(); - var state = socket.BeginConnect(options.Server, options.Port, tcs.SetResult, null); + socket.BeginConnect(options.Server, options.Port, tcs.SetResult, null); using (ct.Register(() => { diff --git a/backend/src/Squidex.Infrastructure/Log/ISemanticLog.cs b/backend/src/Squidex.Infrastructure/Log/ISemanticLog.cs index 77123f866..4c5e33d2f 100644 --- a/backend/src/Squidex.Infrastructure/Log/ISemanticLog.cs +++ b/backend/src/Squidex.Infrastructure/Log/ISemanticLog.cs @@ -11,7 +11,7 @@ namespace Squidex.Infrastructure.Log { public delegate void LogFormatter(IObjectWriter writer); - public delegate void LogFormatter(T context, IObjectWriter writer); + public delegate void LogFormatter(T context, IObjectWriter writer); public interface ISemanticLog { diff --git a/backend/src/Squidex.Infrastructure/Orleans/J{T}.cs b/backend/src/Squidex.Infrastructure/Orleans/J{T}.cs index 8584b59b5..af70c52e6 100644 --- a/backend/src/Squidex.Infrastructure/Orleans/J{T}.cs +++ b/backend/src/Squidex.Infrastructure/Orleans/J{T}.cs @@ -19,7 +19,7 @@ using Squidex.Infrastructure.Log; namespace Squidex.Infrastructure.Orleans { [Immutable] - public struct J + public readonly struct J { public T Value { get; } diff --git a/backend/src/Squidex.Infrastructure/Tasks/AsyncHelper.cs b/backend/src/Squidex.Infrastructure/Tasks/AsyncHelper.cs index 236a15859..729ceb1b1 100644 --- a/backend/src/Squidex.Infrastructure/Tasks/AsyncHelper.cs +++ b/backend/src/Squidex.Infrastructure/Tasks/AsyncHelper.cs @@ -60,12 +60,12 @@ namespace Squidex.Infrastructure.Tasks var timer = new Timer(_ => batchBlock.TriggerBatch()); - var timerBlock = new TransformBlock((T value) => + var timerBlock = new TransformBlock(value => { timer.Change(timeout, Timeout.Infinite); return value; - }, new ExecutionDataflowBlockOptions() + }, new ExecutionDataflowBlockOptions { BoundedCapacity = 1, CancellationToken = dataflowBlockOptions.CancellationToken, @@ -76,7 +76,7 @@ namespace Squidex.Infrastructure.Tasks TaskScheduler = dataflowBlockOptions.TaskScheduler }); - timerBlock.LinkTo(batchBlock, new DataflowLinkOptions() + timerBlock.LinkTo(batchBlock, new DataflowLinkOptions { PropagateCompletion = true }); diff --git a/backend/src/Squidex.Infrastructure/Translations/ResourcesLocalizer.cs b/backend/src/Squidex.Infrastructure/Translations/ResourcesLocalizer.cs index d785758c5..9950f7028 100644 --- a/backend/src/Squidex.Infrastructure/Translations/ResourcesLocalizer.cs +++ b/backend/src/Squidex.Infrastructure/Translations/ResourcesLocalizer.cs @@ -175,7 +175,7 @@ namespace Squidex.Infrastructure.Translations { if (!missingTranslations.Add(key)) { - File.AppendAllLines(MissingFileName, new string[] { key }); + File.AppendAllLines(MissingFileName, new[] { key }); } } #endif diff --git a/backend/src/Squidex.Infrastructure/ValueStopwatch.cs b/backend/src/Squidex.Infrastructure/ValueStopwatch.cs index 133cfab83..66af46944 100644 --- a/backend/src/Squidex.Infrastructure/ValueStopwatch.cs +++ b/backend/src/Squidex.Infrastructure/ValueStopwatch.cs @@ -9,7 +9,7 @@ using System.Diagnostics; namespace Squidex.Infrastructure { - public struct ValueStopwatch + public readonly struct ValueStopwatch { private const long TicksPerMillisecond = 10000; private const long TicksPerSecond = TicksPerMillisecond * 1000; diff --git a/backend/src/Squidex.Shared/Texts.it.resx b/backend/src/Squidex.Shared/Texts.it.resx index c7d514b36..08b32a3b5 100644 --- a/backend/src/Squidex.Shared/Texts.it.resx +++ b/backend/src/Squidex.Shared/Texts.it.resx @@ -283,7 +283,7 @@ Esecuzione dello script fallita, Errore Javascript: {message} - + Uno script ha proibito l'operazione. diff --git a/backend/src/Squidex.Shared/Texts.nl.resx b/backend/src/Squidex.Shared/Texts.nl.resx index d25c00f8c..0b5bfc1f0 100644 --- a/backend/src/Squidex.Shared/Texts.nl.resx +++ b/backend/src/Squidex.Shared/Texts.nl.resx @@ -283,7 +283,7 @@ Kan script niet uitvoeren met Javascript-fout: {message} - + Script heeft de bewerking verboden. diff --git a/backend/src/Squidex.Shared/Texts.resx b/backend/src/Squidex.Shared/Texts.resx index 90498f527..9755c2e6d 100644 --- a/backend/src/Squidex.Shared/Texts.resx +++ b/backend/src/Squidex.Shared/Texts.resx @@ -283,7 +283,7 @@ Failed to execute script with Javascript error: {message} - + Script has forbidden the operation. diff --git a/backend/src/Squidex.Web/Deferred.cs b/backend/src/Squidex.Web/Deferred.cs index 7367c639d..bda383f0e 100644 --- a/backend/src/Squidex.Web/Deferred.cs +++ b/backend/src/Squidex.Web/Deferred.cs @@ -11,7 +11,7 @@ using Squidex.Infrastructure; namespace Squidex.Web { - public struct Deferred + public readonly struct Deferred { private readonly Lazy> value; diff --git a/backend/src/Squidex.Web/Pipeline/ApiCostsFilter.cs b/backend/src/Squidex.Web/Pipeline/ApiCostsFilter.cs index 05df7513f..adb7e5cce 100644 --- a/backend/src/Squidex.Web/Pipeline/ApiCostsFilter.cs +++ b/backend/src/Squidex.Web/Pipeline/ApiCostsFilter.cs @@ -6,6 +6,7 @@ // ========================================================================== using System; +using System.Globalization; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc.Filters; @@ -64,7 +65,7 @@ namespace Squidex.Web.Pipeline } } - context.HttpContext.Response.Headers.Add("X-Costs", FilterDefinition.Costs.ToString()); + context.HttpContext.Response.Headers.Add("X-Costs", FilterDefinition.Costs.ToString(CultureInfo.InvariantCulture)); } await next(); diff --git a/backend/src/Squidex.Web/Pipeline/AppResolver.cs b/backend/src/Squidex.Web/Pipeline/AppResolver.cs index 42023a9c6..d88061e0f 100644 --- a/backend/src/Squidex.Web/Pipeline/AppResolver.cs +++ b/backend/src/Squidex.Web/Pipeline/AppResolver.cs @@ -6,7 +6,6 @@ // ========================================================================== using System; -using System.Collections.Generic; using System.Linq; using System.Security.Claims; using System.Threading.Tasks; @@ -106,7 +105,7 @@ namespace Squidex.Web.Pipeline await next(); } - private Context SetContext(HttpContext httpContext, IAppEntity app) + private static Context SetContext(HttpContext httpContext, IAppEntity app) { var requestContext = new Context(httpContext.User, app); diff --git a/backend/src/Squidex/Areas/Api/Config/OpenApi/OpenApiServices.cs b/backend/src/Squidex/Areas/Api/Config/OpenApi/OpenApiServices.cs index d3b31e8d0..995d21954 100644 --- a/backend/src/Squidex/Areas/Api/Config/OpenApi/OpenApiServices.cs +++ b/backend/src/Squidex/Areas/Api/Config/OpenApi/OpenApiServices.cs @@ -17,6 +17,7 @@ using Squidex.Areas.Api.Controllers.Rules.Models; using Squidex.Domain.Apps.Core.Assets; using Squidex.Domain.Apps.Core.Contents; using Squidex.Infrastructure; +using Squidex.Infrastructure.Json.Objects; namespace Squidex.Areas.Api.Config.OpenApi { @@ -76,18 +77,24 @@ namespace Squidex.Areas.Api.Config.OpenApi CreateStringMap(), CreateStringMap(), - new PrimitiveTypeMapper(typeof(AssetMetadata), schema => - { - schema.Type = JsonObjectType.Object; - - schema.AdditionalPropertiesSchema = new JsonSchema - { - Description = "Any JSON type" - }; - }) + CreateObjectMap(), + CreateObjectMap() }; } + private static ITypeMapper CreateObjectMap() + { + return new PrimitiveTypeMapper(typeof(T), schema => + { + schema.Type = JsonObjectType.Object; + + schema.AdditionalPropertiesSchema = new JsonSchema + { + Description = "Any JSON type" + }; + }); + } + private static ITypeMapper CreateStringMap(string? format = null) { return new PrimitiveTypeMapper(typeof(T), schema => diff --git a/backend/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs b/backend/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs index 2ae96ef8f..ff639f516 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs @@ -108,7 +108,6 @@ namespace Squidex.Areas.Api.Controllers.Apps var response = Deferred.Response(() => { var userOrClientId = HttpContext.User.UserOrClientId()!; - var userPermissions = Resources.Permissions; var isFrontend = HttpContext.User.IsInClient(DefaultClients.Frontend); @@ -217,7 +216,7 @@ namespace Squidex.Areas.Api.Controllers.Apps try { - await assetStore.DownloadAsync(resizedAsset, body); + await assetStore.DownloadAsync(resizedAsset, body, ct: ct); } catch (AssetNotFoundException) { diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs index b63863cbc..27ca3afbb 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs @@ -143,7 +143,7 @@ namespace Squidex.Areas.Api.Controllers.Assets if (asset.Type == AssetType.Image && resizeOptions.IsValid) { - callback = new FileCallback(async (bodyStream, range, ct) => + callback = async (bodyStream, range, ct) => { var resizedAsset = $"{asset.Id}_{asset.FileVersion}_{resizeOptions}"; @@ -162,16 +162,16 @@ namespace Squidex.Areas.Api.Controllers.Assets await ResizeAsync(asset, bodyStream, resizedAsset, resizeOptions, false, ct); } } - }); + }; } else { contentLength = asset.FileSize; - callback = new FileCallback(async (bodyStream, range, ct) => + callback = async (bodyStream, range, ct) => { await assetFileStore.DownloadAsync(asset.Id, asset.FileVersion, bodyStream, range, ct); - }); + }; } return new FileCallbackResult(asset.MimeType, callback) diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetFoldersController.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetFoldersController.cs index 585f402a9..4bf1a82d5 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetFoldersController.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetFoldersController.cs @@ -85,7 +85,7 @@ namespace Squidex.Areas.Api.Controllers.Assets { var command = request.ToCommand(); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return CreatedAtAction(nameof(GetAssetFolders), new { parentId = request.ParentId, app }, response); } @@ -111,7 +111,7 @@ namespace Squidex.Areas.Api.Controllers.Assets { var command = request.ToCommand(id); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -136,7 +136,7 @@ namespace Squidex.Areas.Api.Controllers.Assets { var command = request.ToFolderCommand(id); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -161,7 +161,7 @@ namespace Squidex.Areas.Api.Controllers.Assets return NoContent(); } - private async Task InvokeCommandAsync(string app, ICommand command) + private async Task InvokeCommandAsync(ICommand command) { var context = await CommandBus.PublishAsync(command); diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs index a4d3f16bf..7c6ffdc2c 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs @@ -193,7 +193,7 @@ namespace Squidex.Areas.Api.Controllers.Assets var command = new CreateAsset { File = assetFile, ParentId = parentId }; - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return CreatedAtAction(nameof(GetAsset), new { app, id = response.Id }, response); } @@ -223,7 +223,7 @@ namespace Squidex.Areas.Api.Controllers.Assets var command = new UpdateAsset { File = assetFile, AssetId = id }; - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -249,7 +249,7 @@ namespace Squidex.Areas.Api.Controllers.Assets { var command = request.ToCommand(id); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -274,7 +274,7 @@ namespace Squidex.Areas.Api.Controllers.Assets { var command = request.ToCommand(id); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -299,7 +299,7 @@ namespace Squidex.Areas.Api.Controllers.Assets return NoContent(); } - private async Task InvokeCommandAsync(string app, ICommand command) + private async Task InvokeCommandAsync(ICommand command) { var context = await CommandBus.PublishAsync(command); diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs index d737a0f11..0b6e48454 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs @@ -201,8 +201,6 @@ namespace Squidex.Areas.Api.Controllers.Assets.Models response.AddDeleteLink("delete", resources.Url(x => nameof(x.DeleteAsset), values)); } - var version = response.FileVersion; - if (!string.IsNullOrWhiteSpace(response.Slug)) { response.AddGetLink("content", resources.Url(x => nameof(x.GetAssetContentBySlug), new { app, idOrSlug = response.Id, more = response.Slug })); diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFoldersDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFoldersDto.cs index b69f814c0..429883e24 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFoldersDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFoldersDto.cs @@ -38,7 +38,7 @@ namespace Squidex.Areas.Api.Controllers.Assets.Models var response = new AssetFoldersDto { Total = assetFolders.Total, - Items = assetFolders.Select(x => AssetFolderDto.FromAssetFolder(x, resources)).ToArray(), + Items = assetFolders.Select(x => AssetFolderDto.FromAssetFolder(x, resources)).ToArray() }; response.Path = path.Select(x => AssetFolderDto.FromAssetFolder(x, resources)).ToArray(); diff --git a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/GraphQLGetDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/GraphQLGetDto.cs index 45644abae..e8b2c574f 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/GraphQLGetDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/GraphQLGetDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using GraphQL; using GraphQL.NewtonsoftJson; using Squidex.Domain.Apps.Entities.Contents.GraphQL; using Squidex.Infrastructure.Reflection; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/GraphQLPostDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/GraphQLPostDto.cs index 79156fe43..efb19cc8e 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/GraphQLPostDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Contents/Models/GraphQLPostDto.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using GraphQL; using GraphQL.NewtonsoftJson; using Newtonsoft.Json.Linq; using Squidex.Domain.Apps.Entities.Contents.GraphQL; diff --git a/backend/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs b/backend/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs index e8b6f72f6..01a9d2b8f 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Rules/RulesController.cs @@ -120,7 +120,7 @@ namespace Squidex.Areas.Api.Controllers.Rules { var command = request.ToCommand(); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return CreatedAtAction(nameof(GetRules), new { app }, response); } @@ -164,7 +164,7 @@ namespace Squidex.Areas.Api.Controllers.Rules { var command = request.ToCommand(id); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -187,7 +187,7 @@ namespace Squidex.Areas.Api.Controllers.Rules { var command = new EnableRule { RuleId = id }; - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -210,7 +210,7 @@ namespace Squidex.Areas.Api.Controllers.Rules { var command = new DisableRule { RuleId = id }; - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -356,7 +356,7 @@ namespace Squidex.Areas.Api.Controllers.Rules return NoContent(); } - private async Task InvokeCommandAsync(string app, ICommand command) + private async Task InvokeCommandAsync(ICommand command) { var context = await CommandBus.PublishAsync(command); diff --git a/backend/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs b/backend/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs index 6a0e2e91b..b4cc1841d 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Schemas/SchemasController.cs @@ -121,7 +121,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas { var command = request.ToCommand(); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return CreatedAtAction(nameof(GetSchema), new { app, name = request.Name }, response); } @@ -146,7 +146,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas { var command = request.ToCommand(); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -171,7 +171,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas { var command = request.ToCommand(); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -195,7 +195,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas { var command = request.ToCommand(); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -220,7 +220,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas { var command = request.ToCommand(); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -245,7 +245,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas { var command = request.ToCommand(); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -270,7 +270,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas { var command = request.ToCommand(); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -293,7 +293,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas { var command = new PublishSchema(); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -316,7 +316,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas { var command = new UnpublishSchema(); - var response = await InvokeCommandAsync(app, command); + var response = await InvokeCommandAsync(command); return Ok(response); } @@ -341,7 +341,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas return NoContent(); } - private async Task InvokeCommandAsync(string app, ICommand command) + private async Task InvokeCommandAsync(ICommand command) { var context = await CommandBus.PublishAsync(command); diff --git a/backend/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs b/backend/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs index 05696fd59..26489bf67 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs @@ -176,7 +176,7 @@ namespace Squidex.Areas.Api.Controllers.Users } catch { - await body.WriteAsync(AvatarBytes); + await body.WriteAsync(AvatarBytes, ct); } }); diff --git a/backend/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml b/backend/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml index 02a8c9fa5..22f17675e 100644 --- a/backend/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml +++ b/backend/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml @@ -1,7 +1,7 @@ @model Squidex.Areas.IdentityServer.Controllers.Account.LoginVM @{ - var action = Model.IsLogin ? @T.Get("common.login") : @T.Get("common.signup"); + var action = Model.IsLogin ? T.Get("common.login") : T.Get("common.signup"); ViewBag.Title = action; } diff --git a/backend/src/Squidex/Areas/IdentityServer/Views/Error/Error.cshtml b/backend/src/Squidex/Areas/IdentityServer/Views/Error/Error.cshtml index e6618d5a0..5775b1ec8 100644 --- a/backend/src/Squidex/Areas/IdentityServer/Views/Error/Error.cshtml +++ b/backend/src/Squidex/Areas/IdentityServer/Views/Error/Error.cshtml @@ -3,7 +3,7 @@ @{ ViewBag.Theme = "white"; - ViewBag.Title = @T.Get("users.error.title"); + ViewBag.Title = T.Get("users.error.title"); } diff --git a/backend/src/Squidex/Areas/IdentityServer/Views/Profile/Profile.cshtml b/backend/src/Squidex/Areas/IdentityServer/Views/Profile/Profile.cshtml index f7f1fbe82..6f5ba85f6 100644 --- a/backend/src/Squidex/Areas/IdentityServer/Views/Profile/Profile.cshtml +++ b/backend/src/Squidex/Areas/IdentityServer/Views/Profile/Profile.cshtml @@ -3,14 +3,14 @@ @{ ViewBag.Class = "profile-lg"; - ViewBag.Title = @T.Get("users.profile.title"); + ViewBag.Title = T.Get("users.profile.title"); void RenderValidation(string field) { @if (ViewContext.ViewData.ModelState[field]?.ValidationState == Microsoft.AspNetCore.Mvc.ModelBinding.ModelValidationState.Invalid) {
- @Html.ValidationMessage(field) + Html.ValidationMessage(field)
} } @@ -278,13 +278,13 @@ } document.addEventListener('click', - function (event) { + function(event) { if (event.target.className.indexOf('remove-item') >= 0) { event.target.parentNode.parentNode.remove(); updateNames(); } - }) + }); pictureButton.addEventListener('click', function () { diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/RolesJsonTests.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/RolesJsonTests.cs index afd040de0..6bae7a9c6 100644 --- a/backend/tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/RolesJsonTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/RolesJsonTests.cs @@ -22,7 +22,7 @@ namespace Squidex.Domain.Apps.Core.Model.Apps { var source = new Dictionary { - ["Custom"] = new string[] + ["Custom"] = new[] { "Permission1", "Permission2" diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/EventSynchronization/SchemaSynchronizerTests.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/EventSynchronization/SchemaSynchronizerTests.cs index 2ddaedda2..8b1d02d17 100644 --- a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/EventSynchronization/SchemaSynchronizerTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/EventSynchronization/SchemaSynchronizerTests.cs @@ -560,9 +560,6 @@ namespace Squidex.Domain.Apps.Core.Operations.EventSynchronization [Fact] public void Should_create_events_if_nested_fields_reordered() { - var id1 = NamedId.Of(1, "f1"); - var id2 = NamedId.Of(2, "f1"); - var sourceSchema = new Schema("source") .AddArray(arrayId.Id, arrayId.Name, Partitioning.Invariant, f => f diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/ExpressionsAttribute.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/ExpressionsAttribute.cs index 7061e54fd..0bdf9be5c 100644 --- a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/ExpressionsAttribute.cs +++ b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/ExpressionsAttribute.cs @@ -44,7 +44,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules { yield return new object[] { - string.Format("Script(`{0}`)", script) + $"Script(`{script}`)" }; } @@ -52,7 +52,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules { yield return new object[] { - string.Format("Liquid({0})", liquid) + $"Liquid({liquid})" }; } } diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterCompareTests.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterCompareTests.cs index 47ce32722..7936c857e 100644 --- a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterCompareTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterCompareTests.cs @@ -46,7 +46,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules { public (bool Match, ValueTask) Format(EnrichedEvent @event, object value, string[] path) { - if (path[0] == "data" && value is JsonArray _) + if (path[0] == "data" && value is JsonArray) { return (true, GetValueAsync()); } @@ -54,7 +54,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules return default; } - private async ValueTask GetValueAsync() + private static async ValueTask GetValueAsync() { await Task.Delay(5); @@ -79,8 +79,6 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules A.CallTo(() => user.Claims) .Returns(new List { new Claim(SquidexClaimTypes.DisplayName, "me") }); - JintScriptEngine scriptEngine = BuildScriptEngine(); - var formatters = new IRuleEventFormatter[] { new PredefinedPatternsFormatter(urlGenerator), diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs index 1f925ffd5..457b46e2b 100644 --- a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs @@ -43,7 +43,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules { public (bool Match, ValueTask) Format(EnrichedEvent @event, object value, string[] path) { - if (path[0] == "data" && value is JsonArray _) + if (path[0] == "data" && value is JsonArray) { return (true, GetValueAsync()); } @@ -51,7 +51,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules return default; } - private async ValueTask GetValueAsync() + private static async ValueTask GetValueAsync() { await Task.Delay(5); @@ -76,8 +76,6 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules A.CallTo(() => user.Claims) .Returns(new List { new Claim(SquidexClaimTypes.DisplayName, "me") }); - JintScriptEngine scriptEngine = BuildScriptEngine(); - var formatters = new IRuleEventFormatter[] { new PredefinedPatternsFormatter(urlGenerator), diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/AssetsValidatorTests.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/AssetsValidatorTests.cs index 4fbb5c013..befbc31bd 100644 --- a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/AssetsValidatorTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/AssetsValidatorTests.cs @@ -224,10 +224,10 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators private IValidator Validator(AssetsFieldProperties properties) { - return new AssetsValidator(properties, new CheckAssets(ids => + return new AssetsValidator(properties, ids => { return Task.FromResult>(new List { document, image1, image2 }); - })); + }); } } } diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/ReferencesValidatorTests.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/ReferencesValidatorTests.cs index 2fd98f043..96425392e 100644 --- a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/ReferencesValidatorTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/ReferencesValidatorTests.cs @@ -72,7 +72,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent private static CheckContentsByIds FoundReferences(params (Guid SchemaId, Guid Id)[] references) { - return new CheckContentsByIds(x => Task.FromResult>(references.ToList())); + return x => Task.FromResult>(references.ToList()); } } } diff --git a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/UniqueValidatorTests.cs b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/UniqueValidatorTests.cs index 649212b39..86f6175ee 100644 --- a/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/UniqueValidatorTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/UniqueValidatorTests.cs @@ -86,12 +86,12 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators private CheckUniqueness Check(Guid id, Action? filter = null) { - return new CheckUniqueness(filterNode => + return filterNode => { filter?.Invoke(filterNode.ToString()); return Task.FromResult>(new List<(Guid, Guid)> { (schemaId, id) }); - }); + }; } } } diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Apps/DefaultAppLogStoreTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Apps/DefaultAppLogStoreTests.cs index 12c003cf7..5813889ce 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Apps/DefaultAppLogStoreTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Apps/DefaultAppLogStoreTests.cs @@ -85,8 +85,7 @@ namespace Squidex.Domain.Apps.Entities.Apps using (var reader = new StreamReader(stream)) { - string? line = null; - while ((line = reader.ReadLine()) != null) + while ((await reader.ReadLineAsync()) != null) { lines++; } diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Apps/Guards/GuardAppRolesTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Apps/Guards/GuardAppRolesTests.cs index b0af8856e..e281b6214 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Apps/Guards/GuardAppRolesTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Apps/Guards/GuardAppRolesTests.cs @@ -10,7 +10,6 @@ using Squidex.Domain.Apps.Core.TestHelpers; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Domain.Apps.Entities.TestHelpers; using Squidex.Infrastructure; -using Squidex.Infrastructure.Json.Objects; using Squidex.Infrastructure.Validation; using Xunit; diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/FileTagAssetMetadataSourceTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/FileTagAssetMetadataSourceTests.cs index d6592251d..a3095f472 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/FileTagAssetMetadataSourceTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/FileTagAssetMetadataSourceTests.cs @@ -121,7 +121,7 @@ namespace Squidex.Domain.Apps.Entities.Assets Assert.Empty(formatted); } - private UploadAssetCommand Command(string path) + private static UploadAssetCommand Command(string path) { var file = new FileInfo(Path.Combine("Assets", "TestFiles", path)); @@ -131,7 +131,7 @@ namespace Squidex.Domain.Apps.Entities.Assets }; } - private UploadAssetCommand FakeCommand(string name) + private static UploadAssetCommand FakeCommand(string name) { var stream = new MemoryStream(); diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/ImageAssetMetadataSourceTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/ImageAssetMetadataSourceTests.cs index ee87d08c8..a8070233b 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/ImageAssetMetadataSourceTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/ImageAssetMetadataSourceTests.cs @@ -139,7 +139,7 @@ namespace Squidex.Domain.Apps.Entities.Assets { var source = new AssetEntity { - Metadata = new AssetMetadata() + Metadata = new AssetMetadata { ["pixelWidth"] = JsonValue.Create(128), ["pixelHeight"] = JsonValue.Create(55) diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/RecursiveDeleterTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/RecursiveDeleterTests.cs index 8c6f8ae29..033c8e282 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/RecursiveDeleterTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/RecursiveDeleterTests.cs @@ -59,7 +59,7 @@ namespace Squidex.Domain.Apps.Entities.Assets { IEventConsumer consumer = sut; - Assert.Equal(typeof(RecursiveDeleter).Name, consumer.Name); + Assert.Equal(nameof(RecursiveDeleter), consumer.Name); } [Fact] diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentTriggerHandlerTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentTriggerHandlerTests.cs index addf2f834..95b7b8c69 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentTriggerHandlerTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Comments/CommentTriggerHandlerTests.cs @@ -255,7 +255,7 @@ namespace Squidex.Domain.Apps.Entities.Comments }); } - private IUser CreateUser(string id, string email = "sebastian@squidex.io") + private static IUser CreateUser(string id, string email = "sebastian@squidex.io") { var user = A.Fake(); diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs index 9c9a8ab79..05e72aef9 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs @@ -587,7 +587,7 @@ namespace Squidex.Domain.Apps.Entities.Contents return A.That.Matches(x => M(x, newData, oldData, newStatus, oldStatus)); } - private ScriptOptions ScriptOptions() + private static ScriptOptions ScriptOptions() { return A.That.Matches(x => x.CanDisallow && x.CanReject && x.AsContext); } diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs index 7952ab499..617c4a0c0 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/TestAsset.cs @@ -109,7 +109,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL pixelWidth = asset.Metadata.GetPixelWidth(), pixelHeight = asset.Metadata.GetPixelHeight() }, - slug = asset.Slug, + slug = asset.Slug }; } } diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs index 06b2099c2..b15c67303 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs @@ -233,8 +233,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guard [Fact] public void CreateDraft_should_throw_exception_if_not_published() { - var schema = CreateSchema(false); - var content = CreateContent(Status.Draft); var command = new CreateContentDraft(); @@ -244,8 +242,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guard [Fact] public void CreateDraft_should_not_throw_exception() { - var schema = CreateSchema(false); - var content = CreateContent(Status.Published); var command = new CreateContentDraft(); @@ -255,8 +251,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guard [Fact] public void CanDeleteDraft_should_throw_exception_if_no_draft_found() { - var schema = CreateSchema(false); - var content = new ContentState(); var command = new DeleteContentDraft(); @@ -266,8 +260,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guard [Fact] public void CanDeleteDraft_should_not_throw_exception() { - var schema = CreateSchema(false); - var content = CreateDraftContent(Status.Draft); var command = new DeleteContentDraft(); @@ -311,7 +303,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guard return Mocks.Schema(appId, NamedId.Of(Guid.NewGuid(), "my-schema"), new Schema("schema", isSingleton: isSingleton)); } - private ContentState CreateDraftContent(Status status) + private static ContentState CreateDraftContent(Status status) { return new ContentState { @@ -319,7 +311,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guard }; } - private ContentState CreateContent(Status status) + private static ContentState CreateContent(Status status) { return new ContentState { diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/ContentsQueryFixture.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/ContentsQueryFixture.cs index 821c583e9..7eb49f05b 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/ContentsQueryFixture.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/MongoDb/ContentsQueryFixture.cs @@ -37,13 +37,13 @@ namespace Squidex.Domain.Apps.Entities.Contents.MongoDb public IContentRepository ContentRepository { get; } - public NamedId[] AppIds { get; } = new[] + public NamedId[] AppIds { get; } = { NamedId.Of(Guid.Parse("3b5ba909-e5a5-4858-9d0d-df4ff922d452"), "my-app1"), NamedId.Of(Guid.Parse("4b3672c1-97c6-4e0b-a067-71e9e9a29db9"), "my-app1") }; - public NamedId[] SchemaIds { get; } = new[] + public NamedId[] SchemaIds { get; } = { NamedId.Of(Guid.Parse("3b5ba909-e5a5-4858-9d0d-df4ff922d452"), "my-schema1"), NamedId.Of(Guid.Parse("4b3672c1-97c6-4e0b-a067-71e9e9a29db9"), "my-schema2"), diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ResolveReferencesTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ResolveReferencesTests.cs index 2c7ff323c..9712889a8 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ResolveReferencesTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ResolveReferencesTests.cs @@ -107,8 +107,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries await sut.EnrichAsync(requestContext, contents, schemaProvider); - var enriched1 = contents[0]; - A.CallTo(() => requestCache.AddDependency(refSchemaId1.Id, 0)) .MustHaveHappened(); diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ScriptContentTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ScriptContentTests.cs index 5fb335832..4cd1ed685 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ScriptContentTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ScriptContentTests.cs @@ -109,7 +109,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries .MustHaveHappened(); } - private ScriptOptions ScriptOptions() + private static ScriptOptions ScriptOptions() { return A.That.Matches(x => x.AsContext); } diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ReferenceFluidExtensionTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ReferenceFluidExtensionTests.cs index 39bba76a9..f0cda4378 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ReferenceFluidExtensionTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ReferenceFluidExtensionTests.cs @@ -85,7 +85,7 @@ namespace Squidex.Domain.Apps.Entities.Contents Assert.Equal(expected, result); } - private IEnrichedContentEntity CreateReference(Guid referenceId, int index) + private static IEnrichedContentEntity CreateReference(Guid referenceId, int index) { return new ContentEntity { diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/CachingTextIndexerStateTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/CachingTextIndexerStateTests.cs index e02ae0e20..691ca52e6 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/CachingTextIndexerStateTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/CachingTextIndexerStateTests.cs @@ -58,8 +58,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Text var contentId = Guid.NewGuid(); var contentIds = HashSet.Of(contentId); - var state = new TextContentState { ContentId = contentId }; - A.CallTo(() => inner.GetAsync(A>.That.Is(contentIds))) .Returns(new Dictionary()); diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Queries/RuleEnricherTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Queries/RuleEnricherTests.cs index 1afcf66ac..4a7348f60 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Queries/RuleEnricherTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Queries/RuleEnricherTests.cs @@ -65,7 +65,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Queries A.CallTo(() => ruleEventRepository.QueryStatisticsByAppAsync(appId.Id)) .Returns(new List { stats }); - var result = await sut.EnrichAsync(source, requestContext); + await sut.EnrichAsync(source, requestContext); A.CallTo(() => requestCache.AddDependency(source.Id, source.Version)) .MustHaveHappened(); diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleEnqueuerTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleEnqueuerTests.cs index 2d980114f..72e6fef39 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleEnqueuerTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleEnqueuerTests.cs @@ -71,7 +71,7 @@ namespace Squidex.Domain.Apps.Entities.Rules { IEventConsumer consumer = sut; - Assert.Equal(typeof(RuleEnqueuer).Name, consumer.Name); + Assert.Equal(nameof(RuleEnqueuer), consumer.Name); } [Fact] diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/GuardSchemaTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/GuardSchemaTests.cs index e8d81c88c..371328418 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/GuardSchemaTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/GuardSchemaTests.cs @@ -578,7 +578,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards FieldRules = new[] { new FieldRuleCommand { Field = "field", Action = (FieldRuleAction)5 }, - new FieldRuleCommand(), + new FieldRuleCommand() } }; diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Tags/TagGrainTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Tags/TagGrainTests.cs index 47b111a77..d9ba395f4 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Tags/TagGrainTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Tags/TagGrainTests.cs @@ -108,9 +108,7 @@ namespace Squidex.Domain.Apps.Entities.Tags public async Task Should_remove_tags_from_grain() { var result1 = await sut.NormalizeTagsAsync(HashSet.Of("name1", "name2"), null); -#pragma warning disable IDE0059 // Unnecessary assignment of a value var result2 = await sut.NormalizeTagsAsync(HashSet.Of("name2", "name3"), null); -#pragma warning restore IDE0059 // Unnecessary assignment of a value await sut.NormalizeTagsAsync(null, new HashSet(result1.Values)); diff --git a/backend/tests/Squidex.Infrastructure.Tests/BytesRangeTests.cs b/backend/tests/Squidex.Infrastructure.Tests/BytesRangeTests.cs index ce33ecc5f..5668991e7 100644 --- a/backend/tests/Squidex.Infrastructure.Tests/BytesRangeTests.cs +++ b/backend/tests/Squidex.Infrastructure.Tests/BytesRangeTests.cs @@ -75,7 +75,7 @@ namespace Squidex.Infrastructure TestBytesRange(sut, -5, -3, 0, false, null); } - private void TestBytesRange(BytesRange sut, long? from, long? to, long length, bool defined, string? formatted) + private static void TestBytesRange(BytesRange sut, long? from, long? to, long length, bool defined, string? formatted) { Assert.Equal(from, sut.From); Assert.Equal(to, sut.To); diff --git a/backend/tests/Squidex.Infrastructure.Tests/Orleans/PubSubTests.cs b/backend/tests/Squidex.Infrastructure.Tests/Orleans/PubSubTests.cs index bec58c70c..dd40da06e 100644 --- a/backend/tests/Squidex.Infrastructure.Tests/Orleans/PubSubTests.cs +++ b/backend/tests/Squidex.Infrastructure.Tests/Orleans/PubSubTests.cs @@ -30,7 +30,7 @@ namespace Squidex.Infrastructure.Orleans { Guid.NewGuid(), Guid.NewGuid(), - Guid.NewGuid(), + Guid.NewGuid() }; var received1 = await CreateSubscriber(cluster.Client, sent.Count); @@ -54,7 +54,7 @@ namespace Squidex.Infrastructure.Orleans Assert.True(received2.Result.SetEquals(sent)); } - private async Task>> CreateSubscriber(IGrainFactory grainFactory, int expectedCount) + private static async Task>> CreateSubscriber(IGrainFactory grainFactory, int expectedCount) { var pubSub = new OrleansPubSub(grainFactory); diff --git a/backend/tests/Squidex.Infrastructure.Tests/Queries/QueryJsonConversionTests.cs b/backend/tests/Squidex.Infrastructure.Tests/Queries/QueryJsonConversionTests.cs index 5872e42cf..cfd339b42 100644 --- a/backend/tests/Squidex.Infrastructure.Tests/Queries/QueryJsonConversionTests.cs +++ b/backend/tests/Squidex.Infrastructure.Tests/Queries/QueryJsonConversionTests.cs @@ -465,7 +465,7 @@ namespace Squidex.Infrastructure.Queries public static IEnumerable BuildTests(string field, Predicate opFilter, object value, string valueString) { - var fields = new string[] + var fields = new[] { $"{field}", $"json.{field}", diff --git a/backend/tests/Squidex.Infrastructure.Tests/Reflection/SimpleEqualsTests.cs b/backend/tests/Squidex.Infrastructure.Tests/Reflection/SimpleEqualsTests.cs index ef155d05e..8a1b79c67 100644 --- a/backend/tests/Squidex.Infrastructure.Tests/Reflection/SimpleEqualsTests.cs +++ b/backend/tests/Squidex.Infrastructure.Tests/Reflection/SimpleEqualsTests.cs @@ -88,7 +88,7 @@ namespace Squidex.Infrastructure.Reflection yield return new object[] { new Uri("/url1", UriKind.Relative), - new Uri("/url2", UriKind.Relative), + new Uri("/url2", UriKind.Relative) }; } diff --git a/backend/tests/Squidex.Infrastructure.Tests/UsageTracking/BackgroundUsageTrackerTests.cs b/backend/tests/Squidex.Infrastructure.Tests/UsageTracking/BackgroundUsageTrackerTests.cs index 7e0b482b8..9b95cf238 100644 --- a/backend/tests/Squidex.Infrastructure.Tests/UsageTracking/BackgroundUsageTrackerTests.cs +++ b/backend/tests/Squidex.Infrastructure.Tests/UsageTracking/BackgroundUsageTrackerTests.cs @@ -134,6 +134,8 @@ namespace Squidex.Infrastructure.UsageTracking (dateFrom.AddDays(4), new Counters()) } }; + + result.Should().BeEquivalentTo(expected); } [Fact] diff --git a/backend/tests/Squidex.Infrastructure.Tests/ValidationExceptionTests.cs b/backend/tests/Squidex.Infrastructure.Tests/ValidationExceptionTests.cs index 1fdda25d3..12ff396c5 100644 --- a/backend/tests/Squidex.Infrastructure.Tests/ValidationExceptionTests.cs +++ b/backend/tests/Squidex.Infrastructure.Tests/ValidationExceptionTests.cs @@ -37,7 +37,7 @@ namespace Squidex.Infrastructure var errors = new List { new ValidationError("Error1"), - new ValidationError("Error2"), + new ValidationError("Error2") }; var ex = new ValidationException(errors); @@ -51,7 +51,7 @@ namespace Squidex.Infrastructure var errors = new List { new ValidationError("Error1"), - new ValidationError("Error2"), + new ValidationError("Error2") }; var source = new ValidationException(errors);