diff --git a/CHANGELOG.md b/CHANGELOG.md index 5383c8731..2a4c48963 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,20 @@ # Changelog +## v1.2.0 - 2018-02-10 + +### Features + +* **EventStore**: Event metadata are stored as json objects in MongoDB now and you cacn query by metadata. +* **Content**: Updated to state can be scheduled, e.g. to publish them. + +> This releases will run a migration, which might take a while and also effects the events. We recommend to make a backup first. + ## v1.1.7 - 2018-02-06 ### Bugfixes * **UI**: Checkbox style fixed. - ## v1.1.6 - 2018-02-06 ### Features diff --git a/src/Squidex.Domain.Apps.Core.Model/SquidexCoreModel.cs b/src/Squidex.Domain.Apps.Core.Model/SquidexCoreModel.cs index 885a8936f..6f4f99495 100644 --- a/src/Squidex.Domain.Apps.Core.Model/SquidexCoreModel.cs +++ b/src/Squidex.Domain.Apps.Core.Model/SquidexCoreModel.cs @@ -5,9 +5,12 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System.Reflection; + namespace Squidex.Domain.Apps.Core { public static class SquidexCoreModel { + public static readonly Assembly Assembly = typeof(SquidexCoreModel).Assembly; } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataObject.cs b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataObject.cs index 934ee5387..79b1e14c4 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataObject.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataObject.cs @@ -102,7 +102,7 @@ namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper { EnsurePropertiesInitialized(); - return fieldProperties.GetOrDefault(propertyName) ?? new PropertyDescriptor(new ObjectInstance(Engine) { Extensible = true }, true, false, true); + return fieldProperties.GetOrAdd(propertyName, x => new ContentDataProperty(this, new ContentFieldObject(this, new ContentFieldData(), false))); } public override IEnumerable> GetOwnProperties() diff --git a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataProperty.cs b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataProperty.cs index 943d41240..4ea31b9ea 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataProperty.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataProperty.cs @@ -30,7 +30,7 @@ namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper { if (value == null || !value.IsObject()) { - throw new JavaScriptException("Can only assign object to content data."); + throw new JavaScriptException("You can only assign objects to content data."); } var obj = value.AsObject(); diff --git a/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs b/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs index b9abcee99..57e135981 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs @@ -115,11 +115,11 @@ namespace Squidex.Domain.Apps.Core.Scripting } catch (ParserException ex) { - throw new ValidationException("Failed to execute script with javascript syntax error.", new ValidationError(ex.Message)); + throw new ValidationException($"Failed to execute script with javascript syntax error: {ex.Message}", new ValidationError(ex.Message)); } catch (JavaScriptException ex) { - throw new ValidationException("Failed to execute script with javascript error.", new ValidationError(ex.Message)); + throw new ValidationException($"Failed to execute script with javascript error: {ex.Message}", new ValidationError(ex.Message)); } } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetEntity.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetEntity.cs index 468bd2110..2f2729858 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetEntity.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetEntity.cs @@ -20,9 +20,16 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets IAssetEntity, IUpdateableEntityWithVersion, IUpdateableEntityWithCreatedBy, - IUpdateableEntityWithLastModifiedBy, - IUpdateableEntityWithAppRef + IUpdateableEntityWithLastModifiedBy { + [BsonRequired] + [BsonElement] + public Guid AppIdId { get; set; } + + [BsonRequired] + [BsonElement] + public NamedId AppId { get; set; } + [BsonRequired] [BsonElement] public string MimeType { get; set; } @@ -55,10 +62,6 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets [BsonElement] public int? PixelHeight { get; set; } - [BsonRequired] - [BsonElement] - public Guid AppId { get; set; } - [BsonRequired] [BsonElement] public RefToken CreatedBy { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository_SnapshotStore.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository_SnapshotStore.cs index 3e1cf0c22..a4056d0a7 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository_SnapshotStore.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository_SnapshotStore.cs @@ -36,6 +36,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets var entity = SimpleMapper.Map(value, new MongoAssetEntity()); entity.Version = newVersion; + entity.AppIdId = value.AppId.Id; await Collection.ReplaceOneAsync(x => x.Id == key && x.Version == oldVersion, entity, Upsert); } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/Visitors/FindExtensions.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/Visitors/FindExtensions.cs index b43fc8f48..af3a75764 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/Visitors/FindExtensions.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/Visitors/FindExtensions.cs @@ -51,7 +51,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets.Visitors { var filters = new List> { - Filter.Eq(x => x.AppId, appId), + Filter.Eq(x => x.AppIdId, appId), Filter.Eq(x => x.IsDeleted, false) }; diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentEntity.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentEntity.cs index 68d92be78..f35cb2286 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentEntity.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentEntity.cs @@ -35,12 +35,12 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents [BsonRequired] [BsonElement("ai")] [BsonRepresentation(BsonType.String)] - public Guid AppId { get; set; } + public Guid AppIdId { get; set; } [BsonRequired] [BsonElement("si")] [BsonRepresentation(BsonType.String)] - public Guid SchemaId { get; set; } + public Guid SchemaIdId { get; set; } [BsonRequired] [BsonElement("rf")] @@ -62,6 +62,26 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents [BsonJson] public IdContentData DataByIds { get; set; } + [BsonRequired] + [BsonElement("ai2")] + public NamedId AppId { get; set; } + + [BsonRequired] + [BsonElement("si2")] + public NamedId SchemaId { get; set; } + + [BsonIgnoreIfNull] + [BsonElement("sdt")] + public Status? ScheduledTo { get; set; } + + [BsonIgnoreIfNull] + [BsonElement("sda")] + public Instant? ScheduledAt { get; set; } + + [BsonIgnoreIfNull] + [BsonElement("sdb")] + public RefToken ScheduledBy { get; set; } + [BsonRequired] [BsonElement("ct")] public Instant Created { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs index a8ad1abcc..1d4cc508f 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository.cs @@ -11,6 +11,7 @@ using System.Linq; using System.Threading.Tasks; using Microsoft.OData.UriParser; using MongoDB.Driver; +using NodaTime; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Contents; @@ -51,6 +52,10 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents { await collection.Indexes.TryDropOneAsync("si_1_st_1_dl_1_dt_text"); + await archiveCollection.Indexes.CreateOneAsync( + Index + .Ascending(x => x.ScheduledTo)); + await archiveCollection.Indexes.CreateOneAsync( Index .Ascending(x => x.Id) @@ -59,13 +64,13 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents await collection.Indexes.CreateOneAsync( Index .Text(x => x.DataText) - .Ascending(x => x.SchemaId) + .Ascending(x => x.SchemaIdId) .Ascending(x => x.Status) .Ascending(x => x.IsDeleted)); await collection.Indexes.CreateOneAsync( Index - .Ascending(x => x.SchemaId) + .Ascending(x => x.SchemaIdId) .Ascending(x => x.Id) .Ascending(x => x.IsDeleted) .Ascending(x => x.Status)); @@ -121,7 +126,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents public async Task> QueryAsync(IAppEntity app, ISchemaEntity schema, Status[] status, HashSet ids) { - var find = Collection.Find(x => x.SchemaId == schema.Id && ids.Contains(x.Id) && x.IsDeleted == false && status.Contains(x.Status)); + var find = Collection.Find(x => x.SchemaIdId == schema.Id && ids.Contains(x.Id) && x.IsDeleted == false && status.Contains(x.Status)); var contentItems = find.ToListAsync(); var contentCount = find.CountAsync(); @@ -139,7 +144,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents public async Task> QueryNotFoundAsync(Guid appId, Guid schemaId, IList ids) { var contentEntities = - await Collection.Find(x => x.SchemaId == schemaId && ids.Contains(x.Id) && x.IsDeleted == false).Only(x => x.Id) + await Collection.Find(x => x.SchemaIdId == schemaId && ids.Contains(x.Id) && x.IsDeleted == false).Only(x => x.Id) .ToListAsync(); return ids.Except(contentEntities.Select(x => Guid.Parse(x["id"].AsString))).ToList(); @@ -159,7 +164,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents public async Task FindContentAsync(IAppEntity app, ISchemaEntity schema, Guid id) { var contentEntity = - await Collection.Find(x => x.SchemaId == schema.Id && x.Id == id && x.IsDeleted == false) + await Collection.Find(x => x.SchemaIdId == schema.Id && x.Id == id && x.IsDeleted == false) .FirstOrDefaultAsync(); contentEntity?.ParseData(schema.SchemaDef); @@ -167,6 +172,15 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents return contentEntity; } + public Task QueryScheduledWithoutDataAsync(Instant now, Func callback) + { + return Collection.Find(x => x.ScheduledAt < now && x.IsDeleted == false) + .ForEachAsync(c => + { + callback(c); + }); + } + public override async Task ClearAsync() { await Database.DropCollectionAsync("States_Contents_Archive"); diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs index c220e416e..54e236e4a 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs @@ -28,7 +28,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents if (contentEntity != null) { - var schema = await GetSchemaAsync(contentEntity.AppId, contentEntity.SchemaId); + var schema = await GetSchemaAsync(contentEntity.AppIdId, contentEntity.SchemaIdId); contentEntity?.ParseData(schema.SchemaDef); @@ -40,12 +40,12 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents public async Task WriteAsync(Guid key, ContentState value, long oldVersion, long newVersion) { - if (value.SchemaId == Guid.Empty) + if (value.SchemaId.Id == Guid.Empty) { return; } - var schema = await GetSchemaAsync(value.AppId, value.SchemaId); + var schema = await GetSchemaAsync(value.AppId.Id, value.SchemaId.Id); var idData = value.Data?.ToIdModel(schema.SchemaDef, true); @@ -53,6 +53,8 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents var document = SimpleMapper.Map(value, new MongoContentEntity { + AppIdId = value.AppId.Id, + SchemaIdId = value.SchemaId.Id, IsDeleted = value.IsDeleted, DocumentId = key.ToString(), DataText = idData?.ToFullText(), @@ -92,7 +94,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents private async Task GetSchemaAsync(Guid appId, Guid schemaId) { - var schema = await appProvider.GetSchemaAsync(appId, schemaId); + var schema = await appProvider.GetSchemaAsync(appId, schemaId, true); if (schema == null) { diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs index c4ca769b6..cdfaff9b8 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Visitors/FindExtensions.cs @@ -80,7 +80,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents.Visitors { var filters = new List> { - Filter.Eq(x => x.SchemaId, schemaId), + Filter.Eq(x => x.SchemaIdId, schemaId), Filter.In(x => x.Status, status), Filter.Eq(x => x.IsDeleted, false) }; diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventEntity.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventEntity.cs index 610d38977..5e9d9d50d 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventEntity.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/History/MongoHistoryEventEntity.cs @@ -16,11 +16,9 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.History { public sealed class MongoHistoryEventEntity : MongoEntity, IEntity, - IEntityWithAppRef, IUpdateableEntity, IUpdateableEntityWithVersion, - IUpdateableEntityWithCreatedBy, - IUpdateableEntityWithAppRef + IUpdateableEntityWithCreatedBy { [BsonElement] [BsonRequired] diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs index d54da9c2d..468d8d831 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleEventRepository.cs @@ -39,9 +39,9 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Rules await collection.Indexes.CreateOneAsync(Index.Ascending(x => x.Expires), new CreateIndexOptions { ExpireAfter = TimeSpan.Zero }); } - public Task QueryPendingAsync(Instant now, Func callback, CancellationToken cancellationToken = default(CancellationToken)) + public Task QueryPendingAsync(Instant now, Func callback, CancellationToken ct = default(CancellationToken)) { - return Collection.Find(x => x.NextAttempt < now).ForEachAsync(callback, cancellationToken); + return Collection.Find(x => x.NextAttempt < now).ForEachAsync(callback, ct); } public async Task> QueryByAppAsync(Guid appId, int skip = 0, int take = 20) diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleRepository_SnapshotStore.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleRepository_SnapshotStore.cs index 408a3aaba..cd8a2ee02 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleRepository_SnapshotStore.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Rules/MongoRuleRepository_SnapshotStore.cs @@ -35,7 +35,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Rules { return Collection.UpsertVersionedAsync(key, oldVersion, newVersion, u => u .Set(x => x.State, value) - .Set(x => x.AppId, value.AppId) + .Set(x => x.AppId, value.AppId.Id) .Set(x => x.IsDeleted, value.IsDeleted)); } } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Schemas/MongoSchemaRepository_SnapshotStore.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Schemas/MongoSchemaRepository_SnapshotStore.cs index aadd8cbcb..a23899a7a 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Schemas/MongoSchemaRepository_SnapshotStore.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Schemas/MongoSchemaRepository_SnapshotStore.cs @@ -35,7 +35,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Schemas { return Collection.UpsertVersionedAsync(key, oldVersion, newVersion, u => u .Set(x => x.State, value) - .Set(x => x.AppId, value.AppId) + .Set(x => x.AppId, value.AppId.Id) .Set(x => x.Name, value.Name) .Set(x => x.IsDeleted, value.IsDeleted)); } diff --git a/src/Squidex.Domain.Apps.Entities/AppProvider.cs b/src/Squidex.Domain.Apps.Entities/AppProvider.cs index 38f0b2742..b2e028a12 100644 --- a/src/Squidex.Domain.Apps.Entities/AppProvider.cs +++ b/src/Squidex.Domain.Apps.Entities/AppProvider.cs @@ -88,11 +88,11 @@ namespace Squidex.Domain.Apps.Entities return (await stateFactory.GetSingleAsync(schemaId)).Snapshot; } - public async Task GetSchemaAsync(Guid appId, Guid id) + public async Task GetSchemaAsync(Guid appId, Guid id, bool allowDeleted = false) { var schema = await stateFactory.GetSingleAsync(id); - if (!IsFound(schema)) + if (!IsFound(schema) || (schema.Snapshot.IsDeleted && !allowDeleted) || schema.Snapshot.AppId.Id != appId) { return null; } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs index 9439961c4..829c1388c 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/AppCommandMiddleware.cs @@ -179,7 +179,7 @@ namespace Squidex.Domain.Apps.Entities.Apps } else { - var result = await appPlansBillingManager.ChangePlanAsync(command.Actor.Identifier, command.AppId.Id, a.Snapshot.Name, command.PlanId); + var result = await appPlansBillingManager.ChangePlanAsync(command.Actor.Identifier, a.Snapshot.Id, a.Snapshot.Name, command.PlanId); if (result is PlanChangedResult) { diff --git a/src/Squidex.Domain.Apps.Entities/Apps/AppDomainObject.cs b/src/Squidex.Domain.Apps.Entities/Apps/AppDomainObject.cs index 411f4a8e8..2dedb3a7a 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/AppDomainObject.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/AppDomainObject.cs @@ -13,13 +13,12 @@ using Squidex.Domain.Apps.Entities.Apps.State; using Squidex.Domain.Apps.Events; using Squidex.Domain.Apps.Events.Apps; using Squidex.Infrastructure; -using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Reflection; namespace Squidex.Domain.Apps.Entities.Apps { - public sealed class AppDomainObject : DomainObjectBase + public sealed class AppDomainObject : SquidexDomainObjectBase { private readonly InitialPatterns initialPatterns; diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/AddLanguage.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/AddLanguage.cs index b2619a6f6..3cfec0965 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/AddLanguage.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/AddLanguage.cs @@ -9,7 +9,7 @@ using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class AddLanguage : AppAggregateCommand + public sealed class AddLanguage : AppCommand { public Language Language { get; set; } } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/AddPattern.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/AddPattern.cs index 5442536c1..30873adbb 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/AddPattern.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/AddPattern.cs @@ -9,7 +9,7 @@ using System; namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class AddPattern : AppAggregateCommand + public sealed class AddPattern : AppCommand { public Guid PatternId { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/SchemaAggregateCommand.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/AppCommand.cs similarity index 71% rename from src/Squidex.Domain.Apps.Entities/SchemaAggregateCommand.cs rename to src/Squidex.Domain.Apps.Entities/Apps/Commands/AppCommand.cs index d3d73dd62..a391da077 100644 --- a/src/Squidex.Domain.Apps.Entities/SchemaAggregateCommand.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/AppCommand.cs @@ -8,13 +8,15 @@ using System; using Squidex.Infrastructure.Commands; -namespace Squidex.Domain.Apps.Entities +namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public abstract class SchemaAggregateCommand : SchemaCommand, IAggregateCommand + public abstract class AppCommand : SquidexCommand, IAggregateCommand { + public Guid AppId { get; set; } + Guid IAggregateCommand.AggregateId { - get { return SchemaId.Id; } + get { return AppId; } } } } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/AssignContributor.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/AssignContributor.cs index 13a60ddda..b54518a66 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/AssignContributor.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/AssignContributor.cs @@ -9,7 +9,7 @@ using Squidex.Domain.Apps.Core.Apps; namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class AssignContributor : AppAggregateCommand + public sealed class AssignContributor : AppCommand { public string ContributorId { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/AttachClient.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/AttachClient.cs index 4239c1e47..0fd8c6c4d 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/AttachClient.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/AttachClient.cs @@ -9,10 +9,15 @@ using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class AttachClient : AppAggregateCommand + public sealed class AttachClient : AppCommand { public string Id { get; set; } - public string Secret { get; } = RandomHash.New(); + public string Secret { get; set; } + + public AttachClient() + { + Secret = RandomHash.New(); + } } } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/ChangePlan.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/ChangePlan.cs index b5af896bf..a323b8b10 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/ChangePlan.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/ChangePlan.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class ChangePlan : AppAggregateCommand + public sealed class ChangePlan : AppCommand { public bool FromCallback { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/CreateApp.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/CreateApp.cs index 5e8050247..d4dc2528b 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/CreateApp.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/CreateApp.cs @@ -10,19 +10,12 @@ using Squidex.Infrastructure.Commands; namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class CreateApp : SquidexCommand, IAggregateCommand + public sealed class CreateApp : AppCommand, IAggregateCommand { - public Guid AppId { get; set; } - public string Name { get; set; } public string Template { get; set; } - Guid IAggregateCommand.AggregateId - { - get { return AppId; } - } - public CreateApp() { AppId = Guid.NewGuid(); diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/DeletePattern.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/DeletePattern.cs index 5db33b435..199bff83c 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/DeletePattern.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/DeletePattern.cs @@ -9,7 +9,7 @@ using System; namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class DeletePattern : AppAggregateCommand + public sealed class DeletePattern : AppCommand { public Guid PatternId { get; set; } } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/RemoveContributor.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/RemoveContributor.cs index 6f707811f..a4e27d426 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/RemoveContributor.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/RemoveContributor.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class RemoveContributor : AppAggregateCommand + public sealed class RemoveContributor : AppCommand { public string ContributorId { get; set; } } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/RemoveLanguage.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/RemoveLanguage.cs index c863e7b85..602c35756 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/RemoveLanguage.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/RemoveLanguage.cs @@ -9,7 +9,7 @@ using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class RemoveLanguage : AppAggregateCommand + public sealed class RemoveLanguage : AppCommand { public Language Language { get; set; } } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/RevokeClient.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/RevokeClient.cs index 623da3058..9361891ba 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/RevokeClient.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/RevokeClient.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class RevokeClient : AppAggregateCommand + public sealed class RevokeClient : AppCommand { public string Id { get; set; } } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/UpdateClient.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/UpdateClient.cs index 856de1f4a..6002bba30 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/UpdateClient.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/UpdateClient.cs @@ -9,7 +9,7 @@ using Squidex.Domain.Apps.Core.Apps; namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class UpdateClient : AppAggregateCommand + public sealed class UpdateClient : AppCommand { public string Id { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/UpdateLanguage.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/UpdateLanguage.cs index c0f442a25..52e40e5d0 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/UpdateLanguage.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/UpdateLanguage.cs @@ -10,7 +10,7 @@ using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class UpdateLanguage : AppAggregateCommand + public sealed class UpdateLanguage : AppCommand { public Language Language { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Commands/UpdatePattern.cs b/src/Squidex.Domain.Apps.Entities/Apps/Commands/UpdatePattern.cs index 9ae7b510e..415856189 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Commands/UpdatePattern.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Commands/UpdatePattern.cs @@ -9,7 +9,7 @@ using System; namespace Squidex.Domain.Apps.Entities.Apps.Commands { - public sealed class UpdatePattern : AppAggregateCommand + public sealed class UpdatePattern : AppCommand { public Guid PatternId { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppClients.cs b/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppClients.cs index 604284090..b46cf9240 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppClients.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Guards/GuardAppClients.cs @@ -21,7 +21,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Guards { if (string.IsNullOrWhiteSpace(command.Id)) { - error(new ValidationError("Client id must be defined.", nameof(command.Id))); + error(new ValidationError("Client id is required.", nameof(command.Id))); } else if (clients.ContainsKey(command.Id)) { @@ -40,7 +40,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Guards { if (string.IsNullOrWhiteSpace(command.Id)) { - error(new ValidationError("Client id must be defined.", nameof(command.Id))); + error(new ValidationError("Client id is required.", nameof(command.Id))); } }); } @@ -55,12 +55,12 @@ namespace Squidex.Domain.Apps.Entities.Apps.Guards { if (string.IsNullOrWhiteSpace(command.Id)) { - error(new ValidationError("Client id must be defined.", nameof(command.Id))); + error(new ValidationError("Client id is required.", nameof(command.Id))); } if (string.IsNullOrWhiteSpace(command.Name) && command.Permission == null) { - error(new ValidationError("Either name or permission must be defined.", nameof(command.Name), nameof(command.Permission))); + error(new ValidationError("Either name or permission is required.", nameof(command.Name), nameof(command.Permission))); } if (command.Permission.HasValue && !command.Permission.Value.IsEnumValue()) diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs index 93e9747b9..adea21e4c 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs @@ -36,17 +36,10 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates { 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)); + CreatePagesAsync(context.CommandBus, appId), + CreatePostsAsync(context.CommandBus, appId), + CreateClientAsync(context.CommandBus, appId)); } return TaskHelper.Done; @@ -57,16 +50,16 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates return string.Equals(createApp.Template, TemplateName, StringComparison.OrdinalIgnoreCase); } - private static async Task CreateClientAsync(Func publishAsync, NamedId appId) + private static async Task CreateClientAsync(ICommandBus bus, NamedId appId) { - await publishAsync(new AttachClient { Id = "sample-client" }); + await bus.PublishAsync(new AttachClient { Id = "sample-client" }); } - private async Task CreatePostsAsync(Func publishAsync, NamedId appId) + private async Task CreatePostsAsync(ICommandBus bus, NamedId appId) { - var postsId = await CreatePostsSchema(publishAsync); + var postsId = await CreatePostsSchema(bus, appId); - await publishAsync(new CreateContent + await bus.PublishAsync(new CreateContent { SchemaId = postsId, Data = @@ -81,11 +74,11 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates }); } - private async Task CreatePagesAsync(Func publishAsync, NamedId appId) + private async Task CreatePagesAsync(ICommandBus bus, NamedId appId) { - var pagesId = await CreatePagesSchema(publishAsync); + var pagesId = await CreatePagesSchema(bus, appId); - await publishAsync(new CreateContent + await bus.PublishAsync(new CreateContent { SchemaId = pagesId, Data = @@ -100,68 +93,70 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates }); } - private async Task> CreatePostsSchema(Func publishAsync) + private async Task> CreatePostsSchema(ICommandBus bus, NamedId appId) { var command = new CreateSchema { Name = "posts", + Publish = true, Properties = new SchemaProperties { Label = "Posts" }, Fields = new List + { + new CreateSchemaField { - new CreateSchemaField + Name = "title", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties { - Name = "title", - Partitioning = Partitioning.Invariant.Key, - Properties = new StringFieldProperties - { - Editor = StringFieldEditor.Input, - IsRequired = true, - IsListField = true, - MaxLength = 100, - MinLength = 0, - Label = "Title" - } - }, - new CreateSchemaField + Editor = StringFieldEditor.Input, + IsRequired = true, + IsListField = true, + MaxLength = 100, + MinLength = 0, + Label = "Title" + } + }, + new CreateSchemaField + { + Name = "slug", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties { - Name = "slug", - Partitioning = Partitioning.Invariant.Key, - Properties = new StringFieldProperties - { - Editor = StringFieldEditor.Slug, - IsRequired = false, - IsListField = true, - MaxLength = 100, - MinLength = 0, - Label = "Slug" - } + Editor = StringFieldEditor.Slug, + IsRequired = false, + IsListField = true, + MaxLength = 100, + MinLength = 0, + Label = "Slug (Autogenerated)" }, - new CreateSchemaField + IsDisabled = true + }, + new CreateSchemaField + { + Name = "text", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties { - Name = "text", - Partitioning = Partitioning.Invariant.Key, - Properties = new StringFieldProperties - { - Editor = StringFieldEditor.RichText, - IsRequired = true, - IsListField = false, - Label = "Text" - } + Editor = StringFieldEditor.RichText, + IsRequired = true, + IsListField = false, + Label = "Text" } } + }, + AppId = appId }; - await publishAsync(command); + await bus.PublishAsync(command); var schemaId = new NamedId(command.SchemaId, command.Name); - await publishAsync(new PublishSchema { SchemaId = schemaId }); - await publishAsync(new ConfigureScripts + await bus.PublishAsync(new ConfigureScripts { - SchemaId = schemaId, + SchemaId = schemaId.Id, ScriptCreate = SlugScript, ScriptUpdate = SlugScript }); @@ -169,7 +164,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates return schemaId; } - private async Task> CreatePagesSchema(Func publishAsync) + private async Task> CreatePagesSchema(ICommandBus bus, NamedId appId) { var command = new CreateSchema { @@ -179,58 +174,59 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates Label = "Pages" }, Fields = new List + { + new CreateSchemaField { - new CreateSchemaField + Name = "title", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties { - Name = "title", - Partitioning = Partitioning.Invariant.Key, - Properties = new StringFieldProperties - { - Editor = StringFieldEditor.Input, - IsRequired = true, - IsListField = true, - MaxLength = 100, - MinLength = 0, - Label = "Title" - } - }, - new CreateSchemaField + Editor = StringFieldEditor.Input, + IsRequired = true, + IsListField = true, + MaxLength = 100, + MinLength = 0, + Label = "Title" + } + }, + new CreateSchemaField + { + Name = "slug", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties { - Name = "slug", - Partitioning = Partitioning.Invariant.Key, - Properties = new StringFieldProperties - { - Editor = StringFieldEditor.Slug, - IsRequired = false, - IsListField = true, - MaxLength = 100, - MinLength = 0, - Label = "Slug" - } + Editor = StringFieldEditor.Slug, + IsRequired = false, + IsListField = true, + MaxLength = 100, + MinLength = 0, + Label = "Slug (Autogenerated)" }, - new CreateSchemaField + IsDisabled = true + }, + new CreateSchemaField + { + Name = "text", + Partitioning = Partitioning.Invariant.Key, + Properties = new StringFieldProperties { - Name = "text", - Partitioning = Partitioning.Invariant.Key, - Properties = new StringFieldProperties - { - Editor = StringFieldEditor.RichText, - IsRequired = true, - IsListField = false, - Label = "Text" - } + Editor = StringFieldEditor.RichText, + IsRequired = true, + IsListField = false, + Label = "Text" } } + }, + AppId = appId }; - await publishAsync(command); + await bus.PublishAsync(command); var schemaId = new NamedId(command.SchemaId, command.Name); - await publishAsync(new PublishSchema { SchemaId = schemaId }); - await publishAsync(new ConfigureScripts + await bus.PublishAsync(new ConfigureScripts { - SchemaId = schemaId, + SchemaId = schemaId.Id, ScriptCreate = SlugScript, ScriptUpdate = SlugScript }); diff --git a/src/Squidex.Domain.Apps.Entities/Assets/AssetDomainObject.cs b/src/Squidex.Domain.Apps.Entities/Assets/AssetDomainObject.cs index 103cd9981..7cc351c83 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/AssetDomainObject.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/AssetDomainObject.cs @@ -7,15 +7,15 @@ using Squidex.Domain.Apps.Entities.Assets.Commands; using Squidex.Domain.Apps.Entities.Assets.State; +using Squidex.Domain.Apps.Events; using Squidex.Domain.Apps.Events.Assets; using Squidex.Infrastructure; -using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Reflection; namespace Squidex.Domain.Apps.Entities.Assets { - public sealed class AssetDomainObject : DomainObjectBase + public sealed class AssetDomainObject : SquidexDomainObjectBase { public AssetDomainObject Create(CreateAsset command) { @@ -74,6 +74,16 @@ namespace Squidex.Domain.Apps.Entities.Assets return this; } + private void RaiseEvent(AppEvent @event) + { + if (@event.AppId == null) + { + @event.AppId = Snapshot.AppId; + } + + RaiseEvent(Envelope.Create(@event)); + } + private void VerifyNotCreated() { if (!string.IsNullOrWhiteSpace(Snapshot.FileName)) diff --git a/src/Squidex.Domain.Apps.Entities/Assets/Commands/AssetAggregateCommand.cs b/src/Squidex.Domain.Apps.Entities/Assets/Commands/AssetCommand.cs similarity index 88% rename from src/Squidex.Domain.Apps.Entities/Assets/Commands/AssetAggregateCommand.cs rename to src/Squidex.Domain.Apps.Entities/Assets/Commands/AssetCommand.cs index efdb41e00..4898243dd 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/Commands/AssetAggregateCommand.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/Commands/AssetCommand.cs @@ -10,7 +10,7 @@ using Squidex.Infrastructure.Commands; namespace Squidex.Domain.Apps.Entities.Assets.Commands { - public abstract class AssetAggregateCommand : AppCommand, IAggregateCommand + public abstract class AssetCommand : SquidexCommand, IAggregateCommand { public Guid AssetId { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Assets/Commands/CreateAsset.cs b/src/Squidex.Domain.Apps.Entities/Assets/Commands/CreateAsset.cs index f7696e14b..f421d9ed8 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/Commands/CreateAsset.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/Commands/CreateAsset.cs @@ -6,12 +6,15 @@ // ========================================================================== using System; +using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; namespace Squidex.Domain.Apps.Entities.Assets.Commands { - public sealed class CreateAsset : AssetAggregateCommand + public sealed class CreateAsset : AssetCommand, IAppCommand { + public NamedId AppId { get; set; } + public AssetFile File { get; set; } public ImageInfo ImageInfo { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Assets/Commands/DeleteAsset.cs b/src/Squidex.Domain.Apps.Entities/Assets/Commands/DeleteAsset.cs index 351333962..4848be209 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/Commands/DeleteAsset.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/Commands/DeleteAsset.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Commands { - public sealed class DeleteAsset : AssetAggregateCommand + public sealed class DeleteAsset : AssetCommand { } } diff --git a/src/Squidex.Domain.Apps.Entities/Assets/Commands/RenameAsset.cs b/src/Squidex.Domain.Apps.Entities/Assets/Commands/RenameAsset.cs index 3dc784b88..65cba7f35 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/Commands/RenameAsset.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/Commands/RenameAsset.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Commands { - public sealed class RenameAsset : AssetAggregateCommand + public sealed class RenameAsset : AssetCommand { public string FileName { get; set; } } diff --git a/src/Squidex.Domain.Apps.Entities/Assets/Commands/UpdateAsset.cs b/src/Squidex.Domain.Apps.Entities/Assets/Commands/UpdateAsset.cs index 8c419ca71..1bb193419 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/Commands/UpdateAsset.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/Commands/UpdateAsset.cs @@ -9,7 +9,7 @@ using Squidex.Infrastructure.Assets; namespace Squidex.Domain.Apps.Entities.Assets.Commands { - public sealed class UpdateAsset : AssetAggregateCommand + public sealed class UpdateAsset : AssetCommand { public AssetFile File { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAsset.cs b/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAsset.cs index 756441da2..757959a6a 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAsset.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAsset.cs @@ -20,7 +20,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Guards { if (string.IsNullOrWhiteSpace(command.FileName)) { - error(new ValidationError("Name must be defined.", nameof(command.FileName))); + error(new ValidationError("Name is required.", nameof(command.FileName))); } if (string.Equals(command.FileName, oldName)) diff --git a/src/Squidex.Domain.Apps.Entities/Assets/IAssetEntity.cs b/src/Squidex.Domain.Apps.Entities/Assets/IAssetEntity.cs index c95179f66..c61c52cc0 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/IAssetEntity.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/IAssetEntity.cs @@ -5,18 +5,21 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; using Squidex.Domain.Apps.Core.ValidateContent; +using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Entities.Assets { public interface IAssetEntity : IEntity, - IEntityWithAppRef, IEntityWithCreatedBy, IEntityWithLastModifiedBy, IEntityWithVersion, IAssetInfo { + NamedId AppId { get; } + string MimeType { get; } long FileVersion { get; } diff --git a/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs b/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs index 8a2f65796..3ed7714a7 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs @@ -10,6 +10,7 @@ using Newtonsoft.Json; using Squidex.Domain.Apps.Core.ValidateContent; using Squidex.Domain.Apps.Events; using Squidex.Domain.Apps.Events.Assets; +using Squidex.Infrastructure; using Squidex.Infrastructure.Dispatching; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Reflection; @@ -18,11 +19,10 @@ namespace Squidex.Domain.Apps.Entities.Assets.State { public class AssetState : DomainObjectState, IAssetEntity, - IAssetInfo, - IUpdateableEntityWithAppRef + IAssetInfo { [JsonProperty] - public Guid AppId { get; set; } + public NamedId AppId { get; set; } [JsonProperty] public string FileName { get; set; } @@ -61,6 +61,8 @@ namespace Squidex.Domain.Apps.Entities.Assets.State SimpleMapper.Map(@event, this); TotalSize += @event.FileSize; + + AppId = @event.AppId; } protected void On(AssetUpdated @event) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Commands/ChangeContentStatus.cs b/src/Squidex.Domain.Apps.Entities/Contents/Commands/ChangeContentStatus.cs index 9e8de0bd2..e855a9aff 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Commands/ChangeContentStatus.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Commands/ChangeContentStatus.cs @@ -5,6 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================= +using NodaTime; using Squidex.Domain.Apps.Core.Contents; namespace Squidex.Domain.Apps.Entities.Contents.Commands @@ -12,5 +13,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Commands public sealed class ChangeContentStatus : ContentCommand { public Status Status { get; set; } + + public Instant? DueTime { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Commands/ContentCommand.cs b/src/Squidex.Domain.Apps.Entities/Contents/Commands/ContentCommand.cs index 3629bdfdc..8e15d2a7b 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Commands/ContentCommand.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Commands/ContentCommand.cs @@ -10,7 +10,7 @@ using Squidex.Infrastructure.Commands; namespace Squidex.Domain.Apps.Entities.Contents.Commands { - public abstract class ContentCommand : SchemaCommand, IAggregateCommand + public abstract class ContentCommand : SquidexCommand, IAggregateCommand { public Guid ContentId { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Commands/CreateContent.cs b/src/Squidex.Domain.Apps.Entities/Contents/Commands/CreateContent.cs index 71e0a11e7..2eec65f73 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Commands/CreateContent.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Commands/CreateContent.cs @@ -6,11 +6,16 @@ // ========================================================================== using System; +using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Entities.Contents.Commands { - public sealed class CreateContent : ContentDataCommand + public sealed class CreateContent : ContentDataCommand, ISchemaCommand, IAppCommand { + public NamedId AppId { get; set; } + + public NamedId SchemaId { get; set; } + public bool Publish { get; set; } public CreateContent() diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentCommandMiddleware.cs index 6b10ba6df..7674f1512 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentCommandMiddleware.cs @@ -109,9 +109,12 @@ namespace Squidex.Domain.Apps.Entities.Contents { GuardContent.CanChangeContentStatus(content.Snapshot.Status, command); - var operationContext = await CreateContext(command, content, () => "Failed to patch content."); + if (!command.DueTime.HasValue) + { + var operationContext = await CreateContext(command, content, () => "Failed to patch content."); - await operationContext.ExecuteScriptAsync(x => x.ScriptChange, command.Status); + await operationContext.ExecuteScriptAsync(x => x.ScriptChange, command.Status); + } content.ChangeStatus(command); }); diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentDomainObject.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentDomainObject.cs index 0b46b12d7..47db34ab1 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentDomainObject.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentDomainObject.cs @@ -8,15 +8,15 @@ using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Domain.Apps.Entities.Contents.State; +using Squidex.Domain.Apps.Events; using Squidex.Domain.Apps.Events.Contents; using Squidex.Infrastructure; -using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Reflection; namespace Squidex.Domain.Apps.Entities.Contents { - public sealed class ContentDomainObject : DomainObjectBase + public sealed class ContentDomainObject : SquidexDomainObjectBase { public ContentDomainObject Create(CreateContent command) { @@ -45,7 +45,14 @@ namespace Squidex.Domain.Apps.Entities.Contents { VerifyCreatedAndNotDeleted(); - RaiseEvent(SimpleMapper.Map(command, new ContentStatusChanged())); + if (command.DueTime.HasValue) + { + RaiseEvent(SimpleMapper.Map(command, new ContentStatusScheduled { DueTime = command.DueTime.Value })); + } + else + { + RaiseEvent(SimpleMapper.Map(command, new ContentStatusChanged())); + } return this; } @@ -80,6 +87,21 @@ namespace Squidex.Domain.Apps.Entities.Contents return this; } + private void RaiseEvent(SchemaEvent @event) + { + if (@event.AppId == null) + { + @event.AppId = Snapshot.AppId; + } + + if (@event.SchemaId == null) + { + @event.SchemaId = Snapshot.SchemaId; + } + + RaiseEvent(Envelope.Create(@event)); + } + private void VerifyNotCreated() { if (Snapshot.Data != null) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentEntity.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentEntity.cs index 9c0bc7af7..27e1c1895 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentEntity.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentEntity.cs @@ -18,7 +18,9 @@ namespace Squidex.Domain.Apps.Entities.Contents { public Guid Id { get; set; } - public Guid AppId { get; set; } + public NamedId AppId { get; set; } + + public NamedId SchemaId { get; set; } public long Version { get; set; } @@ -26,14 +28,20 @@ namespace Squidex.Domain.Apps.Entities.Contents public Instant LastModified { get; set; } + public Status Status { get; set; } + + public Status? ScheduledTo { get; set; } + + public Instant? ScheduledAt { get; set; } + + public RefToken ScheduledBy { get; set; } + public RefToken CreatedBy { get; set; } public RefToken LastModifiedBy { get; set; } public NamedContentData Data { get; set; } - public Status Status { get; set; } - public static ContentEntity Create(CreateContent command, EntityCreatedResult result) { var now = SystemClock.Instance.GetCurrentInstant(); diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs index c6a8c72b3..8660af246 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentOperationContext.cs @@ -42,7 +42,16 @@ namespace Squidex.Domain.Apps.Entities.Contents IScriptEngine scriptEngine, Func message) { - var (appEntity, schemaEntity) = await appProvider.GetAppWithSchemaAsync(command.AppId.Id, command.SchemaId.Id); + var a = content.Snapshot.AppId; + var s = content.Snapshot.SchemaId; + + if (command is CreateContent createContent) + { + a = a ?? createContent.AppId; + s = s ?? createContent.SchemaId; + } + + var (appEntity, schemaEntity) = await appProvider.GetAppWithSchemaAsync(a.Id, s.Id); var context = new ContentOperationContext { @@ -75,17 +84,15 @@ namespace Squidex.Domain.Apps.Entities.Contents { var errors = new List(); - var appId = command.AppId.Id; - var ctx = new ValidationContext( (contentIds, schemaId) => { - return QueryContentsAsync(appId, schemaId, contentIds); + return QueryContentsAsync(content.Snapshot.AppId.Id, schemaId, contentIds); }, assetIds => { - return QueryAssetsAsync(appId, assetIds); + return QueryAssetsAsync(content.Snapshot.AppId.Id, assetIds); }); if (partial) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentScheduler.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentScheduler.cs new file mode 100644 index 000000000..23d3c05a9 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentScheduler.cs @@ -0,0 +1,57 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Threading.Tasks; +using NodaTime; +using Squidex.Domain.Apps.Entities.Contents.Commands; +using Squidex.Domain.Apps.Entities.Contents.Repositories; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure.Timers; + +namespace Squidex.Domain.Apps.Entities.Contents +{ + public sealed class ContentScheduler : IRunnable + { + private readonly CompletionTimer timer; + private readonly IContentRepository contentRepository; + private readonly ICommandBus commandBus; + private readonly IClock clock; + + public ContentScheduler( + IContentRepository contentRepository, + ICommandBus commandBus, + IClock clock) + { + Guard.NotNull(contentRepository, nameof(contentRepository)); + Guard.NotNull(commandBus, nameof(commandBus)); + Guard.NotNull(clock, nameof(clock)); + + this.contentRepository = contentRepository; + this.commandBus = commandBus; + this.clock = clock; + + timer = new CompletionTimer(5000, x => PublishAsync()); + } + + public void Run() + { + } + + private Task PublishAsync() + { + var now = clock.GetCurrentInstant(); + + return contentRepository.QueryScheduledWithoutDataAsync(now, content => + { + var command = new ChangeContentStatus { ContentId = content.Id, Status = content.ScheduledTo.Value, Actor = content.ScheduledBy }; + + return commandBus.PublishAsync(command); + }); + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppMutationsGraphType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppMutationsGraphType.cs index 22c30512c..58ec5d018 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppMutationsGraphType.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppMutationsGraphType.cs @@ -38,13 +38,13 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types var inputType = new ContentDataGraphInputType(model, schema); AddContentCreate(schemaId, schemaType, schemaName, inputType, contentDataType, contentType); - AddContentUpdate(schemaId, schemaType, schemaName, inputType, resultType); - AddContentPatch(schemaId, schemaType, schemaName, inputType, resultType); - AddContentPublish(schemaId, schemaType, schemaName); - AddContentUnpublish(schemaId, schemaType, schemaName); - AddContentArchive(schemaId, schemaType, schemaName); - AddContentRestore(schemaId, schemaType, schemaName); - AddContentDelete(schemaId, schemaType, schemaName); + AddContentUpdate(schemaType, schemaName, inputType, resultType); + AddContentPatch(schemaType, schemaName, inputType, resultType); + AddContentPublish(schemaType, schemaName); + AddContentUnpublish(schemaType, schemaName); + AddContentArchive(schemaType, schemaName); + AddContentRestore(schemaType, schemaName); + AddContentDelete(schemaType, schemaName); } Description = "The app mutations."; @@ -86,7 +86,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types var contentData = GetContentData(c); - var command = new CreateContent { SchemaId = schemaId, ContentId = Guid.NewGuid(), Data = contentData, Publish = argPublish }; + var command = new CreateContent { SchemaId = schemaId, Data = contentData, Publish = argPublish }; var commandContext = await publish(command); var result = commandContext.Result>(); @@ -98,7 +98,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types }); } - private void AddContentUpdate(NamedId schemaId, string schemaType, string schemaName, ContentDataGraphInputType inputType, IComplexGraphType resultType) + private void AddContentUpdate(string schemaType, string schemaName, ContentDataGraphInputType inputType, IComplexGraphType resultType) { AddField(new FieldType { @@ -133,7 +133,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types var contentId = c.GetArgument("id"); var contentData = GetContentData(c); - var command = new UpdateContent { SchemaId = schemaId, ContentId = contentId, Data = contentData }; + var command = new UpdateContent { ContentId = contentId, Data = contentData }; var commandContext = await publish(command); var result = commandContext.Result(); @@ -144,7 +144,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types }); } - private void AddContentPatch(NamedId schemaId, string schemaType, string schemaName, ContentDataGraphInputType inputType, IComplexGraphType resultType) + private void AddContentPatch(string schemaType, string schemaName, ContentDataGraphInputType inputType, IComplexGraphType resultType) { AddField(new FieldType { @@ -179,7 +179,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types var contentId = c.GetArgument("id"); var contentData = GetContentData(c); - var command = new PatchContent { SchemaId = schemaId, ContentId = contentId, Data = contentData }; + var command = new PatchContent { ContentId = contentId, Data = contentData }; var commandContext = await publish(command); var result = commandContext.Result(); @@ -190,7 +190,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types }); } - private void AddContentPublish(NamedId schemaId, string schemaType, string schemaName) + private void AddContentPublish(string schemaType, string schemaName) { AddField(new FieldType { @@ -201,7 +201,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types { var contentId = c.GetArgument("id"); - var command = new ChangeContentStatus { SchemaId = schemaId, ContentId = contentId, Status = Status.Published }; + var command = new ChangeContentStatus { ContentId = contentId, Status = Status.Published }; return publish(command); }), @@ -209,7 +209,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types }); } - private void AddContentUnpublish(NamedId schemaId, string schemaType, string schemaName) + private void AddContentUnpublish(string schemaType, string schemaName) { AddField(new FieldType { @@ -220,7 +220,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types { var contentId = c.GetArgument("id"); - var command = new ChangeContentStatus { SchemaId = schemaId, ContentId = contentId, Status = Status.Draft }; + var command = new ChangeContentStatus { ContentId = contentId, Status = Status.Draft }; return publish(command); }), @@ -228,7 +228,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types }); } - private void AddContentArchive(NamedId schemaId, string schemaType, string schemaName) + private void AddContentArchive(string schemaType, string schemaName) { AddField(new FieldType { @@ -239,7 +239,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types { var contentId = c.GetArgument("id"); - var command = new ChangeContentStatus { SchemaId = schemaId, ContentId = contentId, Status = Status.Archived }; + var command = new ChangeContentStatus { ContentId = contentId, Status = Status.Archived }; return publish(command); }), @@ -247,7 +247,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types }); } - private void AddContentRestore(NamedId schemaId, string schemaType, string schemaName) + private void AddContentRestore(string schemaType, string schemaName) { AddField(new FieldType { @@ -258,7 +258,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types { var contentId = c.GetArgument("id"); - var command = new ChangeContentStatus { SchemaId = schemaId, ContentId = contentId, Status = Status.Draft }; + var command = new ChangeContentStatus { ContentId = contentId, Status = Status.Draft }; return publish(command); }), @@ -266,7 +266,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types }); } - private void AddContentDelete(NamedId schemaId, string schemaType, string schemaName) + private void AddContentDelete(string schemaType, string schemaName) { AddField(new FieldType { @@ -277,7 +277,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types { var contentId = c.GetArgument("id"); - var command = new DeleteContent { SchemaId = schemaId, ContentId = contentId }; + var command = new DeleteContent { ContentId = contentId }; return publish(command); }), diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Guards/GuardContent.cs b/src/Squidex.Domain.Apps.Entities/Contents/Guards/GuardContent.cs index 1ae0abb79..dfd5d8b68 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Guards/GuardContent.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Guards/GuardContent.cs @@ -5,6 +5,8 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; +using NodaTime; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Infrastructure; @@ -62,6 +64,11 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guards { error(new ValidationError($"Content cannot be changed from status {status} to {command.Status}.", nameof(command.Status))); } + + if (command.DueTime.HasValue && command.DueTime.Value < SystemClock.Instance.GetCurrentInstant()) + { + error(new ValidationError("DueTime must be in the future.", nameof(command.DueTime))); + } }); } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/IContentEntity.cs b/src/Squidex.Domain.Apps.Entities/Contents/IContentEntity.cs index 4e9573116..11a33154c 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/IContentEntity.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/IContentEntity.cs @@ -6,19 +6,31 @@ // ========================================================================== // ========================================================================== +using System; +using NodaTime; using Squidex.Domain.Apps.Core.Contents; +using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Entities.Contents { public interface IContentEntity : IEntity, - IEntityWithAppRef, IEntityWithCreatedBy, IEntityWithLastModifiedBy, IEntityWithVersion { + NamedId AppId { get; } + + NamedId SchemaId { get; } + Status Status { get; } + Status? ScheduledTo { get; } + + Instant? ScheduledAt { get; } + + RefToken ScheduledBy { get; } + NamedContentData Data { get; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/Repositories/IContentRepository.cs b/src/Squidex.Domain.Apps.Entities/Contents/Repositories/IContentRepository.cs index 509fc42ca..b9aba61be 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/Repositories/IContentRepository.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/Repositories/IContentRepository.cs @@ -9,6 +9,7 @@ using System; using System.Collections.Generic; using System.Threading.Tasks; using Microsoft.OData.UriParser; +using NodaTime; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Schemas; @@ -27,5 +28,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Repositories Task FindContentAsync(IAppEntity app, ISchemaEntity schema, Guid id); Task FindContentAsync(IAppEntity app, ISchemaEntity schema, Guid id, long version); + + Task QueryScheduledWithoutDataAsync(Instant now, Func callback); } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs b/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs index cdc9884f1..489a03832 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/State/ContentState.cs @@ -7,38 +7,50 @@ using System; using Newtonsoft.Json; +using NodaTime; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Events; using Squidex.Domain.Apps.Events.Contents; +using Squidex.Infrastructure; using Squidex.Infrastructure.Dispatching; using Squidex.Infrastructure.EventSourcing; namespace Squidex.Domain.Apps.Entities.Contents.State { public class ContentState : DomainObjectState, - IContentEntity, - IUpdateableEntityWithAppRef + IContentEntity { [JsonProperty] - public NamedContentData Data { get; set; } + public NamedId AppId { get; set; } [JsonProperty] - public Guid AppId { get; set; } + public NamedId SchemaId { get; set; } [JsonProperty] - public Guid SchemaId { get; set; } + public NamedContentData Data { get; set; } [JsonProperty] public Status Status { get; set; } + [JsonProperty] + public Status? ScheduledTo { get; set; } + + [JsonProperty] + public Instant? ScheduledAt { get; set; } + + [JsonProperty] + public RefToken ScheduledBy { get; set; } + [JsonProperty] public bool IsDeleted { get; set; } protected void On(ContentCreated @event) { - SchemaId = @event.SchemaId.Id; + SchemaId = @event.SchemaId; Data = @event.Data; + + AppId = @event.AppId; } protected void On(ContentUpdated @event) @@ -46,9 +58,20 @@ namespace Squidex.Domain.Apps.Entities.Contents.State Data = @event.Data; } + protected void On(ContentStatusScheduled @event) + { + ScheduledAt = @event.DueTime; + ScheduledBy = @event.Actor; + ScheduledTo = @event.Status; + } + protected void On(ContentStatusChanged @event) { Status = @event.Status; + + ScheduledAt = null; + ScheduledBy = null; + ScheduledTo = null; } protected void On(ContentDeleted @event) diff --git a/src/Squidex.Domain.Apps.Entities/EntityMapper.cs b/src/Squidex.Domain.Apps.Entities/EntityMapper.cs index 1dd17d847..f990ae781 100644 --- a/src/Squidex.Domain.Apps.Entities/EntityMapper.cs +++ b/src/Squidex.Domain.Apps.Entities/EntityMapper.cs @@ -17,7 +17,6 @@ namespace Squidex.Domain.Apps.Entities public static T Update(this T entity, SquidexEvent @event, EnvelopeHeaders headers, Action updater = null) where T : IEntity { SetId(entity, headers); - SetAppId(entity, @event); SetCreated(entity, headers); SetCreatedBy(entity, @event); SetLastModified(entity, headers); @@ -76,13 +75,5 @@ namespace Squidex.Domain.Apps.Entities withModifiedBy.LastModifiedBy = @event.Actor; } } - - private static void SetAppId(IEntity entity, SquidexEvent @event) - { - if (entity is IUpdateableEntityWithAppRef appEntity && @event is AppEvent appEvent) - { - appEntity.AppId = appEvent.AppId.Id; - } - } } } diff --git a/src/Squidex.Domain.Apps.Entities/AppCommand.cs b/src/Squidex.Domain.Apps.Entities/IAppCommand.cs similarity index 70% rename from src/Squidex.Domain.Apps.Entities/AppCommand.cs rename to src/Squidex.Domain.Apps.Entities/IAppCommand.cs index ba5b6a4e4..6a7bcf31b 100644 --- a/src/Squidex.Domain.Apps.Entities/AppCommand.cs +++ b/src/Squidex.Domain.Apps.Entities/IAppCommand.cs @@ -1,17 +1,18 @@ // ========================================================================== // Squidex Headless CMS // ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschränkt) +// Copyright (c) Squidex UG (haftungsbeschraenkt) // All rights reserved. Licensed under the MIT license. // ========================================================================== using System; using Squidex.Infrastructure; +using Squidex.Infrastructure.Commands; namespace Squidex.Domain.Apps.Entities { - public abstract class AppCommand : SquidexCommand + public interface IAppCommand : ICommand { - public NamedId AppId { get; set; } + NamedId AppId { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Entities/IAppProvider.cs b/src/Squidex.Domain.Apps.Entities/IAppProvider.cs index c41da76c9..e246b3cb7 100644 --- a/src/Squidex.Domain.Apps.Entities/IAppProvider.cs +++ b/src/Squidex.Domain.Apps.Entities/IAppProvider.cs @@ -20,7 +20,7 @@ namespace Squidex.Domain.Apps.Entities Task GetAppAsync(string appName); - Task GetSchemaAsync(Guid appId, Guid id); + Task GetSchemaAsync(Guid appId, Guid id, bool allowDeleted = false); Task GetSchemaAsync(Guid appId, string name); diff --git a/src/Squidex.Domain.Apps.Entities/SchemaCommand.cs b/src/Squidex.Domain.Apps.Entities/ISchemaCommand.cs similarity index 69% rename from src/Squidex.Domain.Apps.Entities/SchemaCommand.cs rename to src/Squidex.Domain.Apps.Entities/ISchemaCommand.cs index 62db6405d..bd75842d8 100644 --- a/src/Squidex.Domain.Apps.Entities/SchemaCommand.cs +++ b/src/Squidex.Domain.Apps.Entities/ISchemaCommand.cs @@ -1,17 +1,18 @@ // ========================================================================== // Squidex Headless CMS // ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschränkt) +// Copyright (c) Squidex UG (haftungsbeschraenkt) // All rights reserved. Licensed under the MIT license. // ========================================================================== using System; using Squidex.Infrastructure; +using Squidex.Infrastructure.Commands; namespace Squidex.Domain.Apps.Entities { - public abstract class SchemaCommand : AppCommand + public interface ISchemaCommand : ICommand { - public NamedId SchemaId { get; set; } + NamedId SchemaId { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Rules/Commands/CreateRule.cs b/src/Squidex.Domain.Apps.Entities/Rules/Commands/CreateRule.cs index 667f95dd7..07b49c12b 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/Commands/CreateRule.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/Commands/CreateRule.cs @@ -6,11 +6,14 @@ // ========================================================================== using System; +using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Entities.Rules.Commands { - public sealed class CreateRule : RuleEditCommand + public sealed class CreateRule : RuleEditCommand, IAppCommand { + public NamedId AppId { get; set; } + public CreateRule() { RuleId = Guid.NewGuid(); diff --git a/src/Squidex.Domain.Apps.Entities/Rules/Commands/DeleteRule.cs b/src/Squidex.Domain.Apps.Entities/Rules/Commands/DeleteRule.cs index 055730bd9..d895ed5b4 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/Commands/DeleteRule.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/Commands/DeleteRule.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Commands { - public sealed class DeleteRule : RuleAggregateCommand + public sealed class DeleteRule : RuleCommand { } } diff --git a/src/Squidex.Domain.Apps.Entities/Rules/Commands/DisableRule.cs b/src/Squidex.Domain.Apps.Entities/Rules/Commands/DisableRule.cs index 0718a7b12..de40cf95a 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/Commands/DisableRule.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/Commands/DisableRule.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Commands { - public sealed class DisableRule : RuleAggregateCommand + public sealed class DisableRule : RuleCommand { } } diff --git a/src/Squidex.Domain.Apps.Entities/Rules/Commands/EnableRule.cs b/src/Squidex.Domain.Apps.Entities/Rules/Commands/EnableRule.cs index b35f97d86..62cd528f0 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/Commands/EnableRule.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/Commands/EnableRule.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Commands { - public sealed class EnableRule : RuleAggregateCommand + public sealed class EnableRule : RuleCommand { } } diff --git a/src/Squidex.Domain.Apps.Entities/Rules/Commands/RuleAggregateCommand.cs b/src/Squidex.Domain.Apps.Entities/Rules/Commands/RuleCommand.cs similarity index 88% rename from src/Squidex.Domain.Apps.Entities/Rules/Commands/RuleAggregateCommand.cs rename to src/Squidex.Domain.Apps.Entities/Rules/Commands/RuleCommand.cs index 41a81ea3e..7d8690c46 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/Commands/RuleAggregateCommand.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/Commands/RuleCommand.cs @@ -10,7 +10,7 @@ using Squidex.Infrastructure.Commands; namespace Squidex.Domain.Apps.Entities.Rules.Commands { - public abstract class RuleAggregateCommand : AppCommand, IAggregateCommand + public abstract class RuleCommand : SquidexCommand, IAggregateCommand { public Guid RuleId { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Rules/Commands/RuleEditCommand.cs b/src/Squidex.Domain.Apps.Entities/Rules/Commands/RuleEditCommand.cs index ba8d77981..e461ff8ac 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/Commands/RuleEditCommand.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/Commands/RuleEditCommand.cs @@ -9,7 +9,7 @@ using Squidex.Domain.Apps.Core.Rules; namespace Squidex.Domain.Apps.Entities.Rules.Commands { - public abstract class RuleEditCommand : RuleAggregateCommand + public abstract class RuleEditCommand : RuleCommand { public RuleTrigger Trigger { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Rules/Guards/GuardRule.cs b/src/Squidex.Domain.Apps.Entities/Rules/Guards/GuardRule.cs index 86707be2f..77f1298df 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/Guards/GuardRule.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/Guards/GuardRule.cs @@ -5,6 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; using System.Threading.Tasks; using Squidex.Domain.Apps.Core.Rules; using Squidex.Domain.Apps.Entities.Rules.Commands; @@ -22,7 +23,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards { if (command.Trigger == null) { - error(new ValidationError("Trigger must be defined.", nameof(command.Trigger))); + error(new ValidationError("Trigger is required.", nameof(command.Trigger))); } else { @@ -33,7 +34,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards if (command.Action == null) { - error(new ValidationError("Trigger must be defined.", nameof(command.Action))); + error(new ValidationError("Trigger is required.", nameof(command.Action))); } else { @@ -44,7 +45,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards }); } - public static Task CanUpdate(UpdateRule command, IAppProvider appProvider) + public static Task CanUpdate(UpdateRule command, Guid appId, IAppProvider appProvider) { Guard.NotNull(command, nameof(command)); @@ -52,12 +53,12 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards { if (command.Trigger == null && command.Action == null) { - error(new ValidationError("Either trigger or action must be defined.", nameof(command.Trigger), nameof(command.Action))); + error(new ValidationError("Either trigger or action is required.", nameof(command.Trigger), nameof(command.Action))); } if (command.Trigger != null) { - var errors = await RuleTriggerValidator.ValidateAsync(command.AppId.Id, command.Trigger, appProvider); + var errors = await RuleTriggerValidator.ValidateAsync(appId, command.Trigger, appProvider); errors.Foreach(error); } diff --git a/src/Squidex.Domain.Apps.Entities/Rules/Guards/RuleActionValidator.cs b/src/Squidex.Domain.Apps.Entities/Rules/Guards/RuleActionValidator.cs index 2d36a13c5..3b794922d 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/Guards/RuleActionValidator.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/Guards/RuleActionValidator.cs @@ -31,17 +31,17 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards if (string.IsNullOrWhiteSpace(action.ApiKey)) { - errors.Add(new ValidationError("Api key must be defined.", nameof(action.ApiKey))); + errors.Add(new ValidationError("Api key is required.", nameof(action.ApiKey))); } if (string.IsNullOrWhiteSpace(action.AppId)) { - errors.Add(new ValidationError("Application ID key must be defined.", nameof(action.AppId))); + errors.Add(new ValidationError("Application ID key is required.", nameof(action.AppId))); } if (string.IsNullOrWhiteSpace(action.IndexName)) { - errors.Add(new ValidationError("Index name must be defined.", nameof(action.ApiKey))); + errors.Add(new ValidationError("Index name is required.", nameof(action.IndexName))); } return Task.FromResult>(errors); @@ -53,12 +53,12 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards if (string.IsNullOrWhiteSpace(action.ConnectionString)) { - errors.Add(new ValidationError("Connection string must be defined.", nameof(action.ConnectionString))); + errors.Add(new ValidationError("Connection string is required.", nameof(action.ConnectionString))); } if (string.IsNullOrWhiteSpace(action.Queue)) { - errors.Add(new ValidationError("Queue must be defined.", nameof(action.Queue))); + errors.Add(new ValidationError("Queue is required.", nameof(action.Queue))); } else if (!Regex.IsMatch(action.Queue, "^[a-z][a-z0-9]{2,}(\\-[a-z0-9]+)*$")) { @@ -74,12 +74,12 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards if (string.IsNullOrWhiteSpace(action.ApiKey)) { - errors.Add(new ValidationError("Api key must be defined.", nameof(action.ApiKey))); + errors.Add(new ValidationError("Api key is required.", nameof(action.ApiKey))); } if (string.IsNullOrWhiteSpace(action.ServiceId)) { - errors.Add(new ValidationError("Service name must be defined.", nameof(action.ServiceId))); + errors.Add(new ValidationError("Service ID is required.", nameof(action.ServiceId))); } return Task.FromResult>(errors); @@ -91,7 +91,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards if (action.WebhookUrl == null || !action.WebhookUrl.IsAbsoluteUri) { - errors.Add(new ValidationError("Webhook Url must be specified and absolute.", nameof(action.WebhookUrl))); + errors.Add(new ValidationError("Webhook Url is required and must be an absolute URL.", nameof(action.WebhookUrl))); } return Task.FromResult>(errors); @@ -103,7 +103,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards if (action.Url == null || !action.Url.IsAbsoluteUri) { - errors.Add(new ValidationError("Url must be specified and absolute.", nameof(action.Url))); + errors.Add(new ValidationError("Url is required and must be an absolute URL.", nameof(action.Url))); } return Task.FromResult>(errors); diff --git a/src/Squidex.Domain.Apps.Entities/Rules/IRuleEntity.cs b/src/Squidex.Domain.Apps.Entities/Rules/IRuleEntity.cs index 2caaa814c..ef69c574f 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/IRuleEntity.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/IRuleEntity.cs @@ -5,17 +5,20 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; using Squidex.Domain.Apps.Core.Rules; +using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Entities.Rules { public interface IRuleEntity : IEntity, - IEntityWithAppRef, IEntityWithCreatedBy, IEntityWithLastModifiedBy, IEntityWithVersion { + NamedId AppId { get; set; } + Rule RuleDef { get; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Rules/Repositories/IRuleEventRepository.cs b/src/Squidex.Domain.Apps.Entities/Rules/Repositories/IRuleEventRepository.cs index 8edc62f37..31c09131b 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/Repositories/IRuleEventRepository.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/Repositories/IRuleEventRepository.cs @@ -23,7 +23,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Repositories Task MarkSentAsync(Guid jobId, string dump, RuleResult result, RuleJobResult jobResult, TimeSpan elapsed, Instant? nextCall); - Task QueryPendingAsync(Instant now, Func callback, CancellationToken cancellationToken = default(CancellationToken)); + Task QueryPendingAsync(Instant now, Func callback, CancellationToken ct = default(CancellationToken)); Task CountByAppAsync(Guid appId); diff --git a/src/Squidex.Domain.Apps.Entities/Rules/RuleCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Rules/RuleCommandMiddleware.cs index c0ee1cf5b..8a6e43441 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/RuleCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/RuleCommandMiddleware.cs @@ -44,7 +44,7 @@ namespace Squidex.Domain.Apps.Entities.Rules { return handler.UpdateSyncedAsync(context, async r => { - await GuardRule.CanUpdate(command, appProvider); + await GuardRule.CanUpdate(command, r.Snapshot.AppId.Id, appProvider); r.Update(command); }); diff --git a/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuer.cs b/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuer.cs index 32d0096bb..693d661bb 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuer.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/RuleDequeuer.cs @@ -72,13 +72,13 @@ namespace Squidex.Domain.Apps.Entities.Rules timer.SkipCurrentDelay(); } - private async Task QueryAsync(CancellationToken cancellationToken) + private async Task QueryAsync(CancellationToken ct) { try { var now = clock.GetCurrentInstant(); - await ruleEventRepository.QueryPendingAsync(now, requestBlock.SendAsync, cancellationToken); + await ruleEventRepository.QueryPendingAsync(now, requestBlock.SendAsync, ct); } catch (Exception ex) { diff --git a/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs b/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs index bc05ac8bd..54c9afc2d 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/RuleDomainObject.cs @@ -7,15 +7,15 @@ using Squidex.Domain.Apps.Entities.Rules.Commands; using Squidex.Domain.Apps.Entities.Rules.State; +using Squidex.Domain.Apps.Events; using Squidex.Domain.Apps.Events.Rules; using Squidex.Infrastructure; -using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Reflection; namespace Squidex.Domain.Apps.Entities.Rules { - public sealed class RuleDomainObject : DomainObjectBase + public sealed class RuleDomainObject : SquidexDomainObjectBase { public void Create(CreateRule command) { @@ -52,6 +52,16 @@ namespace Squidex.Domain.Apps.Entities.Rules RaiseEvent(SimpleMapper.Map(command, new RuleDeleted())); } + private void RaiseEvent(AppEvent @event) + { + if (@event.AppId == null) + { + @event.AppId = Snapshot.AppId; + } + + RaiseEvent(Envelope.Create(@event)); + } + private void VerifyNotCreated() { if (Snapshot.RuleDef != null) diff --git a/src/Squidex.Domain.Apps.Entities/Rules/State/RuleState.cs b/src/Squidex.Domain.Apps.Entities/Rules/State/RuleState.cs index 7b6dd9602..fa87078da 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/State/RuleState.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/State/RuleState.cs @@ -10,18 +10,17 @@ using Newtonsoft.Json; using Squidex.Domain.Apps.Core.Rules; using Squidex.Domain.Apps.Events; using Squidex.Domain.Apps.Events.Rules; +using Squidex.Infrastructure; using Squidex.Infrastructure.Dispatching; using Squidex.Infrastructure.EventSourcing; namespace Squidex.Domain.Apps.Entities.Rules.State { public class RuleState : DomainObjectState, - IRuleEntity, - IEntityWithAppRef, - IUpdateableEntityWithAppRef + IRuleEntity { [JsonProperty] - public Guid AppId { get; set; } + public NamedId AppId { get; set; } [JsonProperty] public Rule RuleDef { get; set; } @@ -32,6 +31,8 @@ namespace Squidex.Domain.Apps.Entities.Rules.State protected void On(RuleCreated @event) { RuleDef = new Rule(@event.Trigger, @event.Action); + + AppId = @event.AppId; } protected void On(RuleUpdated @event) diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/AddField.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/AddField.cs index e14d082e8..8856821d6 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/AddField.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/AddField.cs @@ -9,7 +9,7 @@ using Squidex.Domain.Apps.Core.Schemas; namespace Squidex.Domain.Apps.Entities.Schemas.Commands { - public sealed class AddField : SchemaAggregateCommand + public sealed class AddField : SchemaCommand { public string Name { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/ConfigureScripts.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/ConfigureScripts.cs index f4fea680a..d850076a6 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/ConfigureScripts.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/ConfigureScripts.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Commands { - public sealed class ConfigureScripts : SchemaAggregateCommand + public sealed class ConfigureScripts : SchemaCommand { public string ScriptQuery { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/CreateSchema.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/CreateSchema.cs index f303e5c95..923499e79 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/CreateSchema.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/CreateSchema.cs @@ -7,25 +7,22 @@ using System; using Squidex.Domain.Apps.Core.Schemas; -using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure; using SchemaFields = System.Collections.Generic.List; namespace Squidex.Domain.Apps.Entities.Schemas.Commands { - public sealed class CreateSchema : AppCommand, IAggregateCommand + public sealed class CreateSchema : SchemaCommand, IAppCommand { - public Guid SchemaId { get; set; } + public NamedId AppId { get; set; } + + public string Name { get; set; } public SchemaFields Fields { get; set; } public SchemaProperties Properties { get; set; } - public string Name { get; set; } - - Guid IAggregateCommand.AggregateId - { - get { return SchemaId; } - } + public bool Publish { get; set; } public CreateSchema() { diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/DeleteSchema.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/DeleteSchema.cs index d4c3d9bfb..d3b79c454 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/DeleteSchema.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/DeleteSchema.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Commands { - public sealed class DeleteSchema : SchemaAggregateCommand + public sealed class DeleteSchema : SchemaCommand { } } \ No newline at end of file diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/FieldCommand.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/FieldCommand.cs index 9ddbd0301..5ad93ddf1 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/FieldCommand.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/FieldCommand.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Commands { - public class FieldCommand : SchemaAggregateCommand + public class FieldCommand : SchemaCommand { public long FieldId { get; set; } } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/PublishSchema.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/PublishSchema.cs index 8bb789b72..c8d68314d 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/PublishSchema.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/PublishSchema.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Commands { - public sealed class PublishSchema : SchemaAggregateCommand + public sealed class PublishSchema : SchemaCommand { } } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/ReorderFields.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/ReorderFields.cs index 068b41162..9afe0346c 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/ReorderFields.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/ReorderFields.cs @@ -9,7 +9,7 @@ using System.Collections.Generic; namespace Squidex.Domain.Apps.Entities.Schemas.Commands { - public sealed class ReorderFields : SchemaAggregateCommand + public sealed class ReorderFields : SchemaCommand { public List FieldIds { get; set; } } diff --git a/src/Squidex.Domain.Apps.Entities/AppAggregateCommand.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/SchemaCommand.cs similarity index 77% rename from src/Squidex.Domain.Apps.Entities/AppAggregateCommand.cs rename to src/Squidex.Domain.Apps.Entities/Schemas/Commands/SchemaCommand.cs index a4143215c..49bba3620 100644 --- a/src/Squidex.Domain.Apps.Entities/AppAggregateCommand.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/SchemaCommand.cs @@ -10,11 +10,13 @@ using Squidex.Infrastructure.Commands; namespace Squidex.Domain.Apps.Entities { - public class AppAggregateCommand : AppCommand, IAggregateCommand + public abstract class SchemaCommand : SquidexCommand, IAggregateCommand { + public Guid SchemaId { get; set; } + Guid IAggregateCommand.AggregateId { - get { return AppId.Id; } + get { return SchemaId; } } } } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/UnpublishSchema.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/UnpublishSchema.cs index c8c2b722d..31d5c284a 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/UnpublishSchema.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/UnpublishSchema.cs @@ -7,7 +7,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Commands { - public sealed class UnpublishSchema : SchemaAggregateCommand + public sealed class UnpublishSchema : SchemaCommand { } } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/UpdateSchema.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/UpdateSchema.cs index 329cbc400..579f55bb7 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/UpdateSchema.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/UpdateSchema.cs @@ -9,7 +9,7 @@ using Squidex.Domain.Apps.Core.Schemas; namespace Squidex.Domain.Apps.Entities.Schemas.Commands { - public sealed class UpdateSchema : SchemaAggregateCommand + public sealed class UpdateSchema : SchemaCommand { public SchemaProperties Properties { get; set; } } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Guards/FieldPropertiesValidator.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Guards/FieldPropertiesValidator.cs index 730a8083a..44becd941 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Guards/FieldPropertiesValidator.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Guards/FieldPropertiesValidator.cs @@ -57,7 +57,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards if (properties.AspectWidth.HasValue != properties.AspectHeight.HasValue) { - yield return new ValidationError("Aspect width and height must be defined.", + yield return new ValidationError("Aspect width and height is required.", nameof(properties.AspectWidth), nameof(properties.AspectHeight)); } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchema.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchema.cs index a7cd406c5..c95bac2f6 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchema.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchema.cs @@ -52,7 +52,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards if (field.Properties == null) { - error(new ValidationError("Properties must be defined.", $"{prefix}.{nameof(field.Properties)}")); + error(new ValidationError("Properties is required.", $"{prefix}.{nameof(field.Properties)}")); } var propertyErrors = FieldPropertiesValidator.Validate(field.Properties); @@ -79,7 +79,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards { if (command.FieldIds == null) { - error(new ValidationError("Field ids must be specified.", nameof(command.FieldIds))); + error(new ValidationError("Field ids is required.", nameof(command.FieldIds))); } if (command.FieldIds.Count != schema.Fields.Count || command.FieldIds.Any(x => !schema.FieldsById.ContainsKey(x))) diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchemaField.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchemaField.cs index 58ec7dc5b..73463a710 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchemaField.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchemaField.cs @@ -32,7 +32,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards if (command.Properties == null) { - error(new ValidationError("Properties must be defined.", nameof(command.Properties))); + error(new ValidationError("Properties is required.", nameof(command.Properties))); } var propertyErrors = FieldPropertiesValidator.Validate(command.Properties); @@ -57,7 +57,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards { if (command.Properties == null) { - error(new ValidationError("Properties must be defined.", nameof(command.Properties))); + error(new ValidationError("Properties is required.", nameof(command.Properties))); } var propertyErrors = FieldPropertiesValidator.Validate(command.Properties); diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/ISchemaEntity.cs b/src/Squidex.Domain.Apps.Entities/Schemas/ISchemaEntity.cs index da1fd2045..8c341e76e 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/ISchemaEntity.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/ISchemaEntity.cs @@ -5,17 +5,20 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Entities.Schemas { public interface ISchemaEntity : IEntity, - IEntityWithAppRef, IEntityWithCreatedBy, IEntityWithLastModifiedBy, IEntityWithVersion { + NamedId AppId { get; } + string Name { get; } bool IsPublished { get; } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaDomainObject.cs b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaDomainObject.cs index cc081ee28..b57b31333 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaDomainObject.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaDomainObject.cs @@ -10,15 +10,15 @@ using System.Collections.Generic; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Entities.Schemas.Commands; using Squidex.Domain.Apps.Entities.Schemas.State; +using Squidex.Domain.Apps.Events; using Squidex.Domain.Apps.Events.Schemas; using Squidex.Infrastructure; -using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Reflection; namespace Squidex.Domain.Apps.Entities.Schemas { - public sealed class SchemaDomainObject : DomainObjectBase + public sealed class SchemaDomainObject : SquidexDomainObjectBase { private readonly FieldRegistry registry; @@ -190,6 +190,21 @@ namespace Squidex.Domain.Apps.Entities.Schemas RaiseEvent(@event); } + private void RaiseEvent(SchemaEvent @event) + { + if (@event.SchemaId == null) + { + @event.SchemaId = new NamedId(Snapshot.Id, Snapshot.Name); + } + + if (@event.AppId == null) + { + @event.AppId = Snapshot.AppId; + } + + RaiseEvent(Envelope.Create(@event)); + } + private void VerifyNotCreated() { if (Snapshot.SchemaDef != null) diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs b/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs index 5a8755b82..bc148430b 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs @@ -11,6 +11,7 @@ using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Events; using Squidex.Domain.Apps.Events.Schemas; +using Squidex.Infrastructure; using Squidex.Infrastructure.Dispatching; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Reflection; @@ -18,16 +19,13 @@ using Squidex.Infrastructure.Reflection; namespace Squidex.Domain.Apps.Entities.Schemas.State { public class SchemaState : DomainObjectState, - ISchemaEntity, - IUpdateableEntityWithAppRef, - IUpdateableEntityWithCreatedBy, - IUpdateableEntityWithLastModifiedBy + ISchemaEntity { [JsonProperty] - public string Name { get; set; } + public NamedId AppId { get; set; } [JsonProperty] - public Guid AppId { get; set; } + public string Name { get; set; } [JsonProperty] public int TotalFields { get; set; } = 0; @@ -70,6 +68,11 @@ namespace Squidex.Domain.Apps.Entities.Schemas.State schema = schema.Update(@event.Properties); } + if (@event.Publish) + { + schema = schema.Publish(); + } + if (@event.Fields != null) { foreach (var eventField in @event.Fields) @@ -103,6 +106,8 @@ namespace Squidex.Domain.Apps.Entities.Schemas.State } SchemaDef = schema; + + AppId = @event.AppId; } protected void On(FieldAdded @event, FieldRegistry registry) diff --git a/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectBase.cs b/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectBase.cs new file mode 100644 index 000000000..63f0f94ed --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectBase.cs @@ -0,0 +1,26 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Squidex.Domain.Apps.Events; +using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure.EventSourcing; + +namespace Squidex.Domain.Apps.Entities +{ + public abstract class SquidexDomainObjectBase : DomainObjectBase where T : IDomainState, new() + { + public override void RaiseEvent(Envelope @event) + { + if (@event.Payload is AppEvent appEvent) + { + @event.SetAppId(appEvent.AppId.Id); + } + + base.RaiseEvent(@event); + } + } +} diff --git a/src/Squidex.Domain.Apps.Events/Contents/ContentStatusScheduled.cs b/src/Squidex.Domain.Apps.Events/Contents/ContentStatusScheduled.cs new file mode 100644 index 000000000..e0d0a5bac --- /dev/null +++ b/src/Squidex.Domain.Apps.Events/Contents/ContentStatusScheduled.cs @@ -0,0 +1,21 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using NodaTime; +using Squidex.Domain.Apps.Core.Contents; +using Squidex.Infrastructure.EventSourcing; + +namespace Squidex.Domain.Apps.Events.Contents +{ + [EventType(nameof(ContentStatusScheduled))] + public sealed class ContentStatusScheduled : ContentEvent + { + public Status Status { get; set; } + + public Instant DueTime { get; set; } + } +} diff --git a/src/Squidex.Domain.Apps.Events/Schemas/SchemaCreated.cs b/src/Squidex.Domain.Apps.Events/Schemas/SchemaCreated.cs index c44595bbc..2e7c6ec2b 100644 --- a/src/Squidex.Domain.Apps.Events/Schemas/SchemaCreated.cs +++ b/src/Squidex.Domain.Apps.Events/Schemas/SchemaCreated.cs @@ -19,5 +19,7 @@ namespace Squidex.Domain.Apps.Events.Schemas public SchemaFields Fields { get; set; } public SchemaProperties Properties { get; set; } + + public bool Publish { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Events/SquidexEvents.cs b/src/Squidex.Domain.Apps.Events/SquidexEvents.cs index 906a579bf..d49cb8921 100644 --- a/src/Squidex.Domain.Apps.Events/SquidexEvents.cs +++ b/src/Squidex.Domain.Apps.Events/SquidexEvents.cs @@ -5,9 +5,12 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System.Reflection; + namespace Squidex.Domain.Apps.Events { public static class SquidexEvents { + public static readonly Assembly Assembly = typeof(SquidexEvents).Assembly; } } diff --git a/src/Squidex.Domain.Apps.Events/SquidexHeaderExtensions.cs b/src/Squidex.Domain.Apps.Events/SquidexHeaderExtensions.cs new file mode 100644 index 000000000..0673d3b5b --- /dev/null +++ b/src/Squidex.Domain.Apps.Events/SquidexHeaderExtensions.cs @@ -0,0 +1,28 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Globalization; +using Squidex.Infrastructure.EventSourcing; + +namespace Squidex.Domain.Apps.Events +{ + public static class SquidexHeaderExtensions + { + public static Guid AppId(this EnvelopeHeaders headers) + { + return headers[SquidexHeaders.AppId].ToGuid(CultureInfo.InvariantCulture); + } + + public static Envelope SetAppId(this Envelope envelope, Guid value) where T : class + { + envelope.Headers.Set(SquidexHeaders.AppId, value); + + return envelope; + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/IEntityWithAppRef.cs b/src/Squidex.Domain.Apps.Events/SquidexHeaders.cs similarity index 64% rename from src/Squidex.Domain.Apps.Entities/IEntityWithAppRef.cs rename to src/Squidex.Domain.Apps.Events/SquidexHeaders.cs index bf899acef..e2f610a10 100644 --- a/src/Squidex.Domain.Apps.Entities/IEntityWithAppRef.cs +++ b/src/Squidex.Domain.Apps.Events/SquidexHeaders.cs @@ -1,16 +1,14 @@ // ========================================================================== // Squidex Headless CMS // ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschränkt) +// Copyright (c) Squidex UG (haftungsbeschraenkt) // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; - -namespace Squidex.Domain.Apps.Entities +namespace Squidex.Domain.Apps.Events { - public interface IEntityWithAppRef + public static class SquidexHeaders { - Guid AppId { get; } + public static readonly string AppId = "AppId"; } -} \ No newline at end of file +} diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/Formatter.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/Formatter.cs index f0721a586..aefd883b2 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/Formatter.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/Formatter.cs @@ -5,6 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; using System.Text; using EventStore.ClientAPI; using EventStoreData = EventStore.ClientAPI.EventData; @@ -20,7 +21,7 @@ namespace Squidex.Infrastructure.EventSourcing var body = Encoding.UTF8.GetString(@event.Data); var meta = Encoding.UTF8.GetString(@event.Metadata); - var eventData = new EventData { Type = @event.EventType, EventId = @event.EventId, Payload = body, Metadata = meta }; + var eventData = new EventData { Type = @event.EventType, Payload = body, Metadata = meta }; return new StoredEvent( resolvedEvent.OriginalEventNumber.ToString(), @@ -30,13 +31,10 @@ namespace Squidex.Infrastructure.EventSourcing public static EventStoreData Write(EventData eventData) { - var body = Encoding.UTF8.GetBytes(eventData.Payload); - var meta = Encoding.UTF8.GetBytes(eventData.Metadata); + var body = Encoding.UTF8.GetBytes(eventData.Payload.ToString()); + var meta = Encoding.UTF8.GetBytes(eventData.Metadata.ToString()); - return new EventStoreData( - eventData.EventId, - eventData.Type, - true, body, meta); + return new EventStoreData(Guid.NewGuid(), eventData.Type, true, body, meta); } } } diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs index 2023d0f73..9e4d1a4d8 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStore.cs @@ -11,7 +11,6 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; using EventStore.ClientAPI; -using EventStore.ClientAPI.Projections; namespace Squidex.Infrastructure.EventSourcing { @@ -20,18 +19,18 @@ namespace Squidex.Infrastructure.EventSourcing private const int WritePageSize = 500; private const int ReadPageSize = 500; private readonly IEventStoreConnection connection; - private readonly string projectionHost; private readonly string prefix; - private ProjectionsManager projectionsManager; + private ProjectionClient projectionClient; public GetEventStore(IEventStoreConnection connection, string prefix, string projectionHost) { Guard.NotNull(connection, nameof(connection)); this.connection = connection; - this.projectionHost = projectionHost; this.prefix = prefix?.Trim(' ', '-').WithFallback("squidex"); + + projectionClient = new ProjectionClient(connection, prefix, projectionHost); } public void Initialize() @@ -45,50 +44,43 @@ namespace Squidex.Infrastructure.EventSourcing throw new ConfigurationException("Cannot connect to event store.", ex); } - try - { - projectionsManager = connection.GetProjectionsManagerAsync(projectionHost).Result; - - projectionsManager.ListAllAsync(connection.Settings.DefaultUserCredentials).Wait(); - } - catch (Exception ex) - { - throw new ConfigurationException($"Cannot connect to event store projections: {projectionHost}.", ex); - } + projectionClient.ConnectAsync().Wait(); } public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null) { - return new GetEventStoreSubscription(connection, subscriber, projectionsManager, prefix, position, streamFilter); + return new GetEventStoreSubscription(connection, subscriber, projectionClient, prefix, position, streamFilter); } - public async Task GetEventsAsync(Func callback, string streamFilter = null, string position = null, CancellationToken cancellationToken = default(CancellationToken)) + public Task CreateIndexAsync(string property) { - var streamName = await connection.CreateProjectionAsync(projectionsManager, prefix, streamFilter); + return projectionClient.CreateProjectionAsync(property, string.Empty); + } - var sliceStart = ProjectionHelper.ParsePosition(position); + public async Task QueryAsync(Func callback, string property, object value, string position = null, CancellationToken ct = default(CancellationToken)) + { + var streamName = await projectionClient.CreateProjectionAsync(property, value); - StreamEventsSlice currentSlice; - do - { - currentSlice = await connection.ReadStreamEventsForwardAsync(streamName, sliceStart, ReadPageSize, true); + var sliceStart = projectionClient.ParsePosition(position); - if (currentSlice.Status == SliceReadStatus.Success) - { - sliceStart = currentSlice.NextEventNumber; + await QueryAsync(callback, streamName, sliceStart, ct); + } - foreach (var resolved in currentSlice.Events) - { - var storedEvent = Formatter.Read(resolved); + public async Task QueryAsync(Func callback, string streamFilter = null, string position = null, CancellationToken ct = default(CancellationToken)) + { + var streamName = await projectionClient.CreateProjectionAsync(streamFilter); - await callback(storedEvent); - } - } - } - while (!currentSlice.IsEndOfStream && !cancellationToken.IsCancellationRequested); + var sliceStart = projectionClient.ParsePosition(position); + + await QueryAsync(callback, streamName, sliceStart, ct); + } + + private Task QueryAsync(Func callback, string streamName, long sliceStart, CancellationToken ct) + { + return QueryAsync(callback, GetStreamName(streamName), sliceStart, ct); } - public async Task> GetEventsAsync(string streamName, long streamPosition = 0) + public async Task> QueryAsync(string streamName, long streamPosition = 0) { var result = new List(); @@ -97,7 +89,7 @@ namespace Squidex.Infrastructure.EventSourcing StreamEventsSlice currentSlice; do { - currentSlice = await connection.ReadStreamEventsForwardAsync(GetStreamName(streamName), sliceStart, ReadPageSize, false); + currentSlice = await connection.ReadStreamEventsForwardAsync(streamName, sliceStart, ReadPageSize, false); if (currentSlice.Status == SliceReadStatus.Success) { @@ -116,12 +108,12 @@ namespace Squidex.Infrastructure.EventSourcing return result; } - public Task AppendEventsAsync(Guid commitId, string streamName, ICollection events) + public Task AppendAsync(Guid commitId, string streamName, ICollection events) { return AppendEventsInternalAsync(streamName, EtagVersion.Any, events); } - public Task AppendEventsAsync(Guid commitId, string streamName, long expectedVersion, ICollection events) + public Task AppendAsync(Guid commitId, string streamName, long expectedVersion, ICollection events) { Guard.GreaterEquals(expectedVersion, -1, nameof(expectedVersion)); diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStoreSubscription.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStoreSubscription.cs index f5102f54a..b3cfed490 100644 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStoreSubscription.cs +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/GetEventStoreSubscription.cs @@ -8,33 +8,32 @@ using System.Threading.Tasks; using EventStore.ClientAPI; using EventStore.ClientAPI.Exceptions; -using EventStore.ClientAPI.Projections; using Squidex.Infrastructure.Tasks; namespace Squidex.Infrastructure.EventSourcing { internal sealed class GetEventStoreSubscription : IEventSubscription { - private readonly IEventStoreConnection eventStoreConnection; - private readonly IEventSubscriber eventSubscriber; + private readonly IEventStoreConnection connection; + private readonly IEventSubscriber subscriber; private readonly EventStoreCatchUpSubscription subscription; private readonly long? position; public GetEventStoreSubscription( - IEventStoreConnection eventStoreConnection, - IEventSubscriber eventSubscriber, - ProjectionsManager projectionsManager, + IEventStoreConnection connection, + IEventSubscriber subscriber, + ProjectionClient projectionClient, string prefix, string position, string streamFilter) { - Guard.NotNull(eventSubscriber, nameof(eventSubscriber)); + Guard.NotNull(subscriber, nameof(subscriber)); - this.eventStoreConnection = eventStoreConnection; - this.eventSubscriber = eventSubscriber; - this.position = ProjectionHelper.ParsePositionOrNull(position); + this.connection = connection; + this.position = projectionClient.ParsePositionOrNull(position); + this.subscriber = subscriber; - var streamName = eventStoreConnection.CreateProjectionAsync(projectionsManager, prefix, streamFilter).Result; + var streamName = projectionClient.CreateProjectionAsync(streamFilter).Result; subscription = SubscribeToStream(streamName); } @@ -54,12 +53,12 @@ namespace Squidex.Infrastructure.EventSourcing { var settings = CatchUpSubscriptionSettings.Default; - return eventStoreConnection.SubscribeToStreamFrom(streamName, position, settings, + return connection.SubscribeToStreamFrom(streamName, position, settings, (s, e) => { var storedEvent = Formatter.Read(e); - eventSubscriber.OnEventAsync(this, storedEvent).Wait(); + subscriber.OnEventAsync(this, storedEvent).Wait(); }, null, (s, reason, ex) => { @@ -68,7 +67,7 @@ namespace Squidex.Infrastructure.EventSourcing { ex = ex ?? new ConnectionClosedException($"Subscription closed with reason {reason}."); - eventSubscriber.OnErrorAsync(this, ex); + subscriber.OnErrorAsync(this, ex); } }); } diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionClient.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionClient.cs new file mode 100644 index 000000000..6c4ef3f75 --- /dev/null +++ b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionClient.cs @@ -0,0 +1,142 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Concurrent; +using System.Linq; +using System.Net; +using System.Net.Sockets; +using System.Threading.Tasks; +using EventStore.ClientAPI; +using EventStore.ClientAPI.Exceptions; +using EventStore.ClientAPI.Projections; + +namespace Squidex.Infrastructure.EventSourcing +{ + public sealed class ProjectionClient + { + private readonly ConcurrentDictionary projections = new ConcurrentDictionary(); + private readonly IEventStoreConnection connection; + private readonly string prefix; + private readonly string projectionHost; + private ProjectionsManager projectionsManager; + + public ProjectionClient(IEventStoreConnection connection, string prefix, string projectionHost) + { + this.connection = connection; + + this.prefix = prefix; + this.projectionHost = projectionHost; + } + + private string CreateFilterProjectionName(string filter) + { + return $"by-{prefix.Slugify()}-{filter.Slugify()}"; + } + + private string CreatePropertyProjectionName(string property) + { + return $"by-{prefix.Slugify()}-{property.Slugify()}-property"; + } + + public async Task CreateProjectionAsync(string property, object value) + { + var name = CreatePropertyProjectionName(property); + + var query = + $@"fromAll() + .when({{ + $any: function (s, e) {{ + if (e.streamId.indexOf('{prefix}') === 0 && e.metadata.{property}) {{ + linkTo('{name}-' + e.metadata.{property}, e); + }} + }} + }});"; + + await CreateProjectionAsync(name, query); + + return $"{name}-{value}"; + } + + public async Task CreateProjectionAsync(string streamFilter = null) + { + streamFilter = streamFilter ?? ".*"; + + var name = CreateFilterProjectionName(streamFilter); + + var query = + $@"fromAll() + .when({{ + $any: function (s, e) {{ + if (e.streamId.indexOf('{prefix}') === 0 && /{streamFilter}/.test(e.streamId.substring({prefix.Length + 1}))) {{ + linkTo('{name}', e); + }} + }} + }});"; + + await CreateProjectionAsync(name, query); + + return name; + } + + private async Task CreateProjectionAsync(string name, string query) + { + if (projections.TryAdd(name, true)) + { + try + { + var credentials = connection.Settings.DefaultUserCredentials; + + await projectionsManager.CreateContinuousAsync(name, query, credentials); + } + catch (Exception ex) + { + if (!ex.Is()) + { + throw; + } + } + } + } + + public async Task ConnectAsync() + { + var addressParts = projectionHost.Split(':'); + + if (addressParts.Length < 2 || !int.TryParse(addressParts[1], out var port)) + { + port = 2113; + } + + var endpoints = await Dns.GetHostAddressesAsync(addressParts[0]); + var endpoint = new IPEndPoint(endpoints.First(x => x.AddressFamily == AddressFamily.InterNetwork), port); + + projectionsManager = + new ProjectionsManager( + connection.Settings.Log, endpoint, + connection.Settings.OperationTimeout); + try + { + await projectionsManager.ListAllAsync(connection.Settings.DefaultUserCredentials); + } + catch (Exception ex) + { + throw new ConfigurationException($"Cannot connect to event store projections: {projectionHost}.", ex); + } + } + + public long? ParsePositionOrNull(string position) + { + return long.TryParse(position, out var parsedPosition) ? (long?)parsedPosition : null; + } + + public long ParsePosition(string position) + { + return long.TryParse(position, out var parsedPosition) ? parsedPosition : 0; + } + } +} diff --git a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionHelper.cs b/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionHelper.cs deleted file mode 100644 index 4219dcdb0..000000000 --- a/src/Squidex.Infrastructure.GetEventStore/EventSourcing/ProjectionHelper.cs +++ /dev/null @@ -1,97 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschränkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using System.Collections.Concurrent; -using System.Globalization; -using System.Linq; -using System.Net; -using System.Net.Sockets; -using System.Threading.Tasks; -using EventStore.ClientAPI; -using EventStore.ClientAPI.Exceptions; -using EventStore.ClientAPI.Projections; - -namespace Squidex.Infrastructure.EventSourcing -{ - public static class ProjectionHelper - { - private const string ProjectionName = "by-{0}-{1}"; - private static readonly ConcurrentDictionary SubscriptionsCreated = new ConcurrentDictionary(); - - private static string ParseFilter(string prefix, string filter) - { - return string.Format(CultureInfo.InvariantCulture, ProjectionName, prefix.Slugify(), filter.Slugify()); - } - - public static async Task CreateProjectionAsync(this IEventStoreConnection connection, ProjectionsManager projectionsManager, string prefix, string streamFilter = null) - { - streamFilter = streamFilter ?? ".*"; - - var streamName = ParseFilter(prefix, streamFilter); - - if (SubscriptionsCreated.TryAdd(streamName, true)) - { - var projectionConfig = - $@"fromAll() - .when({{ - $any: function (s, e) {{ - if (e.streamId.indexOf('{prefix}') === 0 && /{streamFilter}/.test(e.streamId.substring({prefix.Length + 1}))) {{ - linkTo('{streamName}', e); - }} - }} - }});"; - - try - { - var credentials = connection.Settings.DefaultUserCredentials; - - await projectionsManager.CreateContinuousAsync($"${streamName}", projectionConfig, credentials); - } - catch (Exception ex) - { - if (!ex.Is()) - { - throw; - } - } - } - - return streamName; - } - - public static async Task GetProjectionsManagerAsync(this IEventStoreConnection connection, string projectionHost) - { - var addressParts = projectionHost.Split(':'); - - if (addressParts.Length < 2 || !int.TryParse(addressParts[1], out var port)) - { - port = 2113; - } - - var endpoints = await Dns.GetHostAddressesAsync(addressParts[0]); - var endpoint = new IPEndPoint(endpoints.First(x => x.AddressFamily == AddressFamily.InterNetwork), port); - - var projectionsManager = - new ProjectionsManager( - connection.Settings.Log, endpoint, - connection.Settings.OperationTimeout); - - return projectionsManager; - } - - public static long? ParsePositionOrNull(string position) - { - return long.TryParse(position, out var parsedPosition) ? (long?)parsedPosition : null; - } - - public static long ParsePosition(string position) - { - return long.TryParse(position, out var parsedPosition) ? parsedPosition : 0; - } - } -} diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEvent.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEvent.cs index 703fb5223..62d15ca20 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEvent.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEvent.cs @@ -5,42 +5,33 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using MongoDB.Bson.Serialization.Attributes; -using Squidex.Infrastructure.Reflection; +using Newtonsoft.Json.Linq; namespace Squidex.Infrastructure.EventSourcing { public class MongoEvent { - [BsonElement] - [BsonRequired] - public Guid EventId { get; set; } - [BsonElement] [BsonRequired] public string Payload { get; set; } [BsonElement] [BsonRequired] - public string Metadata { get; set; } + public JToken Metadata { get; set; } [BsonElement] [BsonRequired] public string Type { get; set; } - public MongoEvent() - { - } - - public MongoEvent(EventData data) + public static MongoEvent FromEventData(EventData data) { - SimpleMapper.Map(data, this); + return new MongoEvent { Type = data.Type, Metadata = data.Metadata, Payload = data.ToString() }; } public EventData ToEventData() { - return SimpleMapper.Map(this, new EventData()); + return new EventData { Type = Type, Metadata = Metadata, Payload = JObject.Parse(Payload) }; } } } \ No newline at end of file diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs index 6bca83110..e5779e42e 100644 --- a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore.cs @@ -5,10 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; -using System.Collections.Generic; -using System.Reactive.Linq; -using System.Threading; using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; @@ -16,16 +12,19 @@ using Squidex.Infrastructure.MongoDb; namespace Squidex.Infrastructure.EventSourcing { - public class MongoEventStore : MongoRepositoryBase, IEventStore + public partial class MongoEventStore : MongoRepositoryBase, IEventStore { - private const int MaxAttempts = 20; - private static readonly BsonTimestamp EmptyTimestamp = new BsonTimestamp(0); private static readonly FieldDefinition TimestampField = Fields.Build(x => x.Timestamp); private static readonly FieldDefinition EventsCountField = Fields.Build(x => x.EventsCount); private static readonly FieldDefinition EventStreamOffsetField = Fields.Build(x => x.EventStreamOffset); private static readonly FieldDefinition EventStreamField = Fields.Build(x => x.EventStream); private readonly IEventNotifier notifier; + public IMongoCollection RawCollection + { + get { return Database.GetCollection(CollectionName()); } + } + public MongoEventStore(IMongoDatabase database, IEventNotifier notifier) : base(database) { @@ -50,220 +49,5 @@ namespace Squidex.Infrastructure.EventSourcing collection.Indexes.CreateOneAsync(Index.Ascending(x => x.Timestamp).Ascending(x => x.EventStream)), collection.Indexes.CreateOneAsync(Index.Ascending(x => x.EventStream).Descending(x => x.EventStreamOffset), new CreateIndexOptions { Unique = true })); } - - public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null) - { - Guard.NotNull(subscriber, nameof(subscriber)); - Guard.NotNullOrEmpty(streamFilter, nameof(streamFilter)); - - return new PollingSubscription(this, subscriber, streamFilter, position); - } - - public async Task> GetEventsAsync(string streamName, long streamPosition = 0) - { - var commits = - await Collection.Find( - Filter.And( - Filter.Eq(EventStreamField, streamName), - Filter.Gte(EventStreamOffsetField, streamPosition - 1))) - .Sort(Sort.Ascending(TimestampField)).ToListAsync(); - - var result = new List(); - - foreach (var commit in commits) - { - var eventStreamOffset = (int)commit.EventStreamOffset; - - var commitTimestamp = commit.Timestamp; - var commitOffset = 0; - - foreach (var e in commit.Events) - { - eventStreamOffset++; - - if (eventStreamOffset >= streamPosition) - { - var eventData = e.ToEventData(); - var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); - - result.Add(new StoredEvent(eventToken, eventStreamOffset, eventData)); - } - } - } - - return result; - } - - public async Task GetEventsAsync(Func callback, string streamFilter = null, string position = null, CancellationToken cancellationToken = default(CancellationToken)) - { - Guard.NotNull(callback, nameof(callback)); - - StreamPosition lastPosition = position; - - var filter = CreateFilter(streamFilter, lastPosition); - - await Collection.Find(filter).Sort(Sort.Ascending(TimestampField)).ForEachAsync(async commit => - { - var eventStreamOffset = (int)commit.EventStreamOffset; - - var commitTimestamp = commit.Timestamp; - var commitOffset = 0; - - foreach (var e in commit.Events) - { - eventStreamOffset++; - - if (commitOffset > lastPosition.CommitOffset || commitTimestamp > lastPosition.Timestamp) - { - var eventData = e.ToEventData(); - var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); - - await callback(new StoredEvent(eventToken, eventStreamOffset, eventData)); - - commitOffset++; - } - } - }, cancellationToken); - } - - public Task AppendEventsAsync(Guid commitId, string streamName, ICollection events) - { - return AppendEventsInternalAsync(commitId, streamName, EtagVersion.Any, events); - } - - public Task AppendEventsAsync(Guid commitId, string streamName, long expectedVersion, ICollection events) - { - Guard.GreaterEquals(expectedVersion, EtagVersion.Any, nameof(expectedVersion)); - - return AppendEventsInternalAsync(commitId, streamName, expectedVersion, events); - } - - private async Task AppendEventsInternalAsync(Guid commitId, string streamName, long expectedVersion, ICollection events) - { - Guard.NotNullOrEmpty(streamName, nameof(streamName)); - Guard.NotNull(events, nameof(events)); - - if (events.Count == 0) - { - return; - } - - var currentVersion = await GetEventStreamOffset(streamName); - - if (expectedVersion != EtagVersion.Any && expectedVersion != currentVersion) - { - throw new WrongEventVersionException(currentVersion, expectedVersion); - } - - var commit = BuildCommit(commitId, streamName, expectedVersion >= -1 ? expectedVersion : currentVersion, events); - - for (var attempt = 0; attempt < MaxAttempts; attempt++) - { - try - { - await Collection.InsertOneAsync(commit); - - notifier.NotifyEventsStored(streamName); - - return; - } - catch (MongoWriteException ex) - { - if (ex.WriteError?.Category == ServerErrorCategory.DuplicateKey) - { - currentVersion = await GetEventStreamOffset(streamName); - - if (expectedVersion != EtagVersion.Any) - { - throw new WrongEventVersionException(currentVersion, expectedVersion); - } - else if (attempt < MaxAttempts) - { - expectedVersion = currentVersion; - } - else - { - throw new TimeoutException("Could not acquire a free slot for the commit within the provided time."); - } - } - else - { - throw; - } - } - } - } - - private async Task GetEventStreamOffset(string streamName) - { - var document = - await Collection.Find(Filter.Eq(EventStreamField, streamName)) - .Project(Projection - .Include(EventStreamOffsetField) - .Include(EventsCountField)) - .Sort(Sort.Descending(EventStreamOffsetField)).Limit(1) - .FirstOrDefaultAsync(); - - if (document != null) - { - return document[nameof(MongoEventCommit.EventStreamOffset)].ToInt64() + document[nameof(MongoEventCommit.EventsCount)].ToInt64(); - } - - return EtagVersion.Empty; - } - - private static FilterDefinition CreateFilter(string streamFilter, StreamPosition streamPosition) - { - var filters = new List>(); - - if (streamPosition.IsEndOfCommit) - { - filters.Add(Filter.Gt(TimestampField, streamPosition.Timestamp)); - } - else - { - filters.Add(Filter.Gte(TimestampField, streamPosition.Timestamp)); - } - - if (!string.IsNullOrWhiteSpace(streamFilter) && !string.Equals(streamFilter, ".*", StringComparison.OrdinalIgnoreCase)) - { - if (streamFilter.Contains("^")) - { - filters.Add(Filter.Regex(EventStreamField, streamFilter)); - } - else - { - filters.Add(Filter.Eq(EventStreamField, streamFilter)); - } - } - - return Filter.And(filters); - } - - private static MongoEventCommit BuildCommit(Guid commitId, string streamName, long expectedVersion, ICollection events) - { - var commitEvents = new MongoEvent[events.Count]; - - var i = 0; - - foreach (var e in events) - { - var mongoEvent = new MongoEvent(e); - - commitEvents[i++] = mongoEvent; - } - - var mongoCommit = new MongoEventCommit - { - Id = commitId, - Events = commitEvents, - EventsCount = events.Count, - EventStream = streamName, - EventStreamOffset = expectedVersion, - Timestamp = EmptyTimestamp - }; - - return mongoCommit; - } } } \ No newline at end of file diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs new file mode 100644 index 000000000..eed2d0bce --- /dev/null +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Reader.cs @@ -0,0 +1,173 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Reactive.Linq; +using System.Threading; +using System.Threading.Tasks; +using MongoDB.Driver; +using Squidex.Infrastructure.MongoDb; + +namespace Squidex.Infrastructure.EventSourcing +{ + public partial class MongoEventStore : MongoRepositoryBase, IEventStore + { + public Task CreateIndexAsync(string property) + { + return Collection.Indexes.CreateOneAsync(Index.Ascending(CreateIndexPath(property))); + } + + public IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null) + { + Guard.NotNull(subscriber, nameof(subscriber)); + Guard.NotNullOrEmpty(streamFilter, nameof(streamFilter)); + + return new PollingSubscription(this, notifier, subscriber, streamFilter, position); + } + + public async Task> QueryAsync(string streamName, long streamPosition = 0) + { + var commits = + await Collection.Find( + Filter.And( + Filter.Eq(EventStreamField, streamName), + Filter.Gte(EventStreamOffsetField, streamPosition - 1))) + .Sort(Sort.Ascending(TimestampField)).ToListAsync(); + + var result = new List(); + + foreach (var commit in commits) + { + var eventStreamOffset = (int)commit.EventStreamOffset; + + var commitTimestamp = commit.Timestamp; + var commitOffset = 0; + + foreach (var e in commit.Events) + { + eventStreamOffset++; + + if (eventStreamOffset >= streamPosition) + { + var eventData = e.ToEventData(); + var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); + + result.Add(new StoredEvent(eventToken, eventStreamOffset, eventData)); + } + } + } + + return result; + } + + public Task QueryAsync(Func callback, string property, object value, string position = null, CancellationToken ct = default(CancellationToken)) + { + Guard.NotNull(callback, nameof(callback)); + + StreamPosition lastPosition = position; + + var filter = CreateFilter(property, value, lastPosition); + + return QueryAsync(callback, lastPosition, filter, ct); + } + + public Task QueryAsync(Func callback, string streamFilter = null, string position = null, CancellationToken ct = default(CancellationToken)) + { + Guard.NotNull(callback, nameof(callback)); + + StreamPosition lastPosition = position; + + var filter = CreateFilter(streamFilter, lastPosition); + + return QueryAsync(callback, lastPosition, filter, ct); + } + + private async Task QueryAsync(Func callback, StreamPosition lastPosition, FilterDefinition filter, CancellationToken ct) + { + await Collection.Find(filter).Sort(Sort.Ascending(TimestampField)).ForEachAsync(async commit => + { + var eventStreamOffset = (int)commit.EventStreamOffset; + + var commitTimestamp = commit.Timestamp; + var commitOffset = 0; + + foreach (var e in commit.Events) + { + eventStreamOffset++; + + if (commitOffset > lastPosition.CommitOffset || commitTimestamp > lastPosition.Timestamp) + { + var eventData = e.ToEventData(); + var eventToken = new StreamPosition(commitTimestamp, commitOffset, commit.Events.Length); + + await callback(new StoredEvent(eventToken, eventStreamOffset, eventData)); + + commitOffset++; + } + } + }, ct); + } + + private static FilterDefinition CreateFilter(string property, object value, StreamPosition streamPosition) + { + var filters = new List>(); + + AddPositionFilter(streamPosition, filters); + AddPropertyFitler(property, value, filters); + + return Filter.And(filters); + } + + private static FilterDefinition CreateFilter(string streamFilter, StreamPosition streamPosition) + { + var filters = new List>(); + + AddPositionFilter(streamPosition, filters); + AddStreamFilter(streamFilter, filters); + + return Filter.And(filters); + } + + private static void AddPropertyFitler(string property, object value, List> filters) + { + filters.Add(Filter.Eq(CreateIndexPath(property), value)); + } + + private static void AddStreamFilter(string streamFilter, List> filters) + { + if (!string.IsNullOrWhiteSpace(streamFilter) && !string.Equals(streamFilter, ".*", StringComparison.OrdinalIgnoreCase)) + { + if (streamFilter.Contains("^")) + { + filters.Add(Filter.Regex(EventStreamField, streamFilter)); + } + else + { + filters.Add(Filter.Eq(EventStreamField, streamFilter)); + } + } + } + + private static void AddPositionFilter(StreamPosition streamPosition, List> filters) + { + if (streamPosition.IsEndOfCommit) + { + filters.Add(Filter.Gt(TimestampField, streamPosition.Timestamp)); + } + else + { + filters.Add(Filter.Gte(TimestampField, streamPosition.Timestamp)); + } + } + + private static string CreateIndexPath(string property) + { + return $"Events.Metadata.{property}"; + } + } +} \ No newline at end of file diff --git a/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs new file mode 100644 index 000000000..937b66050 --- /dev/null +++ b/src/Squidex.Infrastructure.MongoDb/EventSourcing/MongoEventStore_Writer.cs @@ -0,0 +1,129 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Reactive.Linq; +using System.Threading.Tasks; +using MongoDB.Bson; +using MongoDB.Driver; + +namespace Squidex.Infrastructure.EventSourcing +{ + public partial class MongoEventStore + { + private const int MaxWriteAttempts = 20; + private static readonly BsonTimestamp EmptyTimestamp = new BsonTimestamp(0); + + public Task AppendAsync(Guid commitId, string streamName, ICollection events) + { + return AppendAsync(commitId, streamName, EtagVersion.Any, events); + } + + public async Task AppendAsync(Guid commitId, string streamName, long expectedVersion, ICollection events) + { + Guard.GreaterEquals(expectedVersion, EtagVersion.Any, nameof(expectedVersion)); + Guard.NotNullOrEmpty(streamName, nameof(streamName)); + Guard.NotNull(events, nameof(events)); + + if (events.Count == 0) + { + return; + } + + var currentVersion = await GetEventStreamOffset(streamName); + + if (expectedVersion != EtagVersion.Any && expectedVersion != currentVersion) + { + throw new WrongEventVersionException(currentVersion, expectedVersion); + } + + var commit = BuildCommit(commitId, streamName, expectedVersion >= -1 ? expectedVersion : currentVersion, events); + + for (var attempt = 0; attempt < MaxWriteAttempts; attempt++) + { + try + { + await Collection.InsertOneAsync(commit); + + notifier.NotifyEventsStored(streamName); + + return; + } + catch (MongoWriteException ex) + { + if (ex.WriteError?.Category == ServerErrorCategory.DuplicateKey) + { + currentVersion = await GetEventStreamOffset(streamName); + + if (expectedVersion != EtagVersion.Any) + { + throw new WrongEventVersionException(currentVersion, expectedVersion); + } + + if (attempt < MaxWriteAttempts) + { + expectedVersion = currentVersion; + } + else + { + throw new TimeoutException("Could not acquire a free slot for the commit within the provided time."); + } + } + else + { + throw; + } + } + } + } + + private async Task GetEventStreamOffset(string streamName) + { + var document = + await Collection.Find(Filter.Eq(EventStreamField, streamName)) + .Project(Projection + .Include(EventStreamOffsetField) + .Include(EventsCountField)) + .Sort(Sort.Descending(EventStreamOffsetField)).Limit(1) + .FirstOrDefaultAsync(); + + if (document != null) + { + return document[nameof(MongoEventCommit.EventStreamOffset)].ToInt64() + document[nameof(MongoEventCommit.EventsCount)].ToInt64(); + } + + return EtagVersion.Empty; + } + + private static MongoEventCommit BuildCommit(Guid commitId, string streamName, long expectedVersion, ICollection events) + { + var commitEvents = new MongoEvent[events.Count]; + + var i = 0; + + foreach (var e in events) + { + var mongoEvent = MongoEvent.FromEventData(e); + + commitEvents[i++] = mongoEvent; + } + + var mongoCommit = new MongoEventCommit + { + Id = commitId, + Events = commitEvents, + EventsCount = events.Count, + EventStream = streamName, + EventStreamOffset = expectedVersion, + Timestamp = EmptyTimestamp + }; + + return mongoCommit; + } + } +} \ No newline at end of file diff --git a/src/Squidex.Infrastructure.MongoDb/MongoDb/BsonJsonConvention.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/BsonJsonConvention.cs index ab9f13d11..2a8d6e572 100644 --- a/src/Squidex.Infrastructure.MongoDb/MongoDb/BsonJsonConvention.cs +++ b/src/Squidex.Infrastructure.MongoDb/MongoDb/BsonJsonConvention.cs @@ -11,6 +11,7 @@ using System.Reflection; using MongoDB.Bson.Serialization; using MongoDB.Bson.Serialization.Conventions; using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace Squidex.Infrastructure.MongoDb { @@ -31,6 +32,18 @@ namespace Squidex.Infrastructure.MongoDb memberMap.SetSerializer((IBsonSerializer)bsonSerializer); } + else if (memberMap.MemberType == typeof(JToken)) + { + memberMap.SetSerializer(JTokenSerializer.Instance); + } + else if (memberMap.MemberType == typeof(JObject)) + { + memberMap.SetSerializer(JTokenSerializer.Instance); + } + else if (memberMap.MemberType == typeof(JValue)) + { + memberMap.SetSerializer(JTokenSerializer.Instance); + } }); ConventionRegistry.Register("json", pack, t => true); diff --git a/src/Squidex.Infrastructure.MongoDb/MongoDb/JTokenSerializer.cs b/src/Squidex.Infrastructure.MongoDb/MongoDb/JTokenSerializer.cs new file mode 100644 index 000000000..fbb1039e0 --- /dev/null +++ b/src/Squidex.Infrastructure.MongoDb/MongoDb/JTokenSerializer.cs @@ -0,0 +1,32 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using MongoDB.Bson.Serialization; +using MongoDB.Bson.Serialization.Serializers; +using Newtonsoft.Json.Linq; + +namespace Squidex.Infrastructure.MongoDb +{ + public sealed class JTokenSerializer : ClassSerializerBase where T : JToken + { + public static readonly JTokenSerializer Instance = new JTokenSerializer(); + + protected override T DeserializeValue(BsonDeserializationContext context, BsonDeserializationArgs args) + { + var jsonReader = new BsonJsonReader(context.Reader); + + return (T)JToken.ReadFrom(jsonReader); + } + + protected override void SerializeValue(BsonSerializationContext context, BsonSerializationArgs args, T value) + { + var jsonWriter = new BsonJsonWriter(context.Writer); + + value.WriteTo(jsonWriter); + } + } +} diff --git a/src/Squidex.Infrastructure/Commands/DomainObjectBase.cs b/src/Squidex.Infrastructure/Commands/DomainObjectBase.cs index fd7e62c36..c4d0e0ef4 100644 --- a/src/Squidex.Infrastructure/Commands/DomainObjectBase.cs +++ b/src/Squidex.Infrastructure/Commands/DomainObjectBase.cs @@ -44,17 +44,15 @@ namespace Squidex.Infrastructure.Commands RaiseEvent(Envelope.Create(@event)); } - public void RaiseEvent(Envelope @event) where TEvent : class, IEvent + public virtual void RaiseEvent(Envelope @event) { Guard.NotNull(@event, nameof(@event)); @event.SetAggregateId(id); - ApplyEvent(@event.To()); + ApplyEvent(@event); - snapshot.Version++; - - uncomittedEvents.Add(@event.To()); + uncomittedEvents.Add(@event); } public IReadOnlyList> GetUncomittedEvents() diff --git a/src/Squidex.Infrastructure/EventSourcing/JsonEventDataFormatter.cs b/src/Squidex.Infrastructure/EventSourcing/DefaultEventDataFormatter.cs similarity index 51% rename from src/Squidex.Infrastructure/EventSourcing/JsonEventDataFormatter.cs rename to src/Squidex.Infrastructure/EventSourcing/DefaultEventDataFormatter.cs index 9af9e3a68..72f01b63a 100644 --- a/src/Squidex.Infrastructure/EventSourcing/JsonEventDataFormatter.cs +++ b/src/Squidex.Infrastructure/EventSourcing/DefaultEventDataFormatter.cs @@ -7,38 +7,37 @@ using System; using Newtonsoft.Json; +using Newtonsoft.Json.Linq; namespace Squidex.Infrastructure.EventSourcing { - public class JsonEventDataFormatter : IEventDataFormatter + public class DefaultEventDataFormatter : IEventDataFormatter { - private readonly JsonSerializerSettings serializerSettings; + private readonly JsonSerializer serializer; private readonly TypeNameRegistry typeNameRegistry; - public JsonEventDataFormatter(TypeNameRegistry typeNameRegistry, JsonSerializerSettings serializerSettings = null) + public DefaultEventDataFormatter(TypeNameRegistry typeNameRegistry, JsonSerializer serializer = null) { Guard.NotNull(typeNameRegistry, nameof(typeNameRegistry)); this.typeNameRegistry = typeNameRegistry; - this.serializerSettings = serializerSettings ?? new JsonSerializerSettings(); + this.serializer = serializer ?? JsonSerializer.CreateDefault(); } public Envelope Parse(EventData eventData, bool migrate = true) { - var headers = ReadJson(eventData.Metadata); - var eventType = typeNameRegistry.GetType(eventData.Type); - var eventPayload = ReadJson(eventData.Payload, eventType); - if (migrate && eventPayload is IMigratedEvent migratedEvent) + var headers = eventData.Metadata.ToObject(); + var content = eventData.Payload.ToObject(eventType, serializer) as IEvent; + + if (migrate && content is IMigratedEvent migratedEvent) { - eventPayload = migratedEvent.Migrate(); + content = migratedEvent.Migrate(); } - var envelope = new Envelope(eventPayload, headers); - - envelope.SetEventId(eventData.EventId); + var envelope = new Envelope(content, headers); return envelope; } @@ -56,20 +55,10 @@ namespace Squidex.Infrastructure.EventSourcing envelope.SetCommitId(commitId); - var headers = WriteJson(envelope.Headers); - var content = WriteJson(envelope.Payload); + var headers = JToken.FromObject(envelope.Headers, serializer); + var content = JToken.FromObject(envelope.Payload, serializer); - return new EventData { EventId = envelope.Headers.EventId(), Type = eventType, Payload = content, Metadata = headers }; - } - - private T ReadJson(string data, Type type = null) - { - return (T)JsonConvert.DeserializeObject(data, type ?? typeof(T), serializerSettings); - } - - private string WriteJson(object value) - { - return JsonConvert.SerializeObject(value, serializerSettings); + return new EventData { Type = eventType, Payload = content, Metadata = headers }; } } } diff --git a/src/Squidex.Infrastructure/EventSourcing/EventData.cs b/src/Squidex.Infrastructure/EventSourcing/EventData.cs index 9ca13635d..739ea8068 100644 --- a/src/Squidex.Infrastructure/EventSourcing/EventData.cs +++ b/src/Squidex.Infrastructure/EventSourcing/EventData.cs @@ -5,17 +5,15 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; +using Newtonsoft.Json.Linq; namespace Squidex.Infrastructure.EventSourcing { public class EventData { - public Guid EventId { get; set; } + public JToken Payload { get; set; } - public string Payload { get; set; } - - public string Metadata { get; set; } + public JToken Metadata { get; set; } public string Type { get; set; } } diff --git a/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs b/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs index 2993ef86b..c33d86e5a 100644 --- a/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs +++ b/src/Squidex.Infrastructure/EventSourcing/IEventStore.cs @@ -14,13 +14,17 @@ namespace Squidex.Infrastructure.EventSourcing { public interface IEventStore { - Task> GetEventsAsync(string streamName, long streamPosition = 0); + Task CreateIndexAsync(string property); - Task GetEventsAsync(Func callback, string streamFilter = null, string position = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> QueryAsync(string streamName, long streamPosition = 0); - Task AppendEventsAsync(Guid commitId, string streamName, ICollection events); + Task QueryAsync(Func callback, string streamFilter = null, string position = null, CancellationToken ct = default(CancellationToken)); - Task AppendEventsAsync(Guid commitId, string streamName, long expectedVersion, ICollection events); + Task QueryAsync(Func callback, string property, object value, string position = null, CancellationToken ct = default(CancellationToken)); + + Task AppendAsync(Guid commitId, string streamName, ICollection events); + + Task AppendAsync(Guid commitId, string streamName, long expectedVersion, ICollection events); IEventSubscription CreateSubscription(IEventSubscriber subscriber, string streamFilter, string position = null); } diff --git a/src/Squidex.Infrastructure/EventSourcing/PollingSubscription.cs b/src/Squidex.Infrastructure/EventSourcing/PollingSubscription.cs index cfdb4486d..10c908ad5 100644 --- a/src/Squidex.Infrastructure/EventSourcing/PollingSubscription.cs +++ b/src/Squidex.Infrastructure/EventSourcing/PollingSubscription.cs @@ -41,7 +41,7 @@ namespace Squidex.Infrastructure.EventSourcing { try { - await eventStore.GetEventsAsync(async storedEvent => + await eventStore.QueryAsync(async storedEvent => { await eventSubscriber.OnEventAsync(this, storedEvent); diff --git a/src/Squidex.Infrastructure/EventSourcing/StoredEvent.cs b/src/Squidex.Infrastructure/EventSourcing/StoredEvent.cs index 747dce5bc..3c93e21a4 100644 --- a/src/Squidex.Infrastructure/EventSourcing/StoredEvent.cs +++ b/src/Squidex.Infrastructure/EventSourcing/StoredEvent.cs @@ -9,33 +9,21 @@ namespace Squidex.Infrastructure.EventSourcing { public sealed class StoredEvent { - private readonly string eventPosition; - private readonly long eventStreamNumber; - private readonly EventData data; + public string EventPosition { get; } - public string EventPosition - { - get { return eventPosition; } - } - - public long EventStreamNumber - { - get { return eventStreamNumber; } - } + public long EventStreamNumber { get; } - public EventData Data - { - get { return data; } - } + public EventData Data { get; } public StoredEvent(string eventPosition, long eventStreamNumber, EventData data) { Guard.NotNullOrEmpty(eventPosition, nameof(eventPosition)); Guard.NotNull(data, nameof(data)); - this.data = data; - this.eventPosition = eventPosition; - this.eventStreamNumber = eventStreamNumber; + Data = data; + + EventPosition = eventPosition; + EventStreamNumber = eventStreamNumber; } } } diff --git a/src/Squidex.Infrastructure/Json/NamedGuidIdConverter.cs b/src/Squidex.Infrastructure/Json/NamedGuidIdConverter.cs index 4499419d3..1695a96f9 100644 --- a/src/Squidex.Infrastructure/Json/NamedGuidIdConverter.cs +++ b/src/Squidex.Infrastructure/Json/NamedGuidIdConverter.cs @@ -6,7 +6,6 @@ // ========================================================================== using System; -using System.Linq; using Newtonsoft.Json; namespace Squidex.Infrastructure.Json @@ -25,19 +24,14 @@ namespace Squidex.Infrastructure.Json throw new JsonException($"Expected String, but got {reader.TokenType}."); } - var parts = reader.Value.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); - - if (parts.Length < 2) + try { - throw new JsonException("Named id must have more than 2 parts divided by commata."); + return NamedId.Parse(reader.Value.ToString(), Guid.TryParse); } - - if (!Guid.TryParse(parts[0], out var id)) + catch (ArgumentException ex) { - throw new JsonException("Named id must be a valid guid."); + throw new JsonException(ex.Message); } - - return new NamedId(id, string.Join(",", parts.Skip(1))); } } } diff --git a/src/Squidex.Infrastructure/Json/NamedLongIdConverter.cs b/src/Squidex.Infrastructure/Json/NamedLongIdConverter.cs index 4efb97dc0..cc85acd9b 100644 --- a/src/Squidex.Infrastructure/Json/NamedLongIdConverter.cs +++ b/src/Squidex.Infrastructure/Json/NamedLongIdConverter.cs @@ -6,7 +6,6 @@ // ========================================================================== using System; -using System.Linq; using Newtonsoft.Json; namespace Squidex.Infrastructure.Json @@ -25,19 +24,14 @@ namespace Squidex.Infrastructure.Json throw new JsonException($"Expected String, but got {reader.TokenType}."); } - var parts = reader.Value.ToString().Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); - - if (parts.Length < 2) + try { - throw new JsonException("Named id must have more than 2 parts divided by commata."); + return NamedId.Parse(reader.Value.ToString(), long.TryParse); } - - if (!long.TryParse(parts[0], out var id)) + catch (ArgumentException ex) { - throw new JsonException("Named id must be a valid long."); + throw new JsonException(ex.Message); } - - return new NamedId(id, string.Join(",", parts.Skip(1))); } } } diff --git a/src/Squidex.Infrastructure/Migrations/IMigration.cs b/src/Squidex.Infrastructure/Migrations/IMigration.cs index 89d698688..3a837e088 100644 --- a/src/Squidex.Infrastructure/Migrations/IMigration.cs +++ b/src/Squidex.Infrastructure/Migrations/IMigration.cs @@ -5,17 +5,12 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System.Collections.Generic; using System.Threading.Tasks; namespace Squidex.Infrastructure.Migrations { public interface IMigration { - int FromVersion { get; } - - int ToVersion { get; } - - Task UpdateAsync(IEnumerable previousMigrations); + Task UpdateAsync(); } } diff --git a/src/Squidex.Infrastructure/Migrations/IMigrationPath.cs b/src/Squidex.Infrastructure/Migrations/IMigrationPath.cs new file mode 100644 index 000000000..3992f953e --- /dev/null +++ b/src/Squidex.Infrastructure/Migrations/IMigrationPath.cs @@ -0,0 +1,16 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; + +namespace Squidex.Infrastructure.Migrations +{ + public interface IMigrationPath + { + (int Version, IEnumerable Migrations) GetNext(int version); + } +} diff --git a/src/Squidex.Infrastructure/Migrations/Migrator.cs b/src/Squidex.Infrastructure/Migrations/Migrator.cs index 4ad2f4065..0ba832d9e 100644 --- a/src/Squidex.Infrastructure/Migrations/Migrator.cs +++ b/src/Squidex.Infrastructure/Migrations/Migrator.cs @@ -5,8 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; -using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Squidex.Infrastructure.Log; @@ -15,20 +13,20 @@ namespace Squidex.Infrastructure.Migrations { public sealed class Migrator { - private readonly IMigrationStatus migrationStatus; - private readonly IEnumerable migrations; private readonly ISemanticLog log; + private readonly IMigrationStatus migrationStatus; + private readonly IMigrationPath migrationPath; - public int LockWaitMs { get; set; } = 5000; + public int LockWaitMs { get; set; } = 500; - public Migrator(IMigrationStatus migrationStatus, IEnumerable migrations, ISemanticLog log) + public Migrator(IMigrationStatus migrationStatus, IMigrationPath migrationPath, ISemanticLog log) { Guard.NotNull(migrationStatus, nameof(migrationStatus)); - Guard.NotNull(migrations, nameof(migrations)); + Guard.NotNull(migrationPath, nameof(migrationPath)); Guard.NotNull(log, nameof(log)); this.migrationStatus = migrationStatus; - this.migrations = migrations.OrderByDescending(x => x.ToVersion).ToList(); + this.migrationPath = migrationPath; this.log = log; } @@ -39,8 +37,6 @@ namespace Squidex.Infrastructure.Migrations try { - var lastMigrator = migrations.FirstOrDefault(); - while (!await migrationStatus.TryLockAsync()) { log.LogInformation(w => w @@ -52,13 +48,16 @@ namespace Squidex.Infrastructure.Migrations version = await migrationStatus.GetVersionAsync(); - if (lastMigrator != null && lastMigrator.ToVersion != version) + while (true) { - var migrationPath = FindMigratorPath(version, lastMigrator.ToVersion).ToList(); + var migrationStep = migrationPath.GetNext(version); - var previousMigrations = new List(); + if (migrationStep.Migrations == null || !migrationStep.Migrations.Any()) + { + break; + } - foreach (var migration in migrationPath) + foreach (var migration in migrationStep.Migrations) { var name = migration.GetType().ToString(); @@ -72,13 +71,11 @@ namespace Squidex.Infrastructure.Migrations .WriteProperty("status", "Completed") .WriteProperty("migrator", name))) { - await migration.UpdateAsync(previousMigrations.ToList()); - - version = migration.ToVersion; + await migration.UpdateAsync(); } - - previousMigrations.Add(migration); } + + version = migrationStep.Version; } } finally @@ -86,30 +83,5 @@ namespace Squidex.Infrastructure.Migrations await migrationStatus.UnlockAsync(version); } } - - private IEnumerable FindMigratorPath(int fromVersion, int toVersion) - { - var addedMigrators = new HashSet(); - - while (true) - { - var bestMigrator = migrations.Where(x => x.FromVersion < x.ToVersion).FirstOrDefault(x => x.FromVersion == fromVersion); - - if (bestMigrator != null && addedMigrators.Add(bestMigrator)) - { - fromVersion = bestMigrator.ToVersion; - - yield return bestMigrator; - } - else if (fromVersion != toVersion) - { - throw new InvalidOperationException($"There is no migration path from {fromVersion} to {toVersion}."); - } - else - { - break; - } - } - } } } diff --git a/src/Squidex.Infrastructure/NamedId.cs b/src/Squidex.Infrastructure/NamedId.cs index 0b16475fe..e8f99f6d4 100644 --- a/src/Squidex.Infrastructure/NamedId.cs +++ b/src/Squidex.Infrastructure/NamedId.cs @@ -6,9 +6,12 @@ // ========================================================================== using System; +using System.Linq; namespace Squidex.Infrastructure { + public delegate bool Parser(string input, out T result); + public sealed class NamedId : IEquatable> { public T Id { get; } @@ -44,5 +47,24 @@ namespace Squidex.Infrastructure { return (Id.GetHashCode() * 397) ^ Name.GetHashCode(); } + + public static NamedId Parse(string value, Parser parser) + { + Guard.NotNull(value, nameof(value)); + + var parts = value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries); + + if (parts.Length < 2) + { + throw new ArgumentException("Named id must have more than 2 parts divided by commata."); + } + + if (!parser(parts[0], out var id)) + { + throw new ArgumentException("Named id must be a valid guid."); + } + + return new NamedId(id, string.Join(",", parts.Skip(1))); + } } } diff --git a/src/Squidex.Infrastructure/SquidexInfrastructure.cs b/src/Squidex.Infrastructure/SquidexInfrastructure.cs index 11cfb6764..8dac58f91 100644 --- a/src/Squidex.Infrastructure/SquidexInfrastructure.cs +++ b/src/Squidex.Infrastructure/SquidexInfrastructure.cs @@ -5,9 +5,12 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System.Reflection; + namespace Squidex.Infrastructure { public static class SquidexInfrastructure { + public static readonly Assembly Assembly = typeof(SquidexInfrastructure).Assembly; } } diff --git a/src/Squidex.Infrastructure/States/Persistence{TOwner,TSnapshot,TKey}.cs b/src/Squidex.Infrastructure/States/Persistence{TOwner,TSnapshot,TKey}.cs index 024a05119..cb0900aed 100644 --- a/src/Squidex.Infrastructure/States/Persistence{TOwner,TSnapshot,TKey}.cs +++ b/src/Squidex.Infrastructure/States/Persistence{TOwner,TSnapshot,TKey}.cs @@ -101,7 +101,7 @@ namespace Squidex.Infrastructure.States { if (UseEventSourcing()) { - var events = await eventStore.GetEventsAsync(GetStreamName(), versionEvents + 1); + var events = await eventStore.QueryAsync(GetStreamName(), versionEvents + 1); foreach (var @event in events) { @@ -160,7 +160,7 @@ namespace Squidex.Infrastructure.States try { - await eventStore.AppendEventsAsync(commitId, GetStreamName(), expectedVersion, eventData); + await eventStore.AppendAsync(commitId, GetStreamName(), expectedVersion, eventData); } catch (WrongEventVersionException ex) { diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs index 386e84edc..327a28e8f 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs @@ -146,7 +146,7 @@ namespace Squidex.Areas.Api.Controllers.Assets /// 400 => Asset exceeds the maximum size. /// /// - /// You can only upload one file at a time. The mime type of the file is not calculated by Squidex and must be defined correctly. + /// You can only upload one file at a time. The mime type of the file is not calculated by Squidex and is required correctly. /// [MustBeAppEditor] [HttpPost] @@ -248,7 +248,7 @@ namespace Squidex.Areas.Api.Controllers.Assets { if (file.Count != 1) { - var error = new ValidationError($"Can only upload one file, found {file.Count}."); + var error = new ValidationError($"Can only upload one file, found {file.Count} files."); throw new ValidationException("Cannot create asset.", error); } diff --git a/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs b/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs index 9fb56d378..f5a497941 100644 --- a/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Content/ContentsController.cs @@ -10,6 +10,8 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; +using NodaTime; +using NodaTime.Text; using NSwag.Annotations; using Squidex.Areas.Api.Controllers.Contents.Models; using Squidex.Domain.Apps.Core.Contents; @@ -42,12 +44,24 @@ namespace Squidex.Areas.Api.Controllers.Contents this.graphQl = graphQl; } + /// + /// GraphQL endpoint. + /// + /// The name of the app. + /// The graphql endpoint. + /// + /// 200 => Contents retrieved or mutated. + /// 404 => Schema or app not found. + /// + /// + /// You can read the generated documentation for your app at /api/content/{appName}/docs + /// [MustBeAppReader] [HttpGet] [HttpPost] [Route("content/{app}/graphql/")] [ApiCosts(2)] - public async Task PostGraphQL([FromBody] GraphQLQuery query) + public async Task PostGraphQL(string app, [FromBody] GraphQLQuery query) { var result = await graphQl.QueryAsync(App, User, query); @@ -61,11 +75,25 @@ namespace Squidex.Areas.Api.Controllers.Contents } } + /// + /// Queries contents. + /// + /// The name of the app. + /// The name of the schema. + /// The optional ids of the content to fetch. + /// Indicates whether to query content items from the archive. + /// + /// 200 => Contents retrieved. + /// 404 => Schema or app not found. + /// + /// + /// You can read the generated documentation for your app at /api/content/{appName}/docs + /// [MustBeAppReader] [HttpGet] [Route("content/{app}/{name}/")] [ApiCosts(2)] - public async Task GetContents(string name, [FromQuery] bool archived = false, [FromQuery] string ids = null) + public async Task GetContents(string app, string name, [FromQuery] bool archived = false, [FromQuery] string ids = null) { HashSet idsList = null; @@ -110,11 +138,24 @@ namespace Squidex.Areas.Api.Controllers.Contents return Ok(response); } + /// + /// Get a content item. + /// + /// The name of the app. + /// The name of the schema. + /// The id of the content to fetch. + /// + /// 200 => Content found. + /// 404 => Content, schema or app not found. + /// + /// + /// You can read the generated documentation for your app at /api/content/{appName}/docs + /// [MustBeAppReader] [HttpGet] [Route("content/{app}/{name}/{id}/")] [ApiCosts(1)] - public async Task GetContent(string name, Guid id) + public async Task GetContent(string app, string name, Guid id) { var (schema, entity) = await contentQuery.FindContentAsync(App, name, User, id); @@ -133,11 +174,26 @@ namespace Squidex.Areas.Api.Controllers.Contents return Ok(response); } + /// + /// Get a content item with a specific version. + /// + /// The name of the app. + /// The name of the schema. + /// The id of the content to fetch. + /// The version fo the content to fetch. + /// + /// 200 => Content found. + /// 404 => Content, schema or app not found. + /// 400 => Content data is not valid. + /// + /// + /// You can read the generated documentation for your app at /api/content/{appName}/docs + /// [MustBeAppReader] [HttpGet] [Route("content/{app}/{name}/{id}/{version}/")] [ApiCosts(1)] - public async Task GetContentVersion(string name, Guid id, int version) + public async Task GetContentVersion(string app, string name, Guid id, int version) { var content = await contentQuery.FindContentAsync(App, name, User, id, version); @@ -155,11 +211,26 @@ namespace Squidex.Areas.Api.Controllers.Contents return Ok(response.Data); } + /// + /// Create a content item. + /// + /// The name of the app. + /// The name of the schema. + /// The full data for the content item. + /// Indicates whether the content should be published immediately. + /// + /// 201 => Content created. + /// 404 => Content, schema or app not found. + /// 400 => Content data is not valid. + /// + /// + /// You can read the generated documentation for your app at /api/content/{appName}/docs + /// [MustBeAppEditor] [HttpPost] [Route("content/{app}/{name}/")] [ApiCosts(1)] - public async Task PostContent(string name, [FromBody] NamedContentData request, [FromQuery] bool publish = false) + public async Task PostContent(string app, string name, [FromBody] NamedContentData request, [FromQuery] bool publish = false) { await contentQuery.FindSchemaAsync(App, name); @@ -173,11 +244,26 @@ namespace Squidex.Areas.Api.Controllers.Contents return CreatedAtAction(nameof(GetContent), new { id = command.ContentId }, response); } + /// + /// Update a content item. + /// + /// The name of the app. + /// The name of the schema. + /// The id of the content item to update. + /// The full data for the content item. + /// + /// 200 => Content updated. + /// 404 => Content, schema or app not found. + /// 400 => Content data is not valid. + /// + /// + /// You can read the generated documentation for your app at /api/content/{appName}/docs + /// [MustBeAppEditor] [HttpPut] [Route("content/{app}/{name}/{id}/")] [ApiCosts(1)] - public async Task PutContent(string name, Guid id, [FromBody] NamedContentData request) + public async Task PutContent(string app, string name, Guid id, [FromBody] NamedContentData request) { await contentQuery.FindSchemaAsync(App, name); @@ -191,11 +277,26 @@ namespace Squidex.Areas.Api.Controllers.Contents return Ok(response); } + /// + /// Patchs a content item. + /// + /// The name of the app. + /// The name of the schema. + /// The id of the content item to patch. + /// The patch for the content item. + /// + /// 200 => Content patched. + /// 404 => Content, schema or app not found. + /// 400 => Content patch is not valid. + /// + /// + /// You can read the generated documentation for your app at /api/content/{appName}/docs + /// [MustBeAppEditor] [HttpPatch] [Route("content/{app}/{name}/{id}/")] [ApiCosts(1)] - public async Task PatchContent(string name, Guid id, [FromBody] NamedContentData request) + public async Task PatchContent(string app, string name, Guid id, [FromBody] NamedContentData request) { await contentQuery.FindSchemaAsync(App, name); @@ -209,71 +310,144 @@ namespace Squidex.Areas.Api.Controllers.Contents return Ok(response); } + /// + /// Publish a content item. + /// + /// The name of the app. + /// The name of the schema. + /// The id of the content item to publish. + /// The date and time when the content should be published. + /// + /// 204 => Content published. + /// 404 => Content, schema or app not found. + /// 400 => Content was already published. + /// + /// + /// You can read the generated documentation for your app at /api/content/{appName}/docs + /// [MustBeAppEditor] [HttpPut] [Route("content/{app}/{name}/{id}/publish/")] [ApiCosts(1)] - public async Task PublishContent(string name, Guid id) + public async Task PublishContent(string app, string name, Guid id, string dueTime = null) { await contentQuery.FindSchemaAsync(App, name); - var command = new ChangeContentStatus { Status = Status.Published, ContentId = id }; + var command = CreateCommand(id, Status.Published, dueTime); await CommandBus.PublishAsync(command); return NoContent(); } + /// + /// Unpublish a content item. + /// + /// The name of the app. + /// The name of the schema. + /// The id of the content item to unpublish. + /// The date and time when the content should be unpublished. + /// + /// 204 => Content unpublished. + /// 404 => Content, schema or app not found. + /// 400 => Content was not published. + /// + /// + /// You can read the generated documentation for your app at /api/content/{appName}/docs + /// [MustBeAppEditor] [HttpPut] [Route("content/{app}/{name}/{id}/unpublish/")] [ApiCosts(1)] - public async Task UnpublishContent(string name, Guid id) + public async Task UnpublishContent(string app, string name, Guid id, string dueTime = null) { await contentQuery.FindSchemaAsync(App, name); - var command = new ChangeContentStatus { Status = Status.Draft, ContentId = id }; + var command = CreateCommand(id, Status.Draft, dueTime); await CommandBus.PublishAsync(command); return NoContent(); } + /// + /// Archive a content item. + /// + /// The name of the app. + /// The name of the schema. + /// The id of the content item to archive. + /// The date and time when the content should be archived. + /// + /// 204 => Content archived. + /// 404 => Content, schema or app not found. + /// 400 => Content was already archived. + /// + /// + /// You can read the generated documentation for your app at /api/content/{appName}/docs + /// [MustBeAppEditor] [HttpPut] [Route("content/{app}/{name}/{id}/archive/")] [ApiCosts(1)] - public async Task ArchiveContent(string name, Guid id) + public async Task ArchiveContent(string app, string name, Guid id, string dueTime = null) { await contentQuery.FindSchemaAsync(App, name); - var command = new ChangeContentStatus { Status = Status.Archived, ContentId = id }; + var command = CreateCommand(id, Status.Archived, dueTime); await CommandBus.PublishAsync(command); return NoContent(); } + /// + /// Restore a content item. + /// + /// The name of the app. + /// The name of the schema. + /// The id of the content item to restore. + /// The date and time when the content should be restored. + /// + /// 204 => Content restored. + /// 404 => Content, schema or app not found. + /// 400 => Content was not archived. + /// + /// + /// You can read the generated documentation for your app at /api/content/{appName}/docs + /// [MustBeAppEditor] [HttpPut] [Route("content/{app}/{name}/{id}/restore/")] [ApiCosts(1)] - public async Task RestoreContent(string name, Guid id) + public async Task RestoreContent(string app, string name, Guid id, string dueTime = null) { await contentQuery.FindSchemaAsync(App, name); - var command = new ChangeContentStatus { Status = Status.Draft, ContentId = id }; + var command = CreateCommand(id, Status.Draft, dueTime); await CommandBus.PublishAsync(command); return NoContent(); } + /// + /// Delete a content item. + /// + /// The name of the app. + /// The name of the schema. + /// The id of the content item to delete. + /// + /// 204 => Content has been deleted. + /// 404 => Content, schema or app not found. + /// + /// + /// You can create an generated documentation for your app at /api/content/{appName}/docs + /// [MustBeAppEditor] [HttpDelete] [Route("content/{app}/{name}/{id}/")] [ApiCosts(1)] - public async Task DeleteContent(string name, Guid id) + public async Task DeleteContent(string app, string name, Guid id) { await contentQuery.FindSchemaAsync(App, name); @@ -283,5 +457,22 @@ namespace Squidex.Areas.Api.Controllers.Contents return NoContent(); } + + private static ChangeContentStatus CreateCommand(Guid id, Status status, string dueTime) + { + Instant? dt = null; + + if (!string.IsNullOrWhiteSpace(dueTime)) + { + var parseResult = InstantPattern.General.Parse(dueTime); + + if (parseResult.Success) + { + dt = parseResult.Value; + } + } + + return new ChangeContentStatus { Status = status, ContentId = id, DueTime = dt }; + } } } diff --git a/src/Squidex/Areas/Api/Controllers/Content/Generator/SchemaSwaggerGenerator.cs b/src/Squidex/Areas/Api/Controllers/Content/Generator/SchemaSwaggerGenerator.cs index 010f411c0..03acbbdad 100644 --- a/src/Squidex/Areas/Api/Controllers/Content/Generator/SchemaSwaggerGenerator.cs +++ b/src/Squidex/Areas/Api/Controllers/Content/Generator/SchemaSwaggerGenerator.cs @@ -148,7 +148,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Generator operation.AddBodyParameter("data", dataSchema, SchemaBodyDescription); operation.AddQueryParameter("publish", JsonObjectType.Boolean, "Set to true to autopublish content."); - operation.AddResponse("201", $"{schemaName} created.", contentSchema); + operation.AddResponse("201", $"{schemaName} content created.", contentSchema); }); } @@ -162,7 +162,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Generator operation.AddBodyParameter("data", dataSchema, SchemaBodyDescription); - operation.AddResponse("201", $"{schemaName} item updated.", dataSchema); + operation.AddResponse("200", $"{schemaName} content updated.", dataSchema); }); } @@ -176,7 +176,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Generator operation.AddBodyParameter("data", dataSchema, SchemaBodyDescription); - operation.AddResponse("201", $"{schemaName} item patched.", dataSchema); + operation.AddResponse("200", $"{schemaName} content patched.", dataSchema); }); } @@ -188,7 +188,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Generator operation.Summary = $"Publish a {schemaName} content."; operation.Security = EditorSecurity; - operation.AddResponse("204", $"{schemaName} item published."); + operation.AddResponse("204", $"{schemaName} content published."); }); } @@ -200,7 +200,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Generator operation.Summary = $"Unpublish a {schemaName} content."; operation.Security = EditorSecurity; - operation.AddResponse("204", $"{schemaName} item unpublished."); + operation.AddResponse("204", $"{schemaName} content unpublished."); }); } @@ -212,7 +212,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Generator operation.Summary = $"Archive a {schemaName} content."; operation.Security = EditorSecurity; - operation.AddResponse("204", $"{schemaName} item restored."); + operation.AddResponse("204", $"{schemaName} content restored."); }); } @@ -224,7 +224,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Generator operation.Summary = $"Restore a {schemaName} content."; operation.Security = EditorSecurity; - operation.AddResponse("204", $"{schemaName} item restored."); + operation.AddResponse("204", $"{schemaName} content restored."); }); } diff --git a/src/Squidex/Areas/Api/Controllers/Content/Models/ContentDto.cs b/src/Squidex/Areas/Api/Controllers/Content/Models/ContentDto.cs index eee19d42f..2be029606 100644 --- a/src/Squidex/Areas/Api/Controllers/Content/Models/ContentDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Content/Models/ContentDto.cs @@ -40,6 +40,21 @@ namespace Squidex.Areas.Api.Controllers.Contents.Models [Required] public object Data { get; set; } + /// + /// The scheduled status. + /// + public Status? ScheduledTo { get; set; } + + /// + /// The scheduled date. + /// + public Instant? ScheduledAt { get; set; } + + /// + /// The user that has scheduled the content. + /// + public RefToken ScheduledBy { get; set; } + /// /// The date and time when the content item has been created. /// diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs index 80b0d9a3b..cb6a04ae7 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs @@ -28,5 +28,10 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models /// Optional fields. /// public List Fields { get; set; } + + /// + /// Set it to true to autopublish the schema. + /// + public bool Publish { get; set; } } } diff --git a/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs b/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs index 92fec91b3..d77397666 100644 --- a/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs +++ b/src/Squidex/Areas/Api/Controllers/Users/UserManagementController.cs @@ -24,6 +24,7 @@ namespace Squidex.Areas.Api.Controllers.Users { [ApiAuthorize] [ApiExceptionFilter] + [ApiModelValidation] [MustBeAdministrator] [SwaggerIgnore] public sealed class UserManagementController : ApiController diff --git a/src/Squidex/Config/Domain/InfrastructureServices.cs b/src/Squidex/Config/Domain/InfrastructureServices.cs index 6781b36e7..9a182bf87 100644 --- a/src/Squidex/Config/Domain/InfrastructureServices.cs +++ b/src/Squidex/Config/Domain/InfrastructureServices.cs @@ -89,7 +89,7 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .As(); - services.AddSingletonAs() + services.AddSingletonAs() .As(); services.AddSingletonAs() diff --git a/src/Squidex/Config/Domain/ReadServices.cs b/src/Squidex/Config/Domain/ReadServices.cs index 97dfe5c6e..1ce8db5b4 100644 --- a/src/Squidex/Config/Domain/ReadServices.cs +++ b/src/Squidex/Config/Domain/ReadServices.cs @@ -42,6 +42,8 @@ namespace Squidex.Config.Domain { services.AddSingletonAs() .As(); + services.AddSingletonAs() + .As(); } var exposeSourceUrl = config.GetOptionalValue("assetStore:exposeSourceUrl", true); diff --git a/src/Squidex/Config/Domain/SerializationServices.cs b/src/Squidex/Config/Domain/SerializationServices.cs index c8f3cbb12..f783f2601 100644 --- a/src/Squidex/Config/Domain/SerializationServices.cs +++ b/src/Squidex/Config/Domain/SerializationServices.cs @@ -28,10 +28,10 @@ namespace Squidex.Config.Domain { private static readonly TypeNameRegistry TypeNameRegistry = new TypeNameRegistry() - .MapUnmapped(typeof(Migration01_FromCqrs).Assembly) - .MapUnmapped(typeof(SquidexCoreModel).Assembly) - .MapUnmapped(typeof(SquidexEvents).Assembly) - .MapUnmapped(typeof(SquidexInfrastructure).Assembly); + .MapUnmapped(SquidexCoreModel.Assembly) + .MapUnmapped(SquidexEvents.Assembly) + .MapUnmapped(SquidexInfrastructure.Assembly) + .MapUnmapped(SquidexMigrations.Assembly); private static readonly FieldRegistry FieldRegistry = new FieldRegistry(TypeNameRegistry); diff --git a/src/Squidex/Config/Domain/WriteServices.cs b/src/Squidex/Config/Domain/WriteServices.cs index 7c890b235..a40bd1c87 100644 --- a/src/Squidex/Config/Domain/WriteServices.cs +++ b/src/Squidex/Config/Domain/WriteServices.cs @@ -9,6 +9,7 @@ using System; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Options; using Migrate_01; +using Migrate_01.Migrations; using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Core.Scripting; using Squidex.Domain.Apps.Entities.Apps; @@ -67,16 +68,22 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .As(); - services.AddTransientAs() + services.AddTransientAs() + .As(); + + services.AddTransientAs() + .As(); + + services.AddTransientAs() .As(); - services.AddTransientAs() + services.AddTransientAs() .As(); - services.AddTransientAs() + services.AddTransientAs() .As(); - services.AddTransientAs() + services.AddTransientAs() .As(); services.AddTransientAs() diff --git a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs index ae8ec9899..42c2ba178 100644 --- a/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs +++ b/src/Squidex/Pipeline/ApiExceptionFilterAttribute.cs @@ -64,27 +64,6 @@ namespace Squidex.Pipeline return new ObjectResult(error) { StatusCode = statusCode }; } - public override void OnActionExecuting(ActionExecutingContext context) - { - if (!context.ModelState.IsValid) - { - var errors = new List(); - - foreach (var m in context.ModelState) - { - foreach (var e in m.Value.Errors) - { - if (!string.IsNullOrWhiteSpace(e.ErrorMessage)) - { - errors.Add(new ValidationError(e.ErrorMessage, m.Key)); - } - } - } - - throw new ValidationException("The model is not valid.", errors); - } - } - public void OnException(ExceptionContext context) { IActionResult result = null; diff --git a/src/Squidex/Pipeline/ApiModelValidationAttribute.cs b/src/Squidex/Pipeline/ApiModelValidationAttribute.cs new file mode 100644 index 000000000..8b62de32f --- /dev/null +++ b/src/Squidex/Pipeline/ApiModelValidationAttribute.cs @@ -0,0 +1,37 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using Microsoft.AspNetCore.Mvc.Filters; +using Squidex.Infrastructure; + +namespace Squidex.Pipeline +{ + public sealed class ApiModelValidationAttribute : ActionFilterAttribute + { + public override void OnActionExecuting(ActionExecutingContext context) + { + if (!context.ModelState.IsValid) + { + var errors = new List(); + + foreach (var m in context.ModelState) + { + foreach (var e in m.Value.Errors) + { + if (!string.IsNullOrWhiteSpace(e.ErrorMessage)) + { + errors.Add(new ValidationError(e.ErrorMessage, m.Key)); + } + } + } + + throw new ValidationException("The model is not valid.", errors); + } + } + } +} diff --git a/src/Squidex/Pipeline/CommandMiddlewares/ETagCommandMiddleware.cs b/src/Squidex/Pipeline/CommandMiddlewares/ETagCommandMiddleware.cs index 25cbebe80..8ee2b62da 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/ETagCommandMiddleware.cs +++ b/src/Squidex/Pipeline/CommandMiddlewares/ETagCommandMiddleware.cs @@ -25,6 +25,11 @@ namespace Squidex.Pipeline.CommandMiddlewares public async Task HandleAsync(CommandContext context, Func next) { + if (httpContextAccessor.HttpContext == null) + { + return; + } + var headers = httpContextAccessor.HttpContext.Request.Headers; var headerMatch = headers["If-Match"].ToString(); diff --git a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs b/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs index ce1b72ced..f8e16d354 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs +++ b/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithActorCommandMiddleware.cs @@ -27,6 +27,11 @@ namespace Squidex.Pipeline.CommandMiddlewares public Task HandleAsync(CommandContext context, Func next) { + if (httpContextAccessor.HttpContext == null) + { + return next(); + } + if (context.Command is SquidexCommand squidexCommand) { if (squidexCommand.Actor == null) diff --git a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs b/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs index 27d93b073..1a063c723 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs +++ b/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs @@ -25,7 +25,12 @@ namespace Squidex.Pipeline.CommandMiddlewares public Task HandleAsync(CommandContext context, Func next) { - if (context.Command is AppCommand appCommand && appCommand.AppId == null) + if (httpContextAccessor.HttpContext == null) + { + return next(); + } + + if (context.Command is IAppCommand appCommand && appCommand.AppId == null) { var appFeature = httpContextAccessor.HttpContext.Features.Get(); diff --git a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs b/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs index 15a20857f..495131855 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs +++ b/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs @@ -29,8 +29,35 @@ namespace Squidex.Pipeline.CommandMiddlewares public async Task HandleAsync(CommandContext context, Func next) { - if (context.Command is SchemaCommand schemaCommand && schemaCommand.SchemaId == null) + if (actionContextAccessor.ActionContext == null) { + await next(); + } + + if (context.Command is ISchemaCommand schemaCommand && schemaCommand.SchemaId == null) + { + NamedId appId = null; + + if (context.Command is IAppCommand appCommand) + { + appId = appCommand.AppId; + } + + if (appId == null) + { + var appFeature = actionContextAccessor.ActionContext.HttpContext.Features.Get(); + + if (appFeature != null && appFeature.App != null) + { + appId = new NamedId(appFeature.App.Id, appFeature.App.Name); + } + } + + if (appId == null) + { + return; + } + var routeValues = actionContextAccessor.ActionContext.RouteData.Values; if (routeValues.ContainsKey("name")) @@ -41,11 +68,11 @@ namespace Squidex.Pipeline.CommandMiddlewares if (Guid.TryParse(schemaName, out var id)) { - schema = await appProvider.GetSchemaAsync(schemaCommand.AppId.Id, id); + schema = await appProvider.GetSchemaAsync(appId.Id, id); } else { - schema = await appProvider.GetSchemaAsync(schemaCommand.AppId.Id, schemaName); + schema = await appProvider.GetSchemaAsync(appId.Id, schemaName); } if (schema == null) diff --git a/src/Squidex/app-config/webpack.run.prod.js b/src/Squidex/app-config/webpack.run.prod.js index d5f989ab5..55677f21e 100644 --- a/src/Squidex/app-config/webpack.run.prod.js +++ b/src/Squidex/app-config/webpack.run.prod.js @@ -1,6 +1,7 @@  var webpack = require('webpack'), webpackMerge = require('webpack-merge'), ExtractTextPlugin = require('extract-text-webpack-plugin'), + UglifyJsPlugin = require('uglifyjs-webpack-plugin'), ngToolsWebpack = require('@ngtools/webpack'), runConfig = require('./webpack.run.base.js'), helpers = require('./helpers'); @@ -86,6 +87,7 @@ module.exports = webpackMerge(runConfig, { plugins: [ new webpack.NoEmitOnErrorsPlugin(), new webpack.DefinePlugin({ 'process.env': { 'ENV': JSON.stringify(ENV) } }), + new webpack.optimize.ModuleConcatenationPlugin(), /* * Puts each bundle into a file and appends the hash of the file to the path. @@ -93,16 +95,20 @@ module.exports = webpackMerge(runConfig, { * See: https://github.com/webpack/extract-text-webpack-plugin */ new ExtractTextPlugin('[name].css'), - - new webpack.optimize.UglifyJsPlugin({ - beautify: false, - mangle: { - screw_ie8: true, keep_fnames: true - }, - compress: { - screw_ie8: true, warnings: false - }, - comments: false + + new UglifyJsPlugin({ + cache: true, + uglifyOptions: { + mangle: { + safari10: true, + }, + compress: { + pure_getters: true, passes: 3 + }, + output: { + ascii_only: true, comments: false,webkit: true, + } + } }), new ngToolsWebpack.AngularCompilerPlugin({ diff --git a/src/Squidex/app/app.routes.ts b/src/Squidex/app/app.routes.ts index c6ca613b6..00674bff9 100644 --- a/src/Squidex/app/app.routes.ts +++ b/src/Squidex/app/app.routes.ts @@ -6,7 +6,7 @@ */ import { ModuleWithProviders } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; import { AppAreaComponent, @@ -96,4 +96,4 @@ export const routes: Routes = [ } ]; -export const routing: ModuleWithProviders = RouterModule.forRoot(routes, { useHash: false }); \ No newline at end of file +export const routing: ModuleWithProviders = RouterModule.forRoot(routes, { useHash: false, preloadingStrategy: PreloadAllModules }); \ No newline at end of file diff --git a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss index f1563c37b..afdde04bc 100644 --- a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss +++ b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss @@ -9,7 +9,8 @@ .graphiql-container > * { box-sizing: content-box; - + + // sass-lint:disable class-name-format & .editorWrap { overflow: hidden; } diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.ts b/src/Squidex/app/features/content/pages/content/content-page.component.ts index 0b6467631..9ba93a9e9 100644 --- a/src/Squidex/app/features/content/pages/content/content-page.component.ts +++ b/src/Squidex/app/features/content/pages/content/content-page.component.ts @@ -12,9 +12,8 @@ import { Observable, Subscription } from 'rxjs'; import { ContentCreated, - ContentPublished, ContentRemoved, - ContentUnpublished, + ContentStatusChanged, ContentUpdated, ContentVersionSelected } from './../messages'; @@ -39,8 +38,7 @@ import { ] }) export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, OnInit { - private contentPublishedSubscription: Subscription; - private contentUnpublishedSubscription: Subscription; + private contentStatusChangedSubscription: Subscription; private contentDeletedSubscription: Subscription; private contentVersionSelectedSubscription: Subscription; @@ -63,8 +61,7 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, public ngOnDestroy() { this.contentVersionSelectedSubscription.unsubscribe(); - this.contentUnpublishedSubscription.unsubscribe(); - this.contentPublishedSubscription.unsubscribe(); + this.contentStatusChangedSubscription.unsubscribe(); this.contentDeletedSubscription.unsubscribe(); } @@ -75,27 +72,25 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, this.loadVersion(message.version); }); - this.contentPublishedSubscription = - this.ctx.bus.of(ContentPublished) - .subscribe(message => { - if (this.content && message.content.id === this.content.id) { - this.content = this.content.publish(message.content.lastModifiedBy, message.content.version, message.content.lastModified); - } - }); - - this.contentUnpublishedSubscription = - this.ctx.bus.of(ContentUnpublished) + this.contentDeletedSubscription = + this.ctx.bus.of(ContentRemoved) .subscribe(message => { if (this.content && message.content.id === this.content.id) { - this.content = this.content.unpublish(message.content.lastModifiedBy, message.content.version, message.content.lastModified); + this.router.navigate(['../'], { relativeTo: this.ctx.route }); } }); - this.contentDeletedSubscription = - this.ctx.bus.of(ContentRemoved) + this.contentStatusChangedSubscription = + this.ctx.bus.of(ContentStatusChanged) .subscribe(message => { if (this.content && message.content.id === this.content.id) { - this.router.navigate(['../'], { relativeTo: this.ctx.route }); + this.content = + this.content.changeStatus( + message.content.scheduledTo || message.content.status, + message.content.scheduledAt, + message.content.lastModifiedBy, + message.content.version, + message.content.lastModified); } }); 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 fa9efefed..f00ddc40a 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 @@ -28,7 +28,7 @@ Search for content using full text search over all fields and languages! -
+

- Refs + References

@@ -92,25 +92,25 @@
- {{selectionCount}} items selected: + {{selectionCount}} items selected:   - - - - -
- \ No newline at end of file + + +
+
+
+
+
+

{{dueTimeAction}} content item(s)

+
+ +
+
+ + +
+ +
+ + +
+ + +
+ +
+
+ + +
+
+
+
+
diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts index a00c846b8..689d817ec 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts @@ -11,9 +11,8 @@ import { Observable, Subscription } from 'rxjs'; import { ContentCreated, - ContentPublished, ContentRemoved, - ContentUnpublished, + ContentStatusChanged, ContentUpdated } from './../messages'; @@ -23,6 +22,7 @@ import { AppLanguageDto, ContentDto, ContentsService, + DateTime, FieldDto, ImmutableArray, ModalView, @@ -52,6 +52,12 @@ export class ContentsPageComponent implements OnDestroy, OnInit { public contentsQuery = ''; public contentsPager = new Pager(0); + public dueTimeDialog = new ModalView(); + public dueTime: string | null = ''; + public dueTimeFunction: Function | null; + public dueTimeAction: string | null = ''; + public dueTimeMode = 'Immediately'; + public selectedItems: { [id: string]: boolean; } = {}; public selectionCount = 0; @@ -118,116 +124,89 @@ export class ContentsPageComponent implements OnDestroy, OnInit { } public publishContent(content: ContentDto) { - this.publishContentItem(content).subscribe(); - } - - public publishSelected() { - Observable.forkJoin( - this.contentItems.values - .filter(c => this.selectedItems[c.id]) - .filter(c => c.status !== 'Published') - .map(c => this.publishContentItem(c))) - .finally(() => { - this.updateSelectionSummary(); - }) - .subscribe(); + this.changeContentItems([content], 'Publish', 'Published', false); } - private publishContentItem(content: ContentDto): Observable { - return this.contentsService.publishContent(this.ctx.appName, this.schema.name, content.id, content.version) - .catch(error => { - this.ctx.notifyError(error); + public publishSelected(scheduled: boolean) { + const contents = this.contentItems.filter(c => c.status !== 'Published' && this.selectedItems[c.id]).values; - return Observable.throw(error); - }) - .do(dto => { - this.contentItems = this.contentItems.replaceBy('id', content.publish(this.ctx.userToken, dto.version)); - - this.emitContentPublished(content); - }); + this.changeContentItems(contents, 'Publish', 'Published', false); } public unpublishContent(content: ContentDto) { - this.unpublishContentItem(content).subscribe(); + this.changeContentItems([content], 'Unpublish', 'Draft', false); } - public unpublishSelected() { - Observable.forkJoin( - this.contentItems.values - .filter(c => this.selectedItems[c.id]) - .filter(c => c.status !== 'Unpublished') - .map(c => this.unpublishContentItem(c))) - .finally(() => { - this.updateSelectionSummary(); - }) - .subscribe(); - } - - private unpublishContentItem(content: ContentDto): Observable { - return this.contentsService.unpublishContent(this.ctx.appName, this.schema.name, content.id, content.version) - .catch(error => { - this.ctx.notifyError(error); - - return Observable.throw(error); - }) - .do(dto => { - this.contentItems = this.contentItems.replaceBy('id', content.unpublish(this.ctx.userToken, dto.version)); + public unpublishSelected(scheduled: boolean) { + const contents = this.contentItems.filter(c => c.status === 'Published' && this.selectedItems[c.id]).values; - this.emitContentUnpublished(content); - }); - } - - public archiveSelected() { - Observable.forkJoin( - this.contentItems.values.filter(c => this.selectedItems[c.id]) - .map(c => this.archiveContentItem(c))) - .finally(() => { - this.load(); - }) - .subscribe(); + this.changeContentItems(contents, 'Unpublish', 'Draft', false); } public archiveContent(content: ContentDto) { - this.archiveContentItem(content) - .finally(() => { - this.load(); - }) - .subscribe(); + this.changeContentItems([content], 'Archive', 'Archived', true); } - public archiveContentItem(content: ContentDto): Observable { - return this.contentsService.archiveContent(this.ctx.appName, this.schema.name, content.id, content.version) - .catch(error => { - this.ctx.notifyError(error); + public archiveSelected(scheduled: boolean) { + const contents = this.contentItems.filter(c => this.selectedItems[c.id]).values; - return Observable.throw(error); - }); + this.changeContentItems(contents, 'Archive', 'Archived', true); } - public restoreSelected() { - Observable.forkJoin( - this.contentItems.values.filter(c => this.selectedItems[c.id]) - .map(c => this.restoreContentItem(c))) - .finally(() => { - this.load(); - }) - .subscribe(); + public restoreContent(content: ContentDto) { + this.changeContentItems([content], 'Restore', 'Draft', true); } - public restoreContent(content: ContentDto) { - this.restoreContentItem(content) - .finally(() => { - this.load(); - }) - .subscribe(); + public restoreSelected(scheduled: boolean) { + const contents = this.contentItems.filter(c => this.selectedItems[c.id]).values; + + this.changeContentItems(contents, 'Restore', 'Draft', true); } - public restoreContentItem(content: ContentDto): Observable { - return this.contentsService.restoreContent(this.ctx.appName, this.schema.name, content.id, content.version) + private changeContentItems(contents: ContentDto[], action: string, status: string, reload: boolean) { + if (contents.length === 0) { + return; + } + + this.dueTimeFunction = () => { + if (this.dueTime) { + reload = false; + } + Observable.forkJoin( + contents + .map(c => this.changeContentItem(c, action, status, this.dueTime, reload))) + .finally(() => { + if (reload) { + this.load(); + } else { + this.updateSelectionSummary(); + } + }) + .subscribe(); + }; + + this.dueTimeAction = action; + this.dueTimeDialog.show(); + } + + private changeContentItem(content: ContentDto, action: string, status: string, dueTime: string | null, reload: boolean): Observable { + return this.contentsService.changeContentStatus(this.ctx.appName, this.schema.name, content.id, action, dueTime, content.version) .catch(error => { this.ctx.notifyError(error); return Observable.throw(error); + }) + .do(dto => { + if (!reload) { + const dt = + dueTime ? + DateTime.parseISO_UTC(dueTime) : + null; + + this.contentItems = this.contentItems.replaceBy('id', content.changeStatus(status, dt, this.ctx.userToken, dto.version)); + + this.emitContentStatusChanged(content); + } }); } @@ -359,12 +338,8 @@ export class ContentsPageComponent implements OnDestroy, OnInit { this.languageSelected = language; } - private emitContentPublished(content: ContentDto) { - this.ctx.bus.emit(new ContentPublished(content)); - } - - private emitContentUnpublished(content: ContentDto) { - this.ctx.bus.emit(new ContentUnpublished(content)); + private emitContentStatusChanged(content: ContentDto) { + this.ctx.bus.emit(new ContentStatusChanged(content)); } private emitContentRemoved(content: ContentDto) { @@ -393,5 +368,18 @@ export class ContentsPageComponent implements OnDestroy, OnInit { this.contentFields = [{}]; } } + + public confirmStatusChange() { + this.dueTimeFunction!(); + + this.cancelStatusChange(); + } + + public cancelStatusChange() { + this.dueTimeMode = 'Immediately'; + this.dueTimeDialog.hide(); + this.dueTimeFunction = null; + this.dueTime = null; + } } diff --git a/src/Squidex/app/features/content/pages/messages.ts b/src/Squidex/app/features/content/pages/messages.ts index 896f677e2..112827d57 100644 --- a/src/Squidex/app/features/content/pages/messages.ts +++ b/src/Squidex/app/features/content/pages/messages.ts @@ -35,14 +35,7 @@ export class ContentVersionSelected { } } -export class ContentPublished { - constructor( - public readonly content: ContentDto - ) { - } -} - -export class ContentUnpublished { +export class ContentStatusChanged { constructor( public readonly content: ContentDto ) { diff --git a/src/Squidex/app/features/content/shared/content-item.component.html b/src/Squidex/app/features/content/shared/content-item.component.html index e3bb20cdf..051ed7162 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.html +++ b/src/Squidex/app/features/content/shared/content-item.component.html @@ -10,7 +10,21 @@ - + + + + + + {{content.status}} + + + + + + + + Will be set to '{{content.scheduledTo}}' at {{content.scheduledAt | sqxFullDateTime}} + {{content.lastModified | sqxFromNow}} @@ -22,7 +36,7 @@ -
+
Publish diff --git a/src/Squidex/app/features/content/shared/content-item.component.scss b/src/Squidex/app/features/content/shared/content-item.component.scss index 727784a9c..d87c980ec 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.scss +++ b/src/Squidex/app/features/content/shared/content-item.component.scss @@ -1,22 +1,30 @@ @import '_vars'; @import '_mixins'; -.content { +.content-status { & { - cursor: pointer; + vertical-align: middle; } &-published { - & { - @include circle(.5rem); - display: inline-block; - border: 0; - background: $color-theme-green; - margin-left: .4rem; - } + color: $color-theme-green; + } + + &-draft { + color: $color-text-decent; + } + + &-archived { + color: $color-theme-error; + } - &.unpublished { - background: $color-theme-error; - } + &-tooltip { + @include border-radius; + background: $color-tooltip; + border: 0; + font-size: .9rem; + font-weight: normal; + color: $color-dark-foreground; + padding: .75rem; } } \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/content-item.component.ts b/src/Squidex/app/features/content/shared/content-item.component.ts index 7ba32c2f3..d5f667beb 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.ts +++ b/src/Squidex/app/features/content/shared/content-item.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, OnInit, Output } from '@angular/core'; import { AppContext, @@ -27,7 +27,8 @@ import { ], animations: [ fadeAnimation - ] + ], + changeDetection: ChangeDetectionStrategy.OnPush }) export class ContentItemComponent implements OnInit, OnChanges { @Output() @@ -46,7 +47,7 @@ export class ContentItemComponent implements OnInit, OnChanges { public deleting = new EventEmitter(); @Output() - public selectedChange = new EventEmitter(); + public selectedChange = new EventEmitter(); @Input() public selected = false; diff --git a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html index b0cf8866b..7af9fc272 100644 --- a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html +++ b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html @@ -77,7 +77,7 @@ Attempts: {{event.numCalls}}
- Next: {{event.nextAttempt.toStringFormat('MMM DD h:mm:ss a')}} + Next: {{event.nextAttempt | sqxFromNow}}
-
+
Enable 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 3fc4d2c90..6cefc740c 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 @@ -21,7 +21,7 @@ -
+
Scripts diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.scss b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.scss index 2205232de..f016991ef 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.scss +++ b/src/Squidex/app/features/schemas/pages/schema/schema-scripts-form.component.scss @@ -7,8 +7,4 @@ .nav-tabs { border: 0; -} - -.clearfix { - width: 100%; } \ No newline at end of file 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 b8c1705a4..45de2781a 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 @@ -1,4 +1,15 @@
+
+ + +
+ +
+
+ +
diff --git a/src/Squidex/app/framework/angular/control-errors.component.ts b/src/Squidex/app/framework/angular/control-errors.component.ts index 4fd2b061f..9f1f9c972 100644 --- a/src/Squidex/app/framework/angular/control-errors.component.ts +++ b/src/Squidex/app/framework/angular/control-errors.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Sebastian Stehle. All rights r vbeserved */ -import { Component, Host, Input, OnChanges, Optional } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Host, Input, OnChanges, Optional } from '@angular/core'; import { AbstractControl, FormGroupDirective } from '@angular/forms'; import { fadeAnimation } from './animations'; @@ -30,7 +30,8 @@ const DEFAULT_ERRORS: { [key: string]: string } = { templateUrl: './control-errors.component.html', animations: [ fadeAnimation - ] + ], + changeDetection: ChangeDetectionStrategy.OnPush }) export class ControlErrorsComponent implements OnChanges { private displayFieldName: string; diff --git a/src/Squidex/app/framework/angular/date-time-editor.component.html b/src/Squidex/app/framework/angular/date-time-editor.component.html index d219753c9..7cecce042 100644 --- a/src/Squidex/app/framework/angular/date-time-editor.component.html +++ b/src/Squidex/app/framework/angular/date-time-editor.component.html @@ -12,7 +12,7 @@
-
+
diff --git a/src/Squidex/app/framework/angular/date-time-editor.component.ts b/src/Squidex/app/framework/angular/date-time-editor.component.ts index 3ee9fc078..ad6103174 100644 --- a/src/Squidex/app/framework/angular/date-time-editor.component.ts +++ b/src/Squidex/app/framework/angular/date-time-editor.component.ts @@ -40,6 +40,9 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, @Input() public enforceTime: boolean; + @Input() + public hideClear: boolean; + public timeControl = new FormControl(); public dateControl = new FormControl(); @@ -169,7 +172,7 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, let result: string | null = null; if ((this.dateValue && !this.dateValue.isValid()) || (this.timeValue && !this.timeValue.isValid())) { - result = 'Invalid DateTime'; + result = null; } else if (!this.dateValue && !this.timeValue) { result = null; } else { diff --git a/src/Squidex/app/framework/angular/date-time.pipes.spec.ts b/src/Squidex/app/framework/angular/date-time.pipes.spec.ts index f738a3d35..c01bb8fec 100644 --- a/src/Squidex/app/framework/angular/date-time.pipes.spec.ts +++ b/src/Squidex/app/framework/angular/date-time.pipes.spec.ts @@ -13,6 +13,7 @@ import { DayPipe, DurationPipe, FromNowPipe, + FullDateTimePipe, MonthPipe, ShortDatePipe, ShortTimePipe @@ -33,6 +34,17 @@ describe('DurationPipe', () => { }); }); +describe('FullDateTimePipe', () => { + it('should format to nice string', () => { + const pipe = new FullDateTimePipe(); + + const actual = pipe.transform(dateTime); + const expected = 'Thursday, October 3, 2013 12:13 PM'; + + expect(actual).toBe(expected); + }); +}); + describe('DayPipe', () => { it('should format to day numbers', () => { const pipe = new DayPipe(); diff --git a/src/Squidex/app/framework/angular/date-time.pipes.ts b/src/Squidex/app/framework/angular/date-time.pipes.ts index 8c0d9d9e6..754f278ad 100644 --- a/src/Squidex/app/framework/angular/date-time.pipes.ts +++ b/src/Squidex/app/framework/angular/date-time.pipes.ts @@ -80,6 +80,16 @@ export class ShortTimePipe implements PipeTransform { } } +@Pipe({ + name: 'sqxFullDateTime', + pure: true +}) +export class FullDateTimePipe implements PipeTransform { + public transform(value: DateTime): any { + return value.toStringFormat('LLLL'); + } +} + @Pipe({ name: 'sqxDuration', pure: true diff --git a/src/Squidex/app/framework/angular/dialog-renderer.component.scss b/src/Squidex/app/framework/angular/dialog-renderer.component.scss index a990f3756..f86958242 100644 --- a/src/Squidex/app/framework/angular/dialog-renderer.component.scss +++ b/src/Squidex/app/framework/angular/dialog-renderer.component.scss @@ -29,8 +29,4 @@ &-bottomleft { @include fixed(auto, auto, 0, 0); } -} - -.clearfix { - width: 100%; } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/modal-target.directive.ts b/src/Squidex/app/framework/angular/modal-target.directive.ts index 854b407d2..cef07507f 100644 --- a/src/Squidex/app/framework/angular/modal-target.directive.ts +++ b/src/Squidex/app/framework/angular/modal-target.directive.ts @@ -87,6 +87,10 @@ export class ModalTargetDirective implements AfterViewInit, OnDestroy, OnInit { } private updatePosition() { + if (!this.targetElement) { + return; + } + const viewportHeight = document.documentElement.clientHeight; const viewportWidth = document.documentElement.clientWidth; diff --git a/src/Squidex/app/framework/angular/onboarding-tooltip.component.html b/src/Squidex/app/framework/angular/onboarding-tooltip.component.html index 4de8bb7f8..14ad85a31 100644 --- a/src/Squidex/app/framework/angular/onboarding-tooltip.component.html +++ b/src/Squidex/app/framework/angular/onboarding-tooltip.component.html @@ -1,5 +1,4 @@ -
- +
diff --git a/src/Squidex/app/framework/angular/onboarding-tooltip.component.scss b/src/Squidex/app/framework/angular/onboarding-tooltip.component.scss index 33430c7e2..2b991d2d7 100644 --- a/src/Squidex/app/framework/angular/onboarding-tooltip.component.scss +++ b/src/Squidex/app/framework/angular/onboarding-tooltip.component.scss @@ -1,12 +1,10 @@ @import '_mixins'; @import '_vars'; -$color: #1a2129; - .onboarding { &-help { @include border-radius; - background: $color; + background: $color-tooltip; border: 0; max-width: 20rem; padding: .75rem; diff --git a/src/Squidex/app/framework/angular/tooltip.component.scss b/src/Squidex/app/framework/angular/tooltip.component.scss new file mode 100644 index 000000000..015124b29 --- /dev/null +++ b/src/Squidex/app/framework/angular/tooltip.component.scss @@ -0,0 +1,12 @@ +@import '_vars'; +@import '_mixins'; + +.tooltip-container { + @include border-radius; + background: $color-tooltip; + border: 0; + font-size: .9rem; + font-weight: normal; + color: $color-dark-foreground; + padding: .5rem; +} \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/tooltip.component.ts b/src/Squidex/app/framework/angular/tooltip.component.ts new file mode 100644 index 000000000..d1374b235 --- /dev/null +++ b/src/Squidex/app/framework/angular/tooltip.component.ts @@ -0,0 +1,64 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { ChangeDetectionStrategy, Component, Input, OnDestroy, OnInit, Renderer } from '@angular/core'; + +import { ModalView } from './../utils/modal-view'; + +import { fadeAnimation } from './animations'; + +@Component({ + selector: 'sqx-tooltip', + styleUrls: ['./tooltip.component.scss'], + template: ` +
+ +
`, + animations: [ + fadeAnimation + ], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class TooltipComponent implements OnDestroy, OnInit { + private targetMouseEnterListener: any; + private targetMouseLeaveListener: any; + + @Input() + public target: any; + + public modal = new ModalView(false, false); + + constructor( + private readonly renderer: Renderer + ) { + } + + public ngOnDestroy() { + if (this.targetMouseEnterListener) { + this.targetMouseEnterListener(); + } + + if (this.targetMouseLeaveListener) { + this.targetMouseLeaveListener(); + } + } + + public ngOnInit() { + if (this.target) { + this.targetMouseEnterListener = + this.renderer.listen(this.target, 'mouseenter', () => { + this.modal.show(); + // this.changeDetector.detectChanges(); + }); + + this.targetMouseLeaveListener = + this.renderer.listen(this.target, 'mouseleave', () => { + this.modal.hide(); + }); + } + } +} \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/user-report.component.ts b/src/Squidex/app/framework/angular/user-report.component.ts index 0f93c2ef6..621ef46a5 100644 --- a/src/Squidex/app/framework/angular/user-report.component.ts +++ b/src/Squidex/app/framework/angular/user-report.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; import { ResourceLoaderService } from './../services/resource-loader.service'; import { UserReportConfig } from './../configurations'; @@ -17,9 +17,11 @@ import { UserReportConfig } from './../configurations'; export class UserReportComponent implements OnDestroy, OnInit { private loadingTimer: any; - constructor(config: UserReportConfig, + constructor(config: UserReportConfig, changeDetector: ChangeDetectorRef, private readonly resourceLoader: ResourceLoaderService ) { + changeDetector.detach(); + window['_urq'] = window['_urq'] || []; window['_urq'].push(['initSite', config.siteId]); } diff --git a/src/Squidex/app/framework/declarations.ts b/src/Squidex/app/framework/declarations.ts index 586ffbc4b..e0b8c3aea 100644 --- a/src/Squidex/app/framework/declarations.ts +++ b/src/Squidex/app/framework/declarations.ts @@ -48,6 +48,7 @@ export * from './angular/tag-editor.component'; export * from './angular/template-wrapper.directive'; export * from './angular/title.component'; export * from './angular/toggle.component'; +export * from './angular/tooltip.component'; export * from './angular/user-report.component'; export * from './angular/validators'; export * from './configurations'; diff --git a/src/Squidex/app/framework/module.ts b/src/Squidex/app/framework/module.ts index 45b1b528e..985558ac7 100644 --- a/src/Squidex/app/framework/module.ts +++ b/src/Squidex/app/framework/module.ts @@ -32,6 +32,7 @@ import { FileSizePipe, FocusOnInitDirective, FromNowPipe, + FullDateTimePipe, IgnoreScrollbarDirective, ImageSourceDirective, IndeterminateValueDirective, @@ -70,6 +71,7 @@ import { TitleService, TitleComponent, ToggleComponent, + TooltipComponent, UserReportComponent } from './declarations'; @@ -98,6 +100,7 @@ import { FileSizePipe, FocusOnInitDirective, FromNowPipe, + FullDateTimePipe, IgnoreScrollbarDirective, ImageSourceDirective, IndeterminateValueDirective, @@ -129,6 +132,7 @@ import { TemplateWrapperDirective, TitleComponent, ToggleComponent, + TooltipComponent, UserReportComponent ], exports: [ @@ -148,6 +152,7 @@ import { FileSizePipe, FocusOnInitDirective, FromNowPipe, + FullDateTimePipe, IgnoreScrollbarDirective, ImageSourceDirective, IndeterminateValueDirective, @@ -179,6 +184,7 @@ import { TemplateWrapperDirective, TitleComponent, ToggleComponent, + TooltipComponent, UserReportComponent, HttpClientModule, FormsModule, diff --git a/src/Squidex/app/shared/components/language-selector.component.html b/src/Squidex/app/shared/components/language-selector.component.html index 2e3d06452..880e57172 100644 --- a/src/Squidex/app/shared/components/language-selector.component.html +++ b/src/Squidex/app/shared/components/language-selector.component.html @@ -8,7 +8,7 @@ -
+
{{language.iso2Code}}     ({{language.englishName}})
diff --git a/src/Squidex/app/shared/services/assets.service.spec.ts b/src/Squidex/app/shared/services/assets.service.spec.ts index 1fb922072..09cb9af92 100644 --- a/src/Squidex/app/shared/services/assets.service.spec.ts +++ b/src/Squidex/app/shared/services/assets.service.spec.ts @@ -89,7 +89,7 @@ describe('AssetsService', () => { }); const req = httpMock.expectOne('http://service/p/api/apps/my-app/assets?$top=17&$skip=13'); - + expect(req.request.method).toEqual('GET'); expect(req.request.headers.get('If-Match')).toBeNull(); diff --git a/src/Squidex/app/shared/services/contents.service.spec.ts b/src/Squidex/app/shared/services/contents.service.spec.ts index 396fd3a2c..7f6637a95 100644 --- a/src/Squidex/app/shared/services/contents.service.spec.ts +++ b/src/Squidex/app/shared/services/contents.service.spec.ts @@ -23,11 +23,12 @@ describe('ContentDto', () => { const creator = 'not-me'; const modified = DateTime.now(); const modifier = 'me'; + const dueTime = DateTime.now().addDays(1); const version = new Version('1'); const newVersion = new Version('2'); it('should update data property and user info when updating', () => { - const content_1 = new ContentDto('1', 'Published', creator, creator, creation, creation, { data: 1 }, version); + const content_1 = new ContentDto('1', 'Published', creator, creator, creation, creation, null, null, null, { data: 1 }, version); const content_2 = content_1.update({ data: 2 }, modifier, newVersion, modified); expect(content_2.data).toEqual({ data: 2 }); @@ -36,9 +37,9 @@ describe('ContentDto', () => { expect(content_2.version).toEqual(newVersion); }); - it('should update status property and user info when publishing', () => { - const content_1 = new ContentDto('1', 'Draft', creator, creator, creation, creation, { data: 1 }, version); - const content_2 = content_1.publish(modifier, newVersion, modified); + it('should update status property and user info when changing status', () => { + const content_1 = new ContentDto('1', 'Draft', creator, creator, creation, creation, null, null, null, { data: 1 }, version); + const content_2 = content_1.changeStatus('Published', null, modifier, newVersion, modified); expect(content_2.status).toEqual('Published'); expect(content_2.lastModified).toEqual(modified); @@ -46,40 +47,23 @@ describe('ContentDto', () => { expect(content_2.version).toEqual(newVersion); }); - it('should update status property and user info when unpublishing', () => { - const content_1 = new ContentDto('1', 'Published', creator, creator, creation, creation, { data: 1 }, version); - const content_2 = content_1.unpublish(modifier, newVersion, modified); - - expect(content_2.status).toEqual('Draft'); - expect(content_2.lastModified).toEqual(modified); - expect(content_2.lastModifiedBy).toEqual(modifier); - expect(content_2.version).toEqual(newVersion); - }); - - it('should update status property and user info when archiving', () => { - const content_1 = new ContentDto('1', 'Draft', creator, creator, creation, creation, { data: 1 }, version); - const content_2 = content_1.archive(modifier, newVersion, modified); - - expect(content_2.status).toEqual('Archived'); - expect(content_2.lastModified).toEqual(modified); - expect(content_2.lastModifiedBy).toEqual(modifier); - expect(content_2.version).toEqual(newVersion); - }); - - it('should update status property and user info when restoring', () => { - const content_1 = new ContentDto('1', 'Archived', creator, creator, creation, creation, { data: 1 }, version); - const content_2 = content_1.restore(modifier, newVersion, modified); + it('should update schedules property and user info when changing status with due time', () => { + const content_1 = new ContentDto('1', 'Draft', creator, creator, creation, creation, null, null, null, { data: 1 }, version); + const content_2 = content_1.changeStatus('Published', dueTime, modifier, newVersion, modified); expect(content_2.status).toEqual('Draft'); expect(content_2.lastModified).toEqual(modified); expect(content_2.lastModifiedBy).toEqual(modifier); + expect(content_2.scheduledAt).toEqual(dueTime); + expect(content_2.scheduledBy).toEqual(modifier); + expect(content_2.scheduledTo).toEqual('Published'); expect(content_2.version).toEqual(newVersion); }); it('should update data property when setting data', () => { const newData = {}; - const content_1 = new ContentDto('1', 'Published', creator, creator, creation, creation, { data: 1 }, version); + const content_1 = new ContentDto('1', 'Published', creator, creator, creation, creation, null, null, null, { data: 1 }, version); const content_2 = content_1.setData(newData); expect(content_2.data).toBe(newData); @@ -130,6 +114,9 @@ describe('ContentsService', () => { createdBy: 'Created1', lastModified: '2017-12-12T10:10', lastModifiedBy: 'LastModifiedBy1', + scheduledTo: 'Draft', + scheduledBy: 'Scheduler1', + scheduledAt: '2018-12-12T10:10', version: 11, data: {} }, @@ -151,11 +138,17 @@ describe('ContentsService', () => { new ContentDto('id1', 'Published', 'Created1', 'LastModifiedBy1', DateTime.parseISO_UTC('2016-12-12T10:10'), DateTime.parseISO_UTC('2017-12-12T10:10'), + 'Draft', + 'Scheduler1', + DateTime.parseISO_UTC('2018-12-12T10:10'), {}, new Version('11')), new ContentDto('id2', 'Published', 'Created2', 'LastModifiedBy2', DateTime.parseISO_UTC('2016-10-12T10:10'), DateTime.parseISO_UTC('2017-10-12T10:10'), + null, + null, + null, {}, new Version('22')) ])); @@ -221,6 +214,9 @@ describe('ContentsService', () => { createdBy: 'Created1', lastModified: '2017-12-12T10:10', lastModifiedBy: 'LastModifiedBy1', + scheduledTo: 'Draft', + scheduledBy: 'Scheduler1', + scheduledAt: '2018-12-12T10:10', data: {} }, { headers: { @@ -232,6 +228,9 @@ describe('ContentsService', () => { new ContentDto('id1', 'Published', 'Created1', 'LastModifiedBy1', DateTime.parseISO_UTC('2016-12-12T10:10'), DateTime.parseISO_UTC('2017-12-12T10:10'), + 'Draft', + 'Scheduler1', + DateTime.parseISO_UTC('2018-12-12T10:10'), {}, new Version('2'))); })); @@ -270,6 +269,9 @@ describe('ContentsService', () => { new ContentDto('id1', 'Published', 'Created1', 'LastModifiedBy1', DateTime.parseISO_UTC('2016-12-12T10:10'), DateTime.parseISO_UTC('2017-12-12T10:10'), + null, + null, + null, {}, new Version('2'))); })); @@ -310,10 +312,10 @@ describe('ContentsService', () => { req.flush({}); })); - it('should make put request to publish content', + it('should make put request to change content status', inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => { - contentsService.publishContent('my-app', 'my-schema', 'content1', version).subscribe(); + contentsService.changeContentStatus('my-app', 'my-schema', 'content1', 'publish', null, version).subscribe(); const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/content1/publish'); @@ -323,38 +325,14 @@ describe('ContentsService', () => { req.flush({}); })); - it('should make put request to unpublish content', - inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => { - - contentsService.unpublishContent('my-app', 'my-schema', 'content1', version).subscribe(); - - const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/content1/unpublish'); - - expect(req.request.method).toEqual('PUT'); - expect(req.request.headers.get('If-Match')).toEqual(version.value); - - req.flush({}); - })); - - it('should make put request to archive content', + it('should make put request with due time when status change is scheduled', inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => { - contentsService.archiveContent('my-app', 'my-schema', 'content1', version).subscribe(); - - const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/content1/archive'); - - expect(req.request.method).toEqual('PUT'); - expect(req.request.headers.get('If-Match')).toEqual(version.value); - - req.flush({}); - })); - - it('should make put request to restore content', - inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => { + const dueTime = '2016-12-12T10:10:00'; - contentsService.restoreContent('my-app', 'my-schema', 'content1', version).subscribe(); + contentsService.changeContentStatus('my-app', 'my-schema', 'content1', 'publish', dueTime, version).subscribe(); - const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/content1/restore'); + const req = httpMock.expectOne('http://service/p/api/content/my-app/my-schema/content1/publish?dueTime=2016-12-12T10:10:00'); expect(req.request.method).toEqual('PUT'); expect(req.request.headers.get('If-Match')).toEqual(version.value); diff --git a/src/Squidex/app/shared/services/contents.service.ts b/src/Squidex/app/shared/services/contents.service.ts index 553912441..966c90414 100644 --- a/src/Squidex/app/shared/services/contents.service.ts +++ b/src/Squidex/app/shared/services/contents.service.ts @@ -36,6 +36,9 @@ export class ContentDto { public readonly lastModifiedBy: string, public readonly created: DateTime, public readonly lastModified: DateTime, + public readonly scheduledTo: string | null, + public readonly scheduledBy: string | null, + public readonly scheduledAt: DateTime | null, public readonly data: any, public readonly version: Version ) { @@ -49,34 +52,37 @@ export class ContentDto { this.lastModifiedBy, this.created, this.lastModified, + this.scheduledTo, + this.scheduledBy, + this.scheduledAt, data, this.version); } - public publish(user: string, version: Version, now?: DateTime): ContentDto { - return this.changeStatus('Published', user, version, now); - } - - public unpublish(user: string, version: Version, now?: DateTime): ContentDto { - return this.changeStatus('Draft', user, version, now); - } - - public archive(user: string, version: Version, now?: DateTime): ContentDto { - return this.changeStatus('Archived', user, version, now); - } - - public restore(user: string, version: Version, now?: DateTime): ContentDto { - return this.changeStatus('Draft', user, version, now); - } - - private changeStatus(status: string, user: string, version: Version, now?: DateTime): ContentDto { - return new ContentDto( - this.id, - status, - this.createdBy, user, - this.created, now || DateTime.now(), - this.data, - version); + public changeStatus(status: string, dueTime: DateTime | null, user: string, version: Version, now?: DateTime): ContentDto { + if (dueTime) { + return new ContentDto( + this.id, + this.status, + this.createdBy, user, + this.created, now || DateTime.now(), + status, + user, + dueTime, + this.data, + version); + } else { + return new ContentDto( + this.id, + status, + this.createdBy, user, + this.created, now || DateTime.now(), + null, + null, + null, + this.data, + version); + } } public update(data: any, user: string, version: Version, now?: DateTime): ContentDto { @@ -85,6 +91,9 @@ export class ContentDto { this.status, this.createdBy, user, this.created, now || DateTime.now(), + this.scheduledTo, + this.scheduledBy, + this.scheduledAt, data, version); } @@ -146,6 +155,9 @@ export class ContentsService { item.lastModifiedBy, DateTime.parseISO_UTC(item.created), DateTime.parseISO_UTC(item.lastModified), + item.scheduledTo || null, + item.scheduledBy || null, + item.scheduledAt ? DateTime.parseISO_UTC(item.scheduledAt) : null, item.data, new Version(item.version.toString())); })); @@ -167,6 +179,9 @@ export class ContentsService { body.lastModifiedBy, DateTime.parseISO_UTC(body.created), DateTime.parseISO_UTC(body.lastModified), + body.scheduledTo || null, + body.scheduledBy || null, + body.scheduledAt || null ? DateTime.parseISO_UTC(body.scheduledAt) : null, body.data, response.version); }) @@ -197,6 +212,9 @@ export class ContentsService { body.lastModifiedBy, DateTime.parseISO_UTC(body.created), DateTime.parseISO_UTC(body.lastModified), + null, + null, + null, body.data, response.version); }) @@ -231,43 +249,17 @@ export class ContentsService { .pretifyError('Failed to delete content. Please reload.'); } - public publishContent(appName: string, schemaName: string, id: string, version: Version): Observable> { - const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}/publish`); - - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { - this.analytics.trackEvent('Content', 'Published', appName); - }) - .pretifyError('Failed to publish content. Please reload.'); - } - - public unpublishContent(appName: string, schemaName: string, id: string, version: Version): Observable> { - const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}/unpublish`); - - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { - this.analytics.trackEvent('Content', 'Unpublished', appName); - }) - .pretifyError('Failed to unpublish content. Please reload.'); - } + public changeContentStatus(appName: string, schemaName: string, id: string, action: string, dueTime: string | null, version: Version): Observable> { + let url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}/${action}`); - public archiveContent(appName: string, schemaName: string, id: string, version: Version): Observable> { - const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}/archive`); + if (dueTime) { + url += `?dueTime=${dueTime}`; + } return HTTP.putVersioned(this.http, url, {}, version) .do(() => { this.analytics.trackEvent('Content', 'Archived', appName); }) - .pretifyError('Failed to archive content. Please reload.'); - } - - public restoreContent(appName: string, schemaName: string, id: string, version: Version): Observable> { - const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}/restore`); - - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { - this.analytics.trackEvent('Content', 'Restored', appName); - }) - .pretifyError('Failed to restore content. Please reload.'); + .pretifyError(`Failed to ${action} content. Please reload.`); } } \ No newline at end of file diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.html b/src/Squidex/app/shell/pages/internal/apps-menu.component.html index f12ad5bd7..b85dd49a1 100644 --- a/src/Squidex/app/shell/pages/internal/apps-menu.component.html +++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.html @@ -2,7 +2,7 @@
  • {{selectedApp ? selectedApp.name : 'Apps Overview'}} -
    +
    All Apps {{apps.length}} diff --git a/src/Squidex/app/shell/pages/internal/profile-menu.component.html b/src/Squidex/app/shell/pages/internal/profile-menu.component.html index 346576300..8b0bd2b44 100644 --- a/src/Squidex/app/shell/pages/internal/profile-menu.component.html +++ b/src/Squidex/app/shell/pages/internal/profile-menu.component.html @@ -8,7 +8,7 @@ -
    +
    Administration diff --git a/src/Squidex/app/theme/_bootstrap.scss b/src/Squidex/app/theme/_bootstrap.scss index c22e92ab3..b7993ea66 100644 --- a/src/Squidex/app/theme/_bootstrap.scss +++ b/src/Squidex/app/theme/_bootstrap.scss @@ -458,6 +458,12 @@ a { margin-top: 4.5rem; } } + + &-footer { + .clearfix { + width: 100%; + } + } } // diff --git a/src/Squidex/app/theme/_lists.scss b/src/Squidex/app/theme/_lists.scss index 717491867..754191386 100644 --- a/src/Squidex/app/theme/_lists.scss +++ b/src/Squidex/app/theme/_lists.scss @@ -27,6 +27,10 @@ } } + td { + border-top: 0; + } + thead { // Small font size for the table header, content is more important! th { diff --git a/src/Squidex/app/theme/_panels.scss b/src/Squidex/app/theme/_panels.scss index 33bb19aa0..b1b0b88d3 100644 --- a/src/Squidex/app/theme/_panels.scss +++ b/src/Squidex/app/theme/_panels.scss @@ -289,15 +289,24 @@ .grid-content { @include flex-grow(1); - margin: 0; - margin-top: .25rem; + padding-top: .5rem; + padding-bottom: .5rem; overflow-y: scroll; } .grid-header { - padding-top: .75 * $panel-padding; - border: 0; - border-bottom: 2px solid $color-border; + & { + border: 0; + border-bottom: 2px solid $color-border; + } + + th { + padding: .7rem; + } + + .table-items { + margin: 0; + } } .grid-footer { @@ -305,6 +314,6 @@ } .pagination { - margin-top: .25rem; + margin: .25rem 0; } } \ No newline at end of file diff --git a/src/Squidex/app/theme/_rules.scss b/src/Squidex/app/theme/_rules.scss index c9cf20d62..053604955 100644 --- a/src/Squidex/app/theme/_rules.scss +++ b/src/Squidex/app/theme/_rules.scss @@ -10,6 +10,8 @@ $action-slack: #5c3a58; $action-azure: #55b3ff; $action-fastly: #e23335; +// sass-lint:disable class-name-format + @mixin build-element($color) { & { background: $color; diff --git a/src/Squidex/app/theme/_vars.scss b/src/Squidex/app/theme/_vars.scss index 9dd26ff4b..a4862968b 100644 --- a/src/Squidex/app/theme/_vars.scss +++ b/src/Squidex/app/theme/_vars.scss @@ -6,6 +6,7 @@ $color-border-dark: #b3bbbf; $color-title: #000; $color-text: #373a3c; $color-text-decent: #a9b2bb; +$color-tooltip: #1a2129; $color-input: #dbe4eb; $color-input-background: #fff; diff --git a/src/Squidex/app/theme/icomoon/demo-files/demo.css b/src/Squidex/app/theme/icomoon/demo-files/demo.css index 38755ccf3..1c4674f67 100644 --- a/src/Squidex/app/theme/icomoon/demo-files/demo.css +++ b/src/Squidex/app/theme/icomoon/demo-files/demo.css @@ -150,10 +150,10 @@ p { font-size: 32px; } .fs2 { - font-size: 28px; + font-size: 32px; } .fs3 { - font-size: 32px; + font-size: 28px; } .fs4 { font-size: 32px; diff --git a/src/Squidex/app/theme/icomoon/demo.html b/src/Squidex/app/theme/icomoon/demo.html index 78d96da2d..810b7602e 100644 --- a/src/Squidex/app/theme/icomoon/demo.html +++ b/src/Squidex/app/theme/icomoon/demo.html @@ -9,10 +9,26 @@
    -

    Font Name: icomoon (Glyphs: 83)

    +

    Font Name: icomoon (Glyphs: 85)

    Grid Size: Unknown

    +
    +
    + + + + icon-circle +
    +
    + + +
    +
    + liga: + +
    +
    @@ -847,17 +863,17 @@
    -

    Grid Size: 14

    +

    Grid Size: 16

    - + - icon-action-Slack + icon-clock
    - - + +
    liga: @@ -866,14 +882,14 @@
    - + - icon-orleans + icon-bin2
    - - + +
    liga: @@ -882,30 +898,30 @@
    - + - icon-document-lock + icon-earth
    - - + +
    liga: - +
    - + - icon-document-unpublish + icon-elapsed
    - - + +
    liga: @@ -914,14 +930,14 @@
    - + - icon-angle-down + icon-google
    - - + +
    liga: @@ -930,14 +946,14 @@
    - + - icon-angle-left + icon-lock
    - - + +
    liga: @@ -946,14 +962,14 @@
    - + - icon-angle-right + icon-microsoft
    - - + +
    liga: @@ -962,14 +978,14 @@
    - + - icon-angle-up + icon-action-AzureQueue
    - - + +
    liga: @@ -978,14 +994,14 @@
    - + - icon-api + icon-pause
    - - + +
    liga: @@ -994,14 +1010,14 @@
    - + - icon-assets + icon-play
    - - + +
    liga: @@ -1010,14 +1026,14 @@
    - + - icon-bug + icon-reset
    - - + +
    liga: @@ -1026,14 +1042,14 @@
    - + - icon-caret-down + icon-settings2
    - - + +
    liga: @@ -1042,14 +1058,14 @@
    - + - icon-caret-left + icon-timeout
    - - + +
    liga: @@ -1058,209 +1074,209 @@
    - + - icon-caret-right + icon-unlocked
    - - + +
    liga:
    -
    +
    +
    +

    Grid Size: 14

    +
    - + - icon-caret-up + icon-action-Slack
    - - + +
    liga:
    -
    +
    - + - icon-contents + icon-orleans
    - - + +
    liga:
    -
    +
    - + - icon-trigger-ContentChanged + icon-document-lock
    - - + +
    liga:
    -
    +
    - + - icon-control-Date + icon-document-unpublish
    - - + +
    liga:
    -
    +
    - + - icon-control-DateTime + icon-angle-down
    - - + +
    liga:
    -
    +
    - + - icon-control-Markdown + icon-angle-left
    - - + +
    liga:
    -
    +
    - + - icon-grid + icon-angle-right
    - - + +
    liga:
    -
    +
    - + - icon-list + icon-angle-up
    - - + +
    liga:
    -
    +
    - + - icon-user-o + icon-api
    - - + +
    liga:
    -
    +
    - + - icon-rules + icon-assets
    - - + +
    liga:
    -
    +
    - + - icon-action-Webhook + icon-bug
    - - + +
    liga:
    -
    -
    -

    Grid Size: 16

    - + - icon-bin2 + icon-caret-down
    - - + +
    liga: @@ -1269,30 +1285,30 @@
    - + - icon-earth + icon-caret-left
    - - + +
    liga: - +
    - + - icon-elapsed + icon-caret-right
    - - + +
    liga: @@ -1301,14 +1317,14 @@
    - + - icon-google + icon-caret-up
    - - + +
    liga: @@ -1317,14 +1333,14 @@
    - + - icon-lock + icon-contents
    - - + +
    liga: @@ -1333,14 +1349,14 @@
    - + - icon-microsoft + icon-trigger-ContentChanged
    - - + +
    liga: @@ -1349,14 +1365,14 @@
    - + - icon-action-AzureQueue + icon-control-Date
    - - + +
    liga: @@ -1365,14 +1381,14 @@
    - + - icon-pause + icon-control-DateTime
    - - + +
    liga: @@ -1381,14 +1397,14 @@
    - + - icon-play + icon-control-Markdown
    - - + +
    liga: @@ -1397,14 +1413,14 @@
    - + - icon-reset + icon-grid
    - - + +
    liga: @@ -1413,14 +1429,14 @@
    - + - icon-settings2 + icon-list
    - - + +
    liga: @@ -1429,14 +1445,14 @@
    - + - icon-timeout + icon-user-o
    - - + +
    liga: @@ -1445,14 +1461,30 @@
    - + - icon-unlocked + icon-rules
    - - + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-action-Webhook +
    +
    + +
    liga: diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot index c3b9462c5..e8abe5415 100644 Binary files a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot and b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot differ diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg index e3075362d..313a70455 100644 --- a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg +++ b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg @@ -87,6 +87,8 @@ + + diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf index d71543c96..d4f4fe27a 100644 Binary files a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf and b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf differ diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.woff b/src/Squidex/app/theme/icomoon/fonts/icomoon.woff index 209f70aa3..614d1aace 100644 Binary files a/src/Squidex/app/theme/icomoon/fonts/icomoon.woff and b/src/Squidex/app/theme/icomoon/fonts/icomoon.woff differ diff --git a/src/Squidex/app/theme/icomoon/selection.json b/src/Squidex/app/theme/icomoon/selection.json index 525c50f99..efad51065 100644 --- a/src/Squidex/app/theme/icomoon/selection.json +++ b/src/Squidex/app/theme/icomoon/selection.json @@ -1,6 +1,35 @@ { "IcoMoonType": "selection", "icons": [ + { + "icon": { + "paths": [ + "M1024 512c0 282.77-229.23 512-512 512s-512-229.23-512-512c0-282.77 229.23-512 512-512s512 229.23 512 512z" + ], + "attrs": [ + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 0, + "tags": [ + "circle" + ] + }, + "attrs": [ + {} + ], + "properties": { + "order": 106, + "id": 0, + "name": "circle", + "prevSize": 32, + "code": 59729 + }, + "setIdx": 0, + "setId": 6, + "iconIdx": 0 + }, { "icon": { "paths": [ @@ -27,7 +56,7 @@ "prevSize": 32, "code": 59726 }, - "setIdx": 0, + "setIdx": 2, "setId": 4, "iconIdx": 0 }, @@ -59,7 +88,7 @@ "prevSize": 32, "code": 59727 }, - "setIdx": 0, + "setIdx": 2, "setId": 4, "iconIdx": 1 }, @@ -88,7 +117,7 @@ "prevSize": 32, "code": 59724 }, - "setIdx": 2, + "setIdx": 4, "setId": 2, "iconIdx": 0 }, @@ -142,7 +171,7 @@ "prevSize": 32, "code": 59722 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 0 }, @@ -171,7 +200,7 @@ "prevSize": 32, "code": 59652 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 1 }, @@ -200,7 +229,7 @@ "prevSize": 32, "code": 59653 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 2 }, @@ -229,7 +258,7 @@ "prevSize": 32, "code": 59654 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 3 }, @@ -258,7 +287,7 @@ "prevSize": 32, "code": 59655 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 4 }, @@ -287,7 +316,7 @@ "prevSize": 32, "code": 59656 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 5 }, @@ -316,7 +345,7 @@ "prevSize": 32, "code": 59657 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 6 }, @@ -345,7 +374,7 @@ "prevSize": 32, "code": 59658 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 7 }, @@ -374,7 +403,7 @@ "prevSize": 32, "code": 59659 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 8 }, @@ -403,7 +432,7 @@ "prevSize": 32, "code": 59660 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 9 }, @@ -432,7 +461,7 @@ "prevSize": 32, "code": 59661 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 10 }, @@ -461,7 +490,7 @@ "prevSize": 32, "code": 59662 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 11 }, @@ -490,7 +519,7 @@ "prevSize": 32, "code": 59663 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 12 }, @@ -519,7 +548,7 @@ "prevSize": 32, "code": 59664 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 13 }, @@ -554,7 +583,7 @@ "prevSize": 32, "code": 59665 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 14 }, @@ -583,7 +612,7 @@ "prevSize": 32, "code": 59666 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 15 }, @@ -612,7 +641,7 @@ "prevSize": 32, "code": 59667 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 16 }, @@ -641,7 +670,7 @@ "prevSize": 32, "code": 59668 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 17 }, @@ -670,7 +699,7 @@ "prevSize": 32, "code": 59669 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 18 }, @@ -699,7 +728,7 @@ "prevSize": 32, "code": 59670 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 19 }, @@ -728,7 +757,7 @@ "prevSize": 32, "code": 59671 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 20 }, @@ -757,7 +786,7 @@ "prevSize": 32, "code": 59672 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 21 }, @@ -787,7 +816,7 @@ "prevSize": 32, "code": 59713 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 22 }, @@ -816,7 +845,7 @@ "prevSize": 32, "code": 59673 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 23 }, @@ -845,7 +874,7 @@ "prevSize": 32, "code": 59675 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 24 }, @@ -874,7 +903,7 @@ "prevSize": 32, "code": 59676 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 25 }, @@ -903,7 +932,7 @@ "prevSize": 32, "code": 59677 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 26 }, @@ -932,7 +961,7 @@ "prevSize": 32, "code": 59678 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 27 }, @@ -961,7 +990,7 @@ "prevSize": 32, "code": 59679 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 28 }, @@ -990,7 +1019,7 @@ "prevSize": 32, "code": 59680 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 29 }, @@ -1028,7 +1057,7 @@ "prevSize": 32, "code": 59681 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 30 }, @@ -1057,7 +1086,7 @@ "prevSize": 32, "code": 59682 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 31 }, @@ -1086,7 +1115,7 @@ "prevSize": 32, "code": 59683 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 32 }, @@ -1115,7 +1144,7 @@ "prevSize": 32, "code": 59684 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 33 }, @@ -1144,7 +1173,7 @@ "prevSize": 32, "code": 59685 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 34 }, @@ -1173,7 +1202,7 @@ "prevSize": 32, "code": 59674 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 35 }, @@ -1202,7 +1231,7 @@ "prevSize": 32, "code": 59686 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 36 }, @@ -1231,7 +1260,7 @@ "prevSize": 32, "code": 59687 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 37 }, @@ -1260,25 +1289,26 @@ "prevSize": 32, "code": 59688 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 38 }, { "icon": { "paths": [ - "M868 443.429c46.857 0 82.857 34.286 82.857 81.143 0 36.571-18.857 62.286-53.143 74.286l-98.286 33.714 32 95.429c2.857 8.571 4 17.714 4 26.857 0 45.143-36.571 82.857-81.714 82.857-36 0-68-22.286-79.429-56.571l-31.429-94.286-177.143 60.571 31.429 93.714c2.857 8.571 4.571 17.714 4.571 26.857 0 44.571-36.571 82.857-82.286 82.857-36 0-67.429-22.286-78.857-56.571l-31.429-93.143-87.429 30.286c-9.143 2.857-18.857 5.143-28.571 5.143-46.286 0-81.143-34.286-81.143-80.571 0-35.429 22.857-67.429 56.571-78.857l89.143-30.286-60-178.857-89.143 30.857c-9.143 2.857-18.286 4.571-27.429 4.571-45.714 0-81.143-34.857-81.143-80.571 0-35.429 22.857-67.429 56.571-78.857l89.714-30.286-30.286-90.857c-2.857-8.571-4.571-17.714-4.571-26.857 0-45.143 36.571-82.857 82.286-82.857 36 0 67.429 22.286 78.857 56.571l30.857 91.429 177.143-60-30.857-91.429c-2.857-8.571-4.571-17.714-4.571-26.857 0-45.143 37.143-82.857 82.286-82.857 36 0 68 22.857 79.429 56.571l30.286 92 92.571-31.429c8-2.286 16-3.429 24.571-3.429 44.571 0 82.857 33.143 82.857 78.857 0 35.429-27.429 65.143-59.429 76l-89.714 30.857 60 180.571 93.714-32c8.571-2.857 17.714-4.571 26.286-4.571zM414.286 593.143l177.143-60-60-180-177.143 61.143z" + "M658.744 749.256l-210.744-210.746v-282.51h128v229.49l173.256 173.254zM512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 896c-212.078 0-384-171.922-384-384s171.922-384 384-384c212.078 0 384 171.922 384 384s-171.922 384-384 384z" ], "attrs": [ {} ], - "width": 951, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "slack" + "clock", + "time", + "schedule" ], - "grid": 14 + "grid": 16 }, "attrs": [ {} @@ -1286,152 +1316,164 @@ "properties": { "order": 1, "id": 0, - "prevSize": 28, - "code": 59725, - "name": "action-Slack" + "prevSize": 32, + "code": 59728, + "name": "clock" }, "setIdx": 1, - "setId": 3, + "setId": 5, "iconIdx": 0 }, { "icon": { "paths": [ - "M512 26.38l-424.96 242.8v485.64l424.96 242.8 424.96-242.8v-485.64l-424.96-242.8zM512 235.52l245.76 138.24v276.48l-245.76 138.24-245.76-138.24v-276.48l245.76-138.24z" + "M128 320v640c0 35.2 28.8 64 64 64h576c35.2 0 64-28.8 64-64v-640h-704zM320 896h-64v-448h64v448zM448 896h-64v-448h64v448zM576 896h-64v-448h64v448zM704 896h-64v-448h64v448z", + "M848 128h-208v-80c0-26.4-21.6-48-48-48h-224c-26.4 0-48 21.6-48 48v80h-208c-26.4 0-48 21.6-48 48v80h832v-80c0-26.4-21.6-48-48-48zM576 128h-192v-63.198h192v63.198z" ], "attrs": [ + {}, {} ], "isMulticolor": false, "isMulticolor2": false, - "grid": 14, "tags": [ - "orleans" - ] + "bin", + "trashcan", + "remove", + "delete", + "recycle", + "dispose" + ], + "grid": 16 }, "attrs": [ + {}, {} ], "properties": { - "order": 99, - "id": 209, - "name": "orleans", - "prevSize": 28, - "code": 59723 + "order": 1, + "id": 0, + "name": "bin2", + "prevSize": 32, + "code": 59650 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 39 + "iconIdx": 61 }, { "icon": { "paths": [ - "M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v204.8h51.2v-204.8h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-307.2v51.2h307.2c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM716.8 189.8l117.4 117.4h-117.4z", - "M153.6 640v281.6h358.4v-281.6zM179.2 640v-76.8c0-84.48 69.12-153.6 153.6-153.6s153.6 69.12 153.6 153.6v76.8h-51.2v-76.8c0-56.32-46.080-102.4-102.4-102.4s-102.4 46.080-102.4 102.4v76.8z" - ], - "attrs": [ - {}, - {} + "M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 960.002c-62.958 0-122.872-13.012-177.23-36.452l233.148-262.29c5.206-5.858 8.082-13.422 8.082-21.26v-96c0-17.674-14.326-32-32-32-112.99 0-232.204-117.462-233.374-118.626-6-6.002-14.14-9.374-22.626-9.374h-128c-17.672 0-32 14.328-32 32v192c0 12.122 6.848 23.202 17.69 28.622l110.31 55.156v187.886c-116.052-80.956-192-215.432-192-367.664 0-68.714 15.49-133.806 43.138-192h116.862c8.488 0 16.626-3.372 22.628-9.372l128-128c6-6.002 9.372-14.14 9.372-22.628v-77.412c40.562-12.074 83.518-18.588 128-18.588 70.406 0 137.004 16.26 196.282 45.2-4.144 3.502-8.176 7.164-12.046 11.036-36.266 36.264-56.236 84.478-56.236 135.764s19.97 99.5 56.236 135.764c36.434 36.432 85.218 56.264 135.634 56.26 3.166 0 6.342-0.080 9.518-0.236 13.814 51.802 38.752 186.656-8.404 372.334-0.444 1.744-0.696 3.488-0.842 5.224-81.324 83.080-194.7 134.656-320.142 134.656z" ], + "attrs": [], "isMulticolor": false, "isMulticolor2": false, - "grid": 14, "tags": [ - "document-lock" - ] + "earth", + "globe", + "language", + "web", + "internet", + "sphere", + "planet" + ], + "defaultCode": 59850, + "grid": 16 }, - "attrs": [ - {}, - {} - ], + "attrs": [], "properties": { - "order": 97, - "id": 208, - "name": "document-lock", - "prevSize": 28, - "code": 59721 + "ligatures": "earth, globe2", + "name": "earth", + "id": 202, + "order": 91, + "prevSize": 32, + "code": 59850 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 40 + "iconIdx": 62 }, { "icon": { "paths": [ - "M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v153.6h51.2v-153.6h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM716.8 189.8l117.4 117.4h-117.4zM332.8 460.8l-230.4 256v51.2h102.4v153.6h256v-153.6h102.4v-51.2zM332.8 537.3l161.5 179.5h-84.7v153.6h-153.6v-153.6h-84.7z", - "M102.4 357.532h460.8v52.068h-460.8v-52.068z" + "M512.002 193.212v-65.212h128v-64c0-35.346-28.654-64-64.002-64h-191.998c-35.346 0-64 28.654-64 64v64h128v65.212c-214.798 16.338-384 195.802-384 414.788 0 229.75 186.25 416 416 416s416-186.25 416-416c0-218.984-169.202-398.448-384-414.788zM706.276 834.274c-60.442 60.44-140.798 93.726-226.274 93.726s-165.834-33.286-226.274-93.726c-60.44-60.44-93.726-140.8-93.726-226.274s33.286-165.834 93.726-226.274c58.040-58.038 134.448-91.018 216.114-93.548l-21.678 314.020c-1.86 26.29 12.464 37.802 31.836 37.802s33.698-11.512 31.836-37.802l-21.676-314.022c81.666 2.532 158.076 35.512 216.116 93.55 60.44 60.44 93.726 140.8 93.726 226.274s-33.286 165.834-93.726 226.274z" ], "attrs": [ - {}, {} ], "isMulticolor": false, "isMulticolor2": false, - "grid": 14, "tags": [ - "document-unpublish" - ] + "stopwatch", + "time", + "speed", + "meter", + "chronometer" + ], + "grid": 16 }, "attrs": [ - {}, {} ], "properties": { - "order": 96, - "id": 207, - "name": "document-unpublish", - "prevSize": 28, - "code": 59711 + "order": 1, + "id": 2, + "prevSize": 32, + "code": 59715, + "name": "elapsed" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 41 + "iconIdx": 63 }, { "icon": { "paths": [ - "M614.286 420.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8-5.714 13.143-5.714 4.571 0 9.714 2.286 13.143 5.714l224.571 224.571 224.571-224.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8.571 5.714 13.143z" + "M522.2 438.8v175.6h290.4c-11.8 75.4-87.8 220.8-290.4 220.8-174.8 0-317.4-144.8-317.4-323.2s142.6-323.2 317.4-323.2c99.4 0 166 42.4 204 79l139-133.8c-89.2-83.6-204.8-134-343-134-283 0-512 229-512 512s229 512 512 512c295.4 0 491.6-207.8 491.6-500.2 0-33.6-3.6-59.2-8-84.8l-483.6-0.2z" ], "attrs": [ {} ], - "width": 658, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "angle-down" + "google", + "brand" ], - "grid": 14 + "grid": 16 }, "attrs": [ {} ], "properties": { "order": 1, - "id": 1, - "prevSize": 28, - "code": 59648, - "name": "angle-down" + "id": 0, + "prevSize": 32, + "code": 59707, + "name": "google" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 42 + "iconIdx": 64 }, { "icon": { "paths": [ - "M358.286 310.857c0 4.571-2.286 9.714-5.714 13.143l-224.571 224.571 224.571 224.571c3.429 3.429 5.714 8.571 5.714 13.143s-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8 5.714 13.143z" + "M592 448h-16v-192c0-105.87-86.13-192-192-192h-128c-105.87 0-192 86.13-192 192v192h-16c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h544c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48zM192 256c0-35.29 28.71-64 64-64h128c35.29 0 64 28.71 64 64v192h-256v-192z" ], "attrs": [ {} ], - "width": 384, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "angle-left" + "lock", + "secure", + "private", + "encrypted" ], - "grid": 14 + "grid": 16 }, "attrs": [ {} @@ -1439,253 +1481,256 @@ "properties": { "order": 2, "id": 0, - "prevSize": 28, - "code": 59649, - "name": "angle-left" + "prevSize": 32, + "code": 59700, + "name": "lock" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 43 + "iconIdx": 65 }, { "icon": { "paths": [ - "M340 548.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8-5.714-13.143 0-4.571 2.286-9.714 5.714-13.143l224.571-224.571-224.571-224.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143z" + "M0.35 512l-0.35-312.074 384-52.144v364.218zM448 138.482l511.872-74.482v448h-511.872zM959.998 576l-0.126 448-511.872-72.016v-375.984zM384 943.836l-383.688-52.594-0.020-315.242h383.708z" ], "attrs": [ {} ], - "width": 347, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "angle-right" + "windows8", + "brand", + "os" ], - "grid": 14 + "grid": 16 }, "attrs": [ {} ], "properties": { - "order": 67, - "id": 0, - "prevSize": 28, - "code": 59697, - "name": "angle-right" + "order": 1, + "id": 1, + "prevSize": 32, + "code": 59712, + "name": "microsoft, action-AzureQueue" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 44 + "iconIdx": 66 }, { "icon": { "paths": [ - "M614.286 676.571c0 4.571-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8 5.714-13.143 5.714-4.571 0-9.714-2.286-13.143-5.714l-224.571-224.571-224.571 224.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143z" + "M128 128h320v768h-320zM576 128h320v768h-320z" ], "attrs": [ {} ], - "width": 658, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "angle-up" + "pause", + "player" ], - "grid": 14 + "grid": 16 }, "attrs": [ {} ], "properties": { "order": 2, - "id": 2, - "prevSize": 28, - "code": 59651, - "name": "angle-up" + "id": 1, + "prevSize": 32, + "code": 59695, + "name": "pause" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 45 + "iconIdx": 67 }, { "icon": { "paths": [ - "M592 393.6h-156.8c-57.6 0-105.6-48-105.6-105.6v-182.4c0-57.6 48-105.6 105.6-105.6h156.8c57.6 0 105.6 48 105.6 105.6v182.4c-3.2 57.6-48 105.6-105.6 105.6zM432 64c-22.4 0-41.6 19.2-41.6 41.6v182.4c0 22.4 19.2 41.6 41.6 41.6h156.8c22.4 0 41.6-19.2 41.6-41.6v-182.4c0-22.4-19.2-41.6-41.6-41.6h-156.8z", - "M195.2 1024c-105.6 0-195.2-89.6-195.2-195.2 0-108.8 89.6-195.2 195.2-195.2s195.2 89.6 195.2 195.2c3.2 105.6-86.4 195.2-195.2 195.2zM195.2 694.4c-73.6 0-131.2 60.8-131.2 131.2 0 73.6 60.8 134.4 131.2 134.4 73.6 0 131.2-60.8 131.2-131.2 3.2-73.6-57.6-134.4-131.2-134.4z", - "M828.8 1024c-108.8 0-195.2-89.6-195.2-195.2 0-108.8 89.6-195.2 195.2-195.2s195.2 89.6 195.2 195.2c0 105.6-89.6 195.2-195.2 195.2zM828.8 694.4c-73.6 0-131.2 60.8-131.2 131.2 0 73.6 60.8 131.2 131.2 131.2 73.6 0 131.2-60.8 131.2-131.2s-60.8-131.2-131.2-131.2z", - "M332.8 640c-6.4 0-12.8 0-16-3.2-16-9.6-19.2-28.8-9.6-44.8l83.2-137.6c9.6-16 28.8-19.2 44.8-9.6s19.2 28.8 9.6 44.8l-83.2 137.6c-6.4 6.4-16 12.8-28.8 12.8z", - "M691.2 640c-9.6 0-22.4-6.4-28.8-16l-83.2-137.6c-9.6-16-3.2-35.2 9.6-44.8s35.2-3.2 44.8 9.6l83.2 137.6c9.6 16 3.2 35.2-9.6 44.8-6.4 6.4-12.8 6.4-16 6.4z" + "M192 128l640 384-640 384z" ], "attrs": [ - {}, - {}, - {}, - {}, {} ], "isMulticolor": false, "isMulticolor2": false, - "grid": 14, "tags": [ - "api" - ] + "play", + "player" + ], + "grid": 16 }, "attrs": [ - {}, - {}, - {}, - {}, {} ], "properties": { - "order": 94, - "id": 206, - "name": "api", - "prevSize": 28, - "code": 59717 + "order": 3, + "id": 0, + "prevSize": 32, + "code": 59696, + "name": "play" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 46 + "iconIdx": 68 }, { "icon": { "paths": [ - "M800 1024h-576c-124.8 0-224-99.2-224-224v-576c0-124.8 99.2-224 224-224h576c124.8 0 224 99.2 224 224v576c0 124.8-99.2 224-224 224zM224 64c-89.6 0-160 70.4-160 160v576c0 89.6 70.4 160 160 160h576c89.6 0 160-70.4 160-160v-576c0-89.6-70.4-160-160-160h-576z", - "M771.2 860.8h-438.4c-12.8 0-22.4-6.4-28.8-19.2s-3.2-25.6 3.2-35.2l300.8-355.2c6.4-6.4 16-12.8 25.6-12.8s19.2 6.4 25.6 12.8l192 275.2c3.2 3.2 3.2 6.4 3.2 9.6 16 44.8 3.2 73.6-6.4 89.6-22.4 32-70.4 35.2-76.8 35.2zM403.2 796.8h371.2c6.4 0 22.4-3.2 25.6-9.6 3.2-3.2 3.2-12.8 0-25.6l-166.4-236.8-230.4 272z", - "M332.8 502.4c-76.8 0-140.8-64-140.8-140.8s64-140.8 140.8-140.8 140.8 64 140.8 140.8-60.8 140.8-140.8 140.8zM332.8 284.8c-41.6 0-76.8 32-76.8 76.8s35.2 76.8 76.8 76.8 76.8-35.2 76.8-76.8-32-76.8-76.8-76.8z" + "M889.68 166.32c-93.608-102.216-228.154-166.32-377.68-166.32-282.77 0-512 229.23-512 512h96c0-229.75 186.25-416 416-416 123.020 0 233.542 53.418 309.696 138.306l-149.696 149.694h352v-352l-134.32 134.32z", + "M928 512c0 229.75-186.25 416-416 416-123.020 0-233.542-53.418-309.694-138.306l149.694-149.694h-352v352l134.32-134.32c93.608 102.216 228.154 166.32 377.68 166.32 282.77 0 512-229.23 512-512h-96z" ], "attrs": [ - {}, {}, {} ], "isMulticolor": false, "isMulticolor2": false, - "grid": 14, "tags": [ - "assets" - ] + "loop", + "repeat", + "player", + "reload", + "refresh", + "update", + "synchronize", + "arrows" + ], + "grid": 16 }, "attrs": [ - {}, {}, {} ], "properties": { - "order": 95, - "id": 205, - "name": "assets", - "prevSize": 28, - "code": 59720 + "order": 49, + "id": 2, + "prevSize": 32, + "code": 59694, + "name": "reset" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 47 + "iconIdx": 69 }, { "icon": { "paths": [ - "M932.571 548.571c0 20-16.571 36.571-36.571 36.571h-128c0 71.429-15.429 125.143-38.286 165.714l118.857 119.429c14.286 14.286 14.286 37.143 0 51.429-6.857 7.429-16.571 10.857-25.714 10.857s-18.857-3.429-25.714-10.857l-113.143-112.571s-74.857 68.571-172 68.571v-512h-73.143v512c-103.429 0-178.857-75.429-178.857-75.429l-104.571 118.286c-7.429 8-17.143 12-27.429 12-8.571 0-17.143-2.857-24.571-9.143-14.857-13.714-16-36.571-2.857-52l115.429-129.714c-20-39.429-33.143-90.286-33.143-156.571h-128c-20 0-36.571-16.571-36.571-36.571s16.571-36.571 36.571-36.571h128v-168l-98.857-98.857c-14.286-14.286-14.286-37.143 0-51.429s37.143-14.286 51.429 0l98.857 98.857h482.286l98.857-98.857c14.286-14.286 37.143-14.286 51.429 0s14.286 37.143 0 51.429l-98.857 98.857v168h128c20 0 36.571 16.571 36.571 36.571zM658.286 219.429h-365.714c0-101.143 81.714-182.857 182.857-182.857s182.857 81.714 182.857 182.857z" + "M933.79 610.25c-53.726-93.054-21.416-212.304 72.152-266.488l-100.626-174.292c-28.75 16.854-62.176 26.518-97.846 26.518-107.536 0-194.708-87.746-194.708-195.99h-201.258c0.266 33.41-8.074 67.282-25.958 98.252-53.724 93.056-173.156 124.702-266.862 70.758l-100.624 174.292c28.97 16.472 54.050 40.588 71.886 71.478 53.638 92.908 21.512 211.92-71.708 266.224l100.626 174.292c28.65-16.696 61.916-26.254 97.4-26.254 107.196 0 194.144 87.192 194.7 194.958h201.254c-0.086-33.074 8.272-66.57 25.966-97.218 53.636-92.906 172.776-124.594 266.414-71.012l100.626-174.29c-28.78-16.466-53.692-40.498-71.434-71.228zM512 719.332c-114.508 0-207.336-92.824-207.336-207.334 0-114.508 92.826-207.334 207.336-207.334 114.508 0 207.332 92.826 207.332 207.334-0.002 114.51-92.824 207.334-207.332 207.334z" ], "attrs": [ {} ], - "width": 951, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "bug" + "cog", + "gear", + "preferences", + "settings", + "generate", + "control", + "options" ], - "grid": 14 + "grid": 16 }, "attrs": [ {} ], "properties": { "order": 1, - "id": 0, - "prevSize": 28, - "code": 59709, - "name": "bug" + "id": 1, + "prevSize": 32, + "code": 59693, + "name": "settings2" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 48 + "iconIdx": 70 }, { "icon": { "paths": [ - "M585.143 402.286c0 9.714-4 18.857-10.857 25.714l-256 256c-6.857 6.857-16 10.857-25.714 10.857s-18.857-4-25.714-10.857l-256-256c-6.857-6.857-10.857-16-10.857-25.714 0-20 16.571-36.571 36.571-36.571h512c20 0 36.571 16.571 36.571 36.571z" + "M512 128c-247.424 0-448 200.576-448 448s200.576 448 448 448 448-200.576 448-448-200.576-448-448-448zM512 936c-198.824 0-360-161.178-360-360 0-198.824 161.176-360 360-360 198.822 0 360 161.176 360 360 0 198.822-161.178 360-360 360zM934.784 287.174c16.042-28.052 25.216-60.542 25.216-95.174 0-106.040-85.96-192-192-192-61.818 0-116.802 29.222-151.92 74.596 131.884 27.236 245.206 105.198 318.704 212.578v0zM407.92 74.596c-35.116-45.374-90.102-74.596-151.92-74.596-106.040 0-192 85.96-192 192 0 34.632 9.174 67.122 25.216 95.174 73.5-107.38 186.822-185.342 318.704-212.578z", + "M512 576v-256h-64v320h256v-64z" ], "attrs": [ + {}, {} ], - "width": 585, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "caret-down" + "alarm", + "time", + "clock" ], - "grid": 14 + "grid": 16 }, "attrs": [ + {}, {} ], "properties": { - "order": 4, - "id": 4, - "prevSize": 28, - "code": 59692, - "name": "caret-down" + "order": 2, + "id": 1, + "prevSize": 32, + "code": 59716, + "name": "timeout" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 49 + "iconIdx": 71 }, { "icon": { "paths": [ - "M365.714 256v512c0 20-16.571 36.571-36.571 36.571-9.714 0-18.857-4-25.714-10.857l-256-256c-6.857-6.857-10.857-16-10.857-25.714s4-18.857 10.857-25.714l256-256c6.857-6.857 16-10.857 25.714-10.857 20 0 36.571 16.571 36.571 36.571z" + "M768 64c105.87 0 192 86.13 192 192v192h-128v-192c0-35.29-28.71-64-64-64h-128c-35.29 0-64 28.71-64 64v192h16c26.4 0 48 21.6 48 48v480c0 26.4-21.6 48-48 48h-544c-26.4 0-48-21.6-48-48v-480c0-26.4 21.6-48 48-48h400v-192c0-105.87 86.13-192 192-192h128z" ], "attrs": [ {} ], - "width": 402, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "caret-left" + "unlocked", + "lock-open" ], - "grid": 14 + "grid": 16 }, "attrs": [ {} ], "properties": { - "order": 2, - "id": 6, - "prevSize": 28, - "code": 59690, - "name": "caret-left" + "order": 1, + "id": 1, + "prevSize": 32, + "code": 59699, + "name": "unlocked" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 50 + "iconIdx": 72 }, { "icon": { "paths": [ - "M329.143 512c0 9.714-4 18.857-10.857 25.714l-256 256c-6.857 6.857-16 10.857-25.714 10.857-20 0-36.571-16.571-36.571-36.571v-512c0-20 16.571-36.571 36.571-36.571 9.714 0 18.857 4 25.714 10.857l256 256c6.857 6.857 10.857 16 10.857 25.714z" + "M868 443.429c46.857 0 82.857 34.286 82.857 81.143 0 36.571-18.857 62.286-53.143 74.286l-98.286 33.714 32 95.429c2.857 8.571 4 17.714 4 26.857 0 45.143-36.571 82.857-81.714 82.857-36 0-68-22.286-79.429-56.571l-31.429-94.286-177.143 60.571 31.429 93.714c2.857 8.571 4.571 17.714 4.571 26.857 0 44.571-36.571 82.857-82.286 82.857-36 0-67.429-22.286-78.857-56.571l-31.429-93.143-87.429 30.286c-9.143 2.857-18.857 5.143-28.571 5.143-46.286 0-81.143-34.286-81.143-80.571 0-35.429 22.857-67.429 56.571-78.857l89.143-30.286-60-178.857-89.143 30.857c-9.143 2.857-18.286 4.571-27.429 4.571-45.714 0-81.143-34.857-81.143-80.571 0-35.429 22.857-67.429 56.571-78.857l89.714-30.286-30.286-90.857c-2.857-8.571-4.571-17.714-4.571-26.857 0-45.143 36.571-82.857 82.286-82.857 36 0 67.429 22.286 78.857 56.571l30.857 91.429 177.143-60-30.857-91.429c-2.857-8.571-4.571-17.714-4.571-26.857 0-45.143 37.143-82.857 82.286-82.857 36 0 68 22.857 79.429 56.571l30.286 92 92.571-31.429c8-2.286 16-3.429 24.571-3.429 44.571 0 82.857 33.143 82.857 78.857 0 35.429-27.429 65.143-59.429 76l-89.714 30.857 60 180.571 93.714-32c8.571-2.857 17.714-4.571 26.286-4.571zM414.286 593.143l177.143-60-60-180-177.143 61.143z" ], "attrs": [ {} ], - "width": 329, + "width": 951, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "caret-right" + "slack" ], "grid": 14 }, @@ -1694,56 +1739,51 @@ ], "properties": { "order": 1, - "id": 7, + "id": 0, "prevSize": 28, - "code": 59689, - "name": "caret-right" + "code": 59725, + "name": "action-Slack" }, "setIdx": 3, - "setId": 1, - "iconIdx": 51 + "setId": 3, + "iconIdx": 0 }, { "icon": { "paths": [ - "M585.143 694.857c0 20-16.571 36.571-36.571 36.571h-512c-20 0-36.571-16.571-36.571-36.571 0-9.714 4-18.857 10.857-25.714l256-256c6.857-6.857 16-10.857 25.714-10.857s18.857 4 25.714 10.857l256 256c6.857 6.857 10.857 16 10.857 25.714z" + "M512 26.38l-424.96 242.8v485.64l424.96 242.8 424.96-242.8v-485.64l-424.96-242.8zM512 235.52l245.76 138.24v276.48l-245.76 138.24-245.76-138.24v-276.48l245.76-138.24z" ], "attrs": [ {} ], - "width": 585, "isMulticolor": false, "isMulticolor2": false, + "grid": 14, "tags": [ - "caret-up" - ], - "grid": 14 + "orleans" + ] }, "attrs": [ {} ], "properties": { - "order": 3, - "id": 5, + "order": 99, + "id": 209, + "name": "orleans", "prevSize": 28, - "code": 59691, - "name": "caret-up" + "code": 59723 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 52 + "iconIdx": 39 }, { "icon": { "paths": [ - "M800 1024h-576c-124.8 0-224-99.2-224-224v-576c0-124.8 99.2-224 224-224h576c124.8 0 224 99.2 224 224v576c0 124.8-99.2 224-224 224zM224 64c-89.6 0-160 70.4-160 160v576c0 89.6 70.4 160 160 160h576c89.6 0 160-70.4 160-160v-576c0-89.6-70.4-160-160-160h-576z", - "M480 448h-211.2c-57.6 0-105.6-48-105.6-105.6v-73.6c0-57.6 48-105.6 105.6-105.6h211.2c57.6 0 105.6 48 105.6 105.6v73.6c0 57.6-48 105.6-105.6 105.6zM268.8 227.2c-22.4 0-41.6 19.2-41.6 41.6v73.6c0 22.4 19.2 41.6 41.6 41.6h211.2c22.4 0 41.6-19.2 41.6-41.6v-73.6c0-22.4-19.2-41.6-41.6-41.6h-211.2z", - "M828.8 611.2h-633.6c-19.2 0-32-12.8-32-32s12.8-32 32-32h630.4c19.2 0 32 12.8 32 32s-12.8 32-28.8 32z", - "M553.6 777.6h-358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h355.2c19.2 0 32 12.8 32 32s-12.8 32-28.8 32z" + "M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v204.8h51.2v-204.8h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-307.2v51.2h307.2c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM716.8 189.8l117.4 117.4h-117.4z", + "M153.6 640v281.6h358.4v-281.6zM179.2 640v-76.8c0-84.48 69.12-153.6 153.6-153.6s153.6 69.12 153.6 153.6v76.8h-51.2v-76.8c0-56.32-46.080-102.4-102.4-102.4s-102.4 46.080-102.4 102.4v76.8z" ], "attrs": [ - {}, - {}, {}, {} ], @@ -1751,216 +1791,225 @@ "isMulticolor2": false, "grid": 14, "tags": [ - "content" + "document-lock" ] }, "attrs": [ - {}, - {}, {}, {} ], "properties": { - "order": 93, - "id": 204, - "name": "contents, trigger-ContentChanged", + "order": 97, + "id": 208, + "name": "document-lock", "prevSize": 28, - "code": 59718 + "code": 59721 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 53 + "iconIdx": 40 }, { "icon": { "paths": [ - "M947.2 102.4h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-512v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v716.8c0 42.342 34.458 76.8 76.8 76.8h870.4c42.342 0 76.8-34.458 76.8-76.8v-716.8c0-42.342-34.458-76.8-76.8-76.8zM972.8 896c0 14.131-11.469 25.6-25.6 25.6h-870.4c-14.080 0-25.6-11.469-25.6-25.6v-537.6h921.6v537.6zM972.8 307.2h-921.6v-128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h512v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128zM332.8 512h51.2c14.080 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM640 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6z" + "M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v153.6h51.2v-153.6h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM716.8 189.8l117.4 117.4h-117.4zM332.8 460.8l-230.4 256v51.2h102.4v153.6h256v-153.6h102.4v-51.2zM332.8 537.3l161.5 179.5h-84.7v153.6h-153.6v-153.6h-84.7z", + "M102.4 357.532h460.8v52.068h-460.8v-52.068z" ], "attrs": [ + {}, {} ], "isMulticolor": false, "isMulticolor2": false, "grid": 14, "tags": [ - "control-date" + "document-unpublish" ] }, "attrs": [ + {}, {} ], "properties": { - "order": 71, - "id": 42, - "name": "control-Date", + "order": 96, + "id": 207, + "name": "document-unpublish", "prevSize": 28, - "code": 59702 + "code": 59711 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 54 + "iconIdx": 41 }, { "icon": { "paths": [ - "M486.4 409.6h51.2c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6zM230.4 614.4c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM230.4 512c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM51.2 742.4v-435.2h665.6v102.4h51.2v-281.6c0-42.342-34.458-76.8-76.8-76.8h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-256v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v614.4c0 42.342 34.458 76.8 76.8 76.8h332.8v-51.2h-332.8c-14.080 0-25.6-11.469-25.6-25.6zM51.2 128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h256v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128h-665.6v-128zM384 409.6c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM742.4 460.8c-155.546 0-281.6 126.054-281.6 281.6s126.054 281.6 281.6 281.6 281.6-126.054 281.6-281.6-126.054-281.6-281.6-281.6zM742.4 972.8c-127.232 0-230.4-103.168-230.4-230.4s103.168-230.4 230.4-230.4 230.4 103.168 230.4 230.4-103.168 230.4-230.4 230.4zM384 512c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM384 614.4c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM844.8 716.8c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-102.4c-14.131 0-25.6-11.469-25.6-25.6v-102.4c0-14.131 11.469-25.6 25.6-25.6s25.6 11.469 25.6 25.6v76.8h76.8z" + "M614.286 420.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8-5.714 13.143-5.714 4.571 0 9.714 2.286 13.143 5.714l224.571 224.571 224.571-224.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8.571 5.714 13.143z" ], "attrs": [ {} ], + "width": 658, "isMulticolor": false, "isMulticolor2": false, - "grid": 14, "tags": [ - "control-date-time" - ] + "angle-down" + ], + "grid": 14 }, "attrs": [ {} ], "properties": { - "order": 70, - "id": 41, - "name": "control-DateTime", + "order": 1, + "id": 1, "prevSize": 28, - "code": 59703 + "code": 59648, + "name": "angle-down" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 55 + "iconIdx": 42 }, { "icon": { "paths": [ - "M793.6 609.416h-61.838v-28.108h-0.783q-21.135 33.092-62.034 33.092-37.573 0-60.469-26.912-22.896-27.112-22.896-75.554 0-50.635 25.244-81.136t66.144-30.501q38.747 0 54.011 28.308h0.783v-121.405h61.838v302.216zM732.936 510.139v-15.35q0-19.935-11.35-33.092t-29.549-13.157q-20.548 0-32.093 16.546-11.546 16.347-11.546 45.053 0 26.912 11.154 41.465t30.919 14.553q18.786 0 30.528-15.35 11.937-15.35 11.937-40.668zM548.594 609.416h-61.643v-116.421q0-44.455-32.093-44.455-15.264 0-24.853 13.357t-9.589 33.292v114.228h-61.839v-117.617q0-43.259-31.506-43.259-15.851 0-25.44 12.758-9.393 12.758-9.393 34.687v113.431h-61.838v-204.135h61.838v31.896h0.783q9.589-16.347 26.81-26.514 17.417-10.366 37.964-10.366 42.465 0 58.12 38.076 22.896-38.076 67.318-38.076 65.361 0 65.361 82.133v126.987zM0 0v204.8h76.8v76.8h51.2v-76.8h76.8v-204.8zM819.2 0v204.8h204.8v-204.8zM51.2 51.2h102.4v102.4h-102.4zM870.4 51.2h102.4v102.4h-102.4zM281.6 76.8v51.2h102.4v-51.2zM486.4 76.8v51.2h102.4v-51.2zM691.2 76.8v51.2h102.4v-51.2zM896 281.6v102.4h51.2v-102.4zM76.8 384v102.4h51.2v-102.4zM896 486.4v102.4h51.2v-102.4zM76.8 588.8v102.4h51.2v-102.4zM896 691.2v102.4h51.2v-102.4zM76.8 793.6v25.6h-76.8v204.8h204.8v-76.8h76.8v-51.2h-76.8v-76.8h-76.8v-25.6zM819.2 819.2v76.8h-25.6v51.2h25.6v76.8h204.8v-204.8zM51.2 870.4h102.4v102.4h-102.4zM870.4 870.4h102.4v102.4h-102.4zM384 896v51.2h102.4v-51.2zM588.8 896v51.2h102.4v-51.2z" + "M358.286 310.857c0 4.571-2.286 9.714-5.714 13.143l-224.571 224.571 224.571 224.571c3.429 3.429 5.714 8.571 5.714 13.143s-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8 5.714 13.143z" ], "attrs": [ {} ], + "width": 384, "isMulticolor": false, "isMulticolor2": false, - "grid": 14, "tags": [ - "control-Markdown" - ] + "angle-left" + ], + "grid": 14 }, "attrs": [ {} ], "properties": { - "order": 72, - "id": 43, - "name": "control-Markdown", + "order": 2, + "id": 0, "prevSize": 28, - "code": 59704 + "code": 59649, + "name": "angle-left" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 56 + "iconIdx": 43 }, { "icon": { "paths": [ - "M292.571 713.143v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM292.571 420.571v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM658.286 713.143v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM292.571 128v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM658.286 420.571v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM1024 713.143v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM658.286 128v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM1024 420.571v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM1024 128v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857z" + "M340 548.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8-5.714-13.143 0-4.571 2.286-9.714 5.714-13.143l224.571-224.571-224.571-224.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143z" ], - "width": 1024, - "attrs": [], + "attrs": [ + {} + ], + "width": 347, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "th" + "angle-right" ], - "defaultCode": 61450, "grid": 14 }, - "attrs": [], + "attrs": [ + {} + ], "properties": { - "name": "grid", - "id": 14, - "order": 83, + "order": 67, + "id": 0, "prevSize": 28, - "code": 61450 + "code": 59697, + "name": "angle-right" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 57 + "iconIdx": 44 }, { "icon": { "paths": [ - "M877.714 768v73.143c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h804.571c20 0 36.571 16.571 36.571 36.571zM877.714 475.429v73.143c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h804.571c20 0 36.571 16.571 36.571 36.571zM877.714 182.857v73.143c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h804.571c20 0 36.571 16.571 36.571 36.571z" + "M614.286 676.571c0 4.571-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8 5.714-13.143 5.714-4.571 0-9.714-2.286-13.143-5.714l-224.571-224.571-224.571 224.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143z" ], - "width": 877.7142857142857, - "attrs": [], + "attrs": [ + {} + ], + "width": 658, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "bars", - "navicon", - "reorder" + "angle-up" ], - "defaultCode": 61641, "grid": 14 }, - "attrs": [], + "attrs": [ + {} + ], "properties": { - "name": "list", - "id": 178, - "order": 89, + "order": 2, + "id": 2, "prevSize": 28, - "code": 61641 + "code": 59651, + "name": "angle-up" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 58 + "iconIdx": 45 }, { "icon": { "paths": [ - "M512 64c-131.696 0-239.125 107.4-239.125 239 0 65.8 24.831 146.717 65.375 215.25 19.653 33.221 43.902 63.853 71.75 87.125-59.423 7.524-122.009 9.415-172.125 32-79.809 35.967-144.343 94.74-172.375 178.625-1.5 9.499 0 0-1.5 9v0.499c0 73.995 60.563 134.501 134.375 134.501h627.125c73.888 0 134.5-60.506 134.5-134.5l-1.5-9.375c-27.845-84.263-92.273-143.119-172.125-179-50.17-22.544-112.844-24.421-172.375-31.875 27.792-23.26 52.002-53.831 71.625-87 40.544-68.533 65.375-149.45 65.375-215.25 0-131.6-107.304-239-239-239zM512 124c99.241 0 179 79.875 179 179 0 49.562-21.877 125.381-57 184.75s-81.435 98.75-122 98.75c-40.565 0-86.877-39.381-122-98.75s-57.125-135.188-57.125-184.75c0-99.125 79.884-179 179.125-179zM512 646.5c92.551 0 180.829 14.406 249.75 45.375 66.784 30.009 113.649 74.724 136.5 137.75-2.447 39.259-32.9 70.375-72.75 70.375h-627.125c-39.678 0-70.116-31.051-72.625-70.25 22.978-62.705 69.953-107.523 136.75-137.625 68.937-31.067 157.205-45.625 249.5-45.625z" + "M592 393.6h-156.8c-57.6 0-105.6-48-105.6-105.6v-182.4c0-57.6 48-105.6 105.6-105.6h156.8c57.6 0 105.6 48 105.6 105.6v182.4c-3.2 57.6-48 105.6-105.6 105.6zM432 64c-22.4 0-41.6 19.2-41.6 41.6v182.4c0 22.4 19.2 41.6 41.6 41.6h156.8c22.4 0 41.6-19.2 41.6-41.6v-182.4c0-22.4-19.2-41.6-41.6-41.6h-156.8z", + "M195.2 1024c-105.6 0-195.2-89.6-195.2-195.2 0-108.8 89.6-195.2 195.2-195.2s195.2 89.6 195.2 195.2c3.2 105.6-86.4 195.2-195.2 195.2zM195.2 694.4c-73.6 0-131.2 60.8-131.2 131.2 0 73.6 60.8 134.4 131.2 134.4 73.6 0 131.2-60.8 131.2-131.2 3.2-73.6-57.6-134.4-131.2-134.4z", + "M828.8 1024c-108.8 0-195.2-89.6-195.2-195.2 0-108.8 89.6-195.2 195.2-195.2s195.2 89.6 195.2 195.2c0 105.6-89.6 195.2-195.2 195.2zM828.8 694.4c-73.6 0-131.2 60.8-131.2 131.2 0 73.6 60.8 131.2 131.2 131.2 73.6 0 131.2-60.8 131.2-131.2s-60.8-131.2-131.2-131.2z", + "M332.8 640c-6.4 0-12.8 0-16-3.2-16-9.6-19.2-28.8-9.6-44.8l83.2-137.6c9.6-16 28.8-19.2 44.8-9.6s19.2 28.8 9.6 44.8l-83.2 137.6c-6.4 6.4-16 12.8-28.8 12.8z", + "M691.2 640c-9.6 0-22.4-6.4-28.8-16l-83.2-137.6c-9.6-16-3.2-35.2 9.6-44.8s35.2-3.2 44.8 9.6l83.2 137.6c9.6 16 3.2 35.2-9.6 44.8-6.4 6.4-12.8 6.4-16 6.4z" ], "attrs": [ + {}, + {}, + {}, + {}, {} ], "isMulticolor": false, "isMulticolor2": false, "grid": 14, "tags": [ - "user-o" + "api" ] }, "attrs": [ + {}, + {}, + {}, + {}, {} ], "properties": { - "order": 64, - "id": 38, - "name": "user-o", + "order": 94, + "id": 206, + "name": "api", "prevSize": 28, - "code": 59698 + "code": 59717 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 59 + "iconIdx": 46 }, { "icon": { "paths": [ - "M217.6 992c-3.2 0-3.2 0-6.4 0h-3.2c-144-25.6-208-144-208-249.6 0-99.2 57.6-208 185.6-240v-147.2c0-19.2 12.8-32 32-32s32 12.8 32 32v172.8c0 16-12.8 28.8-25.6 32-108.8 16-160 102.4-160 182.4s48 166.4 153.6 185.6h6.4c16 3.2 28.8 19.2 25.6 38.4-3.2 16-16 25.6-32 25.6z", - "M774.4 1001.6c0 0 0 0 0 0-102.4 0-211.2-60.8-243.2-185.6h-176c-19.2 0-32-12.8-32-32s12.8-32 32-32h201.6c16 0 28.8 12.8 32 25.6 16 108.8 102.4 156.8 182.4 160 80 0 166.4-48 185.6-153.6v-3.2c3.2-16 19.2-28.8 38.4-25.6 16 3.2 28.8 19.2 25.6 38.4v3.2c-22.4 140.8-140.8 204.8-246.4 204.8z", - "M787.2 678.4c-19.2 0-32-12.8-32-32v-176c0-16 12.8-28.8 25.6-32 108.8-16 156.8-102.4 160-182.4 0-80-48-166.4-153.6-185.6h-3.2c-19.2-6.4-32-22.4-28.8-38.4s19.2-28.8 38.4-25.6h3.2c144 25.6 208 144 208 249.6 0 99.2-60.8 208-185.6 240v150.4c0 16-16 32-32 32z", - "M41.6 246.4c-3.2 0-3.2 0-6.4 0-16-3.2-28.8-19.2-25.6-35.2v-3.2c25.6-144 140.8-208 246.4-208 0 0 3.2 0 3.2 0 99.2 0 208 60.8 240 185.6h147.2c19.2 0 32 12.8 32 32s-12.8 32-32 32h-172.8c-16 0-28.8-12.8-32-25.6-16-108.8-102.4-156.8-182.4-160-80 0-166.4 48-185.6 153.6v3.2c-3.2 16-16 25.6-32 25.6z", - "M256 387.2c-32 0-67.2-12.8-92.8-38.4-51.2-51.2-51.2-134.4 0-185.6 25.6-22.4 57.6-35.2 92.8-35.2s67.2 12.8 92.8 38.4c25.6 25.6 38.4 57.6 38.4 92.8s-12.8 67.2-38.4 92.8c-25.6 22.4-57.6 35.2-92.8 35.2zM256 192c-16 0-32 6.4-44.8 19.2-25.6 25.6-25.6 67.2 0 92.8s67.2 25.6 92.8 0c12.8-12.8 19.2-28.8 19.2-48s-6.4-32-19.2-44.8-28.8-19.2-48-19.2z", - "M771.2 873.6c-32 0-67.2-12.8-92.8-38.4-51.2-51.2-51.2-134.4 0-185.6 25.6-25.6 57.6-38.4 92.8-38.4s67.2 12.8 92.8 38.4c25.6 25.6 38.4 57.6 38.4 92.8s-12.8 67.2-38.4 92.8c-28.8 25.6-60.8 38.4-92.8 38.4zM771.2 678.4c-19.2 0-35.2 6.4-48 19.2-25.6 25.6-25.6 67.2 0 92.8s67.2 25.6 92.8 0c12.8-12.8 19.2-28.8 19.2-48s-6.4-35.2-19.2-48-28.8-16-44.8-16z", - "M745.6 387.2c-32 0-67.2-12.8-92.8-38.4s-38.4-57.6-38.4-92.8 12.8-67.2 38.4-92.8c25.6-22.4 60.8-35.2 92.8-35.2s67.2 12.8 92.8 38.4c51.2 51.2 51.2 134.4 0 185.6v0c-25.6 22.4-57.6 35.2-92.8 35.2zM745.6 192c-19.2 0-35.2 6.4-48 19.2s-19.2 28.8-19.2 48 6.4 35.2 19.2 48c25.6 25.6 67.2 25.6 92.8 0s25.6-67.2 0-92.8c-9.6-16-25.6-22.4-44.8-22.4z", - "M259.2 873.6c-32 0-67.2-12.8-92.8-38.4s-38.4-57.6-38.4-92.8 12.8-67.2 38.4-92.8c25.6-22.4 57.6-35.2 92.8-35.2s67.2 12.8 92.8 38.4c51.2 51.2 51.2 134.4 0 185.6v0c-25.6 22.4-57.6 35.2-92.8 35.2zM259.2 678.4c-19.2 0-35.2 6.4-48 19.2s-19.2 28.8-19.2 48 6.4 35.2 19.2 48c25.6 25.6 67.2 25.6 92.8 0s25.6-67.2 0-92.8c-9.6-16-25.6-22.4-44.8-22.4z" + "M800 1024h-576c-124.8 0-224-99.2-224-224v-576c0-124.8 99.2-224 224-224h576c124.8 0 224 99.2 224 224v576c0 124.8-99.2 224-224 224zM224 64c-89.6 0-160 70.4-160 160v576c0 89.6 70.4 160 160 160h576c89.6 0 160-70.4 160-160v-576c0-89.6-70.4-160-160-160h-576z", + "M771.2 860.8h-438.4c-12.8 0-22.4-6.4-28.8-19.2s-3.2-25.6 3.2-35.2l300.8-355.2c6.4-6.4 16-12.8 25.6-12.8s19.2 6.4 25.6 12.8l192 275.2c3.2 3.2 3.2 6.4 3.2 9.6 16 44.8 3.2 73.6-6.4 89.6-22.4 32-70.4 35.2-76.8 35.2zM403.2 796.8h371.2c6.4 0 22.4-3.2 25.6-9.6 3.2-3.2 3.2-12.8 0-25.6l-166.4-236.8-230.4 272z", + "M332.8 502.4c-76.8 0-140.8-64-140.8-140.8s64-140.8 140.8-140.8 140.8 64 140.8 140.8-60.8 140.8-140.8 140.8zM332.8 284.8c-41.6 0-76.8 32-76.8 76.8s35.2 76.8 76.8 76.8 76.8-35.2 76.8-76.8-32-76.8-76.8-76.8z" ], "attrs": [ - {}, - {}, - {}, - {}, - {}, {}, {}, {} @@ -1969,423 +2018,434 @@ "isMulticolor2": false, "grid": 14, "tags": [ - "webhooks" + "assets" ] }, "attrs": [ - {}, - {}, - {}, - {}, - {}, {}, {}, {} ], "properties": { - "order": 92, - "id": 203, - "name": "rules, action-Webhook", + "order": 95, + "id": 205, + "name": "assets", "prevSize": 28, - "code": 59719 + "code": 59720 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 60 + "iconIdx": 47 }, { "icon": { "paths": [ - "M128 320v640c0 35.2 28.8 64 64 64h576c35.2 0 64-28.8 64-64v-640h-704zM320 896h-64v-448h64v448zM448 896h-64v-448h64v448zM576 896h-64v-448h64v448zM704 896h-64v-448h64v448z", - "M848 128h-208v-80c0-26.4-21.6-48-48-48h-224c-26.4 0-48 21.6-48 48v80h-208c-26.4 0-48 21.6-48 48v80h832v-80c0-26.4-21.6-48-48-48zM576 128h-192v-63.198h192v63.198z" + "M932.571 548.571c0 20-16.571 36.571-36.571 36.571h-128c0 71.429-15.429 125.143-38.286 165.714l118.857 119.429c14.286 14.286 14.286 37.143 0 51.429-6.857 7.429-16.571 10.857-25.714 10.857s-18.857-3.429-25.714-10.857l-113.143-112.571s-74.857 68.571-172 68.571v-512h-73.143v512c-103.429 0-178.857-75.429-178.857-75.429l-104.571 118.286c-7.429 8-17.143 12-27.429 12-8.571 0-17.143-2.857-24.571-9.143-14.857-13.714-16-36.571-2.857-52l115.429-129.714c-20-39.429-33.143-90.286-33.143-156.571h-128c-20 0-36.571-16.571-36.571-36.571s16.571-36.571 36.571-36.571h128v-168l-98.857-98.857c-14.286-14.286-14.286-37.143 0-51.429s37.143-14.286 51.429 0l98.857 98.857h482.286l98.857-98.857c14.286-14.286 37.143-14.286 51.429 0s14.286 37.143 0 51.429l-98.857 98.857v168h128c20 0 36.571 16.571 36.571 36.571zM658.286 219.429h-365.714c0-101.143 81.714-182.857 182.857-182.857s182.857 81.714 182.857 182.857z" ], "attrs": [ - {}, {} ], + "width": 951, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "bin", - "trashcan", - "remove", - "delete", - "recycle", - "dispose" + "bug" ], - "grid": 16 + "grid": 14 }, "attrs": [ - {}, {} ], "properties": { "order": 1, "id": 0, - "name": "bin2", - "prevSize": 32, - "code": 59650 + "prevSize": 28, + "code": 59709, + "name": "bug" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 61 + "iconIdx": 48 }, { "icon": { "paths": [ - "M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 960.002c-62.958 0-122.872-13.012-177.23-36.452l233.148-262.29c5.206-5.858 8.082-13.422 8.082-21.26v-96c0-17.674-14.326-32-32-32-112.99 0-232.204-117.462-233.374-118.626-6-6.002-14.14-9.374-22.626-9.374h-128c-17.672 0-32 14.328-32 32v192c0 12.122 6.848 23.202 17.69 28.622l110.31 55.156v187.886c-116.052-80.956-192-215.432-192-367.664 0-68.714 15.49-133.806 43.138-192h116.862c8.488 0 16.626-3.372 22.628-9.372l128-128c6-6.002 9.372-14.14 9.372-22.628v-77.412c40.562-12.074 83.518-18.588 128-18.588 70.406 0 137.004 16.26 196.282 45.2-4.144 3.502-8.176 7.164-12.046 11.036-36.266 36.264-56.236 84.478-56.236 135.764s19.97 99.5 56.236 135.764c36.434 36.432 85.218 56.264 135.634 56.26 3.166 0 6.342-0.080 9.518-0.236 13.814 51.802 38.752 186.656-8.404 372.334-0.444 1.744-0.696 3.488-0.842 5.224-81.324 83.080-194.7 134.656-320.142 134.656z" + "M585.143 402.286c0 9.714-4 18.857-10.857 25.714l-256 256c-6.857 6.857-16 10.857-25.714 10.857s-18.857-4-25.714-10.857l-256-256c-6.857-6.857-10.857-16-10.857-25.714 0-20 16.571-36.571 36.571-36.571h512c20 0 36.571 16.571 36.571 36.571z" ], - "attrs": [], + "attrs": [ + {} + ], + "width": 585, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "earth", - "globe", - "language", - "web", - "internet", - "sphere", - "planet" + "caret-down" ], - "defaultCode": 59850, - "grid": 16 + "grid": 14 }, - "attrs": [], + "attrs": [ + {} + ], "properties": { - "ligatures": "earth, globe2", - "name": "earth", - "id": 202, - "order": 91, - "prevSize": 32, - "code": 59850 + "order": 4, + "id": 4, + "prevSize": 28, + "code": 59692, + "name": "caret-down" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 62 + "iconIdx": 49 }, { "icon": { "paths": [ - "M512.002 193.212v-65.212h128v-64c0-35.346-28.654-64-64.002-64h-191.998c-35.346 0-64 28.654-64 64v64h128v65.212c-214.798 16.338-384 195.802-384 414.788 0 229.75 186.25 416 416 416s416-186.25 416-416c0-218.984-169.202-398.448-384-414.788zM706.276 834.274c-60.442 60.44-140.798 93.726-226.274 93.726s-165.834-33.286-226.274-93.726c-60.44-60.44-93.726-140.8-93.726-226.274s33.286-165.834 93.726-226.274c58.040-58.038 134.448-91.018 216.114-93.548l-21.678 314.020c-1.86 26.29 12.464 37.802 31.836 37.802s33.698-11.512 31.836-37.802l-21.676-314.022c81.666 2.532 158.076 35.512 216.116 93.55 60.44 60.44 93.726 140.8 93.726 226.274s-33.286 165.834-93.726 226.274z" + "M365.714 256v512c0 20-16.571 36.571-36.571 36.571-9.714 0-18.857-4-25.714-10.857l-256-256c-6.857-6.857-10.857-16-10.857-25.714s4-18.857 10.857-25.714l256-256c6.857-6.857 16-10.857 25.714-10.857 20 0 36.571 16.571 36.571 36.571z" ], "attrs": [ {} ], + "width": 402, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "stopwatch", - "time", - "speed", - "meter", - "chronometer" + "caret-left" ], - "grid": 16 + "grid": 14 }, "attrs": [ {} ], "properties": { - "order": 1, - "id": 2, - "prevSize": 32, - "code": 59715, - "name": "elapsed" + "order": 2, + "id": 6, + "prevSize": 28, + "code": 59690, + "name": "caret-left" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 63 + "iconIdx": 50 }, { "icon": { "paths": [ - "M522.2 438.8v175.6h290.4c-11.8 75.4-87.8 220.8-290.4 220.8-174.8 0-317.4-144.8-317.4-323.2s142.6-323.2 317.4-323.2c99.4 0 166 42.4 204 79l139-133.8c-89.2-83.6-204.8-134-343-134-283 0-512 229-512 512s229 512 512 512c295.4 0 491.6-207.8 491.6-500.2 0-33.6-3.6-59.2-8-84.8l-483.6-0.2z" + "M329.143 512c0 9.714-4 18.857-10.857 25.714l-256 256c-6.857 6.857-16 10.857-25.714 10.857-20 0-36.571-16.571-36.571-36.571v-512c0-20 16.571-36.571 36.571-36.571 9.714 0 18.857 4 25.714 10.857l256 256c6.857 6.857 10.857 16 10.857 25.714z" ], "attrs": [ {} ], + "width": 329, "isMulticolor": false, "isMulticolor2": false, "tags": [ - "google", - "brand" + "caret-right" ], - "grid": 16 + "grid": 14 }, "attrs": [ {} ], "properties": { "order": 1, - "id": 0, - "prevSize": 32, - "code": 59707, - "name": "google" + "id": 7, + "prevSize": 28, + "code": 59689, + "name": "caret-right" + }, + "setIdx": 5, + "setId": 1, + "iconIdx": 51 + }, + { + "icon": { + "paths": [ + "M585.143 694.857c0 20-16.571 36.571-36.571 36.571h-512c-20 0-36.571-16.571-36.571-36.571 0-9.714 4-18.857 10.857-25.714l256-256c6.857-6.857 16-10.857 25.714-10.857s18.857 4 25.714 10.857l256 256c6.857 6.857 10.857 16 10.857 25.714z" + ], + "attrs": [ + {} + ], + "width": 585, + "isMulticolor": false, + "isMulticolor2": false, + "tags": [ + "caret-up" + ], + "grid": 14 + }, + "attrs": [ + {} + ], + "properties": { + "order": 3, + "id": 5, + "prevSize": 28, + "code": 59691, + "name": "caret-up" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 64 + "iconIdx": 52 }, { "icon": { "paths": [ - "M592 448h-16v-192c0-105.87-86.13-192-192-192h-128c-105.87 0-192 86.13-192 192v192h-16c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h544c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48zM192 256c0-35.29 28.71-64 64-64h128c35.29 0 64 28.71 64 64v192h-256v-192z" + "M800 1024h-576c-124.8 0-224-99.2-224-224v-576c0-124.8 99.2-224 224-224h576c124.8 0 224 99.2 224 224v576c0 124.8-99.2 224-224 224zM224 64c-89.6 0-160 70.4-160 160v576c0 89.6 70.4 160 160 160h576c89.6 0 160-70.4 160-160v-576c0-89.6-70.4-160-160-160h-576z", + "M480 448h-211.2c-57.6 0-105.6-48-105.6-105.6v-73.6c0-57.6 48-105.6 105.6-105.6h211.2c57.6 0 105.6 48 105.6 105.6v73.6c0 57.6-48 105.6-105.6 105.6zM268.8 227.2c-22.4 0-41.6 19.2-41.6 41.6v73.6c0 22.4 19.2 41.6 41.6 41.6h211.2c22.4 0 41.6-19.2 41.6-41.6v-73.6c0-22.4-19.2-41.6-41.6-41.6h-211.2z", + "M828.8 611.2h-633.6c-19.2 0-32-12.8-32-32s12.8-32 32-32h630.4c19.2 0 32 12.8 32 32s-12.8 32-28.8 32z", + "M553.6 777.6h-358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h355.2c19.2 0 32 12.8 32 32s-12.8 32-28.8 32z" ], "attrs": [ + {}, + {}, + {}, {} ], "isMulticolor": false, "isMulticolor2": false, + "grid": 14, "tags": [ - "lock", - "secure", - "private", - "encrypted" - ], - "grid": 16 + "content" + ] }, "attrs": [ + {}, + {}, + {}, {} ], "properties": { - "order": 2, - "id": 0, - "prevSize": 32, - "code": 59700, - "name": "lock" + "order": 93, + "id": 204, + "name": "contents, trigger-ContentChanged", + "prevSize": 28, + "code": 59718 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 65 + "iconIdx": 53 }, { "icon": { "paths": [ - "M0.35 512l-0.35-312.074 384-52.144v364.218zM448 138.482l511.872-74.482v448h-511.872zM959.998 576l-0.126 448-511.872-72.016v-375.984zM384 943.836l-383.688-52.594-0.020-315.242h383.708z" + "M947.2 102.4h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-512v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v716.8c0 42.342 34.458 76.8 76.8 76.8h870.4c42.342 0 76.8-34.458 76.8-76.8v-716.8c0-42.342-34.458-76.8-76.8-76.8zM972.8 896c0 14.131-11.469 25.6-25.6 25.6h-870.4c-14.080 0-25.6-11.469-25.6-25.6v-537.6h921.6v537.6zM972.8 307.2h-921.6v-128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h512v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128zM332.8 512h51.2c14.080 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM640 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6z" ], "attrs": [ {} ], "isMulticolor": false, "isMulticolor2": false, + "grid": 14, "tags": [ - "windows8", - "brand", - "os" - ], - "grid": 16 + "control-date" + ] }, "attrs": [ {} ], "properties": { - "order": 1, - "id": 1, - "prevSize": 32, - "code": 59712, - "name": "microsoft, action-AzureQueue" + "order": 71, + "id": 42, + "name": "control-Date", + "prevSize": 28, + "code": 59702 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 66 + "iconIdx": 54 }, { "icon": { "paths": [ - "M128 128h320v768h-320zM576 128h320v768h-320z" + "M486.4 409.6h51.2c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6zM230.4 614.4c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM230.4 512c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM51.2 742.4v-435.2h665.6v102.4h51.2v-281.6c0-42.342-34.458-76.8-76.8-76.8h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-256v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v614.4c0 42.342 34.458 76.8 76.8 76.8h332.8v-51.2h-332.8c-14.080 0-25.6-11.469-25.6-25.6zM51.2 128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h256v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128h-665.6v-128zM384 409.6c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM742.4 460.8c-155.546 0-281.6 126.054-281.6 281.6s126.054 281.6 281.6 281.6 281.6-126.054 281.6-281.6-126.054-281.6-281.6-281.6zM742.4 972.8c-127.232 0-230.4-103.168-230.4-230.4s103.168-230.4 230.4-230.4 230.4 103.168 230.4 230.4-103.168 230.4-230.4 230.4zM384 512c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM384 614.4c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM844.8 716.8c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-102.4c-14.131 0-25.6-11.469-25.6-25.6v-102.4c0-14.131 11.469-25.6 25.6-25.6s25.6 11.469 25.6 25.6v76.8h76.8z" ], "attrs": [ {} ], "isMulticolor": false, "isMulticolor2": false, + "grid": 14, "tags": [ - "pause", - "player" - ], - "grid": 16 + "control-date-time" + ] }, "attrs": [ {} ], "properties": { - "order": 2, - "id": 1, - "prevSize": 32, - "code": 59695, - "name": "pause" + "order": 70, + "id": 41, + "name": "control-DateTime", + "prevSize": 28, + "code": 59703 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 67 + "iconIdx": 55 }, { "icon": { "paths": [ - "M192 128l640 384-640 384z" + "M793.6 609.416h-61.838v-28.108h-0.783q-21.135 33.092-62.034 33.092-37.573 0-60.469-26.912-22.896-27.112-22.896-75.554 0-50.635 25.244-81.136t66.144-30.501q38.747 0 54.011 28.308h0.783v-121.405h61.838v302.216zM732.936 510.139v-15.35q0-19.935-11.35-33.092t-29.549-13.157q-20.548 0-32.093 16.546-11.546 16.347-11.546 45.053 0 26.912 11.154 41.465t30.919 14.553q18.786 0 30.528-15.35 11.937-15.35 11.937-40.668zM548.594 609.416h-61.643v-116.421q0-44.455-32.093-44.455-15.264 0-24.853 13.357t-9.589 33.292v114.228h-61.839v-117.617q0-43.259-31.506-43.259-15.851 0-25.44 12.758-9.393 12.758-9.393 34.687v113.431h-61.838v-204.135h61.838v31.896h0.783q9.589-16.347 26.81-26.514 17.417-10.366 37.964-10.366 42.465 0 58.12 38.076 22.896-38.076 67.318-38.076 65.361 0 65.361 82.133v126.987zM0 0v204.8h76.8v76.8h51.2v-76.8h76.8v-204.8zM819.2 0v204.8h204.8v-204.8zM51.2 51.2h102.4v102.4h-102.4zM870.4 51.2h102.4v102.4h-102.4zM281.6 76.8v51.2h102.4v-51.2zM486.4 76.8v51.2h102.4v-51.2zM691.2 76.8v51.2h102.4v-51.2zM896 281.6v102.4h51.2v-102.4zM76.8 384v102.4h51.2v-102.4zM896 486.4v102.4h51.2v-102.4zM76.8 588.8v102.4h51.2v-102.4zM896 691.2v102.4h51.2v-102.4zM76.8 793.6v25.6h-76.8v204.8h204.8v-76.8h76.8v-51.2h-76.8v-76.8h-76.8v-25.6zM819.2 819.2v76.8h-25.6v51.2h25.6v76.8h204.8v-204.8zM51.2 870.4h102.4v102.4h-102.4zM870.4 870.4h102.4v102.4h-102.4zM384 896v51.2h102.4v-51.2zM588.8 896v51.2h102.4v-51.2z" ], "attrs": [ {} ], "isMulticolor": false, "isMulticolor2": false, + "grid": 14, "tags": [ - "play", - "player" - ], - "grid": 16 + "control-Markdown" + ] }, "attrs": [ {} ], "properties": { - "order": 3, - "id": 0, - "prevSize": 32, - "code": 59696, - "name": "play" + "order": 72, + "id": 43, + "name": "control-Markdown", + "prevSize": 28, + "code": 59704 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 68 + "iconIdx": 56 }, { "icon": { "paths": [ - "M889.68 166.32c-93.608-102.216-228.154-166.32-377.68-166.32-282.77 0-512 229.23-512 512h96c0-229.75 186.25-416 416-416 123.020 0 233.542 53.418 309.696 138.306l-149.696 149.694h352v-352l-134.32 134.32z", - "M928 512c0 229.75-186.25 416-416 416-123.020 0-233.542-53.418-309.694-138.306l149.694-149.694h-352v352l134.32-134.32c93.608 102.216 228.154 166.32 377.68 166.32 282.77 0 512-229.23 512-512h-96z" - ], - "attrs": [ - {}, - {} + "M292.571 713.143v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM292.571 420.571v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM658.286 713.143v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM292.571 128v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM658.286 420.571v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM1024 713.143v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM658.286 128v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM1024 420.571v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM1024 128v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857z" ], + "width": 1024, + "attrs": [], "isMulticolor": false, "isMulticolor2": false, "tags": [ - "loop", - "repeat", - "player", - "reload", - "refresh", - "update", - "synchronize", - "arrows" + "th" ], - "grid": 16 + "defaultCode": 61450, + "grid": 14 }, - "attrs": [ - {}, - {} - ], + "attrs": [], "properties": { - "order": 49, - "id": 2, - "prevSize": 32, - "code": 59694, - "name": "reset" + "name": "grid", + "id": 14, + "order": 83, + "prevSize": 28, + "code": 61450 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 69 + "iconIdx": 57 }, { "icon": { "paths": [ - "M933.79 610.25c-53.726-93.054-21.416-212.304 72.152-266.488l-100.626-174.292c-28.75 16.854-62.176 26.518-97.846 26.518-107.536 0-194.708-87.746-194.708-195.99h-201.258c0.266 33.41-8.074 67.282-25.958 98.252-53.724 93.056-173.156 124.702-266.862 70.758l-100.624 174.292c28.97 16.472 54.050 40.588 71.886 71.478 53.638 92.908 21.512 211.92-71.708 266.224l100.626 174.292c28.65-16.696 61.916-26.254 97.4-26.254 107.196 0 194.144 87.192 194.7 194.958h201.254c-0.086-33.074 8.272-66.57 25.966-97.218 53.636-92.906 172.776-124.594 266.414-71.012l100.626-174.29c-28.78-16.466-53.692-40.498-71.434-71.228zM512 719.332c-114.508 0-207.336-92.824-207.336-207.334 0-114.508 92.826-207.334 207.336-207.334 114.508 0 207.332 92.826 207.332 207.334-0.002 114.51-92.824 207.334-207.332 207.334z" - ], - "attrs": [ - {} + "M877.714 768v73.143c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h804.571c20 0 36.571 16.571 36.571 36.571zM877.714 475.429v73.143c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h804.571c20 0 36.571 16.571 36.571 36.571zM877.714 182.857v73.143c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h804.571c20 0 36.571 16.571 36.571 36.571z" ], + "width": 877.7142857142857, + "attrs": [], "isMulticolor": false, "isMulticolor2": false, "tags": [ - "cog", - "gear", - "preferences", - "settings", - "generate", - "control", - "options" + "bars", + "navicon", + "reorder" ], - "grid": 16 + "defaultCode": 61641, + "grid": 14 }, - "attrs": [ - {} - ], + "attrs": [], "properties": { - "order": 1, - "id": 1, - "prevSize": 32, - "code": 59693, - "name": "settings2" + "name": "list", + "id": 178, + "order": 89, + "prevSize": 28, + "code": 61641 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 70 + "iconIdx": 58 }, { "icon": { "paths": [ - "M512 128c-247.424 0-448 200.576-448 448s200.576 448 448 448 448-200.576 448-448-200.576-448-448-448zM512 936c-198.824 0-360-161.178-360-360 0-198.824 161.176-360 360-360 198.822 0 360 161.176 360 360 0 198.822-161.178 360-360 360zM934.784 287.174c16.042-28.052 25.216-60.542 25.216-95.174 0-106.040-85.96-192-192-192-61.818 0-116.802 29.222-151.92 74.596 131.884 27.236 245.206 105.198 318.704 212.578v0zM407.92 74.596c-35.116-45.374-90.102-74.596-151.92-74.596-106.040 0-192 85.96-192 192 0 34.632 9.174 67.122 25.216 95.174 73.5-107.38 186.822-185.342 318.704-212.578z", - "M512 576v-256h-64v320h256v-64z" + "M512 64c-131.696 0-239.125 107.4-239.125 239 0 65.8 24.831 146.717 65.375 215.25 19.653 33.221 43.902 63.853 71.75 87.125-59.423 7.524-122.009 9.415-172.125 32-79.809 35.967-144.343 94.74-172.375 178.625-1.5 9.499 0 0-1.5 9v0.499c0 73.995 60.563 134.501 134.375 134.501h627.125c73.888 0 134.5-60.506 134.5-134.5l-1.5-9.375c-27.845-84.263-92.273-143.119-172.125-179-50.17-22.544-112.844-24.421-172.375-31.875 27.792-23.26 52.002-53.831 71.625-87 40.544-68.533 65.375-149.45 65.375-215.25 0-131.6-107.304-239-239-239zM512 124c99.241 0 179 79.875 179 179 0 49.562-21.877 125.381-57 184.75s-81.435 98.75-122 98.75c-40.565 0-86.877-39.381-122-98.75s-57.125-135.188-57.125-184.75c0-99.125 79.884-179 179.125-179zM512 646.5c92.551 0 180.829 14.406 249.75 45.375 66.784 30.009 113.649 74.724 136.5 137.75-2.447 39.259-32.9 70.375-72.75 70.375h-627.125c-39.678 0-70.116-31.051-72.625-70.25 22.978-62.705 69.953-107.523 136.75-137.625 68.937-31.067 157.205-45.625 249.5-45.625z" ], "attrs": [ - {}, {} ], "isMulticolor": false, "isMulticolor2": false, + "grid": 14, "tags": [ - "alarm", - "time", - "clock" - ], - "grid": 16 + "user-o" + ] }, "attrs": [ - {}, {} ], "properties": { - "order": 2, - "id": 1, - "prevSize": 32, - "code": 59716, - "name": "timeout" + "order": 64, + "id": 38, + "name": "user-o", + "prevSize": 28, + "code": 59698 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 71 + "iconIdx": 59 }, { "icon": { "paths": [ - "M768 64c105.87 0 192 86.13 192 192v192h-128v-192c0-35.29-28.71-64-64-64h-128c-35.29 0-64 28.71-64 64v192h16c26.4 0 48 21.6 48 48v480c0 26.4-21.6 48-48 48h-544c-26.4 0-48-21.6-48-48v-480c0-26.4 21.6-48 48-48h400v-192c0-105.87 86.13-192 192-192h128z" + "M217.6 992c-3.2 0-3.2 0-6.4 0h-3.2c-144-25.6-208-144-208-249.6 0-99.2 57.6-208 185.6-240v-147.2c0-19.2 12.8-32 32-32s32 12.8 32 32v172.8c0 16-12.8 28.8-25.6 32-108.8 16-160 102.4-160 182.4s48 166.4 153.6 185.6h6.4c16 3.2 28.8 19.2 25.6 38.4-3.2 16-16 25.6-32 25.6z", + "M774.4 1001.6c0 0 0 0 0 0-102.4 0-211.2-60.8-243.2-185.6h-176c-19.2 0-32-12.8-32-32s12.8-32 32-32h201.6c16 0 28.8 12.8 32 25.6 16 108.8 102.4 156.8 182.4 160 80 0 166.4-48 185.6-153.6v-3.2c3.2-16 19.2-28.8 38.4-25.6 16 3.2 28.8 19.2 25.6 38.4v3.2c-22.4 140.8-140.8 204.8-246.4 204.8z", + "M787.2 678.4c-19.2 0-32-12.8-32-32v-176c0-16 12.8-28.8 25.6-32 108.8-16 156.8-102.4 160-182.4 0-80-48-166.4-153.6-185.6h-3.2c-19.2-6.4-32-22.4-28.8-38.4s19.2-28.8 38.4-25.6h3.2c144 25.6 208 144 208 249.6 0 99.2-60.8 208-185.6 240v150.4c0 16-16 32-32 32z", + "M41.6 246.4c-3.2 0-3.2 0-6.4 0-16-3.2-28.8-19.2-25.6-35.2v-3.2c25.6-144 140.8-208 246.4-208 0 0 3.2 0 3.2 0 99.2 0 208 60.8 240 185.6h147.2c19.2 0 32 12.8 32 32s-12.8 32-32 32h-172.8c-16 0-28.8-12.8-32-25.6-16-108.8-102.4-156.8-182.4-160-80 0-166.4 48-185.6 153.6v3.2c-3.2 16-16 25.6-32 25.6z", + "M256 387.2c-32 0-67.2-12.8-92.8-38.4-51.2-51.2-51.2-134.4 0-185.6 25.6-22.4 57.6-35.2 92.8-35.2s67.2 12.8 92.8 38.4c25.6 25.6 38.4 57.6 38.4 92.8s-12.8 67.2-38.4 92.8c-25.6 22.4-57.6 35.2-92.8 35.2zM256 192c-16 0-32 6.4-44.8 19.2-25.6 25.6-25.6 67.2 0 92.8s67.2 25.6 92.8 0c12.8-12.8 19.2-28.8 19.2-48s-6.4-32-19.2-44.8-28.8-19.2-48-19.2z", + "M771.2 873.6c-32 0-67.2-12.8-92.8-38.4-51.2-51.2-51.2-134.4 0-185.6 25.6-25.6 57.6-38.4 92.8-38.4s67.2 12.8 92.8 38.4c25.6 25.6 38.4 57.6 38.4 92.8s-12.8 67.2-38.4 92.8c-28.8 25.6-60.8 38.4-92.8 38.4zM771.2 678.4c-19.2 0-35.2 6.4-48 19.2-25.6 25.6-25.6 67.2 0 92.8s67.2 25.6 92.8 0c12.8-12.8 19.2-28.8 19.2-48s-6.4-35.2-19.2-48-28.8-16-44.8-16z", + "M745.6 387.2c-32 0-67.2-12.8-92.8-38.4s-38.4-57.6-38.4-92.8 12.8-67.2 38.4-92.8c25.6-22.4 60.8-35.2 92.8-35.2s67.2 12.8 92.8 38.4c51.2 51.2 51.2 134.4 0 185.6v0c-25.6 22.4-57.6 35.2-92.8 35.2zM745.6 192c-19.2 0-35.2 6.4-48 19.2s-19.2 28.8-19.2 48 6.4 35.2 19.2 48c25.6 25.6 67.2 25.6 92.8 0s25.6-67.2 0-92.8c-9.6-16-25.6-22.4-44.8-22.4z", + "M259.2 873.6c-32 0-67.2-12.8-92.8-38.4s-38.4-57.6-38.4-92.8 12.8-67.2 38.4-92.8c25.6-22.4 57.6-35.2 92.8-35.2s67.2 12.8 92.8 38.4c51.2 51.2 51.2 134.4 0 185.6v0c-25.6 22.4-57.6 35.2-92.8 35.2zM259.2 678.4c-19.2 0-35.2 6.4-48 19.2s-19.2 28.8-19.2 48 6.4 35.2 19.2 48c25.6 25.6 67.2 25.6 92.8 0s25.6-67.2 0-92.8c-9.6-16-25.6-22.4-44.8-22.4z" ], "attrs": [ + {}, + {}, + {}, + {}, + {}, + {}, + {}, {} ], "isMulticolor": false, "isMulticolor2": false, + "grid": 14, "tags": [ - "unlocked", - "lock-open" - ], - "grid": 16 + "webhooks" + ] }, "attrs": [ + {}, + {}, + {}, + {}, + {}, + {}, + {}, {} ], "properties": { - "order": 1, - "id": 1, - "prevSize": 32, - "code": 59699, - "name": "unlocked" + "order": 92, + "id": 203, + "name": "rules, action-Webhook", + "prevSize": 28, + "code": 59719 }, - "setIdx": 3, + "setIdx": 5, "setId": 1, - "iconIdx": 72 + "iconIdx": 60 }, { "icon": { @@ -2416,7 +2476,7 @@ "code": 59701, "name": "browser" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 73 }, @@ -2448,7 +2508,7 @@ "code": 59714, "name": "checkmark" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 74 }, @@ -2478,7 +2538,7 @@ "code": 59706, "name": "control-Stars" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 75 }, @@ -2507,7 +2567,7 @@ "code": 59705, "name": "control-RichText" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 76 }, @@ -2536,7 +2596,7 @@ "code": 59710, "name": "download" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 77 }, @@ -2565,7 +2625,7 @@ "code": 59708, "name": "info" }, - "setIdx": 3, + "setIdx": 5, "setId": 1, "iconIdx": 78 } diff --git a/src/Squidex/app/theme/icomoon/style.css b/src/Squidex/app/theme/icomoon/style.css index 12ce91764..910db742c 100644 --- a/src/Squidex/app/theme/icomoon/style.css +++ b/src/Squidex/app/theme/icomoon/style.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src: url('fonts/icomoon.eot?uoafl5'); - src: url('fonts/icomoon.eot?uoafl5#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?uoafl5') format('truetype'), - url('fonts/icomoon.woff?uoafl5') format('woff'), - url('fonts/icomoon.svg?uoafl5#icomoon') format('svg'); + src: url('fonts/icomoon.eot?vpgvr2'); + src: url('fonts/icomoon.eot?vpgvr2#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?vpgvr2') format('truetype'), + url('fonts/icomoon.woff?vpgvr2') format('woff'), + url('fonts/icomoon.svg?vpgvr2#icomoon') format('svg'); font-weight: normal; font-style: normal; } @@ -24,6 +24,9 @@ -moz-osx-font-smoothing: grayscale; } +.icon-circle:before { + content: "\e951"; +} .icon-action-Fastly:before { content: "\e94e"; } @@ -181,6 +184,48 @@ .icon-user:before { content: "\e928"; } +.icon-clock:before { + content: "\e950"; +} +.icon-bin2:before { + content: "\e902"; +} +.icon-earth:before { + content: "\e9ca"; +} +.icon-elapsed:before { + content: "\e943"; +} +.icon-google:before { + content: "\e93b"; +} +.icon-lock:before { + content: "\e934"; +} +.icon-microsoft:before { + content: "\e940"; +} +.icon-action-AzureQueue:before { + content: "\e940"; +} +.icon-pause:before { + content: "\e92f"; +} +.icon-play:before { + content: "\e930"; +} +.icon-reset:before { + content: "\e92e"; +} +.icon-settings2:before { + content: "\e92d"; +} +.icon-timeout:before { + content: "\e944"; +} +.icon-unlocked:before { + content: "\e933"; +} .icon-action-Slack:before { content: "\e94d"; } @@ -256,45 +301,6 @@ .icon-action-Webhook:before { content: "\e947"; } -.icon-bin2:before { - content: "\e902"; -} -.icon-earth:before { - content: "\e9ca"; -} -.icon-elapsed:before { - content: "\e943"; -} -.icon-google:before { - content: "\e93b"; -} -.icon-lock:before { - content: "\e934"; -} -.icon-microsoft:before { - content: "\e940"; -} -.icon-action-AzureQueue:before { - content: "\e940"; -} -.icon-pause:before { - content: "\e92f"; -} -.icon-play:before { - content: "\e930"; -} -.icon-reset:before { - content: "\e92e"; -} -.icon-settings2:before { - content: "\e92d"; -} -.icon-timeout:before { - content: "\e944"; -} -.icon-unlocked:before { - content: "\e933"; -} .icon-browser:before { content: "\e935"; } diff --git a/src/Squidex/package.json b/src/Squidex/package.json index a2bade1fd..98266ec18 100644 --- a/src/Squidex/package.json +++ b/src/Squidex/package.json @@ -9,7 +9,7 @@ "test:coverage": "karma start karma.coverage.conf.js", "test:clean": "rimraf _test-output", "dev": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/ && webpack-dev-server --config app-config/webpack.run.dev.js --inline --port 3000", - "build": "webpack --config app-config/webpack.run.prod.js --display-error-details --bail", + "build": "webpack --config app-config/webpack.run.prod.js --display-error-details --bail --display-optimization-bailout", "build:nobail": "webpack --config app-config/webpack.run.prod.js --display-error-details", "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/", "build:clean": "rimraf wwwroot/build" @@ -63,7 +63,7 @@ "file-loader": "1.1.6", "html-loader": "0.5.5", "html-webpack-plugin": "2.30.1", - "ignore-loader": "^0.1.2", + "ignore-loader": "0.1.2", "istanbul-instrumenter-loader": "0.2.0", "jasmine-core": "2.9.1", "karma": "2.0.0", @@ -72,7 +72,7 @@ "karma-coverage": "1.1.1", "karma-htmlfile-reporter": "0.3.5", "karma-jasmine": "1.1.1", - "karma-jasmine-html-reporter": "^0.2.2", + "karma-jasmine-html-reporter": "0.2.2", "karma-mocha-reporter": "2.2.5", "karma-phantomjs-launcher": "1.0.4", "karma-sourcemap-loader": "0.3.7", @@ -90,6 +90,7 @@ "tslint-loader": "3.5.3", "typemoq": "2.1.0", "typescript": "2.5.3", + "uglifyjs-webpack-plugin": "1.1.8", "underscore": "1.8.3", "webpack": "3.10.0", "webpack-dev-server": "2.11.1", diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/ContentDataObjectTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/ContentDataObjectTests.cs index 9c5f3c7ee..592e0765e 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/ContentDataObjectTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/ContentDataObjectTests.cs @@ -32,6 +32,22 @@ namespace Squidex.Domain.Apps.Core.Operations.Scripting Assert.Equal(expected, result); } + [Fact] + public void Should_update_data_when_setting_lazy_field() + { + var original = new NamedContentData(); + + var expected = + new NamedContentData() + .AddField("number", + new ContentFieldData() + .AddValue("iv", 1.0)); + + var result = ExecuteScript(original, @"data.number.iv = 1"); + + Assert.Equal(expected, result); + } + [Fact] public void Should_update_data_defining_property_for_content() { diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppCommandMiddlewareTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppCommandMiddlewareTests.cs index 42223eaaa..18ab306fa 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppCommandMiddlewareTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppCommandMiddlewareTests.cs @@ -14,6 +14,7 @@ using Squidex.Domain.Apps.Entities.Apps.Services.Implementations; using Squidex.Domain.Apps.Entities.TestHelpers; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure.States; using Squidex.Shared.Users; using Xunit; @@ -46,6 +47,8 @@ namespace Squidex.Domain.Apps.Entities.Apps .Returns(A.Fake()); sut = new AppCommandMiddleware(Handler, appProvider, appPlansProvider, appPlansBillingManager, userResolver); + + app.ActivateAsync(Id, A.Fake>()); } [Fact] diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppDomainObjectTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppDomainObjectTests.cs index 5e6a61a90..e49cf171e 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppDomainObjectTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Apps/AppDomainObjectTests.cs @@ -8,11 +8,13 @@ using System; using System.Collections.Generic; using System.Linq; +using FakeItEasy; using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Domain.Apps.Entities.TestHelpers; using Squidex.Domain.Apps.Events.Apps; using Squidex.Infrastructure; +using Squidex.Infrastructure.States; using Xunit; namespace Squidex.Domain.Apps.Entities.Apps @@ -31,6 +33,11 @@ namespace Squidex.Domain.Apps.Entities.Apps get { return AppId; } } + public AppDomainObjectTests() + { + sut.ActivateAsync(Id, A.Fake>()); + } + [Fact] public void Create_should_throw_exception_if_created() { diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetDomainObjectTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetDomainObjectTests.cs index 4f2d8400d..b1c057749 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetDomainObjectTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetDomainObjectTests.cs @@ -7,11 +7,13 @@ using System; using System.IO; +using FakeItEasy; using Squidex.Domain.Apps.Entities.Assets.Commands; using Squidex.Domain.Apps.Entities.TestHelpers; using Squidex.Domain.Apps.Events.Assets; using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; +using Squidex.Infrastructure.States; using Xunit; namespace Squidex.Domain.Apps.Entities.Assets @@ -28,6 +30,11 @@ namespace Squidex.Domain.Apps.Entities.Assets get { return assetId; } } + public AssetDomainObjectTests() + { + sut.ActivateAsync(Id, A.Fake>()); + } + [Fact] public void Create_should_throw_exception_if_created() { @@ -203,7 +210,7 @@ namespace Squidex.Domain.Apps.Entities.Assets return CreateEvent(@event); } - protected T CreateAssetCommand(T command) where T : AssetAggregateCommand + protected T CreateAssetCommand(T command) where T : AssetCommand { command.AssetId = assetId; diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentCommandMiddlewareTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentCommandMiddlewareTests.cs index 0d9f45594..113b574da 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentCommandMiddlewareTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentCommandMiddlewareTests.cs @@ -9,6 +9,7 @@ using System; using System.Security.Claims; using System.Threading.Tasks; using FakeItEasy; +using NodaTime; using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Core.Contents; @@ -225,6 +226,21 @@ namespace Squidex.Domain.Apps.Entities.Contents A.CallTo(() => scriptEngine.Execute(A.Ignored, "")).MustHaveHappened(); } + [Fact] + public async Task ChangeStatus_should_not_invoke_scripts_when_scheduled() + { + CreateContent(); + + var context = CreateContextForCommand(new ChangeContentStatus { ContentId = contentId, User = user, Status = Status.Published, DueTime = Instant.MaxValue }); + + await TestUpdate(content, async _ => + { + await sut.HandleAsync(context); + }); + + A.CallTo(() => scriptEngine.Execute(A.Ignored, "")).MustNotHaveHappened(); + } + [Fact] public async Task Delete_should_update_domain_object() { diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs index f3f731edf..59e7e0213 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentDomainObjectTests.cs @@ -6,12 +6,15 @@ // ========================================================================== using System; +using FakeItEasy; using FluentAssertions; +using NodaTime; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Domain.Apps.Entities.TestHelpers; using Squidex.Domain.Apps.Events.Contents; using Squidex.Infrastructure; +using Squidex.Infrastructure.States; using Xunit; namespace Squidex.Domain.Apps.Entities.Contents @@ -40,6 +43,8 @@ namespace Squidex.Domain.Apps.Entities.Contents public ContentDomainObjectTests() { patched = otherData.MergeInto(data); + + sut.ActivateAsync(Id, A.Fake>()); } [Fact] @@ -203,6 +208,25 @@ namespace Squidex.Domain.Apps.Entities.Contents ); } + [Fact] + public void ChangeStatus_should_refresh_properties_and_create_scheduled_events_when_command_has_due_time() + { + CreateContent(); + + var dueTime = Instant.MaxValue; + + sut.ChangeStatus(CreateContentCommand(new ChangeContentStatus { Status = Status.Published, DueTime = dueTime })); + + Assert.Equal(Status.Draft, sut.Snapshot.Status); + Assert.Equal(Status.Published, sut.Snapshot.ScheduledTo); + Assert.Equal(dueTime, sut.Snapshot.ScheduledAt); + + sut.GetUncomittedEvents() + .ShouldHaveSameEvents( + CreateContentEvent(new ContentStatusScheduled { Status = Status.Published, DueTime = dueTime }) + ); + } + [Fact] public void Delete_should_throw_exception_if_not_created() { diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs index 211f9345b..48f5338b0 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs @@ -60,7 +60,7 @@ namespace Squidex.Domain.Apps.Entities.Contents [Fact] public async Task Should_return_schema_from_id_if_string_is_guid() { - A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId)) + A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId, false)) .Returns(schema); var result = await sut.FindSchemaAsync(app, schemaId.ToString()); @@ -91,7 +91,7 @@ namespace Squidex.Domain.Apps.Entities.Contents [Fact] public async Task Should_return_content_from_repository_and_transform() { - A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId)) + A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId, false)) .Returns(schema); A.CallTo(() => contentRepository.FindContentAsync(app, schema, contentId)) .Returns(content); @@ -113,7 +113,7 @@ namespace Squidex.Domain.Apps.Entities.Contents [Fact] public async Task Should_throw_if_content_to_find_does_not_exist() { - A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId)) + A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId, false)) .Returns(schema); A.CallTo(() => contentRepository.FindContentAsync(app, schema, contentId)) @@ -196,7 +196,7 @@ namespace Squidex.Domain.Apps.Entities.Contents private void SetupFakeWithIdQuery(Status[] status, HashSet ids) { - A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId)) + A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId, false)) .Returns(schema); A.CallTo(() => contentRepository.QueryAsync(app, schema, A.That.IsSameSequenceAs(status), ids)) @@ -205,7 +205,7 @@ namespace Squidex.Domain.Apps.Entities.Contents private void SetupFakeWithOdataQuery(Status[] status) { - A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId)) + A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId, false)) .Returns(schema); A.CallTo(() => contentRepository.QueryAsync(app, schema, A.That.IsSameSequenceAs(status), A.Ignored)) 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 d92690828..aeebd190d 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs @@ -11,7 +11,6 @@ using FakeItEasy; using Newtonsoft.Json.Linq; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Contents.Commands; -using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Commands; using Xunit; @@ -328,7 +327,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL A.CallTo(() => commandBus.PublishAsync( A.That.Matches(x => - x.SchemaId.Equals(schema.NamedId()) && x.ContentId == contentId && x.Status == Status.Published && x.ExpectedVersion == 10))) @@ -364,7 +362,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL A.CallTo(() => commandBus.PublishAsync( A.That.Matches(x => - x.SchemaId.Equals(schema.NamedId()) && x.ContentId == contentId && x.Status == Status.Draft && x.ExpectedVersion == 10))) @@ -400,7 +397,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL A.CallTo(() => commandBus.PublishAsync( A.That.Matches(x => - x.SchemaId.Equals(schema.NamedId()) && x.ContentId == contentId && x.Status == Status.Archived && x.ExpectedVersion == 10))) @@ -436,7 +432,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL A.CallTo(() => commandBus.PublishAsync( A.That.Matches(x => - x.SchemaId.Equals(schema.NamedId()) && x.ContentId == contentId && x.Status == Status.Draft && x.ExpectedVersion == 10))) @@ -472,7 +467,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL A.CallTo(() => commandBus.PublishAsync( A.That.Matches(x => - x.SchemaId.Equals(schema.NamedId()) && x.ContentId == contentId && x.ExpectedVersion == 10))) .MustHaveHappened(); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs index 60dcbbeef..587a62955 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Guard/GuardContentTests.cs @@ -5,6 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using NodaTime; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Domain.Apps.Entities.Contents.Guards; @@ -15,6 +16,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guard { public class GuardContentTests { + private readonly Instant dueTimeInPast = SystemClock.Instance.GetCurrentInstant().Minus(Duration.FromHours(1)); + [Fact] public void CanCreate_should_throw_exception_if_data_is_null() { @@ -79,6 +82,14 @@ namespace Squidex.Domain.Apps.Entities.Contents.Guard Assert.Throws(() => GuardContent.CanChangeContentStatus(Status.Archived, command)); } + [Fact] + public void CanChangeContentStatus_should_throw_exception_if_due_date_in_past() + { + var command = new ChangeContentStatus { Status = Status.Published, DueTime = dueTimeInPast }; + + Assert.Throws(() => GuardContent.CanChangeContentStatus(Status.Draft, command)); + } + [Fact] public void CanChangeContentStatus_not_should_throw_exception_if_status_flow_valid() { diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/TestData/FakeAssetEntity.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/TestData/FakeAssetEntity.cs index c8bf013c3..82a77eaef 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/TestData/FakeAssetEntity.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/TestData/FakeAssetEntity.cs @@ -14,9 +14,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.TestData { public sealed class FakeAssetEntity : IAssetEntity { - public Guid Id { get; set; } + public NamedId AppId { get; set; } - public Guid AppId { get; set; } + public Guid Id { get; set; } public Guid AssetId { get; set; } diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Guards/GuardRuleTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Guards/GuardRuleTests.cs index 65607a265..4934a4a33 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Guards/GuardRuleTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Guards/GuardRuleTests.cs @@ -30,7 +30,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards public GuardRuleTests() { - A.CallTo(() => appProvider.GetSchemaAsync(appId.Id, A.Ignored)) + A.CallTo(() => appProvider.GetSchemaAsync(appId.Id, A.Ignored, false)) .Returns(A.Fake()); } @@ -87,13 +87,13 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards { var command = new UpdateRule(); - await Assert.ThrowsAsync(() => GuardRule.CanUpdate(command, appProvider)); + await Assert.ThrowsAsync(() => GuardRule.CanUpdate(command, appId.Id, appProvider)); } [Fact] public async Task CanUpdate_should_not_throw_exception_if_trigger_and_action_valid() { - var command = CreateCommand(new UpdateRule + var command = new UpdateRule { Trigger = new ContentChangedTrigger { @@ -103,9 +103,9 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards { Url = validUrl } - }); + }; - await GuardRule.CanUpdate(command, appProvider); + await GuardRule.CanUpdate(command, appId.Id, appProvider); } [Fact] @@ -156,7 +156,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards GuardRule.CanDelete(command); } - private T CreateCommand(T command) where T : AppCommand + private CreateRule CreateCommand(CreateRule command) { command.AppId = appId; diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Guards/Triggers/ContentChangedTriggerTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Guards/Triggers/ContentChangedTriggerTests.cs index e406ec61b..cee1ddb81 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Guards/Triggers/ContentChangedTriggerTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Guards/Triggers/ContentChangedTriggerTests.cs @@ -23,7 +23,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards.Triggers [Fact] public async Task Should_add_error_if_schemas_ids_are_not_valid() { - A.CallTo(() => appProvider.GetSchemaAsync(appId, A.Ignored)) + A.CallTo(() => appProvider.GetSchemaAsync(appId, A.Ignored, false)) .Returns(Task.FromResult(null)); var trigger = new ContentChangedTrigger @@ -64,7 +64,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards.Triggers [Fact] public async Task Should_not_add_error_if_schemas_ids_are_valid() { - A.CallTo(() => appProvider.GetSchemaAsync(appId, A.Ignored)) + A.CallTo(() => appProvider.GetSchemaAsync(appId, A.Ignored, false)) .Returns(A.Fake()); var trigger = new ContentChangedTrigger diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleCommandMiddlewareTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleCommandMiddlewareTests.cs index 239ef4a13..863bd6d97 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleCommandMiddlewareTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleCommandMiddlewareTests.cs @@ -35,7 +35,7 @@ namespace Squidex.Domain.Apps.Entities.Rules public RuleCommandMiddlewareTests() { - A.CallTo(() => appProvider.GetSchemaAsync(A.Ignored, A.Ignored)) + A.CallTo(() => appProvider.GetSchemaAsync(A.Ignored, A.Ignored, false)) .Returns(A.Fake()); sut = new RuleCommandMiddleware(Handler, appProvider); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs index 095e5b439..0afbaab17 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleDomainObjectTests.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Immutable; +using FakeItEasy; using Squidex.Domain.Apps.Core.Rules; using Squidex.Domain.Apps.Core.Rules.Actions; using Squidex.Domain.Apps.Core.Rules.Triggers; @@ -14,6 +15,7 @@ using Squidex.Domain.Apps.Entities.Rules.Commands; using Squidex.Domain.Apps.Entities.TestHelpers; using Squidex.Domain.Apps.Events.Rules; using Squidex.Infrastructure; +using Squidex.Infrastructure.States; using Xunit; namespace Squidex.Domain.Apps.Entities.Rules @@ -30,6 +32,11 @@ namespace Squidex.Domain.Apps.Entities.Rules get { return ruleId; } } + public RuleDomainObjectTests() + { + sut.ActivateAsync(Id, A.Fake>()); + } + [Fact] public void Create_should_throw_exception_if_created() { @@ -48,7 +55,7 @@ namespace Squidex.Domain.Apps.Entities.Rules sut.Create(CreateRuleCommand(command)); - Assert.Equal(AppId, sut.Snapshot.AppId); + Assert.Equal(AppId, sut.Snapshot.AppId.Id); Assert.Same(ruleTrigger, sut.Snapshot.RuleDef.Trigger); Assert.Same(ruleAction, sut.Snapshot.RuleDef.Action); @@ -239,7 +246,7 @@ namespace Squidex.Domain.Apps.Entities.Rules return CreateEvent(@event); } - protected T CreateRuleCommand(T command) where T : RuleAggregateCommand + protected T CreateRuleCommand(T command) where T : RuleCommand { command.RuleId = ruleId; diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/FieldProperties/AssetsFieldPropertiesTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/FieldProperties/AssetsFieldPropertiesTests.cs index 1c0f2c564..f031cd5eb 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/FieldProperties/AssetsFieldPropertiesTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/FieldProperties/AssetsFieldPropertiesTests.cs @@ -82,7 +82,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards.FieldProperties errors.ShouldBeEquivalentTo( new List { - new ValidationError("Aspect width and height must be defined.", "AspectWidth", "AspectHeight") + new ValidationError("Aspect width and height is required.", "AspectWidth", "AspectHeight") }); } @@ -96,7 +96,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards.FieldProperties errors.ShouldBeEquivalentTo( new List { - new ValidationError("Aspect width and height must be defined.", "AspectWidth", "AspectHeight") + new ValidationError("Aspect width and height is required.", "AspectWidth", "AspectHeight") }); } } diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaDomainObjectTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaDomainObjectTests.cs index a3b8b5ba9..71922b093 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaDomainObjectTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaDomainObjectTests.cs @@ -8,11 +8,13 @@ using System; using System.Collections.Generic; using System.Linq; +using FakeItEasy; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Entities.Schemas.Commands; using Squidex.Domain.Apps.Entities.TestHelpers; using Squidex.Domain.Apps.Events.Schemas; using Squidex.Infrastructure; +using Squidex.Infrastructure.States; using Xunit; namespace Squidex.Domain.Apps.Entities.Schemas @@ -35,6 +37,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas var fieldRegistry = new FieldRegistry(new TypeNameRegistry()); sut = new SchemaDomainObject(fieldRegistry); + sut.ActivateAsync(Id, A.Fake>()); } [Fact] @@ -55,7 +58,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas sut.Create(CreateCommand(new CreateSchema { Name = SchemaName, SchemaId = SchemaId, Properties = properties })); - Assert.Equal(AppId, sut.Snapshot.AppId); + Assert.Equal(AppId, sut.Snapshot.AppId.Id); Assert.Equal(SchemaName, sut.Snapshot.Name); Assert.Equal(SchemaName, sut.Snapshot.SchemaDef.Name); @@ -81,7 +84,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas var @event = (SchemaCreated)sut.GetUncomittedEvents().Single().Payload; - Assert.Equal(AppId, sut.Snapshot.AppId); + Assert.Equal(AppId, sut.Snapshot.AppId.Id); Assert.Equal(SchemaName, sut.Snapshot.Name); Assert.Equal(SchemaName, sut.Snapshot.SchemaDef.Name); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs b/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs index 73a745fde..0822c2f2c 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs @@ -134,16 +134,12 @@ namespace Squidex.Domain.Apps.Entities.TestHelpers command.Actor = User; } - var appCommand = command as AppCommand; - - if (appCommand != null && appCommand.AppId == null) + if (command is IAppCommand appCommand && appCommand.AppId == null) { appCommand.AppId = AppNamedId; } - var schemaCommand = command as SchemaCommand; - - if (schemaCommand != null && schemaCommand.SchemaId == null) + if (command is ISchemaCommand schemaCommand && schemaCommand.SchemaId == null) { schemaCommand.SchemaId = SchemaNamedId; } diff --git a/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs b/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs index 678ec9d4a..70e23f0b8 100644 --- a/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Commands/DomainObjectBaseTests.cs @@ -36,23 +36,6 @@ namespace Squidex.Infrastructure.Commands Assert.Equal(EtagVersion.Empty, sut.Version); } - [Fact] - public void Should_add_event_to_uncommitted_events_and_increase_version_when_raised() - { - var event1 = new MyEvent(); - var event2 = new MyEvent(); - - sut.RaiseEvent(event1); - sut.RaiseEvent(event2); - - Assert.Equal(1, sut.Version); - Assert.Equal(new IEvent[] { event1, event2 }, sut.GetUncomittedEvents().Select(x => x.Payload).ToArray()); - - sut.ClearUncommittedEvents(); - - Assert.Equal(0, sut.GetUncomittedEvents().Count); - } - [Fact] public async Task Should_write_state_and_events_when_saved() { diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/EventDataFormatterTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/DefaultEventDataFormatterTests.cs similarity index 93% rename from tests/Squidex.Infrastructure.Tests/EventSourcing/EventDataFormatterTests.cs rename to tests/Squidex.Infrastructure.Tests/EventSourcing/DefaultEventDataFormatterTests.cs index c0272f796..aef438ac2 100644 --- a/tests/Squidex.Infrastructure.Tests/EventSourcing/EventDataFormatterTests.cs +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/DefaultEventDataFormatterTests.cs @@ -15,7 +15,7 @@ using Xunit; namespace Squidex.Infrastructure.EventSourcing { - public class EventDataFormatterTests + public class DefaultEventDataFormatterTests { public sealed class MyOldEvent : IEvent, IMigratedEvent { @@ -29,16 +29,16 @@ namespace Squidex.Infrastructure.EventSourcing private readonly JsonSerializerSettings serializerSettings = new JsonSerializerSettings(); private readonly TypeNameRegistry typeNameRegistry = new TypeNameRegistry(); - private readonly JsonEventDataFormatter sut; + private readonly DefaultEventDataFormatter sut; - public EventDataFormatterTests() + public DefaultEventDataFormatterTests() { serializerSettings.Converters.Add(new PropertiesBagConverter()); typeNameRegistry.Map(typeof(MyEvent), "Event"); typeNameRegistry.Map(typeof(MyOldEvent), "OldEvent"); - sut = new JsonEventDataFormatter(typeNameRegistry, serializerSettings); + sut = new DefaultEventDataFormatter(typeNameRegistry, JsonSerializer.Create(serializerSettings)); } [Fact] diff --git a/tests/Squidex.Infrastructure.Tests/EventSourcing/PollingSubscriptionTests.cs b/tests/Squidex.Infrastructure.Tests/EventSourcing/PollingSubscriptionTests.cs index 4c58d2655..19baac3de 100644 --- a/tests/Squidex.Infrastructure.Tests/EventSourcing/PollingSubscriptionTests.cs +++ b/tests/Squidex.Infrastructure.Tests/EventSourcing/PollingSubscriptionTests.cs @@ -27,7 +27,7 @@ namespace Squidex.Infrastructure.EventSourcing await WaitAndStopAsync(sut); - A.CallTo(() => eventStore.GetEventsAsync(A>.Ignored, "^my-stream", position, A.Ignored)) + A.CallTo(() => eventStore.QueryAsync(A>.Ignored, "^my-stream", position, A.Ignored)) .MustHaveHappened(Repeated.Exactly.Once); } @@ -36,7 +36,7 @@ namespace Squidex.Infrastructure.EventSourcing { var ex = new InvalidOperationException(); - A.CallTo(() => eventStore.GetEventsAsync(A>.Ignored, "^my-stream", position, A.Ignored)) + A.CallTo(() => eventStore.QueryAsync(A>.Ignored, "^my-stream", position, A.Ignored)) .Throws(ex); var sut = new PollingSubscription(eventStore, eventNotifier, eventSubscriber, "^my-stream", position); @@ -52,7 +52,7 @@ namespace Squidex.Infrastructure.EventSourcing { var ex = new OperationCanceledException(); - A.CallTo(() => eventStore.GetEventsAsync(A>.Ignored, "^my-stream", position, A.Ignored)) + A.CallTo(() => eventStore.QueryAsync(A>.Ignored, "^my-stream", position, A.Ignored)) .Throws(ex); var sut = new PollingSubscription(eventStore, eventNotifier, eventSubscriber, "^my-stream", position); @@ -68,7 +68,7 @@ namespace Squidex.Infrastructure.EventSourcing { var ex = new AggregateException(new OperationCanceledException()); - A.CallTo(() => eventStore.GetEventsAsync(A>.Ignored, "^my-stream", position, A.Ignored)) + A.CallTo(() => eventStore.QueryAsync(A>.Ignored, "^my-stream", position, A.Ignored)) .Throws(ex); var sut = new PollingSubscription(eventStore, eventNotifier, eventSubscriber, "^my-stream", position); @@ -88,7 +88,7 @@ namespace Squidex.Infrastructure.EventSourcing await WaitAndStopAsync(sut); - A.CallTo(() => eventStore.GetEventsAsync(A>.Ignored, "^my-stream", position, A.Ignored)) + A.CallTo(() => eventStore.QueryAsync(A>.Ignored, "^my-stream", position, A.Ignored)) .MustHaveHappened(Repeated.Exactly.Once); } @@ -101,7 +101,7 @@ namespace Squidex.Infrastructure.EventSourcing await WaitAndStopAsync(sut); - A.CallTo(() => eventStore.GetEventsAsync(A>.Ignored, "^my-stream", position, A.Ignored)) + A.CallTo(() => eventStore.QueryAsync(A>.Ignored, "^my-stream", position, A.Ignored)) .MustHaveHappened(Repeated.Exactly.Twice); } diff --git a/tests/Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs b/tests/Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs index bbce93481..f9810e1fd 100644 --- a/tests/Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Migrations/MigratorTests.cs @@ -19,7 +19,9 @@ namespace Squidex.Infrastructure.Migrations public class MigratorTests { private readonly IMigrationStatus status = A.Fake(); + private readonly IMigrationPath path = A.Fake(); private readonly ISemanticLog log = A.Fake(); + private readonly List<(int From, int To, IMigration Migration)> migrations = new List<(int From, int To, IMigration Migration)>(); public sealed class InMemoryStatus : IMigrationStatus { @@ -64,6 +66,14 @@ namespace Squidex.Infrastructure.Migrations public MigratorTests() { + A.CallTo(() => path.GetNext(A.Ignored)) + .ReturnsLazily((int v) => + { + var m = migrations.Where(x => x.From == v).ToList(); + + return m.Count == 0 ? (0, null) : (migrations.Max(x => x.To), migrations.Select(x => x.Migration)); + }); + A.CallTo(() => status.GetVersionAsync()).Returns(0); A.CallTo(() => status.TryLockAsync()).Returns(true); } @@ -75,13 +85,13 @@ namespace Squidex.Infrastructure.Migrations var migrator_1_2 = BuildMigration(1, 2); var migrator_2_3 = BuildMigration(2, 3); - var migrator = new Migrator(status, new[] { migrator_0_1, migrator_1_2, migrator_2_3 }, log); + var sut = new Migrator(status, path, log); - await migrator.MigrateAsync(); + await sut.MigrateAsync(); - A.CallTo(() => migrator_0_1.UpdateAsync(A>.That.IsEmpty())).MustHaveHappened(); - A.CallTo(() => migrator_1_2.UpdateAsync(A>.That.IsSameSequenceAs(migrator_0_1))).MustHaveHappened(); - A.CallTo(() => migrator_2_3.UpdateAsync(A>.That.IsSameSequenceAs(migrator_0_1, migrator_1_2))).MustHaveHappened(); + A.CallTo(() => migrator_0_1.UpdateAsync()).MustHaveHappened(); + A.CallTo(() => migrator_1_2.UpdateAsync()).MustHaveHappened(); + A.CallTo(() => migrator_2_3.UpdateAsync()).MustHaveHappened(); A.CallTo(() => status.UnlockAsync(3)).MustHaveHappened(); } @@ -93,51 +103,15 @@ namespace Squidex.Infrastructure.Migrations var migrator_1_2 = BuildMigration(1, 2); var migrator_2_3 = BuildMigration(2, 3); - var migrator = new Migrator(status, new[] { migrator_0_1, migrator_1_2, migrator_2_3 }, log); - - A.CallTo(() => migrator_1_2.UpdateAsync(A>.Ignored)).Throws(new ArgumentException()); - - await Assert.ThrowsAsync(migrator.MigrateAsync); - - A.CallTo(() => migrator_0_1.UpdateAsync(A>.That.IsEmpty())).MustHaveHappened(); - A.CallTo(() => migrator_1_2.UpdateAsync(A>.That.IsSameSequenceAs(migrator_0_1))).MustHaveHappened(); - A.CallTo(() => migrator_2_3.UpdateAsync(A>.Ignored)).MustNotHaveHappened(); - - A.CallTo(() => status.UnlockAsync(1)).MustHaveHappened(); - } - - [Fact] - public async Task Should_migrate_with_fastest_path() - { - var migrator_0_1 = BuildMigration(0, 1); - var migrator_0_2 = BuildMigration(0, 2); - var migrator_1_2 = BuildMigration(1, 2); - var migrator_2_3 = BuildMigration(2, 3); - - var migrator = new Migrator(status, new[] { migrator_0_1, migrator_0_2, migrator_1_2, migrator_2_3 }, log); - - await migrator.MigrateAsync(); - - A.CallTo(() => migrator_0_2.UpdateAsync(A>.That.IsEmpty())).MustHaveHappened(); - A.CallTo(() => migrator_0_1.UpdateAsync(A>.Ignored)).MustNotHaveHappened(); - A.CallTo(() => migrator_1_2.UpdateAsync(A>.Ignored)).MustNotHaveHappened(); - A.CallTo(() => migrator_2_3.UpdateAsync(A>.That.IsSameSequenceAs(migrator_0_2))).MustHaveHappened(); - - A.CallTo(() => status.UnlockAsync(3)).MustHaveHappened(); - } - - [Fact] - public async Task Should_throw_if_no_path_found() - { - var migrator_0_1 = BuildMigration(0, 1); - var migrator_2_3 = BuildMigration(2, 3); + var sut = new Migrator(status, path, log); - var migrator = new Migrator(status, new[] { migrator_0_1, migrator_2_3 }, log); + A.CallTo(() => migrator_1_2.UpdateAsync()).Throws(new ArgumentException()); - await Assert.ThrowsAsync(migrator.MigrateAsync); + await Assert.ThrowsAsync(sut.MigrateAsync); - A.CallTo(() => migrator_0_1.UpdateAsync(A>.Ignored)).MustNotHaveHappened(); - A.CallTo(() => migrator_2_3.UpdateAsync(A>.Ignored)).MustNotHaveHappened(); + A.CallTo(() => migrator_0_1.UpdateAsync()).MustHaveHappened(); + A.CallTo(() => migrator_1_2.UpdateAsync()).MustHaveHappened(); + A.CallTo(() => migrator_2_3.UpdateAsync()).MustNotHaveHappened(); A.CallTo(() => status.UnlockAsync(0)).MustHaveHappened(); } @@ -148,20 +122,19 @@ namespace Squidex.Infrastructure.Migrations var migrator_0_1 = BuildMigration(0, 1); var migrator_1_2 = BuildMigration(1, 2); - var migrator = new Migrator(new InMemoryStatus(), new[] { migrator_0_1, migrator_1_2 }, log) { LockWaitMs = 2 }; + var sut = new Migrator(new InMemoryStatus(), path, log) { LockWaitMs = 2 }; - await Task.WhenAll(Enumerable.Repeat(0, 10).Select(x => Task.Run(migrator.MigrateAsync))); + await Task.WhenAll(Enumerable.Repeat(0, 10).Select(x => Task.Run(sut.MigrateAsync))); - A.CallTo(() => migrator_0_1.UpdateAsync(A>.Ignored)).MustHaveHappened(Repeated.Exactly.Once); - A.CallTo(() => migrator_1_2.UpdateAsync(A>.Ignored)).MustHaveHappened(Repeated.Exactly.Once); + A.CallTo(() => migrator_0_1.UpdateAsync()).MustHaveHappened(Repeated.Exactly.Once); + A.CallTo(() => migrator_1_2.UpdateAsync()).MustHaveHappened(Repeated.Exactly.Once); } private IMigration BuildMigration(int fromVersion, int toVersion) { var migration = A.Fake(); - A.CallTo(() => migration.FromVersion).Returns(fromVersion); - A.CallTo(() => migration.ToVersion).Returns(toVersion); + migrations.Add((fromVersion, toVersion, migration)); return migration; } diff --git a/tests/Squidex.Infrastructure.Tests/States/PersistenceEventSourcingTests.cs b/tests/Squidex.Infrastructure.Tests/States/PersistenceEventSourcingTests.cs index 865d2d0b5..9eed300b9 100644 --- a/tests/Squidex.Infrastructure.Tests/States/PersistenceEventSourcingTests.cs +++ b/tests/Squidex.Infrastructure.Tests/States/PersistenceEventSourcingTests.cs @@ -118,7 +118,7 @@ namespace Squidex.Infrastructure.States await sut.GetSingleAsync(key); - A.CallTo(() => eventStore.GetEventsAsync(key, 3)) + A.CallTo(() => eventStore.QueryAsync(key, 3)) .MustHaveHappened(); } @@ -199,9 +199,9 @@ namespace Squidex.Infrastructure.States await statefulObject.WriteEventsAsync(new MyEvent(), new MyEvent()); await statefulObject.WriteEventsAsync(new MyEvent(), new MyEvent()); - A.CallTo(() => eventStore.AppendEventsAsync(A.Ignored, key, 2, A>.That.Matches(x => x.Count == 2))) + A.CallTo(() => eventStore.AppendAsync(A.Ignored, key, 2, A>.That.Matches(x => x.Count == 2))) .MustHaveHappened(); - A.CallTo(() => eventStore.AppendEventsAsync(A.Ignored, key, 4, A>.That.Matches(x => x.Count == 2))) + A.CallTo(() => eventStore.AppendAsync(A.Ignored, key, 4, A>.That.Matches(x => x.Count == 2))) .MustHaveHappened(); } @@ -212,7 +212,7 @@ namespace Squidex.Infrastructure.States var actualObject = await sut.GetSingleAsync(key); - A.CallTo(() => eventStore.AppendEventsAsync(A.Ignored, key, 2, A>.That.Matches(x => x.Count == 2))) + A.CallTo(() => eventStore.AppendAsync(A.Ignored, key, 2, A>.That.Matches(x => x.Count == 2))) .Throws(new WrongEventVersionException(1, 1)); await Assert.ThrowsAsync(() => statefulObject.WriteEventsAsync(new MyEvent(), new MyEvent())); @@ -221,7 +221,7 @@ namespace Squidex.Infrastructure.States [Fact] public async Task Should_not_remove_from_cache_when_write_failed() { - A.CallTo(() => eventStore.AppendEventsAsync(A.Ignored, A.Ignored, A.Ignored, A>.Ignored)) + A.CallTo(() => eventStore.AppendAsync(A.Ignored, A.Ignored, A.Ignored, A>.Ignored)) .Throws(new InvalidOperationException()); var actualObject = await sut.GetSingleAsync(key); @@ -251,7 +251,7 @@ namespace Squidex.Infrastructure.States Assert.Same(retrievedStates[0], retrievedState); } - A.CallTo(() => eventStore.GetEventsAsync(key, 0)) + A.CallTo(() => eventStore.QueryAsync(key, 0)) .MustHaveHappened(Repeated.Exactly.Once); } @@ -284,7 +284,7 @@ namespace Squidex.Infrastructure.States i++; } - A.CallTo(() => eventStore.GetEventsAsync(key, readPosition)) + A.CallTo(() => eventStore.QueryAsync(key, readPosition)) .Returns(eventsStored); } } diff --git a/tools/Migrate_01/Migrate_01.csproj b/tools/Migrate_01/Migrate_01.csproj index c5b80e7f5..9db8eb6c0 100644 --- a/tools/Migrate_01/Migrate_01.csproj +++ b/tools/Migrate_01/Migrate_01.csproj @@ -6,6 +6,7 @@ + diff --git a/tools/Migrate_01/MigrationPath.cs b/tools/Migrate_01/MigrationPath.cs new file mode 100644 index 000000000..b408df447 --- /dev/null +++ b/tools/Migrate_01/MigrationPath.cs @@ -0,0 +1,56 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using Microsoft.Extensions.DependencyInjection; +using Migrate_01.Migrations; +using Squidex.Infrastructure.Migrations; + +namespace Migrate_01 +{ + public sealed class MigrationPath : IMigrationPath + { + private const int CurrentVersion = 6; + private readonly IServiceProvider serviceProvider; + + public MigrationPath(IServiceProvider serviceProvider) + { + this.serviceProvider = serviceProvider; + } + + public (int Version, IEnumerable Migrations) GetNext(int version) + { + if (version == CurrentVersion) + { + return (CurrentVersion, null); + } + + var migrations = new List(); + + // Version 6: Convert Event store. Must always be executed first. + if (version < 6) + { + migrations.Add(serviceProvider.GetRequiredService()); + } + + // Version 5: Fixes the broken command architecture and requires a rebuild of all snapshots. + if (version < 5) + { + migrations.Add(serviceProvider.GetRequiredService()); + } + + // Version 1: Introduce App patterns. + if (version <= 1) + { + migrations.Add(serviceProvider.GetRequiredService()); + } + + return (CurrentVersion, migrations); + } + } +} diff --git a/tools/Migrate_01/Migration02_AddPatterns.cs b/tools/Migrate_01/Migrations/AddPatterns.cs similarity index 78% rename from tools/Migrate_01/Migration02_AddPatterns.cs rename to tools/Migrate_01/Migrations/AddPatterns.cs index 279ce58cd..68aa6e9dd 100644 --- a/tools/Migrate_01/Migration02_AddPatterns.cs +++ b/tools/Migrate_01/Migrations/AddPatterns.cs @@ -6,35 +6,29 @@ // ========================================================================== using System; -using System.Collections.Generic; using System.Threading.Tasks; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Domain.Apps.Entities.Apps.Repositories; -using Squidex.Infrastructure; using Squidex.Infrastructure.Migrations; using Squidex.Infrastructure.States; -namespace Migrate_01 +namespace Migrate_01.Migrations { - public sealed class Migration02_AddPatterns : IMigration + public sealed class AddPatterns : IMigration { private readonly InitialPatterns initialPatterns; private readonly IStateFactory stateFactory; private readonly IAppRepository appRepository; - public int FromVersion { get; } = 1; - - public int ToVersion { get; } = 2; - - public Migration02_AddPatterns(InitialPatterns initialPatterns, IAppRepository appRepository, IStateFactory stateFactory) + public AddPatterns(InitialPatterns initialPatterns, IAppRepository appRepository, IStateFactory stateFactory) { this.initialPatterns = initialPatterns; this.appRepository = appRepository; this.stateFactory = stateFactory; } - public async Task UpdateAsync(IEnumerable previousMigrations) + public async Task UpdateAsync() { var ids = await appRepository.QueryAppIdsAsync(); @@ -50,7 +44,7 @@ namespace Migrate_01 new AddPattern { Actor = app.Snapshot.CreatedBy, - AppId = new NamedId(app.Snapshot.Id, app.Snapshot.Name), + AppId = app.Snapshot.Id, Name = pattern.Name, PatternId = Guid.NewGuid(), Pattern = pattern.Pattern, diff --git a/tools/Migrate_01/Migrations/ConvertEventStore.cs b/tools/Migrate_01/Migrations/ConvertEventStore.cs new file mode 100644 index 000000000..20c74e8ab --- /dev/null +++ b/tools/Migrate_01/Migrations/ConvertEventStore.cs @@ -0,0 +1,59 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Threading.Tasks; +using MongoDB.Bson; +using MongoDB.Driver; +using Newtonsoft.Json.Linq; +using Squidex.Domain.Apps.Events; +using Squidex.Infrastructure; +using Squidex.Infrastructure.EventSourcing; +using Squidex.Infrastructure.Migrations; +using Squidex.Infrastructure.MongoDb; + +namespace Migrate_01.Migrations +{ + public sealed class ConvertEventStore : IMigration + { + private readonly IEventStore eventStore; + + public ConvertEventStore(IEventStore eventStore) + { + this.eventStore = eventStore; + } + + public async Task UpdateAsync() + { + if (eventStore is MongoEventStore mongoEventStore) + { + var collection = mongoEventStore.RawCollection; + + var filter = Builders.Filter; + + await collection.Find(new BsonDocument()).ForEachAsync(async commit => + { + foreach (BsonDocument @event in commit["Events"].AsBsonArray) + { + var meta = JObject.Parse(@event["Metadata"].AsString); + var data = JObject.Parse(@event["Payload"].AsString); + + if (data.TryGetValue("appId", out var appId)) + { + meta[SquidexHeaders.AppId] = NamedId.Parse(appId.ToString(), Guid.TryParse).Id; + } + + @event.Remove("EventId"); + @event["Metadata"] = meta.ToBson(); + } + + await collection.ReplaceOneAsync(filter.Eq("_id", commit["_id"].AsString), commit); + }); + } + } + } +} diff --git a/tools/Migrate_01/Migration04_FlattenAssetEntity.cs b/tools/Migrate_01/Migrations/RebuildAssets.cs similarity index 59% rename from tools/Migrate_01/Migration04_FlattenAssetEntity.cs rename to tools/Migrate_01/Migrations/RebuildAssets.cs index dc01bfbb8..a07ab718e 100644 --- a/tools/Migrate_01/Migration04_FlattenAssetEntity.cs +++ b/tools/Migrate_01/Migrations/RebuildAssets.cs @@ -12,25 +12,18 @@ using Squidex.Infrastructure.Migrations; namespace Migrate_01 { - public class Migration04_FlattenAssetEntity : IMigration + public class RebuildAssets : IMigration { private readonly Rebuilder rebuilder; - public int FromVersion { get; } = 3; - - public int ToVersion { get; } = 4; - - public Migration04_FlattenAssetEntity(Rebuilder rebuilder) + public RebuildAssets(Rebuilder rebuilder) { this.rebuilder = rebuilder; } - public async Task UpdateAsync(IEnumerable previousMigrations) + public Task UpdateAsync() { - if (!previousMigrations.Any(x => x is Migration01_FromCqrs)) - { - await rebuilder.RebuildAssetsAsync(); - } + return rebuilder.RebuildAssetsAsync(); } } } diff --git a/tools/Migrate_01/Migration03_SplitContentCollections.cs b/tools/Migrate_01/Migrations/RebuildContents.cs similarity index 52% rename from tools/Migrate_01/Migration03_SplitContentCollections.cs rename to tools/Migrate_01/Migrations/RebuildContents.cs index 98ba42784..d7d11a7a7 100644 --- a/tools/Migrate_01/Migration03_SplitContentCollections.cs +++ b/tools/Migrate_01/Migrations/RebuildContents.cs @@ -5,32 +5,23 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using Squidex.Infrastructure.Migrations; -namespace Migrate_01 +namespace Migrate_01.Migrations { - public class Migration03_SplitContentCollections : IMigration + public class RebuildContents : IMigration { private readonly Rebuilder rebuilder; - public int FromVersion { get; } = 2; - - public int ToVersion { get; } = 3; - - public Migration03_SplitContentCollections(Rebuilder rebuilder) + public RebuildContents(Rebuilder rebuilder) { this.rebuilder = rebuilder; } - public async Task UpdateAsync(IEnumerable previousMigrations) + public Task UpdateAsync() { - if (!previousMigrations.Any(x => x is Migration01_FromCqrs)) - { - await rebuilder.RebuildContentAsync(); - } + return rebuilder.RebuildContentAsync(); } } } diff --git a/tools/Migrate_01/Migration01_FromCqrs.cs b/tools/Migrate_01/Migrations/RebuildSnapshots.cs similarity index 68% rename from tools/Migrate_01/Migration01_FromCqrs.cs rename to tools/Migrate_01/Migrations/RebuildSnapshots.cs index f54f4d188..b5a03a4e4 100644 --- a/tools/Migrate_01/Migration01_FromCqrs.cs +++ b/tools/Migrate_01/Migrations/RebuildSnapshots.cs @@ -5,26 +5,21 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System.Collections.Generic; using System.Threading.Tasks; using Squidex.Infrastructure.Migrations; -namespace Migrate_01 +namespace Migrate_01.Migrations { - public sealed class Migration01_FromCqrs : IMigration + public sealed class RebuildSnapshots : IMigration { private readonly Rebuilder rebuilder; - public int FromVersion { get; } = 0; - - public int ToVersion { get; } = 1; - - public Migration01_FromCqrs(Rebuilder rebuilder) + public RebuildSnapshots(Rebuilder rebuilder) { this.rebuilder = rebuilder; } - public async Task UpdateAsync(IEnumerable previousMigrations) + public async Task UpdateAsync() { await rebuilder.RebuildConfigAsync(); await rebuilder.RebuildContentAsync(); diff --git a/tools/Migrate_01/Rebuilder.cs b/tools/Migrate_01/Rebuilder.cs index cb17472fe..a4a350b9b 100644 --- a/tools/Migrate_01/Rebuilder.cs +++ b/tools/Migrate_01/Rebuilder.cs @@ -71,7 +71,7 @@ namespace Migrate_01 var handledIds = new HashSet(); - await eventStore.GetEventsAsync(async storedEvent => + await eventStore.QueryAsync(async storedEvent => { var @event = ParseKnownEvent(storedEvent); @@ -86,7 +86,7 @@ namespace Migrate_01 await asset.WriteSnapshotAsync(); } } - }, filter, cancellationToken: CancellationToken.None); + }, filter, ct: CancellationToken.None); } public async Task RebuildConfigAsync() @@ -99,7 +99,7 @@ namespace Migrate_01 var handledIds = new HashSet(); - await eventStore.GetEventsAsync(async storedEvent => + await eventStore.QueryAsync(async storedEvent => { var @event = ParseKnownEvent(storedEvent); @@ -124,7 +124,7 @@ namespace Migrate_01 await app.WriteSnapshotAsync(); } } - }, filter, cancellationToken: CancellationToken.None); + }, filter, ct: CancellationToken.None); } public async Task RebuildContentAsync() @@ -135,7 +135,7 @@ namespace Migrate_01 var handledIds = new HashSet(); - await eventStore.GetEventsAsync(async storedEvent => + await eventStore.QueryAsync(async storedEvent => { var @event = ParseKnownEvent(storedEvent); @@ -161,7 +161,7 @@ namespace Migrate_01 // Schema has been deleted. } } - }, filter, cancellationToken: CancellationToken.None); + }, filter, ct: CancellationToken.None); } private Envelope ParseKnownEvent(StoredEvent storedEvent) diff --git a/src/Squidex.Domain.Apps.Entities/IUpdateableEntityWithAppRef.cs b/tools/Migrate_01/SquidexMigrations.cs similarity index 59% rename from src/Squidex.Domain.Apps.Entities/IUpdateableEntityWithAppRef.cs rename to tools/Migrate_01/SquidexMigrations.cs index c8ca9da7e..085bcf9dd 100644 --- a/src/Squidex.Domain.Apps.Entities/IUpdateableEntityWithAppRef.cs +++ b/tools/Migrate_01/SquidexMigrations.cs @@ -1,16 +1,16 @@ // ========================================================================== // Squidex Headless CMS // ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschränkt) +// Copyright (c) Squidex UG (haftungsbeschraenkt) // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; +using System.Reflection; -namespace Squidex.Domain.Apps.Entities +namespace Migrate_01 { - public interface IUpdateableEntityWithAppRef + public static class SquidexMigrations { - Guid AppId { get; set; } + public static readonly Assembly Assembly = typeof(SquidexMigrations).Assembly; } }