diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs index f2d0bf83d..06dd47e0e 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs @@ -28,7 +28,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates replace(data);"; - public Task HandleAsync(CommandContext context, Func next) + public async Task HandleAsync(CommandContext context, Func next) { if (context.IsCompleted && context.Command is CreateApp createApp && IsRightTemplate(createApp)) { @@ -44,13 +44,13 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates return context.CommandBus.PublishAsync(command); }); - return Task.WhenAll( + await Task.WhenAll( CreatePagesAsync(publish), CreatePostsAsync(publish), CreateClientAsync(publish, appId.Id)); } - return next(); + await next(); } private static bool IsRightTemplate(CreateApp createApp) @@ -173,6 +173,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates var command = new CreateSchema { Name = "pages", + Publish = true, Properties = new SchemaProperties { Label = "Pages" diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateProfileCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateProfileCommandMiddleware.cs index 15f710fd2..6ab050dfa 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateProfileCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateProfileCommandMiddleware.cs @@ -23,7 +23,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates { private const string TemplateName = "Profile"; - public Task HandleAsync(CommandContext context, Func next) + public async Task HandleAsync(CommandContext context, Func next) { if (context.IsCompleted && context.Command is CreateApp createApp && IsRightTemplate(createApp)) { @@ -39,7 +39,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates return context.CommandBus.PublishAsync(command); }); - return Task.WhenAll( + await Task.WhenAll( CreateBasicsAsync(publish), CreateProjectsSchemaAsync(publish), CreateExperienceSchemaAsync(publish), @@ -49,7 +49,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates CreateClientAsync(publish, appId.Id)); } - return next(); + await next(); } private static bool IsRightTemplate(CreateApp createApp) diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs index 96ee162e2..d8d92d6b5 100644 --- a/src/Squidex/Config/Domain/EntitiesServices.cs +++ b/src/Squidex/Config/Domain/EntitiesServices.cs @@ -116,12 +116,6 @@ namespace Squidex.Config.Domain services.AddSingletonAs>() .As(); - services.AddSingletonAs() - .As(); - - services.AddSingletonAs() - .As(); - services.AddSingletonAs() .As(); @@ -134,6 +128,12 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .As(); + services.AddSingletonAs() + .As(); + + services.AddSingletonAs() + .As(); + services.AddSingletonAs() .As();