diff --git a/README.md b/README.md index d7b94d7fc..9c83fa2af 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ![Squidex Logo](https://raw.githubusercontent.com/Squidex/squidex/master/media/logo-wide.png "Squidex") -# What is Squidex? +# What is Squidex?? Squidex is an open source headless CMS and content management hub. In contrast to a traditional CMS Squidex provides a rich API with OData filter and Swagger definitions. It is up to you to build your UI on top of it. It can be website, a native app or just another server. We build it with ASP.NET Core and CQRS and is tested for Windows and Linux on modern browsers. diff --git a/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs index 51c460837..02bb242bd 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs @@ -6,6 +6,7 @@ // ========================================================================== using System; +using System.Collections.Generic; using System.Threading.Tasks; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Domain.Apps.Entities.Apps.Guards; @@ -45,9 +46,9 @@ namespace Squidex.Domain.Apps.Entities.Apps this.appPlansBillingManager = appPlansBillingManager; } - protected Task On(CreateApp command, CommandContext context) + protected async Task On(CreateApp command, CommandContext context) { - return handler.CreateSyncedAsync(context, async a => + var app = await handler.CreateSyncedAsync(context, async a => { await GuardApp.CanCreate(command, appProvider); @@ -193,10 +194,8 @@ namespace Squidex.Domain.Apps.Entities.Apps public async Task HandleAsync(CommandContext context, Func next) { - if (!await this.DispatchActionAsync(context.Command, context)) - { - await next(); - } + await this.DispatchActionAsync(context.Command, context); + await next(); } } } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/CreateApp.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/CreateApp.cs index b49d54c59..5e8050247 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/CreateApp.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/CreateApp.cs @@ -16,6 +16,8 @@ namespace Squidex.Domain.Apps.Entities.Apps.Commands public string Name { get; set; } + public string Template { get; set; } + Guid IAggregateCommand.AggregateId { get { return AppId; } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs new file mode 100644 index 000000000..64ea26bf5 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs @@ -0,0 +1,243 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Squidex.Domain.Apps.Core; +using Squidex.Domain.Apps.Core.Contents; +using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Domain.Apps.Entities.Apps.Commands; +using Squidex.Domain.Apps.Entities.Contents.Commands; +using Squidex.Domain.Apps.Entities.Schemas.Commands; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure.Tasks; + +namespace Squidex.Domain.Apps.Entities.Apps.Templates +{ + public sealed class CreateBlogCommandMiddleware : ICommandMiddleware + { + private const string TemplateName = "Blog"; + private const string SlugScript = @" + var data = ctx.data; + + data.slug = { iv: slugify(data.title.iv) }; + + replace(data);"; + + public Task HandleAsync(CommandContext context, Func next) + { + if (context.IsCompleted && + context.Command is global::Squidex.Domain.Apps.Entities.Apps.Commands.CreateApp createApp && + IsRightTemplate(createApp)) + { + var appId = new NamedId(createApp.AppId, createApp.Name); + + Task publishAsync(AppCommand command) + { + command.AppId = appId; + + return context.CommandBus.PublishAsync(command); + } + + return Task.WhenAll( + CreatePagesAsync(publishAsync, appId), + CreatePostsAsync(publishAsync, appId), + CreateClientAsync(publishAsync, appId)); + } + + return TaskHelper.Done; + } + + private static bool IsRightTemplate(CreateApp createApp) + { + return string.Equals(createApp.Template, TemplateName, StringComparison.OrdinalIgnoreCase); + } + + private static async Task CreateClientAsync(Func publishAsync, NamedId appId) + { + await publishAsync(new AttachClient { Id = "sample-client" }); + } + + private async Task CreatePostsAsync(Func publishAsync, NamedId appId) + { + var postsId = await CreatePostsSchema(publishAsync); + + await publishAsync(new CreateContent + { + SchemaId = postsId, + Data = + new NamedContentData() + .AddField("title", + new ContentFieldData() + .AddValue("iv", "My first post with Squidex")) + .AddField("text", + new ContentFieldData() + .AddValue("iv", "Just created a blog with Squidex. I love it!")), + Publish = true, + }); + } + + private async Task CreatePagesAsync(Func publishAsync, NamedId appId) + { + var pagesId = await CreatePagesSchema(publishAsync); + + await publishAsync(new CreateContent + { + SchemaId = pagesId, + Data = + new NamedContentData() + .AddField("title", + new ContentFieldData() + .AddValue("iv", "About Me")) + .AddField("text", + new ContentFieldData() + .AddValue("iv", "I love Squidex and SciFi!")), + Publish = true + }); + } + + private async Task> CreatePostsSchema(Func publishAsync) + { + var command = new CreateSchema + { + Name = "posts", + Properties = new SchemaProperties + { + Label = "Posts" + }, + Fields = new List + { + new CreateSchemaField + { + Name = "title", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties + { + Editor = StringFieldEditor.Input, + IsRequired = true, + IsListField = true, + MaxLength = 100, + MinLength = 0, + Label = "Title" + } + }, + new CreateSchemaField + { + Name = "slug", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties + { + Editor = StringFieldEditor.Slug, + IsRequired = false, + IsListField = true, + MaxLength = 100, + MinLength = 0, + Label = "Slug" + } + }, + new CreateSchemaField + { + Name = "text", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties + { + Editor = StringFieldEditor.RichText, + IsRequired = true, + IsListField = false, + Label = "Text" + } + } + } + }; + + await publishAsync(command); + + var schemaId = new NamedId(command.SchemaId, command.Name); + + await publishAsync(new PublishSchema { SchemaId = schemaId }); + await publishAsync(new ConfigureScripts + { + SchemaId = schemaId, + ScriptCreate = SlugScript, + ScriptUpdate = SlugScript + }); + + return schemaId; + } + + private async Task> CreatePagesSchema(Func publishAsync) + { + var command = new CreateSchema + { + Name = "pages", + Properties = new SchemaProperties + { + Label = "Pages" + }, + Fields = new List + { + new CreateSchemaField + { + Name = "title", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties + { + Editor = StringFieldEditor.Input, + IsRequired = true, + IsListField = true, + MaxLength = 100, + MinLength = 0, + Label = "Title" + } + }, + new CreateSchemaField + { + Name = "slug", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties + { + Editor = StringFieldEditor.Slug, + IsRequired = false, + IsListField = true, + MaxLength = 100, + MinLength = 0, + Label = "Slug" + } + }, + new CreateSchemaField + { + Name = "text", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties + { + Editor = StringFieldEditor.RichText, + IsRequired = true, + IsListField = false, + Label = "Text" + } + } + } + }; + + await publishAsync(command); + + var schemaId = new NamedId(command.SchemaId, command.Name); + + await publishAsync(new PublishSchema { SchemaId = schemaId }); + await publishAsync(new ConfigureScripts + { + SchemaId = schemaId, + ScriptCreate = SlugScript, + ScriptUpdate = SlugScript + }); + + return schemaId; + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Commands/CreateContent.cs b/src/Squidex.Domain.Apps.Entities/Contents/Commands/CreateContent.cs index 1837b977f..71e0a11e7 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Commands/CreateContent.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Commands/CreateContent.cs @@ -5,10 +5,17 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; + namespace Squidex.Domain.Apps.Entities.Contents.Commands { public sealed class CreateContent : ContentDataCommand { public bool Publish { get; set; } + + public CreateContent() + { + ContentId = Guid.NewGuid(); + } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentCommandMiddleware.cs index 6923e5005..6b10ba6df 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentCommandMiddleware.cs @@ -133,10 +133,8 @@ namespace Squidex.Domain.Apps.Entities.Contents public async Task HandleAsync(CommandContext context, Func next) { - if (!await this.DispatchActionAsync(context.Command, context)) - { - await next(); - } + await this.DispatchActionAsync(context.Command, context); + await next(); } private async Task CreateContext(ContentCommand command, ContentDomainObject content, Func message) diff --git a/src/Squidex.Domain.Apps.Entities/Rules/RuleCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Rules/RuleCommandMiddleware.cs index e252b5632..c0ee1cf5b 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/RuleCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/RuleCommandMiddleware.cs @@ -82,10 +82,8 @@ namespace Squidex.Domain.Apps.Entities.Rules public async Task HandleAsync(CommandContext context, Func next) { - if (!await this.DispatchActionAsync(context.Command, context)) - { - await next(); - } + await this.DispatchActionAsync(context.Command, context); + await next(); } } } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaCommandMiddleware.cs index 18c468c0f..b58f2c815 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaCommandMiddleware.cs @@ -187,10 +187,8 @@ namespace Squidex.Domain.Apps.Entities.Schemas public async Task HandleAsync(CommandContext context, Func next) { - if (!await this.DispatchActionAsync(context.Command, context)) - { - await next(); - } + await this.DispatchActionAsync(context.Command, context); + await next(); } } } diff --git a/src/Squidex.Infrastructure/Commands/CommandContext.cs b/src/Squidex.Infrastructure/Commands/CommandContext.cs index 278c7eebf..a83ba04fb 100644 --- a/src/Squidex.Infrastructure/Commands/CommandContext.cs +++ b/src/Squidex.Infrastructure/Commands/CommandContext.cs @@ -12,6 +12,7 @@ namespace Squidex.Infrastructure.Commands public sealed class CommandContext { private readonly ICommand command; + private readonly ICommandBus commandBus; private readonly Guid contextId = Guid.NewGuid(); private Tuple result; @@ -20,6 +21,11 @@ namespace Squidex.Infrastructure.Commands get { return command; } } + public ICommandBus CommandBus + { + get { return commandBus; } + } + public Guid ContextId { get { return contextId; } @@ -30,11 +36,13 @@ namespace Squidex.Infrastructure.Commands get { return result != null; } } - public CommandContext(ICommand command) + public CommandContext(ICommand command, ICommandBus commandBus) { Guard.NotNull(command, nameof(command)); + Guard.NotNull(commandBus, nameof(commandBus)); this.command = command; + this.commandBus = commandBus; } public void Complete(object resultValue = null) diff --git a/src/Squidex.Infrastructure/Commands/InMemoryCommandBus.cs b/src/Squidex.Infrastructure/Commands/InMemoryCommandBus.cs index 498a41a28..7c72e8fba 100644 --- a/src/Squidex.Infrastructure/Commands/InMemoryCommandBus.cs +++ b/src/Squidex.Infrastructure/Commands/InMemoryCommandBus.cs @@ -15,24 +15,24 @@ namespace Squidex.Infrastructure.Commands { public sealed class InMemoryCommandBus : ICommandBus { - private readonly List handlers; + private readonly List middlewares; - public InMemoryCommandBus(IEnumerable handlers) + public InMemoryCommandBus(IEnumerable middlewares) { - Guard.NotNull(handlers, nameof(handlers)); + Guard.NotNull(middlewares, nameof(middlewares)); - this.handlers = handlers.Reverse().ToList(); + this.middlewares = middlewares.Reverse().ToList(); } public async Task PublishAsync(ICommand command) { Guard.NotNull(command, nameof(command)); - var context = new CommandContext(command); + var context = new CommandContext(command, this); var next = new Func(() => TaskHelper.Done); - foreach (var handler in handlers) + foreach (var handler in middlewares) { next = Join(handler, context, next); } diff --git a/src/Squidex/Areas/Api/Controllers/Apps/Models/CreateAppDto.cs b/src/Squidex/Areas/Api/Controllers/Apps/Models/CreateAppDto.cs index 362932862..92cab9c82 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/Models/CreateAppDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/Models/CreateAppDto.cs @@ -17,5 +17,10 @@ namespace Squidex.Areas.Api.Controllers.Apps.Models [Required] [RegularExpression("^[a-z0-9]+(\\-[a-z0-9]+)*$")] public string Name { get; set; } + + /// + /// Initialize the app with the inbuilt template. + /// + public string Template { get; set; } } } diff --git a/src/Squidex/Config/Domain/WriteServices.cs b/src/Squidex/Config/Domain/WriteServices.cs index 69bfce8c0..7c890b235 100644 --- a/src/Squidex/Config/Domain/WriteServices.cs +++ b/src/Squidex/Config/Domain/WriteServices.cs @@ -12,6 +12,7 @@ using Migrate_01; using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Core.Scripting; using Squidex.Domain.Apps.Entities.Apps; +using Squidex.Domain.Apps.Entities.Apps.Templates; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Rules; @@ -63,6 +64,9 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .As(); + services.AddSingletonAs() + .As(); + services.AddTransientAs() .As(); diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.html b/src/Squidex/app/features/apps/pages/apps-page.component.html index 36c34a5f2..9c65780f2 100644 --- a/src/Squidex/app/features/apps/pages/apps-page.component.html +++ b/src/Squidex/app/features/apps/pages/apps-page.component.html @@ -1,17 +1,56 @@  -
-
+
+

Hi {{ctx.user.displayName}}

+ +
+ Welcome to Squidex. +
+
+ +
+

You are not collaborating to any app yet

+
- +
+
+

{{app.name}}

+ +
+ Edit +
+
+
-
-
-

{{app.name}}

+
+
+
+
+ +
- Edit +

New App

+ +
+ Create a new blank app without content and schemas. +
+
+
+ +
+
+
+ +
+ +

New Blog Sample

+ +
+
Start with our ready to use blog.
+
Sample Code: ASP.NET Core
+
@@ -21,7 +60,8 @@
-

Create App

+

Create {{template}} Sample

+

Create App

- diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.scss b/src/Squidex/app/features/apps/pages/apps-page.component.scss index 19456fd7f..83a0b1efb 100644 --- a/src/Squidex/app/features/apps/pages/apps-page.component.scss +++ b/src/Squidex/app/features/apps/pages/apps-page.component.scss @@ -2,14 +2,19 @@ @import '_mixins'; .apps { - @include clearfix; - padding: 1.25rem; - padding-left: $size-sidebar-width + .25rem; - display: block; -} + &-title { + font-weight: light; + font-size: 1.4rem; + } -h4 { - line-height: 2rem; + &-section { + @include clearfix; + padding-top: 2rem; + padding-right: 1.25rem; + padding-bottom: 0; + padding-left: $size-sidebar-width + .25rem; + display: block; + } } .app { @@ -26,7 +31,65 @@ h4 { } } -.empty-headline { - margin: 1.25rem; - margin-top: 6.25rem; +.card { + & { + margin-right: 1rem; + margin-bottom: 1rem; + width: 16rem; + float: left; + } + + &-lg { + width: 33rem; + } + + &-image { + text-align: center; + } + + &-text { + color: $color-text-decent; + font-weight: normal; + font-size: .9rem; + } + + &-more { + color: $color-text-decent; + font-weight: normal; + font-size: .8rem; + margin-top: .4rem; + } + + &-title { + color: $color-title; + font-weight: light; + font-size: 1.2rem; + margin-top: .4rem; + } + + &-template { + .card-body { + min-height: 15.5rem; + } + } + + &-href { + & { + cursor: pointer; + } + + &:hover { + @include box-shadow(0, 3px, 16px, .2px); + } + + &:focus { + outline: none; + } + + &:hover, + &:focus, + &:active { + text-decoration: none; + } + } } \ No newline at end of file diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.ts b/src/Squidex/app/features/apps/pages/apps-page.component.ts index 917aa9e89..69bc3f356 100644 --- a/src/Squidex/app/features/apps/pages/apps-page.component.ts +++ b/src/Squidex/app/features/apps/pages/apps-page.component.ts @@ -9,6 +9,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; import { + AppContext, AppDto, AppsStoreService, fadeAnimation, @@ -20,6 +21,9 @@ import { selector: 'sqx-apps-page', styleUrls: ['./apps-page.component.scss'], templateUrl: './apps-page.component.html', + providers: [ + AppContext + ], animations: [ fadeAnimation ] @@ -30,9 +34,12 @@ export class AppsPageComponent implements OnDestroy, OnInit { public addAppDialog = new ModalView(); public apps: AppDto[]; + public template = ''; + public onboardingModal = new ModalView(); constructor( + public readonly ctx: AppContext, private readonly appsStore: AppsStoreService, private readonly onboardingService: OnboardingService ) { @@ -54,4 +61,10 @@ export class AppsPageComponent implements OnDestroy, OnInit { this.apps = apps; }); } + + public createNewApp(template: string) { + this.template = template; + + this.addAppDialog.show(); + } } \ No newline at end of file diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.html b/src/Squidex/app/features/content/pages/content/content-field.component.html index ca0427db4..b8f447f0f 100644 --- a/src/Squidex/app/features/content/pages/content/content-field.component.html +++ b/src/Squidex/app/features/content/pages/content/content-field.component.html @@ -1,6 +1,6 @@
Disabled @@ -18,7 +18,7 @@
- +
diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.html b/src/Squidex/app/features/content/pages/content/content-page.component.html index 7427d6d76..12f2deb59 100644 --- a/src/Squidex/app/features/content/pages/content/content-page.component.html +++ b/src/Squidex/app/features/content/pages/content/content-page.component.html @@ -1,4 +1,4 @@ - +
diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-page.component.html index 757a1d9f0..fa9efefed 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.html +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.html @@ -1,4 +1,4 @@ - +
@@ -75,7 +75,7 @@ - {{field | sqxDisplayName:'properties.label':'name'}} + {{field.displayName}} Updated diff --git a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html index e49d84873..f030c7f5a 100644 --- a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html +++ b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html @@ -25,7 +25,7 @@
diff --git a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts index 494a17ce3..92b47b1fa 100644 --- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts +++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Subscription } from 'rxjs'; import { AppContext, @@ -28,7 +29,9 @@ declare var _urq: any; fadeAnimation ] }) -export class DashboardPageComponent implements OnInit { +export class DashboardPageComponent implements OnDestroy, OnInit { + private subscriptions: Subscription[] = []; + public profileDisplayName = ''; public chartStorageCount: any; @@ -68,84 +71,96 @@ export class DashboardPageComponent implements OnInit { ) { } + public ngOnDestroy() { + for (let subscription of this.subscriptions) { + subscription.unsubscribe(); + } + + this.subscriptions = []; + } + public ngOnInit() { - this.app - .switchMap(app => this.usagesService.getTodayStorage(app.name)) - .subscribe(dto => { - this.assetsCurrent = dto.size; - this.assetsMax = dto.maxAllowed; - }); - - this.app - .switchMap(app => this.usagesService.getMonthCalls(app.name)) - .subscribe(dto => { - this.callsCurrent = dto.count; - this.callsMax = dto.maxAllowed; - }); - - this.app - .switchMap(app => this.usagesService.getStorageUsages(app.name, DateTime.today().addDays(-20), DateTime.today())) - .subscribe(dtos => { - this.chartStorageCount = { - labels: createLabels(dtos), - datasets: [ - { - label: 'Number of Assets', - lineTension: 0, - fill: false, - backgroundColor: 'rgba(51, 137, 213, 0.6)', - borderColor: 'rgba(51, 137, 213, 1)', - borderWidth: 1, - data: dtos.map(x => x.count) - } - ] - }; - - this.chartStorageSize = { - labels: createLabels(dtos), - datasets: [ - { - label: 'Size of Assets (MB)', - lineTension: 0, - fill: false, - backgroundColor: 'rgba(51, 137, 213, 0.6)', - borderColor: 'rgba(51, 137, 213, 1)', - borderWidth: 1, - data: dtos.map(x => Math.round(10 * (x.size / (1024 * 1024))) / 10) - } - ] - }; - }); - - this.app - .switchMap(app => this.usagesService.getCallsUsages(app.name, DateTime.today().addDays(-20), DateTime.today())) - .subscribe(dtos => { - this.chartCallsCount = { - labels: createLabels(dtos), - datasets: [ - { - label: 'Number of API Calls', - backgroundColor: 'rgba(51, 137, 213, 0.6)', - borderColor: 'rgba(51, 137, 213, 1)', - borderWidth: 1, - data: dtos.map(x => x.count) - } - ] - }; - - this.chartCallsPerformance = { - labels: createLabels(dtos), - datasets: [ - { - label: 'API Performance (Milliseconds)', - backgroundColor: 'rgba(51, 137, 213, 0.6)', - borderColor: 'rgba(51, 137, 213, 1)', - borderWidth: 1, - data: dtos.map(x => x.averageMs) - } - ] - }; - }); + this.subscriptions.push( + this.app + .switchMap(app => this.usagesService.getTodayStorage(app.name)) + .subscribe(dto => { + this.assetsCurrent = dto.size; + this.assetsMax = dto.maxAllowed; + })); + + this.subscriptions.push( + this.app + .switchMap(app => this.usagesService.getMonthCalls(app.name)) + .subscribe(dto => { + this.callsCurrent = dto.count; + this.callsMax = dto.maxAllowed; + })); + + this.subscriptions.push( + this.app + .switchMap(app => this.usagesService.getStorageUsages(app.name, DateTime.today().addDays(-20), DateTime.today())) + .subscribe(dtos => { + this.chartStorageCount = { + labels: createLabels(dtos), + datasets: [ + { + label: 'Number of Assets', + lineTension: 0, + fill: false, + backgroundColor: 'rgba(51, 137, 213, 0.6)', + borderColor: 'rgba(51, 137, 213, 1)', + borderWidth: 1, + data: dtos.map(x => x.count) + } + ] + }; + + this.chartStorageSize = { + labels: createLabels(dtos), + datasets: [ + { + label: 'Size of Assets (MB)', + lineTension: 0, + fill: false, + backgroundColor: 'rgba(51, 137, 213, 0.6)', + borderColor: 'rgba(51, 137, 213, 1)', + borderWidth: 1, + data: dtos.map(x => Math.round(10 * (x.size / (1024 * 1024))) / 10) + } + ] + }; + })); + + this.subscriptions.push( + this.app + .switchMap(app => this.usagesService.getCallsUsages(app.name, DateTime.today().addDays(-20), DateTime.today())) + .subscribe(dtos => { + this.chartCallsCount = { + labels: createLabels(dtos), + datasets: [ + { + label: 'Number of API Calls', + backgroundColor: 'rgba(51, 137, 213, 0.6)', + borderColor: 'rgba(51, 137, 213, 1)', + borderWidth: 1, + data: dtos.map(x => x.count) + } + ] + }; + + this.chartCallsPerformance = { + labels: createLabels(dtos), + datasets: [ + { + label: 'API Performance (Milliseconds)', + backgroundColor: 'rgba(51, 137, 213, 0.6)', + borderColor: 'rgba(51, 137, 213, 1)', + borderWidth: 1, + data: dtos.map(x => x.averageMs) + } + ] + }; + })); } public showForum() { diff --git a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html index b09792026..160232581 100644 --- a/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rule-wizard.component.html @@ -32,7 +32,7 @@ - {{ruleTriggers[trigger]}} + {{ruleTriggers[trigger].name}}
@@ -61,7 +61,7 @@ - {{ruleActions[action]}} + {{ruleActions[action].name}}
diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html index de4833ece..a6b7f98f6 100644 --- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html @@ -43,7 +43,7 @@ - {{ruleTriggers[rule.triggerType]}} + {{ruleTriggers[rule.triggerType].name}} @@ -56,7 +56,7 @@ - {{ruleActions[rule.actionType]}} + {{ruleActions[rule.actionType].name}} diff --git a/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.html b/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.html index 8080fde1d..e2dec973b 100644 --- a/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.html +++ b/src/Squidex/app/features/rules/pages/rules/triggers/content-changed-trigger.component.html @@ -35,7 +35,7 @@ - {{schema.schema.name}} + {{schema.schema.displayName}} @@ -64,7 +64,7 @@
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html index 122cbb80f..538327a0e 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html @@ -1,4 +1,4 @@ - +
@@ -49,7 +49,7 @@

- {{schema | sqxDisplayName:'properties.label':'name'}} + {{schema.displayName}}

diff --git a/src/Squidex/app/features/schemas/pages/schema/types/references-validation.component.html b/src/Squidex/app/features/schemas/pages/schema/types/references-validation.component.html index 011526d3f..c6b8839ff 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/references-validation.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/types/references-validation.component.html @@ -4,7 +4,7 @@
diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html index d6c3e2844..305cb764b 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html @@ -33,7 +33,7 @@
- {{schema | sqxDisplayName:'properties.label':'name'}} + {{schema.displayName}}
diff --git a/src/Squidex/app/shared/components/app-form.component.ts b/src/Squidex/app/shared/components/app-form.component.ts index 9b27cad46..1984efe46 100644 --- a/src/Squidex/app/shared/components/app-form.component.ts +++ b/src/Squidex/app/shared/components/app-form.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, EventEmitter, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; import { ApiUrlConfig, ValidatorsEx } from 'framework'; @@ -30,6 +30,9 @@ export class AppFormComponent { @Output() public cancelled = new EventEmitter(); + @Input() + public template = ''; + public createFormError = ''; public createFormSubmitted = false; public createForm = @@ -64,7 +67,7 @@ export class AppFormComponent { if (this.createForm.valid) { this.createForm.disable(); - const request = new CreateAppDto(this.createForm.controls['name'].value); + const request = new CreateAppDto(this.createForm.controls['name'].value, this.template); this.appsStore.createApp(request) .subscribe(dto => { diff --git a/src/Squidex/app/shared/services/apps.service.ts b/src/Squidex/app/shared/services/apps.service.ts index fb9d83451..ed6f8f004 100644 --- a/src/Squidex/app/shared/services/apps.service.ts +++ b/src/Squidex/app/shared/services/apps.service.ts @@ -33,7 +33,8 @@ export class AppDto { export class CreateAppDto { constructor( - public readonly name: string + public readonly name: string, + public readonly template?: string ) { } } diff --git a/src/Squidex/app/shared/services/rules.service.ts b/src/Squidex/app/shared/services/rules.service.ts index 150b4ac66..88cf2b71b 100644 --- a/src/Squidex/app/shared/services/rules.service.ts +++ b/src/Squidex/app/shared/services/rules.service.ts @@ -21,16 +21,30 @@ import { } from 'framework'; export const ruleTriggers: any = { - 'AssetChanged': 'Asset changed', - 'ContentChanged': 'Content changed' + 'AssetChanged': { + name: 'Asset changed' + }, + 'ContentChanged': { + name: 'Content changed' + } }; export const ruleActions: any = { - 'Algolia': 'Populate Algolia Index', - 'AzureQueue': 'Send to Azure Queue', - 'Fastly': 'Purge fastly Cache', - 'Slack': 'Send to Slack', - 'Webhook': 'Send Webhook' + 'Algolia': { + name: 'Populate Algolia Index' + }, + 'AzureQueue': { + name: 'Send to Azure Queue' + }, + 'Fastly': { + name: 'Purge fastly Cache' + }, + 'Slack': { + name: 'Send to Slack' + }, + 'Webhook': { + name: 'Send Webhook' + } }; export class RuleDto { @@ -154,125 +168,125 @@ export class RulesService { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules`); return HTTP.getVersioned(this.http, url) - .map(response => { - const items: any[] = response.payload.body; - - return items.map(item => { - return new RuleDto( - item.id, - item.createdBy, - item.lastModifiedBy, - DateTime.parseISO_UTC(item.created), - DateTime.parseISO_UTC(item.lastModified), - new Version(item.version.toString()), - item.isEnabled, - item.trigger, - item.trigger.triggerType, - item.action, - item.action.actionType); - }); - }) - .pretifyError('Failed to load Rules. Please reload.'); + .map(response => { + const items: any[] = response.payload.body; + + return items.map(item => { + return new RuleDto( + item.id, + item.createdBy, + item.lastModifiedBy, + DateTime.parseISO_UTC(item.created), + DateTime.parseISO_UTC(item.lastModified), + new Version(item.version.toString()), + item.isEnabled, + item.trigger, + item.trigger.triggerType, + item.action, + item.action.actionType); + }); + }) + .pretifyError('Failed to load Rules. Please reload.'); } public postRule(appName: string, dto: CreateRuleDto, user: string, now: DateTime): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules`); return HTTP.postVersioned(this.http, url, dto) - .map(response => { - const body = response.payload.body; - - return new RuleDto( - body.id, - user, - user, - now, - now, - response.version, - true, - dto.trigger, - dto.trigger.triggerType, - dto.action, - dto.action.actionType); - }) - .do(() => { - this.analytics.trackEvent('Rule', 'Created', appName); - }) - .pretifyError('Failed to create rule. Please reload.'); + .map(response => { + const body = response.payload.body; + + return new RuleDto( + body.id, + user, + user, + now, + now, + response.version, + true, + dto.trigger, + dto.trigger.triggerType, + dto.action, + dto.action.actionType); + }) + .do(() => { + this.analytics.trackEvent('Rule', 'Created', appName); + }) + .pretifyError('Failed to create rule. Please reload.'); } public putRule(appName: string, id: string, dto: UpdateRuleDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules/${id}`); return HTTP.putVersioned(this.http, url, dto, version) - .do(() => { - this.analytics.trackEvent('Rule', 'Updated', appName); - }) - .pretifyError('Failed to update rule. Please reload.'); + .do(() => { + this.analytics.trackEvent('Rule', 'Updated', appName); + }) + .pretifyError('Failed to update rule. Please reload.'); } public enableRule(appName: string, id: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules/${id}/enable`); return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { - this.analytics.trackEvent('Rule', 'Updated', appName); - }) - .pretifyError('Failed to enable rule. Please reload.'); + .do(() => { + this.analytics.trackEvent('Rule', 'Updated', appName); + }) + .pretifyError('Failed to enable rule. Please reload.'); } public disableRule(appName: string, id: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules/${id}/disable`); return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { - this.analytics.trackEvent('Rule', 'Updated', appName); - }) - .pretifyError('Failed to disable rule. Please reload.'); + .do(() => { + this.analytics.trackEvent('Rule', 'Updated', appName); + }) + .pretifyError('Failed to disable rule. Please reload.'); } public deleteRule(appName: string, id: string, version: Version): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules/${id}`); return HTTP.deleteVersioned(this.http, url, version) - .do(() => { - this.analytics.trackEvent('Rule', 'Deleted', appName); - }) - .pretifyError('Failed to delete rule. Please reload.'); + .do(() => { + this.analytics.trackEvent('Rule', 'Deleted', appName); + }) + .pretifyError('Failed to delete rule. Please reload.'); } public getEvents(appName: string, take: number, skip: number): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules/events?take=${take}&skip=${skip}`); return HTTP.getVersioned(this.http, url) - .map(response => { - const body = response.payload.body; - - const items: any[] = body.items; - - return new RuleEventsDto(body.total, items.map(item => { - return new RuleEventDto( - item.id, - DateTime.parseISO_UTC(item.created), - item.nextAttempt ? DateTime.parseISO_UTC(item.nextAttempt) : null, - item.eventName, - item.description, - item.lastDump, - item.result, - item.jobResult, - item.numCalls); - })); - }) - .pretifyError('Failed to load events. Please reload.'); + .map(response => { + const body = response.payload.body; + + const items: any[] = body.items; + + return new RuleEventsDto(body.total, items.map(item => { + return new RuleEventDto( + item.id, + DateTime.parseISO_UTC(item.created), + item.nextAttempt ? DateTime.parseISO_UTC(item.nextAttempt) : null, + item.eventName, + item.description, + item.lastDump, + item.result, + item.jobResult, + item.numCalls); + })); + }) + .pretifyError('Failed to load events. Please reload.'); } public enqueueEvent(appName: string, id: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules/events/${id}`); return HTTP.putVersioned(this.http, url, {}) - .do(() => { - this.analytics.trackEvent('Rule', 'EventEnqueued', appName); - }) - .pretifyError('Failed to enqueue rule event. Please reload.'); + .do(() => { + this.analytics.trackEvent('Rule', 'EventEnqueued', appName); + }) + .pretifyError('Failed to enqueue rule event. Please reload.'); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/schemas.service.ts b/src/Squidex/app/shared/services/schemas.service.ts index 63fdd2f5a..a9964164e 100644 --- a/src/Squidex/app/shared/services/schemas.service.ts +++ b/src/Squidex/app/shared/services/schemas.service.ts @@ -17,6 +17,7 @@ import { ApiUrlConfig, DateTime, HTTP, + StringHelper, ValidatorsEx, Version, Versioned @@ -77,6 +78,10 @@ export function createProperties(fieldType: string, values: Object | null = null } export class SchemaDto { + public get displayName() { + return StringHelper.firstNonEmpty(this.properties.label || '', this.name); + } + constructor( public readonly id: string, public readonly name: string, @@ -274,6 +279,10 @@ export class SchemaDetailsDto extends SchemaDto { } export class FieldDto { + public get displayName() { + return StringHelper.firstNonEmpty(this.properties.label || '', this.name); + } + constructor( public readonly fieldId: number, public readonly name: string, diff --git a/src/Squidex/wwwroot/images/add-app.png b/src/Squidex/wwwroot/images/add-app.png index d445eda93..605f0a4c4 100644 Binary files a/src/Squidex/wwwroot/images/add-app.png and b/src/Squidex/wwwroot/images/add-app.png differ diff --git a/src/Squidex/wwwroot/images/add-blog.png b/src/Squidex/wwwroot/images/add-blog.png new file mode 100644 index 000000000..764e65cf1 Binary files /dev/null and b/src/Squidex/wwwroot/images/add-blog.png differ diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs index ffa2afe06..d92690828 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs @@ -22,7 +22,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL { private readonly Guid contentId = Guid.NewGuid(); private readonly IContentEntity content; - private readonly CommandContext commandContext = new CommandContext(new PatchContent()); + private readonly CommandContext commandContext = new CommandContext(new PatchContent(), A.Dummy()); public GraphQLMutationTests() { diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs b/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs index 231aa9d8d..73a745fde 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs @@ -98,7 +98,7 @@ namespace Squidex.Domain.Apps.Entities.TestHelpers protected CommandContext CreateContextForCommand(TCommand command) where TCommand : SquidexCommand { - return new CommandContext(CreateCommand(command)); + return new CommandContext(CreateCommand(command), A.Dummy()); } protected async Task TestCreate(T domainObject, Func action, bool shouldCreate = true) diff --git a/tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs index e0f54127f..f1c9113d0 100644 --- a/tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Commands/AggregateHandlerTests.cs @@ -26,7 +26,7 @@ namespace Squidex.Infrastructure.Commands private readonly Envelope event1 = new Envelope(new MyEvent()); private readonly Envelope event2 = new Envelope(new MyEvent()); private readonly CommandContext context; - private readonly CommandContext invalidContext = new CommandContext(A.Dummy()); + private readonly CommandContext invalidContext = new CommandContext(A.Dummy(), A.Dummy()); private readonly Guid domainObjectId = Guid.NewGuid(); private readonly MyCommand command; private readonly MyDomainObject domainObject = new MyDomainObject(); @@ -35,7 +35,7 @@ namespace Squidex.Infrastructure.Commands public AggregateHandlerTests() { command = new MyCommand { AggregateId = domainObjectId, ExpectedVersion = EtagVersion.Any }; - context = new CommandContext(command); + context = new CommandContext(command, A.Dummy()); A.CallTo(() => store.WithSnapshotsAndEventSourcing(domainObjectId, A>.Ignored, A, Task>>.Ignored)) .Returns(persistence); diff --git a/tests/Squidex.Infrastructure.Tests/Commands/CommandContextTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/CommandContextTests.cs index 3163cacb9..3d97d2a33 100644 --- a/tests/Squidex.Infrastructure.Tests/Commands/CommandContextTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Commands/CommandContextTests.cs @@ -6,6 +6,7 @@ // ========================================================================== using System; +using FakeItEasy; using Squidex.Infrastructure.TestHelpers; using Xunit; @@ -18,7 +19,7 @@ namespace Squidex.Infrastructure.Commands public CommandContextTests() { - sut = new CommandContext(command); + sut = new CommandContext(command, A.Dummy()); } [Fact] diff --git a/tests/Squidex.Infrastructure.Tests/Commands/EnrichWithTimestampCommandMiddlewareTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/EnrichWithTimestampCommandMiddlewareTests.cs index 528b4bfcd..491f9e7d1 100644 --- a/tests/Squidex.Infrastructure.Tests/Commands/EnrichWithTimestampCommandMiddlewareTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Commands/EnrichWithTimestampCommandMiddlewareTests.cs @@ -16,6 +16,7 @@ namespace Squidex.Infrastructure.Commands public class EnrichWithTimestampCommandMiddlewareTests { private readonly IClock clock = A.Fake(); + private readonly ICommandBus commandBus = A.Dummy(); [Fact] public async Task Should_set_timestamp_for_timestamp_command() @@ -28,7 +29,7 @@ namespace Squidex.Infrastructure.Commands var command = new MyCommand(); - await sut.HandleAsync(new CommandContext(command)); + await sut.HandleAsync(new CommandContext(command, commandBus)); Assert.Equal(utc, command.Timestamp); } @@ -38,7 +39,7 @@ namespace Squidex.Infrastructure.Commands { var sut = new EnrichWithTimestampCommandMiddleware(clock); - await sut.HandleAsync(new CommandContext(A.Dummy())); + await sut.HandleAsync(new CommandContext(A.Dummy(), commandBus)); A.CallTo(() => clock.GetCurrentInstant()).MustNotHaveHappened(); } diff --git a/tests/Squidex.Infrastructure.Tests/Commands/LogCommandMiddlewareTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/LogCommandMiddlewareTests.cs index 01415cc30..716aaf60f 100644 --- a/tests/Squidex.Infrastructure.Tests/Commands/LogCommandMiddlewareTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Commands/LogCommandMiddlewareTests.cs @@ -20,6 +20,7 @@ namespace Squidex.Infrastructure.Commands private readonly MyLog log = new MyLog(); private readonly LogCommandMiddleware sut; private readonly ICommand command = A.Dummy(); + private readonly ICommandBus commandBus = A.Dummy(); private sealed class MyLog : ISemanticLog { @@ -47,7 +48,7 @@ namespace Squidex.Infrastructure.Commands [Fact] public async Task Should_log_before_and_after_request() { - var context = new CommandContext(command); + var context = new CommandContext(command, commandBus); await sut.HandleAsync(context, () => { @@ -63,7 +64,7 @@ namespace Squidex.Infrastructure.Commands [Fact] public async Task Should_log_error_if_command_failed() { - var context = new CommandContext(command); + var context = new CommandContext(command, commandBus); await Assert.ThrowsAsync(async () => { @@ -78,7 +79,7 @@ namespace Squidex.Infrastructure.Commands [Fact] public async Task Should_log_if_command_is_not_handled() { - var context = new CommandContext(command); + var context = new CommandContext(command, commandBus); await sut.HandleAsync(context, () => TaskHelper.Done);