From afe55e35497b3443e7d1005dc4dc88dc7f648fd9 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 17 Dec 2017 16:04:41 +0100 Subject: [PATCH] App UI integrated. --- .../Apps/AppPattern.cs | 4 +- .../Apps/Json/JsonAppPattern.cs | 3 - .../Apps/AppCommandMiddleware.cs | 6 +- .../Migrations/MongoMigrationStatus.cs | 2 +- .../Controllers/Apps/AppPatternsController.cs | 2 +- .../Config/Domain/SerializationServices.cs | 1 + .../types/string-validation.component.ts | 2 + .../app/features/settings/declarations.ts | 2 + src/Squidex/app/features/settings/module.ts | 24 +++++ .../pages/patterns/pattern.component.html | 45 +++++++++ .../pages/patterns/pattern.component.scss | 13 +++ .../pages/patterns/pattern.component.ts | 95 +++++++++++++++++++ .../patterns/patterns-page.component.html | 41 ++++++++ .../patterns/patterns-page.component.scss | 2 + .../pages/patterns/patterns-page.component.ts | 87 +++++++++++++++++ .../settings/settings-area.component.html | 6 ++ .../services/app-patterns.service.spec.ts | 18 ++-- .../shared/services/app-patterns.service.ts | 11 ++- tools/Migrate_01/Migration01.cs | 41 +------- 19 files changed, 344 insertions(+), 61 deletions(-) create mode 100644 src/Squidex/app/features/settings/pages/patterns/pattern.component.html create mode 100644 src/Squidex/app/features/settings/pages/patterns/pattern.component.scss create mode 100644 src/Squidex/app/features/settings/pages/patterns/pattern.component.ts create mode 100644 src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html create mode 100644 src/Squidex/app/features/settings/pages/patterns/patterns-page.component.scss create mode 100644 src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts diff --git a/src/Squidex.Domain.Apps.Core.Model/Apps/AppPattern.cs b/src/Squidex.Domain.Apps.Core.Model/Apps/AppPattern.cs index 62fec4af0..ee64fc208 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Apps/AppPattern.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Apps/AppPattern.cs @@ -43,9 +43,9 @@ namespace Squidex.Domain.Apps.Core.Apps } [Pure] - public AppPattern Update(string name, string pattern, string defaultMessage) + public AppPattern Update(string name, string pattern, string message) { - return new AppPattern(name, pattern, defaultMessage); + return new AppPattern(name, pattern, message); } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Apps/Json/JsonAppPattern.cs b/src/Squidex.Domain.Apps.Core.Model/Apps/Json/JsonAppPattern.cs index 9c52a8198..57364a197 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Apps/Json/JsonAppPattern.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Apps/Json/JsonAppPattern.cs @@ -13,9 +13,6 @@ namespace Squidex.Domain.Apps.Core.Apps.Json { public class JsonAppPattern { - [JsonProperty] - public Guid Id { get; set; } - [JsonProperty] public string Name { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs index ccdf24331..72d86aba2 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs @@ -140,7 +140,7 @@ namespace Squidex.Domain.Apps.Entities.Apps protected Task On(AddPattern command, CommandContext context) { - return handler.UpdateAsync(context, a => + return handler.UpdateSyncedAsync(context, a => { GuardAppPattern.CanAdd(a.State.Patterns, command); @@ -150,7 +150,7 @@ namespace Squidex.Domain.Apps.Entities.Apps protected Task On(DeletePattern command, CommandContext context) { - return handler.UpdateAsync(context, a => + return handler.UpdateSyncedAsync(context, a => { GuardAppPattern.CanDelete(a.State.Patterns, command); @@ -160,7 +160,7 @@ namespace Squidex.Domain.Apps.Entities.Apps protected async Task On(UpdatePattern command, CommandContext context) { - await handler.UpdateAsync(context, a => + await handler.UpdateSyncedAsync(context, a => { GuardAppPattern.CanUpdate(a.State.Patterns, command); diff --git a/src/Squidex.Infrastructure.MongoDb/Migrations/MongoMigrationStatus.cs b/src/Squidex.Infrastructure.MongoDb/Migrations/MongoMigrationStatus.cs index eb0ab586a..f70bf2e71 100644 --- a/src/Squidex.Infrastructure.MongoDb/Migrations/MongoMigrationStatus.cs +++ b/src/Squidex.Infrastructure.MongoDb/Migrations/MongoMigrationStatus.cs @@ -40,7 +40,7 @@ namespace Squidex.Infrastructure.Migrations await Collection.FindOneAndUpdateAsync(x => x.Id == DefaultId, Update .Set(x => x.IsLocked, true) - .Set(x => x.Version, 0), + .SetOnInsert(x => x.Version, 0), UpsertFind); return entity == null || entity.IsLocked == false; diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs index 0dfb36706..846353eaf 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppPatternsController.cs @@ -93,7 +93,7 @@ namespace Squidex.Areas.Api.Controllers.Apps /// 404 => App not found or pattern not found. /// [HttpPut] - [Route("apps/{app}/patterns/{name}")] + [Route("apps/{app}/patterns/{id}/")] [ProducesResponseType(typeof(AppPatternDto), 201)] [ApiCosts(1)] public async Task UpdatePattern(string app, Guid id, [FromBody] UpdatePatternDto request) diff --git a/src/Squidex/Config/Domain/SerializationServices.cs b/src/Squidex/Config/Domain/SerializationServices.cs index bbbd00046..90ab4167c 100644 --- a/src/Squidex/Config/Domain/SerializationServices.cs +++ b/src/Squidex/Config/Domain/SerializationServices.cs @@ -43,6 +43,7 @@ namespace Squidex.Config.Domain settings.ContractResolver = new ConverterContractResolver( new AppClientsConverter(), new AppContributorsConverter(), + new AppPatternsConverter(), new ClaimsPrincipalConverter(), new InstantConverter(), new LanguageConverter(), diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts index bf00e09dd..4c0b8750a 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts @@ -80,6 +80,8 @@ export class StringValidationComponent implements OnDestroy, OnInit { } this.setPatternName(); }); + + this.setPatternName(); } public setPattern(pattern: AppPatternDto) { diff --git a/src/Squidex/app/features/settings/declarations.ts b/src/Squidex/app/features/settings/declarations.ts index ee83aef2c..4bbde478f 100644 --- a/src/Squidex/app/features/settings/declarations.ts +++ b/src/Squidex/app/features/settings/declarations.ts @@ -10,6 +10,8 @@ export * from './pages/clients/clients-page.component'; export * from './pages/contributors/contributors-page.component'; export * from './pages/languages/language.component'; export * from './pages/languages/languages-page.component'; +export * from './pages/patterns/pattern.component'; +export * from './pages/patterns/patterns-page.component'; export * from './pages/plans/plans-page.component'; export * from './settings-area.component'; \ No newline at end of file diff --git a/src/Squidex/app/features/settings/module.ts b/src/Squidex/app/features/settings/module.ts index e2be986c4..281a4489f 100644 --- a/src/Squidex/app/features/settings/module.ts +++ b/src/Squidex/app/features/settings/module.ts @@ -22,6 +22,8 @@ import { ContributorsPageComponent, LanguageComponent, LanguagesPageComponent, + PatternComponent, + PatternsPageComponent, PlansPageComponent, SettingsAreaComponent } from './declarations'; @@ -97,6 +99,26 @@ const routes: Routes = [ } } ] + }, + { + path: 'patterns', + component: PatternsPageComponent, + children: [ + { + path: 'history', + component: HistoryComponent, + data: { + channel: 'settings.patterns' + } + }, + { + path: 'help', + component: HelpComponent, + data: { + helpPage: '05-integrated/patterns' + } + } + ] } ] } @@ -115,6 +137,8 @@ const routes: Routes = [ ContributorsPageComponent, LanguageComponent, LanguagesPageComponent, + PatternComponent, + PatternsPageComponent, PlansPageComponent, SettingsAreaComponent ] diff --git a/src/Squidex/app/features/settings/pages/patterns/pattern.component.html b/src/Squidex/app/features/settings/pages/patterns/pattern.component.html new file mode 100644 index 000000000..51913da2b --- /dev/null +++ b/src/Squidex/app/features/settings/pages/patterns/pattern.component.html @@ -0,0 +1,45 @@ +
+
+
+ + + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+
+
\ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/patterns/pattern.component.scss b/src/Squidex/app/features/settings/pages/patterns/pattern.component.scss new file mode 100644 index 000000000..d5c22dda1 --- /dev/null +++ b/src/Squidex/app/features/settings/pages/patterns/pattern.component.scss @@ -0,0 +1,13 @@ +@import '_vars'; +@import '_mixins'; + +.col-options { + min-width: 7.5rem; + max-width: 7.5rem; +} + +.col-name, +.col-message { + min-width: 10rem; + max-width: 10rem; +} \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts b/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts new file mode 100644 index 000000000..41d612573 --- /dev/null +++ b/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts @@ -0,0 +1,95 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Sebastian Stehle. All rights reserved + */ + +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { FormBuilder, Validators } from '@angular/forms'; + +import { + AppPatternDto, + fadeAnimation, + ValidatorsEx, + UpdatePatternDto +} from 'shared'; + +@Component({ + selector: 'sqx-pattern', + styleUrls: ['./pattern.component.scss'], + templateUrl: './pattern.component.html', + animations: [ + fadeAnimation + ] +}) +export class PatternComponent implements OnInit { + @Input() + public isNew = false; + + @Input() + public pattern: AppPatternDto; + + @Output() + public removing = new EventEmitter(); + + @Output() + public updating = new EventEmitter(); + + public editFormSubmitted = false; + public editForm = + this.formBuilder.group({ + name: [ + '', + [ + Validators.required, + Validators.maxLength(100), + ValidatorsEx.pattern('[A-z0-9]+[A-z0-9\- ]*[A-z0-9]', 'Name can only contain letters, numbers, dashes and spaces.') + ] + ], + pattern: [ + '', + [ + Validators.required + ] + ], + message: [ + '', + [ + Validators.maxLength(1000) + ] + ] + }); + + constructor( + private readonly formBuilder: FormBuilder + ) { + } + + public ngOnInit() { + const pattern = this.pattern; + + if (pattern) { + this.editForm.setValue({ name: pattern.name, pattern: pattern.pattern, message: pattern.message || '' }); + } + } + + public cancel() { + this.editFormSubmitted = false; + this.editForm.reset(); + } + + public save() { + this.editFormSubmitted = true; + + if (this.editForm.valid) { + const requestDto = new UpdatePatternDto( + this.editForm.controls['name'].value, + this.editForm.controls['pattern'].value, + this.editForm.controls['message'].value); + + this.updating.emit(requestDto); + } + } +} + diff --git a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html new file mode 100644 index 000000000..433c42aa8 --- /dev/null +++ b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html @@ -0,0 +1,41 @@ + + + +
+
+

Patterns

+
+ + + + +
+ +
+
+
+
+ + +
+ + +
+
+ + +
+ + + + + + +
+
+ + + \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.scss b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.scss new file mode 100644 index 000000000..fbb752506 --- /dev/null +++ b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.scss @@ -0,0 +1,2 @@ +@import '_vars'; +@import '_mixins'; \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts new file mode 100644 index 000000000..d7e9868c2 --- /dev/null +++ b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts @@ -0,0 +1,87 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Sebastian Stehle. All rights reserved + */ + +import { Component, OnInit } from '@angular/core'; + +import { + AppContext, + AppPatternDto, + AppPatternsDto, + AppPatternsService, + HistoryChannelUpdated, + UpdatePatternDto +} from 'shared'; + +@Component({ + selector: 'sqx-patterns-page', + styleUrls: ['./patterns-page.component.scss'], + templateUrl: './patterns-page.component.html', + providers: [ + AppContext + ] +}) +export class PatternsPageComponent implements OnInit { + public appPatterns: AppPatternsDto; + + constructor(public readonly ctx: AppContext, + private readonly appPatternsService: AppPatternsService + ) { + } + + public ngOnInit() { + this.load(); + } + + public load() { + this.appPatternsService.getPatterns(this.ctx.appName).retry(2) + .subscribe(dtos => { + this.updatePatterns(dtos); + }, error => { + this.ctx.notifyError(error); + }); + } + + public addPattern(pattern: AppPatternDto) { + const requestDto = new UpdatePatternDto(pattern.name, pattern.pattern, pattern.message); + + this.appPatternsService.postPattern(this.ctx.appName, requestDto, this.appPatterns.version) + .subscribe(dto => { + this.updatePatterns(this.appPatterns.addPattern(dto.payload, dto.version)); + }, error => { + this.ctx.notifyError(error); + }); + } + + public updatePattern(pattern: AppPatternDto, update: UpdatePatternDto) { + this.appPatternsService.putPattern(this.ctx.appName, pattern.patternId, update, this.appPatterns.version) + .subscribe(dto => { + this.updatePatterns(this.appPatterns.updatePattern(pattern.update(update), dto.version)); + }, error => { + this.ctx.notifyError(error); + }); + } + + public removePattern(pattern: AppPatternDto) { + this.appPatternsService.deletePattern(this.ctx.appName, pattern.patternId, this.appPatterns.version) + .subscribe(dto => { + this.updatePatterns(this.appPatterns.deletePattern(pattern, dto.version)); + }, error => { + this.ctx.notifyError(error); + }); + } + + private updatePatterns(patterns: AppPatternsDto) { + this.appPatterns = + new AppPatternsDto( + patterns.patterns.sort((a, b) => { + return a.name.localeCompare(b.name); + }), + patterns.version); + + this.ctx.bus.emit(new HistoryChannelUpdated()); + } +} \ No newline at end of file diff --git a/src/Squidex/app/features/settings/settings-area.component.html b/src/Squidex/app/features/settings/settings-area.component.html index 7dd011dad..65954946d 100644 --- a/src/Squidex/app/features/settings/settings-area.component.html +++ b/src/Squidex/app/features/settings/settings-area.component.html @@ -32,6 +32,12 @@ +
  • + + Patterns + + +
  • Update Plan diff --git a/src/Squidex/app/shared/services/app-patterns.service.spec.ts b/src/Squidex/app/shared/services/app-patterns.service.spec.ts index b5fa92f91..b919eab8c 100644 --- a/src/Squidex/app/shared/services/app-patterns.service.spec.ts +++ b/src/Squidex/app/shared/services/app-patterns.service.spec.ts @@ -34,7 +34,7 @@ describe('ApppatternsDto', () => { it('should update patterns when removing pattern', () => { const patterns_1 = new AppPatternsDto([pattern1, pattern2], version); - const patterns_2 = patterns_1.removePattern(pattern1, newVersion); + const patterns_2 = patterns_1.deletePattern(pattern1, newVersion); expect(patterns_2.patterns).toEqual([pattern2]); expect(patterns_2.version).toEqual(newVersion); @@ -61,6 +61,8 @@ describe('AppPatternDto', () => { }); describe('AppPatternsService', () => { + const version = new Version('1'); + beforeEach(() => { TestBed.configureTestingModule({ imports: [ @@ -123,14 +125,14 @@ describe('AppPatternsService', () => { let pattern: AppPatternDto | null = null; - patternService.postPattern('my-app', dto, new Version()).subscribe(result => { - pattern = result; + patternService.postPattern('my-app', dto, version).subscribe(result => { + pattern = result.payload; }); const req = httpMock.expectOne('http://service/p/api/apps/my-app/patterns'); expect(req.request.method).toEqual('POST'); - expect(req.request.headers.get('E-Tag')).toBeNull(); + expect(req.request.headers.get('If-Match')).toEqual(version.value); req.flush({ patternId: '1', @@ -147,12 +149,12 @@ describe('AppPatternsService', () => { const dto = new UpdatePatternDto('Number', '[0-9]', 'Message1'); - patternService.updatePattern('my-app', '1', dto, new Version()).subscribe(); + patternService.putPattern('my-app', '1', dto, version).subscribe(); const req = httpMock.expectOne('http://service/p/api/apps/my-app/patterns/1'); expect(req.request.method).toEqual('PUT'); - expect(req.request.headers.get('E-Tag')).toBeNull(); + expect(req.request.headers.get('If-Match')).toEqual(version.value); req.flush({}); })); @@ -160,12 +162,12 @@ describe('AppPatternsService', () => { it('should make delete request to remove pattern', inject([AppPatternsService, HttpTestingController], (patternService: AppPatternsService, httpMock: HttpTestingController) => { - patternService.deletePattern('my-app', '1', new Version('1')).subscribe(); + patternService.deletePattern('my-app', '1', version).subscribe(); const req = httpMock.expectOne('http://service/p/api/apps/my-app/patterns/1'); expect(req.request.method).toEqual('DELETE'); - expect(req.request.headers.get('If-Match')).toEqual(new Version('1').value); + expect(req.request.headers.get('If-Match')).toEqual(version.value); req.flush({}); })); diff --git a/src/Squidex/app/shared/services/app-patterns.service.ts b/src/Squidex/app/shared/services/app-patterns.service.ts index 9585a86c7..657d158bc 100644 --- a/src/Squidex/app/shared/services/app-patterns.service.ts +++ b/src/Squidex/app/shared/services/app-patterns.service.ts @@ -14,7 +14,8 @@ import 'framework/angular/http-extensions'; import { ApiUrlConfig, HTTP, - Version + Version, + Versioned } from 'framework'; export class AppPatternsDto { @@ -32,7 +33,7 @@ export class AppPatternsDto { return new AppPatternsDto(this.patterns.map(p => p.patternId === pattern.patternId ? pattern : p), version); } - public removePattern(pattern: AppPatternDto, version: Version) { + public deletePattern(pattern: AppPatternDto, version: Version) { return new AppPatternsDto(this.patterns.filter(c => c.patternId !== pattern.patternId), version); } } @@ -95,7 +96,7 @@ export class AppPatternsService { .pretifyError('Failed to add pattern. Please reload.'); } - public postPattern(appName: string, pattern: UpdatePatternDto, version: Version): Observable { + public postPattern(appName: string, pattern: UpdatePatternDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns`); return HTTP.postVersioned(this.http, url, pattern, version) @@ -111,14 +112,14 @@ export class AppPatternsService { .pretifyError('Failed to add pattern. Please reload.'); } - public updatePattern(appName: string, id: string, pattern: UpdatePatternDto, version: Version): Observable { + public putPattern(appName: string, id: string, pattern: UpdatePatternDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns/${id}`); return HTTP.putVersioned(this.http, url, pattern, version) .pretifyError('Failed to update pattern. Please reload.'); } - public deletePattern(appName: string, id: string, version: Version): Observable { + public deletePattern(appName: string, id: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns/${id}`); return HTTP.deleteVersioned(this.http, url, version) diff --git a/tools/Migrate_01/Migration01.cs b/tools/Migrate_01/Migration01.cs index c0a8c9e2e..e17291406 100644 --- a/tools/Migrate_01/Migration01.cs +++ b/tools/Migrate_01/Migration01.cs @@ -6,7 +6,6 @@ // All rights reserved. // ========================================================================== -using System; using System.Threading; using System.Threading.Tasks; using Squidex.Domain.Apps.Core.Schemas; @@ -21,18 +20,15 @@ using Squidex.Infrastructure; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Migrations; using Squidex.Infrastructure.States; -using Squidex.Infrastructure.Tasks; namespace Migrate_01 { - public sealed class Migration01 : IMigration, IEventSubscriber + public sealed class Migration01 : IMigration { private readonly FieldRegistry fieldRegistry; private readonly IEventStore eventStore; private readonly IEventDataFormatter eventDataFormatter; private readonly IStateFactory stateFactory; - private readonly Timer timer; - private readonly TaskCompletionSource subscriptionTcs = new TaskCompletionSource(); public int FromVersion { get; } = 0; @@ -48,30 +44,12 @@ namespace Migrate_01 this.eventDataFormatter = eventDataFormatter; this.eventStore = eventStore; this.stateFactory = stateFactory; - - timer = new Timer(d => subscriptionTcs.TrySetResult(true)); } public async Task UpdateAsync() { - var subscription = eventStore.CreateSubscription(this, ".*"); - - try - { - await subscriptionTcs.Task; - } - finally - { - await subscription.StopAsync(); - } - } - - public async Task OnEventAsync(IEventSubscription subscription, StoredEvent storedEvent) - { - try + await eventStore.GetEventsAsync(async storedEvent => { - timer.Change(Timeout.Infinite, Timeout.Infinite); - var @event = ParseKnownEvent(storedEvent); if (@event != null) @@ -111,20 +89,7 @@ namespace Migrate_01 await app.WriteStateAsync(version); } } - - timer.Change(5000, 0); - } - catch (Exception ex) - { - subscriptionTcs.SetException(ex); - } - } - - public Task OnErrorAsync(IEventSubscription subscription, Exception exception) - { - subscriptionTcs.TrySetException(exception); - - return TaskHelper.Done; + }, CancellationToken.None); } private Envelope ParseKnownEvent(StoredEvent storedEvent)