diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/DomainObject/AssetCommandMiddleware.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/DomainObject/AssetCommandMiddleware.cs index fd182a885..afa41a32a 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/DomainObject/AssetCommandMiddleware.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/DomainObject/AssetCommandMiddleware.cs @@ -203,13 +203,18 @@ namespace Squidex.Domain.Apps.Entities.Assets.DomainObject { await assetFileStore.UploadAsync(tempFile, hashStream); - var hash = $"{hashStream.GetHashStringAndReset()}{command.File.FileName}{command.File.FileSize}".Sha256Base64(); - - command.FileHash = hash; + command.FileHash = ComputeHash(command.File, hashStream); } } } + private static string ComputeHash(AssetFile file, HasherStream hashStream) + { + var steamHash = hashStream.GetHashStringAndReset(); + + return $"{steamHash}{file.FileName}{file.FileSize}".Sha256Base64(); + } + private async Task EnrichWithMetadataAsync(UploadAssetCommand command) { foreach (var metadataSource in assetMetadataSources) 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 007f62cf3..f94db8bcf 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentQueryParser.cs @@ -293,7 +293,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries if (schemaType != null) { entityType.AddStructuralProperty("data", new EdmComplexTypeReference(schemaType, false)); - entityType.AddStructuralProperty("dataDraft", new EdmComplexTypeReference(schemaType, false)); model.AddElement(schemaType); } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Schemas/ContentJsonSchemaBuilder.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Schemas/ContentJsonSchemaBuilder.cs index 0315e527c..e1e6fe5ab 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Schemas/ContentJsonSchemaBuilder.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Schemas/ContentJsonSchemaBuilder.cs @@ -44,7 +44,6 @@ namespace Squidex.Domain.Apps.Core.GenerateJsonSchema if (dataSchema != null) { jsonSchema.Properties["data"] = SchemaBuilder.ReferenceProperty(dataSchema, $"The data of the {name}.", true); - jsonSchema.Properties["dataDraft"] = SchemaBuilder.ReferenceProperty(dataSchema, $"The draft data of the {name}."); } return jsonSchema;