diff --git a/.gitignore b/.gitignore index 49682e0d7..3631589b0 100644 --- a/.gitignore +++ b/.gitignore @@ -21,7 +21,9 @@ node_modules/ # Scripts (should be copied from node_modules on build) **/wwwroot/scripts/**/*.* +/src/Squidex/appsettings.Development.json /src/Squidex/Assets +/src/Squidex/package-lock.json +/src/Squidex/Properties/launchSettings.json -/src/Squidex/appsettings.Development.json -/src/Squidex/Properties/launchSettings.json \ No newline at end of file +/global.json diff --git a/src/Squidex.Domain.Apps.Core.Model/Contents/ContentData.cs b/src/Squidex.Domain.Apps.Core.Model/Contents/ContentData.cs index 0258998e9..2ebc1d054 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Contents/ContentData.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Contents/ContentData.cs @@ -25,8 +25,8 @@ namespace Squidex.Domain.Apps.Core.Contents { } - protected ContentData(IDictionary copy, IEqualityComparer comparer) - : base(copy, comparer) + protected ContentData(int capacity, IEqualityComparer comparer) + : base(capacity, comparer) { } @@ -43,7 +43,7 @@ namespace Squidex.Domain.Apps.Core.Contents { foreach (var otherValue in source) { - var fieldValue = target.GetOrAdd(otherValue.Key, x => new ContentFieldData()); + var fieldValue = target.GetOrAddNew(otherValue.Key); foreach (var value in otherValue.Value) { diff --git a/src/Squidex.Domain.Apps.Core.Model/Contents/IdContentData.cs b/src/Squidex.Domain.Apps.Core.Model/Contents/IdContentData.cs index 6398d66d4..0ca33663e 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Contents/IdContentData.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Contents/IdContentData.cs @@ -18,8 +18,8 @@ namespace Squidex.Domain.Apps.Core.Contents { } - public IdContentData(IdContentData copy) - : base(copy, EqualityComparer.Default) + public IdContentData(int capacity) + : base(capacity, EqualityComparer.Default) { } diff --git a/src/Squidex.Domain.Apps.Core.Model/Contents/NamedContentData.cs b/src/Squidex.Domain.Apps.Core.Model/Contents/NamedContentData.cs index b7e4187a5..faa409abb 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Contents/NamedContentData.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Contents/NamedContentData.cs @@ -18,8 +18,8 @@ namespace Squidex.Domain.Apps.Core.Contents { } - public NamedContentData(NamedContentData copy) - : base(copy, EqualityComparer.Default) + public NamedContentData(int capacity) + : base(capacity, EqualityComparer.Default) { } diff --git a/src/Squidex.Domain.Apps.Core.Model/Partitioning.cs b/src/Squidex.Domain.Apps.Core.Model/Partitioning.cs index f6600ede5..8190674f1 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Partitioning.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Partitioning.cs @@ -45,5 +45,12 @@ namespace Squidex.Domain.Apps.Core { return Key; } + + public static Partitioning FromString(string value) + { + var isLanguage = string.Equals(value, Language.Key, StringComparison.OrdinalIgnoreCase); + + return isLanguage ? Language : Invariant; + } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/ArrayField.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/ArrayField.cs new file mode 100644 index 000000000..7a74a39f0 --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/ArrayField.cs @@ -0,0 +1,77 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Diagnostics.Contracts; + +namespace Squidex.Domain.Apps.Core.Schemas +{ + public sealed class ArrayField : RootField, IArrayField + { + private FieldCollection fields = FieldCollection.Empty; + + public IReadOnlyList Fields + { + get { return fields.Ordered; } + } + + public IReadOnlyDictionary FieldsById + { + get { return fields.ById; } + } + + public IReadOnlyDictionary FieldsByName + { + get { return fields.ByName; } + } + + public ArrayField(long id, string name, Partitioning partitioning, ArrayFieldProperties properties) + : base(id, name, partitioning, properties) + { + } + + [Pure] + public ArrayField DeleteField(long fieldId) + { + return Updatefields(f => f.Remove(fieldId)); + } + + [Pure] + public ArrayField ReorderFields(List ids) + { + return Updatefields(f => f.Reorder(ids)); + } + + [Pure] + public ArrayField AddField(NestedField field) + { + return Updatefields(f => f.Add(field)); + } + + [Pure] + public ArrayField UpdateField(long fieldId, Func updater) + { + return Updatefields(f => f.Update(fieldId, updater)); + } + + private ArrayField Updatefields(Func, FieldCollection> updater) + { + var newFields = updater(fields); + + if (ReferenceEquals(newFields, fields)) + { + return this; + } + + return Clone(clone => + { + clone.fields = newFields; + }); + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/ArrayFieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/ArrayFieldProperties.cs new file mode 100644 index 000000000..f3f6100d9 --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/ArrayFieldProperties.cs @@ -0,0 +1,40 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Core.Schemas +{ + [TypeName("ArrayField")] + public sealed class ArrayFieldProperties : FieldProperties + { + public int? MinItems { get; set; } + + public int? MaxItems { get; set; } + + public override T Accept(IFieldPropertiesVisitor visitor) + { + return visitor.Visit(this); + } + + public override T Accept(IFieldVisitor visitor, IField field) + { + return visitor.Visit((IArrayField)field); + } + + public override RootField CreateRootField(long id, string name, Partitioning partitioning) + { + return Fields.Array(id, name, partitioning, this); + } + + public override NestedField CreateNestedField(long id, string name) + { + throw new NotSupportedException(); + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/AssetsFieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/AssetsFieldProperties.cs index 182030e50..62b3be7c1 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/AssetsFieldProperties.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/AssetsFieldProperties.cs @@ -47,9 +47,14 @@ namespace Squidex.Domain.Apps.Core.Schemas return visitor.Visit((IField)field); } - public override Field CreateField(long id, string name, Partitioning partitioning) + public override RootField CreateRootField(long id, string name, Partitioning partitioning) { - return new Field(id, name, partitioning, this); + return Fields.Assets(id, name, partitioning, this); + } + + public override NestedField CreateNestedField(long id, string name) + { + return Fields.Assets(id, name, this); } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/BooleanFieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/BooleanFieldProperties.cs index 363a1a6fa..a4a0750a5 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/BooleanFieldProperties.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/BooleanFieldProperties.cs @@ -28,9 +28,14 @@ namespace Squidex.Domain.Apps.Core.Schemas return visitor.Visit((IField)field); } - public override Field CreateField(long id, string name, Partitioning partitioning) + public override RootField CreateRootField(long id, string name, Partitioning partitioning) { - return new Field(id, name, partitioning, this); + return Fields.Boolean(id, name, partitioning, this); + } + + public override NestedField CreateNestedField(long id, string name) + { + return Fields.Boolean(id, name, this); } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/DateTimeFieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/DateTimeFieldProperties.cs index 0a740490f..efbcad12b 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/DateTimeFieldProperties.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/DateTimeFieldProperties.cs @@ -33,9 +33,14 @@ namespace Squidex.Domain.Apps.Core.Schemas return visitor.Visit((IField)field); } - public override Field CreateField(long id, string name, Partitioning partitioning) + public override RootField CreateRootField(long id, string name, Partitioning partitioning) { - return new Field(id, name, partitioning, this); + return Fields.DateTime(id, name, partitioning, this); + } + + public override NestedField CreateNestedField(long id, string name) + { + return Fields.DateTime(id, name, this); } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldCollection.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldCollection.cs new file mode 100644 index 000000000..d62ef5873 --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldCollection.cs @@ -0,0 +1,161 @@ +// ========================================================================== +// 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.Collections.Immutable; +using System.Diagnostics.Contracts; +using System.Linq; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Core.Schemas +{ + public sealed class FieldCollection : Cloneable> where T : IField + { + public static readonly FieldCollection Empty = new FieldCollection(); + + private ImmutableArray fieldsOrdered = ImmutableArray.Empty; + private ImmutableDictionary fieldsById; + private ImmutableDictionary fieldsByName; + + public IReadOnlyList Ordered + { + get { return fieldsOrdered; } + } + + public IReadOnlyDictionary ById + { + get + { + if (fieldsById == null) + { + if (fieldsOrdered.Length == 0) + { + fieldsById = ImmutableDictionary.Empty; + } + else + { + fieldsById = fieldsOrdered.ToImmutableDictionary(x => x.Id); + } + } + + return fieldsById; + } + } + + public IReadOnlyDictionary ByName + { + get + { + if (fieldsByName == null) + { + if (fieldsOrdered.Length == 0) + { + fieldsByName = ImmutableDictionary.Empty; + } + else + { + fieldsByName = fieldsOrdered.ToImmutableDictionary(x => x.Name); + } + } + + return fieldsByName; + } + } + + private FieldCollection() + { + } + + public FieldCollection(T[] fields) + { + Guard.NotNull(fields, nameof(fields)); + + fieldsOrdered = ImmutableArray.Create(fields); + } + + protected override void OnCloned() + { + fieldsById = null; + fieldsByName = null; + } + + [Pure] + public FieldCollection Remove(long fieldId) + { + if (!ById.TryGetValue(fieldId, out var field)) + { + return this; + } + + return Clone(clone => + { + clone.fieldsOrdered = fieldsOrdered.Remove(field); + }); + } + + [Pure] + public FieldCollection Reorder(List ids) + { + Guard.NotNull(ids, nameof(ids)); + + if (ids.Count != fieldsOrdered.Length || ids.Any(x => !ById.ContainsKey(x))) + { + throw new ArgumentException("Ids must cover all fields.", nameof(ids)); + } + + return Clone(clone => + { + clone.fieldsOrdered = fieldsOrdered.OrderBy(f => ids.IndexOf(f.Id)).ToImmutableArray(); + }); + } + + [Pure] + public FieldCollection Add(T field) + { + Guard.NotNull(field, nameof(field)); + + if (ByName.ContainsKey(field.Name) || ById.ContainsKey(field.Id)) + { + throw new ArgumentException($"A field with name '{field.Name}' and id {field.Id} already exists.", nameof(field)); + } + + return Clone(clone => + { + clone.fieldsOrdered = clone.fieldsOrdered.Add(field); + }); + } + + [Pure] + public FieldCollection Update(long fieldId, Func updater) + { + Guard.NotNull(updater, nameof(updater)); + + if (!ById.TryGetValue(fieldId, out var field)) + { + return this; + } + + var newField = updater(field); + + if (ReferenceEquals(newField, field)) + { + return this; + } + + if (!(newField is T typedField)) + { + throw new InvalidOperationException($"Field must be of type {typeof(T)}"); + } + + return Clone(clone => + { + clone.fieldsOrdered = clone.fieldsOrdered.Replace(field, typedField); + }); + } + } +} \ No newline at end of file diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldExtensions.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldExtensions.cs new file mode 100644 index 000000000..bf34e0911 --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldExtensions.cs @@ -0,0 +1,158 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; + +namespace Squidex.Domain.Apps.Core.Schemas +{ + public static class FieldExtensions + { + public static Schema ReorderFields(this Schema schema, List ids, long? parentId = null) + { + if (parentId != null) + { + return schema.UpdateField(parentId.Value, f => + { + if (f is ArrayField arrayField) + { + return arrayField.ReorderFields(ids); + } + + return f; + }); + } + + return schema.ReorderFields(ids); + } + + public static Schema DeleteField(this Schema schema, long fieldId, long? parentId = null) + { + if (parentId != null) + { + return schema.UpdateField(parentId.Value, f => + { + if (f is ArrayField arrayField) + { + return arrayField.DeleteField(fieldId); + } + + return f; + }); + } + + return schema.DeleteField(fieldId); + } + + public static Schema LockField(this Schema schema, long fieldId, long? parentId = null) + { + if (parentId != null) + { + return schema.UpdateField(parentId.Value, f => + { + if (f is ArrayField arrayField) + { + return arrayField.UpdateField(fieldId, n => n.Lock()); + } + + return f; + }); + } + + return schema.UpdateField(fieldId, f => f.Lock()); + } + + public static Schema HideField(this Schema schema, long fieldId, long? parentId = null) + { + if (parentId != null) + { + return schema.UpdateField(parentId.Value, f => + { + if (f is ArrayField arrayField) + { + return arrayField.UpdateField(fieldId, n => n.Hide()); + } + + return f; + }); + } + + return schema.UpdateField(fieldId, f => f.Hide()); + } + + public static Schema ShowField(this Schema schema, long fieldId, long? parentId = null) + { + if (parentId != null) + { + return schema.UpdateField(parentId.Value, f => + { + if (f is ArrayField arrayField) + { + return arrayField.UpdateField(fieldId, n => n.Show()); + } + + return f; + }); + } + + return schema.UpdateField(fieldId, f => f.Show()); + } + + public static Schema EnableField(this Schema schema, long fieldId, long? parentId = null) + { + if (parentId != null) + { + return schema.UpdateField(parentId.Value, f => + { + if (f is ArrayField arrayField) + { + return arrayField.UpdateField(fieldId, n => n.Enable()); + } + + return f; + }); + } + + return schema.UpdateField(fieldId, f => f.Enable()); + } + + public static Schema DisableField(this Schema schema, long fieldId, long? parentId = null) + { + if (parentId != null) + { + return schema.UpdateField(parentId.Value, f => + { + if (f is ArrayField arrayField) + { + return arrayField.UpdateField(fieldId, n => n.Disable()); + } + + return f; + }); + } + + return schema.UpdateField(fieldId, f => f.Disable()); + } + + public static Schema UpdateField(this Schema schema, long fieldId, FieldProperties properties, long? parentId = null) + { + if (parentId != null) + { + return schema.UpdateField(parentId.Value, f => + { + if (f is ArrayField arrayField) + { + return arrayField.UpdateField(fieldId, n => n.Update(properties)); + } + + return f; + }); + } + + return schema.UpdateField(fieldId, f => f.Update(properties)); + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldProperties.cs index 35da7cf8b..a9c8d0421 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldProperties.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldProperties.cs @@ -21,6 +21,8 @@ namespace Squidex.Domain.Apps.Core.Schemas public abstract T Accept(IFieldVisitor visitor, IField field); - public abstract Field CreateField(long id, string name, Partitioning partitioning); + public abstract RootField CreateRootField(long id, string name, Partitioning partitioning); + + public abstract NestedField CreateNestedField(long id, string name); } } \ No newline at end of file diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldRegistry.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldRegistry.cs index f3488d75e..fe778009b 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldRegistry.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/FieldRegistry.cs @@ -14,10 +14,8 @@ namespace Squidex.Domain.Apps.Core.Schemas { public sealed class FieldRegistry { - private delegate Field FactoryFunction(long id, string name, Partitioning partitioning, FieldProperties properties); - private readonly TypeNameRegistry typeNameRegistry; - private readonly Dictionary fieldsByPropertyType = new Dictionary(); + private readonly HashSet supportedFields = new HashSet(); public FieldRegistry(TypeNameRegistry typeNameRegistry) { @@ -38,23 +36,34 @@ namespace Squidex.Domain.Apps.Core.Schemas private void RegisterField(Type type) { - typeNameRegistry.Map(type); + if (supportedFields.Add(type)) + { + typeNameRegistry.Map(type); + } + } + + public RootField CreateRootField(long id, string name, Partitioning partitioning, FieldProperties properties) + { + CheckProperties(properties); - fieldsByPropertyType[type] = (id, name, partitioning, properties) => properties.CreateField(id, name, partitioning); + return properties.CreateRootField(id, name, partitioning); } - public Field CreateField(long id, string name, Partitioning partitioning, FieldProperties properties) + public NestedField CreateNestedField(long id, string name, FieldProperties properties) { - Guard.NotNull(properties, nameof(properties)); + CheckProperties(properties); + + return properties.CreateNestedField(id, name); + } - var factory = fieldsByPropertyType.GetOrDefault(properties.GetType()); + private void CheckProperties(FieldProperties properties) + { + Guard.NotNull(properties, nameof(properties)); - if (factory == null) + if (!supportedFields.Contains(properties.GetType())) { throw new InvalidOperationException($"The field property '{properties.GetType()}' is not supported."); } - - return factory(id, name, partitioning, properties); } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/Fields.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/Fields.cs index a74402b24..de6e49e28 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/Fields.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/Fields.cs @@ -5,53 +5,132 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; + namespace Squidex.Domain.Apps.Core.Schemas { public static class Fields { - public static Field Assets(long id, string name, Partitioning partitioning, AssetsFieldProperties properties = null) + public static RootField Array(long id, string name, Partitioning partitioning, params NestedField[] fields) + { + var result = new ArrayField(id, name, partitioning, new ArrayFieldProperties()); + + if (fields != null) + { + foreach (var field in fields) + { + result = result.AddField(field); + } + } + + return result; + } + + public static ArrayField Array(long id, string name, Partitioning partitioning, ArrayFieldProperties properties = null) + { + return new ArrayField(id, name, partitioning, properties ?? new ArrayFieldProperties()); + } + + public static RootField Assets(long id, string name, Partitioning partitioning, AssetsFieldProperties properties = null) + { + return new RootField(id, name, partitioning, properties ?? new AssetsFieldProperties()); + } + + public static RootField Boolean(long id, string name, Partitioning partitioning, BooleanFieldProperties properties = null) + { + return new RootField(id, name, partitioning, properties ?? new BooleanFieldProperties()); + } + + public static RootField DateTime(long id, string name, Partitioning partitioning, DateTimeFieldProperties properties = null) + { + return new RootField(id, name, partitioning, properties ?? new DateTimeFieldProperties()); + } + + public static RootField Geolocation(long id, string name, Partitioning partitioning, GeolocationFieldProperties properties = null) + { + return new RootField(id, name, partitioning, properties ?? new GeolocationFieldProperties()); + } + + public static RootField Json(long id, string name, Partitioning partitioning, JsonFieldProperties properties = null) + { + return new RootField(id, name, partitioning, properties ?? new JsonFieldProperties()); + } + + public static RootField Number(long id, string name, Partitioning partitioning, NumberFieldProperties properties = null) + { + return new RootField(id, name, partitioning, properties ?? new NumberFieldProperties()); + } + + public static RootField References(long id, string name, Partitioning partitioning, ReferencesFieldProperties properties = null) + { + return new RootField(id, name, partitioning, properties ?? new ReferencesFieldProperties()); + } + + public static RootField String(long id, string name, Partitioning partitioning, StringFieldProperties properties = null) + { + return new RootField(id, name, partitioning, properties ?? new StringFieldProperties()); + } + + public static RootField Tags(long id, string name, Partitioning partitioning, TagsFieldProperties properties = null) + { + return new RootField(id, name, partitioning, properties ?? new TagsFieldProperties()); + } + + public static NestedField Assets(long id, string name, AssetsFieldProperties properties = null) { - return new Field(id, name, partitioning, properties ?? new AssetsFieldProperties()); + return new NestedField(id, name, properties ?? new AssetsFieldProperties()); } - public static Field Boolean(long id, string name, Partitioning partitioning, BooleanFieldProperties properties = null) + public static NestedField Boolean(long id, string name, BooleanFieldProperties properties = null) { - return new Field(id, name, partitioning, properties ?? new BooleanFieldProperties()); + return new NestedField(id, name, properties ?? new BooleanFieldProperties()); } - public static Field DateTime(long id, string name, Partitioning partitioning, DateTimeFieldProperties properties = null) + public static NestedField DateTime(long id, string name, DateTimeFieldProperties properties = null) { - return new Field(id, name, partitioning, properties ?? new DateTimeFieldProperties()); + return new NestedField(id, name, properties ?? new DateTimeFieldProperties()); } - public static Field Geolocation(long id, string name, Partitioning partitioning, GeolocationFieldProperties properties = null) + public static NestedField Geolocation(long id, string name, GeolocationFieldProperties properties = null) { - return new Field(id, name, partitioning, properties ?? new GeolocationFieldProperties()); + return new NestedField(id, name, properties ?? new GeolocationFieldProperties()); } - public static Field Json(long id, string name, Partitioning partitioning, JsonFieldProperties properties = null) + public static NestedField Json(long id, string name, JsonFieldProperties properties = null) { - return new Field(id, name, partitioning, properties ?? new JsonFieldProperties()); + return new NestedField(id, name, properties ?? new JsonFieldProperties()); } - public static Field Number(long id, string name, Partitioning partitioning, NumberFieldProperties properties = null) + public static NestedField Number(long id, string name, NumberFieldProperties properties = null) { - return new Field(id, name, partitioning, properties ?? new NumberFieldProperties()); + return new NestedField(id, name, properties ?? new NumberFieldProperties()); } - public static Field References(long id, string name, Partitioning partitioning, ReferencesFieldProperties properties = null) + public static NestedField References(long id, string name, ReferencesFieldProperties properties = null) { - return new Field(id, name, partitioning, properties ?? new ReferencesFieldProperties()); + return new NestedField(id, name, properties ?? new ReferencesFieldProperties()); } - public static Field String(long id, string name, Partitioning partitioning, StringFieldProperties properties = null) + public static NestedField String(long id, string name, StringFieldProperties properties = null) { - return new Field(id, name, partitioning, properties ?? new StringFieldProperties()); + return new NestedField(id, name, properties ?? new StringFieldProperties()); } - public static Field Tags(long id, string name, Partitioning partitioning, TagsFieldProperties properties = null) + public static NestedField Tags(long id, string name, TagsFieldProperties properties = null) { - return new Field(id, name, partitioning, properties ?? new TagsFieldProperties()); + return new NestedField(id, name, properties ?? new TagsFieldProperties()); + } + + public static Schema AddArray(this Schema schema, long id, string name, Partitioning partitioning, Func handler, ArrayFieldProperties properties = null) + { + var field = Array(id, name, partitioning, properties); + + if (handler != null) + { + field = handler(field); + } + + return schema.AddField(field); } public static Schema AddAssets(this Schema schema, long id, string name, Partitioning partitioning, AssetsFieldProperties properties = null) @@ -98,5 +177,50 @@ namespace Squidex.Domain.Apps.Core.Schemas { return schema.AddField(Tags(id, name, partitioning, properties)); } + + public static ArrayField AddAssets(this ArrayField field, long id, string name, AssetsFieldProperties properties = null) + { + return field.AddField(Assets(id, name, properties)); + } + + public static ArrayField AddBoolean(this ArrayField field, long id, string name, BooleanFieldProperties properties = null) + { + return field.AddField(Boolean(id, name, properties)); + } + + public static ArrayField AddDateTime(this ArrayField field, long id, string name, DateTimeFieldProperties properties = null) + { + return field.AddField(DateTime(id, name, properties)); + } + + public static ArrayField AddGeolocation(this ArrayField field, long id, string name, GeolocationFieldProperties properties = null) + { + return field.AddField(Geolocation(id, name, properties)); + } + + public static ArrayField AddJson(this ArrayField field, long id, string name, JsonFieldProperties properties = null) + { + return field.AddField(Json(id, name, properties)); + } + + public static ArrayField AddNumber(this ArrayField field, long id, string name, NumberFieldProperties properties = null) + { + return field.AddField(Number(id, name, properties)); + } + + public static ArrayField AddReferences(this ArrayField field, long id, string name, ReferencesFieldProperties properties = null) + { + return field.AddField(References(id, name, properties)); + } + + public static ArrayField AddString(this ArrayField field, long id, string name, StringFieldProperties properties = null) + { + return field.AddField(String(id, name, properties)); + } + + public static ArrayField AddTags(this ArrayField field, long id, string name, TagsFieldProperties properties = null) + { + return field.AddField(Tags(id, name, properties)); + } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/GeolocationFieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/GeolocationFieldProperties.cs index d5a48136c..9136b723c 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/GeolocationFieldProperties.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/GeolocationFieldProperties.cs @@ -24,9 +24,14 @@ namespace Squidex.Domain.Apps.Core.Schemas return visitor.Visit((IField)field); } - public override Field CreateField(long id, string name, Partitioning partitioning) + public override RootField CreateRootField(long id, string name, Partitioning partitioning) { - return new Field(id, name, partitioning, this); + return Fields.Geolocation(id, name, partitioning, this); + } + + public override NestedField CreateNestedField(long id, string name) + { + return Fields.Geolocation(id, name, this); } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/IArrayField.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/IArrayField.cs new file mode 100644 index 000000000..0ea74cfbd --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/IArrayField.cs @@ -0,0 +1,20 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; + +namespace Squidex.Domain.Apps.Core.Schemas +{ + public interface IArrayField : IField + { + IReadOnlyList Fields { get; } + + IReadOnlyDictionary FieldsById { get; } + + IReadOnlyDictionary FieldsByName { get; } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/IField.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/IField.cs index 552a24eda..6cc86239d 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/IField.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/IField.cs @@ -13,12 +13,12 @@ namespace Squidex.Domain.Apps.Core.Schemas string Name { get; } + bool IsLocked { get; } + bool IsDisabled { get; } bool IsHidden { get; } - bool IsLocked { get; } - FieldProperties RawProperties { get; } T Accept(IFieldVisitor visitor); diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/IFieldPropertiesVisitor.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/IFieldPropertiesVisitor.cs index 108269359..c4593a450 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/IFieldPropertiesVisitor.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/IFieldPropertiesVisitor.cs @@ -9,6 +9,8 @@ namespace Squidex.Domain.Apps.Core.Schemas { public interface IFieldPropertiesVisitor { + T Visit(ArrayFieldProperties properties); + T Visit(AssetsFieldProperties properties); T Visit(BooleanFieldProperties properties); diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/IFieldVisitor.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/IFieldVisitor.cs index 3bfad913a..67142acc4 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/IFieldVisitor.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/IFieldVisitor.cs @@ -9,6 +9,8 @@ namespace Squidex.Domain.Apps.Core.Schemas { public interface IFieldVisitor { + T Visit(IArrayField field); + T Visit(IField field); T Visit(IField field); diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/INestedField.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/INestedField.cs new file mode 100644 index 000000000..5bacd00eb --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/INestedField.cs @@ -0,0 +1,13 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Domain.Apps.Core.Schemas +{ + public interface INestedField : IField + { + } +} diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/IRootField.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/IRootField.cs new file mode 100644 index 000000000..31d9cd05f --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/IRootField.cs @@ -0,0 +1,14 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Domain.Apps.Core.Schemas +{ + public interface IRootField : IField + { + Partitioning Partitioning { get; } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonFieldModel.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonFieldModel.cs index e4c04fdf8..952ef87f1 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonFieldModel.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonFieldModel.cs @@ -5,6 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System.Collections.Generic; using Newtonsoft.Json; namespace Squidex.Domain.Apps.Core.Schemas.Json @@ -15,21 +16,24 @@ namespace Squidex.Domain.Apps.Core.Schemas.Json public long Id { get; set; } [JsonProperty] - public bool IsHidden { get; set; } + public string Name { get; set; } [JsonProperty] - public bool IsLocked { get; set; } + public string Partitioning { get; set; } [JsonProperty] - public bool IsDisabled { get; set; } + public bool IsHidden { get; set; } [JsonProperty] - public string Name { get; set; } + public bool IsLocked { get; set; } [JsonProperty] - public string Partitioning { get; set; } + public bool IsDisabled { get; set; } [JsonProperty] public FieldProperties Properties { get; set; } + + [JsonProperty] + public List Children { get; set; } } } \ No newline at end of file diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonNestedFieldModel.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonNestedFieldModel.cs new file mode 100644 index 000000000..59b2035e7 --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonNestedFieldModel.cs @@ -0,0 +1,29 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Newtonsoft.Json; + +namespace Squidex.Domain.Apps.Core.Schemas.Json +{ + public sealed class JsonNestedFieldModel + { + [JsonProperty] + public long Id { get; set; } + + [JsonProperty] + public string Name { get; set; } + + [JsonProperty] + public bool IsHidden { get; set; } + + [JsonProperty] + public bool IsDisabled { get; set; } + + [JsonProperty] + public FieldProperties Properties { get; set; } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonSchemaModel.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonSchemaModel.cs index be5b64a66..d45620c9a 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonSchemaModel.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/Json/JsonSchemaModel.cs @@ -13,7 +13,7 @@ namespace Squidex.Domain.Apps.Core.Schemas.Json { public sealed class JsonSchemaModel { - private static readonly Field[] Empty = new Field[0]; + private static readonly RootField[] Empty = new RootField[0]; [JsonProperty] public string Name { get; set; } @@ -38,11 +38,12 @@ namespace Squidex.Domain.Apps.Core.Schemas.Json Properties = schema.Properties; Fields = - schema.Fields?.Select(x => + schema.Fields.Select(x => new JsonFieldModel { Id = x.Id, Name = x.Name, + Children = CreateChildren(x), IsHidden = x.IsHidden, IsLocked = x.IsLocked, IsDisabled = x.IsDisabled, @@ -53,13 +54,31 @@ namespace Squidex.Domain.Apps.Core.Schemas.Json IsPublished = schema.IsPublished; } - public Schema ToSchema(FieldRegistry fieldRegistry) + private static List CreateChildren(IField field) { - Field[] fields = Empty; + if (field is ArrayField arrayField) + { + return arrayField.Fields.Select(x => + new JsonNestedFieldModel + { + Id = x.Id, + Name = x.Name, + IsHidden = x.IsHidden, + IsDisabled = x.IsDisabled, + Properties = x.RawProperties + }).ToList(); + } + + return null; + } + + public Schema ToSchema(FieldRegistry registry) + { + RootField[] fields = Empty; if (Fields != null) { - fields = new Field[Fields.Count]; + fields = new RootField[Fields.Count]; for (var i = 0; i < fields.Length; i++) { @@ -67,7 +86,29 @@ namespace Squidex.Domain.Apps.Core.Schemas.Json var parititonKey = new Partitioning(fieldModel.Partitioning); - var field = fieldRegistry.CreateField(fieldModel.Id, fieldModel.Name, parititonKey, fieldModel.Properties); + var field = registry.CreateRootField(fieldModel.Id, fieldModel.Name, parititonKey, fieldModel.Properties); + + if (field is ArrayField arrayField && fieldModel.Children?.Count > 0) + { + foreach (var nestedFieldModel in fieldModel.Children) + { + var nestedField = registry.CreateNestedField(nestedFieldModel.Id, nestedFieldModel.Name, nestedFieldModel.Properties); + + if (nestedFieldModel.IsHidden) + { + nestedField = nestedField.Hide(); + } + + if (nestedFieldModel.IsDisabled) + { + nestedField = nestedField.Disable(); + } + + arrayField = arrayField.AddField(nestedField); + } + + field = arrayField; + } if (fieldModel.IsDisabled) { diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/JsonFieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/JsonFieldProperties.cs index b0801ef60..6edb4f80b 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/JsonFieldProperties.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/JsonFieldProperties.cs @@ -22,9 +22,14 @@ namespace Squidex.Domain.Apps.Core.Schemas return visitor.Visit((IField)field); } - public override Field CreateField(long id, string name, Partitioning partitioning) + public override RootField CreateRootField(long id, string name, Partitioning partitioning) { - return new Field(id, name, partitioning, this); + return Fields.Json(id, name, partitioning, this); + } + + public override NestedField CreateNestedField(long id, string name) + { + return Fields.Json(id, name, this); } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/NestedField.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/NestedField.cs new file mode 100644 index 000000000..c958951ad --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/NestedField.cs @@ -0,0 +1,106 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Diagnostics.Contracts; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Core.Schemas +{ + public abstract class NestedField : Cloneable, INestedField + { + private readonly long fieldId; + private readonly string fieldName; + private bool isDisabled; + private bool isHidden; + private bool isLocked; + + public long Id + { + get { return fieldId; } + } + + public string Name + { + get { return fieldName; } + } + + public bool IsLocked + { + get { return isLocked; } + } + + public bool IsHidden + { + get { return isHidden; } + } + + public bool IsDisabled + { + get { return isDisabled; } + } + + public abstract FieldProperties RawProperties { get; } + + protected NestedField(long id, string name) + { + Guard.NotNullOrEmpty(name, nameof(name)); + Guard.GreaterThan(id, 0, nameof(id)); + + fieldId = id; + fieldName = name; + } + + [Pure] + public NestedField Lock() + { + return Clone(clone => + { + clone.isLocked = true; + }); + } + + [Pure] + public NestedField Hide() + { + return Clone(clone => + { + clone.isHidden = true; + }); + } + + [Pure] + public NestedField Show() + { + return Clone(clone => + { + clone.isHidden = false; + }); + } + + [Pure] + public NestedField Disable() + { + return Clone(clone => + { + clone.isDisabled = true; + }); + } + + [Pure] + public NestedField Enable() + { + return Clone(clone => + { + clone.isDisabled = false; + }); + } + + public abstract T Accept(IFieldVisitor visitor); + + public abstract NestedField Update(FieldProperties newProperties); + } +} \ No newline at end of file diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/NestedField{T}.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/NestedField{T}.cs new file mode 100644 index 000000000..7de914a4b --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/NestedField{T}.cs @@ -0,0 +1,70 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Diagnostics.Contracts; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Core.Schemas +{ + public class NestedField : NestedField, IField where T : FieldProperties, new() + { + private T properties; + + public T Properties + { + get { return properties; } + } + + public override FieldProperties RawProperties + { + get { return properties; } + } + + public NestedField(long id, string name, T properties) + : base(id, name) + { + Guard.NotNull(properties, nameof(properties)); + + SetProperties(properties); + } + + [Pure] + public override NestedField Update(FieldProperties newProperties) + { + var typedProperties = ValidateProperties(newProperties); + + return Clone>(clone => + { + clone.SetProperties(typedProperties); + }); + } + + private void SetProperties(T newProperties) + { + properties = newProperties; + properties.Freeze(); + } + + private T ValidateProperties(FieldProperties newProperties) + { + Guard.NotNull(newProperties, nameof(newProperties)); + + if (!(newProperties is T typedProperties)) + { + throw new ArgumentException($"Properties must be of type '{typeof(T)}", nameof(newProperties)); + } + + return typedProperties; + } + + public override TResult Accept(IFieldVisitor visitor) + { + return properties.Accept(visitor, this); + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/NumberFieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/NumberFieldProperties.cs index 4f08f1972..3238aff25 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/NumberFieldProperties.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/NumberFieldProperties.cs @@ -35,9 +35,14 @@ namespace Squidex.Domain.Apps.Core.Schemas return visitor.Visit((IField)field); } - public override Field CreateField(long id, string name, Partitioning partitioning) + public override RootField CreateRootField(long id, string name, Partitioning partitioning) { - return new Field(id, name, partitioning, this); + return Fields.Number(id, name, partitioning, this); + } + + public override NestedField CreateNestedField(long id, string name) + { + return Fields.Number(id, name, this); } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/ReferencesFieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/ReferencesFieldProperties.cs index 2bb64e682..98e4bb5ec 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/ReferencesFieldProperties.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/ReferencesFieldProperties.cs @@ -29,9 +29,14 @@ namespace Squidex.Domain.Apps.Core.Schemas return visitor.Visit((IField)field); } - public override Field CreateField(long id, string name, Partitioning partitioning) + public override RootField CreateRootField(long id, string name, Partitioning partitioning) { - return new Field(id, name, partitioning, this); + return Fields.References(id, name, partitioning, this); + } + + public override NestedField CreateNestedField(long id, string name) + { + return Fields.References(id, name, this); } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/Field.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/RootField.cs similarity index 84% rename from src/Squidex.Domain.Apps.Core.Model/Schemas/Field.cs rename to src/Squidex.Domain.Apps.Core.Model/Schemas/RootField.cs index b69071fb3..461f60365 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/Field.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/RootField.cs @@ -10,11 +10,11 @@ using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Core.Schemas { - public abstract class Field : Cloneable, IField + public abstract class RootField : Cloneable, IRootField { private readonly long fieldId; - private readonly Partitioning partitioning; private readonly string fieldName; + private readonly Partitioning partitioning; private bool isDisabled; private bool isHidden; private bool isLocked; @@ -51,11 +51,11 @@ namespace Squidex.Domain.Apps.Core.Schemas public abstract FieldProperties RawProperties { get; } - protected Field(long id, string name, Partitioning partitioning) + protected RootField(long id, string name, Partitioning partitioning) { Guard.NotNullOrEmpty(name, nameof(name)); - Guard.NotNull(partitioning, nameof(partitioning)); Guard.GreaterThan(id, 0, nameof(id)); + Guard.NotNull(partitioning, nameof(partitioning)); fieldId = id; fieldName = name; @@ -64,16 +64,16 @@ namespace Squidex.Domain.Apps.Core.Schemas } [Pure] - public Field Lock() + public RootField Lock() { - return Clone(clone => + return Clone(clone => { clone.isLocked = true; }); } [Pure] - public Field Hide() + public RootField Hide() { return Clone(clone => { @@ -82,7 +82,7 @@ namespace Squidex.Domain.Apps.Core.Schemas } [Pure] - public Field Show() + public RootField Show() { return Clone(clone => { @@ -91,7 +91,7 @@ namespace Squidex.Domain.Apps.Core.Schemas } [Pure] - public Field Disable() + public RootField Disable() { return Clone(clone => { @@ -100,7 +100,7 @@ namespace Squidex.Domain.Apps.Core.Schemas } [Pure] - public Field Enable() + public RootField Enable() { return Clone(clone => { @@ -108,8 +108,8 @@ namespace Squidex.Domain.Apps.Core.Schemas }); } - public abstract Field Update(FieldProperties newProperties); - public abstract T Accept(IFieldVisitor visitor); + + public abstract RootField Update(FieldProperties newProperties); } } \ No newline at end of file diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/Field{T}.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/RootField{T}.cs similarity index 71% rename from src/Squidex.Domain.Apps.Core.Model/Schemas/Field{T}.cs rename to src/Squidex.Domain.Apps.Core.Model/Schemas/RootField{T}.cs index e1da04c62..90165643b 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/Field{T}.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/RootField{T}.cs @@ -11,7 +11,7 @@ using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Core.Schemas { - public sealed class Field : Field, IField where T : FieldProperties, new() + public class RootField : RootField, IField where T : FieldProperties, new() { private T properties; @@ -25,27 +25,31 @@ namespace Squidex.Domain.Apps.Core.Schemas get { return properties; } } - public Field(long id, string name, Partitioning partitioning, T properties) + public RootField(long id, string name, Partitioning partitioning, T properties) : base(id, name, partitioning) { Guard.NotNull(properties, nameof(properties)); - this.properties = properties; - this.properties.Freeze(); + SetProperties(properties); } [Pure] - public override Field Update(FieldProperties newProperties) + public override RootField Update(FieldProperties newProperties) { var typedProperties = ValidateProperties(newProperties); - return Clone>(clone => + return Clone>(clone => { - clone.properties = typedProperties; - clone.properties.Freeze(); + clone.SetProperties(typedProperties); }); } + private void SetProperties(T newProperties) + { + properties = newProperties; + properties.Freeze(); + } + private T ValidateProperties(FieldProperties newProperties) { Guard.NotNull(newProperties, nameof(newProperties)); @@ -60,7 +64,7 @@ namespace Squidex.Domain.Apps.Core.Schemas public override TResult Accept(IFieldVisitor visitor) { - return RawProperties.Accept(visitor, this); + return properties.Accept(visitor, this); } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/Schema.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/Schema.cs index ec20d7e8a..c6e187087 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/Schema.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/Schema.cs @@ -7,9 +7,7 @@ using System; using System.Collections.Generic; -using System.Collections.Immutable; using System.Diagnostics.Contracts; -using System.Linq; using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Core.Schemas @@ -17,9 +15,7 @@ namespace Squidex.Domain.Apps.Core.Schemas public sealed class Schema : Cloneable { private readonly string name; - private ImmutableArray fieldsOrdered = ImmutableArray.Empty; - private ImmutableDictionary fieldsById; - private ImmutableDictionary fieldsByName; + private FieldCollection fields = FieldCollection.Empty; private SchemaProperties properties; private bool isPublished; @@ -33,49 +29,19 @@ namespace Squidex.Domain.Apps.Core.Schemas get { return isPublished; } } - public IReadOnlyList Fields + public IReadOnlyList Fields { - get { return fieldsOrdered; } + get { return fields.Ordered; } } - public IReadOnlyDictionary FieldsById + public IReadOnlyDictionary FieldsById { - get - { - if (fieldsById == null) - { - if (fieldsOrdered.Length == 0) - { - fieldsById = ImmutableDictionary.Empty; - } - else - { - fieldsById = fieldsOrdered.ToImmutableDictionary(x => x.Id); - } - } - - return fieldsById; - } + get { return fields.ById; } } - public IReadOnlyDictionary FieldsByName + public IReadOnlyDictionary FieldsByName { - get - { - if (fieldsByName == null) - { - if (fieldsOrdered.Length == 0) - { - fieldsByName = ImmutableDictionary.Empty; - } - else - { - fieldsByName = fieldsOrdered.ToImmutableDictionary(x => x.Name); - } - } - - return fieldsByName; - } + get { return fields.ByName; } } public SchemaProperties Properties @@ -93,21 +59,14 @@ namespace Squidex.Domain.Apps.Core.Schemas this.properties.Freeze(); } - public Schema(string name, Field[] fields, SchemaProperties properties, bool isPublished) + public Schema(string name, RootField[] fields, SchemaProperties properties, bool isPublished) : this(name, properties) { - Guard.NotNullOrEmpty(name, nameof(name)); Guard.NotNull(fields, nameof(fields)); - this.isPublished = isPublished; - - fieldsOrdered = ImmutableArray.Create(fields); - } + this.fields = new FieldCollection(fields); - protected override void OnCloned() - { - fieldsById = null; - fieldsByName = null; + this.isPublished = isPublished; } [Pure] @@ -122,60 +81,6 @@ namespace Squidex.Domain.Apps.Core.Schemas }); } - [Pure] - public Schema UpdateField(long fieldId, FieldProperties newProperties) - { - return UpdateField(fieldId, field => - { - return field.Update(newProperties); - }); - } - - [Pure] - public Schema LockField(long fieldId) - { - return UpdateField(fieldId, field => - { - return field.Lock(); - }); - } - - [Pure] - public Schema DisableField(long fieldId) - { - return UpdateField(fieldId, field => - { - return field.Disable(); - }); - } - - [Pure] - public Schema EnableField(long fieldId) - { - return UpdateField(fieldId, field => - { - return field.Enable(); - }); - } - - [Pure] - public Schema HideField(long fieldId) - { - return UpdateField(fieldId, field => - { - return field.Hide(); - }); - } - - [Pure] - public Schema ShowField(long fieldId) - { - return UpdateField(fieldId, field => - { - return field.Show(); - }); - } - [Pure] public Schema Publish() { @@ -197,62 +102,39 @@ namespace Squidex.Domain.Apps.Core.Schemas [Pure] public Schema DeleteField(long fieldId) { - if (!FieldsById.TryGetValue(fieldId, out var field)) - { - return this; - } - - return Clone(clone => - { - clone.fieldsOrdered = fieldsOrdered.Remove(field); - }); + return Updatefields(f => f.Remove(fieldId)); } [Pure] public Schema ReorderFields(List ids) { - Guard.NotNull(ids, nameof(ids)); - - if (ids.Count != fieldsOrdered.Length || ids.Any(x => !FieldsById.ContainsKey(x))) - { - throw new ArgumentException("Ids must cover all fields.", nameof(ids)); - } - - return Clone(clone => - { - clone.fieldsOrdered = fieldsOrdered.OrderBy(f => ids.IndexOf(f.Id)).ToImmutableArray(); - }); + return Updatefields(f => f.Reorder(ids)); } [Pure] - public Schema AddField(Field field) + public Schema AddField(RootField field) { - Guard.NotNull(field, nameof(field)); - - if (FieldsByName.ContainsKey(field.Name) || FieldsById.ContainsKey(field.Id)) - { - throw new ArgumentException($"A field with name '{field.Name}' and id {field.Id} already exists.", nameof(field)); - } - - return Clone(clone => - { - clone.fieldsOrdered = clone.fieldsOrdered.Add(field); - }); + return Updatefields(f => f.Add(field)); } [Pure] - public Schema UpdateField(long fieldId, Func updater) + public Schema UpdateField(long fieldId, Func updater) + { + return Updatefields(f => f.Update(fieldId, updater)); + } + + private Schema Updatefields(Func, FieldCollection> updater) { - Guard.NotNull(updater, nameof(updater)); + var newFields = updater(fields); - if (!FieldsById.TryGetValue(fieldId, out var field)) + if (ReferenceEquals(newFields, fields)) { return this; } return Clone(clone => { - clone.fieldsOrdered = clone.fieldsOrdered.Replace(field, updater(field)); + clone.fields = newFields; }); } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldProperties.cs index 288e36bf5..e9731480d 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldProperties.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldProperties.cs @@ -39,9 +39,14 @@ namespace Squidex.Domain.Apps.Core.Schemas return visitor.Visit((IField)field); } - public override Field CreateField(long id, string name, Partitioning partitioning) + public override RootField CreateRootField(long id, string name, Partitioning partitioning) { - return new Field(id, name, partitioning, this); + return Fields.String(id, name, partitioning, this); + } + + public override NestedField CreateNestedField(long id, string name) + { + return Fields.String(id, name, this); } } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/TagsFieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/TagsFieldProperties.cs index 61f3298a2..31da100e6 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/TagsFieldProperties.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/TagsFieldProperties.cs @@ -26,9 +26,14 @@ namespace Squidex.Domain.Apps.Core.Schemas return visitor.Visit((IField)field); } - public override Field CreateField(long id, string name, Partitioning partitioning) + public override RootField CreateRootField(long id, string name, Partitioning partitioning) { - return new Field(id, name, partitioning, this); + return Fields.Tags(id, name, partitioning, this); + } + + public override NestedField CreateNestedField(long id, string name) + { + return Fields.Tags(id, name, this); } } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ContentConverter.cs b/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ContentConverter.cs index e450d470d..52284631d 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ContentConverter.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ContentConverter.cs @@ -5,128 +5,92 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; +using System.Collections.Generic; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Core.ConvertContent { - public delegate ContentFieldData FieldConverter(ContentFieldData data, Field field); - public static class ContentConverter { - public static NamedContentData ToNameModel(this IdContentData source, Schema schema, params FieldConverter[] converters) + private static readonly Func KeyNameResolver = f => f.Name; + private static readonly Func KeyIdResolver = f => f.Id; + + public static NamedContentData ConvertId2Name(this IdContentData content, Schema schema, params FieldConverter[] converters) { Guard.NotNull(schema, nameof(schema)); - var result = new NamedContentData(); - - foreach (var fieldValue in source) - { - if (!schema.FieldsById.TryGetValue(fieldValue.Key, out var field)) - { - continue; - } - - var fieldData = Convert(fieldValue.Value, field, converters); - - if (fieldData != null) - { - result[field.Name] = fieldData; - } - } + var result = new NamedContentData(content.Count); - return result; + return ConvertInternal(content, result, schema.FieldsById, KeyNameResolver, converters); } - public static IdContentData ToIdModel(this NamedContentData content, Schema schema, params FieldConverter[] converters) + public static IdContentData ConvertId2Id(this IdContentData content, Schema schema, params FieldConverter[] converters) { Guard.NotNull(schema, nameof(schema)); - var result = new IdContentData(); + var result = new IdContentData(content.Count); - foreach (var fieldValue in content) - { - if (!schema.FieldsByName.TryGetValue(fieldValue.Key, out var field)) - { - continue; - } - - var fieldData = Convert(fieldValue.Value, field, converters); - - if (fieldData != null) - { - result[field.Id] = fieldData; - } - } - - return result; + return ConvertInternal(content, result, schema.FieldsById, KeyIdResolver, converters); } - public static IdContentData Convert(this IdContentData content, Schema schema, params FieldConverter[] converters) + public static NamedContentData ConvertName2Name(this NamedContentData content, Schema schema, params FieldConverter[] converters) { Guard.NotNull(schema, nameof(schema)); - var result = new IdContentData(); - - foreach (var fieldValue in content) - { - if (!schema.FieldsById.TryGetValue(fieldValue.Key, out var field)) - { - continue; - } - - var fieldData = Convert(fieldValue.Value, field, converters); - - if (fieldData != null) - { - result[field.Id] = fieldData; - } - } + var result = new NamedContentData(content.Count); - return result; + return ConvertInternal(content, result, schema.FieldsByName, KeyNameResolver, converters); } - public static NamedContentData Convert(this NamedContentData content, Schema schema, params FieldConverter[] converters) + public static IdContentData ConvertName2Id(this NamedContentData content, Schema schema, params FieldConverter[] converters) { Guard.NotNull(schema, nameof(schema)); - var result = new NamedContentData(); + var result = new IdContentData(content.Count); - foreach (var fieldValue in content) + return ConvertInternal(content, result, schema.FieldsByName, KeyIdResolver, converters); + } + + private static TDict2 ConvertInternal( + TDict1 source, + TDict2 target, + IReadOnlyDictionary fields, + Func targetKey, params FieldConverter[] converters) + where TDict1 : IDictionary + where TDict2 : IDictionary + { + foreach (var fieldKvp in source) { - if (!schema.FieldsByName.TryGetValue(fieldValue.Key, out var field)) + if (!fields.TryGetValue(fieldKvp.Key, out var field)) { continue; } - var fieldData = Convert(fieldValue.Value, field, converters); + var newvalue = fieldKvp.Value; - if (fieldData != null) + if (converters != null) { - result[field.Name] = fieldData; - } - } + foreach (var converter in converters) + { + newvalue = converter(newvalue, field); - return result; - } + if (newvalue == null) + { + break; + } + } + } - private static ContentFieldData Convert(ContentFieldData fieldData, Field field, FieldConverter[] converters) - { - if (converters != null) - { - foreach (var converter in converters) + if (newvalue != null) { - fieldData = converter(fieldData, field); - - if (fieldData == null) - { - break; - } + target.Add(targetKey(field), newvalue); } } - return fieldData; + return target; } } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/FieldConverters.cs b/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/FieldConverters.cs index b842ef7a0..381a2d8aa 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/FieldConverters.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/FieldConverters.cs @@ -8,7 +8,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using Newtonsoft.Json.Linq; using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Core.Contents; @@ -21,8 +20,17 @@ using Squidex.Infrastructure.Json; namespace Squidex.Domain.Apps.Core.ConvertContent { + public delegate ContentFieldData FieldConverter(ContentFieldData data, IRootField field); + public static class FieldConverters { + private static readonly Func KeyNameResolver = f => f.Name; + private static readonly Func KeyIdResolver = f => f.Id.ToString(); + private static readonly Func FieldByIdResolver = + (f, k) => long.TryParse(k, out var id) ? f.FieldsById.GetOrDefault(id) : null; + private static readonly Func FieldByNameResolver = + (f, k) => f.FieldsByName.GetOrDefault(k); + public static FieldConverter ExcludeHidden() { return (data, field) => @@ -35,29 +43,23 @@ namespace Squidex.Domain.Apps.Core.ConvertContent { return (data, field) => { - var isValid = true; - foreach (var value in data.Values) { + if (value.IsNull()) + { + continue; + } + try { - if (!value.IsNull()) - { - JsonValueConverter.ConvertValue(field, value); - } + JsonValueConverter.ConvertValue(field, value); } catch { - isValid = false; - break; + return null; } } - if (!isValid) - { - return null; - } - return data; }; } @@ -173,12 +175,10 @@ namespace Squidex.Domain.Apps.Core.ConvertContent return (data, field) => data; } - var languageCodes = - new HashSet( - languages.Select(x => x.Iso2Code).Where(x => languagesConfig.Contains(x)), - StringComparer.OrdinalIgnoreCase); + var languageCodes = languages.Select(x => x.Iso2Code).Where(x => languagesConfig.Contains(x)); + var languageSet = new HashSet(languageCodes, StringComparer.OrdinalIgnoreCase); - if (languageCodes.Count == 0) + if (languageSet.Count == 0) { return (data, field) => data; } @@ -189,7 +189,7 @@ namespace Squidex.Domain.Apps.Core.ConvertContent { var result = new ContentFieldData(); - foreach (var languageCode in languageCodes) + foreach (var languageCode in languageSet) { if (data.TryGetValue(languageCode, out var value)) { @@ -204,26 +204,87 @@ namespace Squidex.Domain.Apps.Core.ConvertContent }; } - public static FieldConverter DecodeJson() + public static FieldConverter ForNestedName2Name(params ValueConverter[] converters) + { + return ForNested(FieldByNameResolver, KeyNameResolver, converters); + } + + public static FieldConverter ForNestedName2Id(params ValueConverter[] converters) + { + return ForNested(FieldByNameResolver, KeyIdResolver, converters); + } + + public static FieldConverter ForNestedId2Name(params ValueConverter[] converters) + { + return ForNested(FieldByIdResolver, KeyNameResolver, converters); + } + + public static FieldConverter ForNestedId2Id(params ValueConverter[] converters) + { + return ForNested(FieldByIdResolver, KeyIdResolver, converters); + } + + private static FieldConverter ForNested( + Func fieldResolver, + Func keyResolver, + params ValueConverter[] converters) { return (data, field) => { - if (field is IField) + if (field is IArrayField arrayField) { var result = new ContentFieldData(); - foreach (var partitionValue in data) + foreach (var partition in data) { - if (partitionValue.Value.IsNull()) + if (!(partition.Value is JArray jArray)) { - result[partitionValue.Key] = null; + continue; } - else + + var newArray = new JArray(); + + foreach (JObject item in jArray.OfType()) { - var value = Encoding.UTF8.GetString(Convert.FromBase64String(partitionValue.Value.ToString())); + var newItem = new JObject(); - result[partitionValue.Key] = JToken.Parse(value); + foreach (var kvp in item) + { + var nestedField = fieldResolver(arrayField, kvp.Key); + + if (nestedField == null) + { + continue; + } + + var newValue = kvp.Value; + + var isUnset = false; + + if (converters != null) + { + foreach (var converter in converters) + { + newValue = converter(newValue, nestedField); + + if (ReferenceEquals(newValue, Value.Unset)) + { + isUnset = true; + break; + } + } + } + + if (!isUnset) + { + newItem.Add(keyResolver(nestedField), newValue); + } + } + + newArray.Add(newItem); } + + result.Add(partition.Key, newArray); } return result; @@ -233,25 +294,37 @@ namespace Squidex.Domain.Apps.Core.ConvertContent }; } - public static FieldConverter EncodeJson() + public static FieldConverter ForValues(params ValueConverter[] converters) { return (data, field) => { - if (field is IField) + if (!(field is IArrayField)) { var result = new ContentFieldData(); - foreach (var partitionValue in data) + foreach (var partition in data) { - if (partitionValue.Value.IsNull()) + var newValue = partition.Value; + + var isUnset = false; + + if (converters != null) { - result[partitionValue.Key] = null; + foreach (var converter in converters) + { + newValue = converter(newValue, field); + + if (ReferenceEquals(newValue, Value.Unset)) + { + isUnset = true; + break; + } + } } - else - { - var value = Convert.ToBase64String(Encoding.UTF8.GetBytes(partitionValue.Value.ToString())); - result[partitionValue.Key] = value; + if (!isUnset) + { + result.Add(partition.Key, newValue); } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/Value.cs b/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/Value.cs new file mode 100644 index 000000000..2229afdfa --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/Value.cs @@ -0,0 +1,16 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Newtonsoft.Json.Linq; + +namespace Squidex.Domain.Apps.Core.ConvertContent +{ + public static class Value + { + public static readonly JToken Unset = JValue.CreateUndefined(); + } +} diff --git a/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ValueConverters.cs b/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ValueConverters.cs new file mode 100644 index 000000000..b6b15ad30 --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ValueConverters.cs @@ -0,0 +1,81 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Text; +using Newtonsoft.Json.Linq; +using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Domain.Apps.Core.ValidateContent; +using Squidex.Infrastructure.Json; + +namespace Squidex.Domain.Apps.Core.ConvertContent +{ + public delegate JToken ValueConverter(JToken value, IField field); + + public static class ValueConverters + { + public static ValueConverter DecodeJson() + { + return (value, field) => + { + if (!value.IsNull() && field is IField) + { + var decoded = Encoding.UTF8.GetString(Convert.FromBase64String(value.ToString())); + + return JToken.Parse(decoded); + } + + return value; + }; + } + + public static ValueConverter EncodeJson() + { + return (value, field) => + { + if (!value.IsNull() && field is IField) + { + var encoded = Convert.ToBase64String(Encoding.UTF8.GetBytes(value.ToString())); + + return encoded; + } + + return value; + }; + } + + public static ValueConverter ExcludeHidden() + { + return (value, field) => + { + return field.IsHidden ? Value.Unset : value; + }; + } + + public static ValueConverter ExcludeChangedTypes() + { + return (value, field) => + { + if (value.IsNull()) + { + return value; + } + + try + { + JsonValueConverter.ConvertValue(field, value); + } + catch + { + return Value.Unset; + } + + return value; + }; + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Operations/EnrichContent/DefaultValueFactory.cs b/src/Squidex.Domain.Apps.Core.Operations/EnrichContent/DefaultValueFactory.cs index 898a98431..a4f8be960 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/EnrichContent/DefaultValueFactory.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/EnrichContent/DefaultValueFactory.cs @@ -13,7 +13,7 @@ using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Core.EnrichContent { - public sealed class DefaultValueFactory : IFieldPropertiesVisitor + public sealed class DefaultValueFactory : IFieldVisitor { private readonly Instant now; @@ -26,62 +26,67 @@ namespace Squidex.Domain.Apps.Core.EnrichContent { Guard.NotNull(field, nameof(field)); - return field.RawProperties.Accept(new DefaultValueFactory(now)); + return field.Accept(new DefaultValueFactory(now)); } - public JToken Visit(AssetsFieldProperties properties) + public JToken Visit(IArrayField field) { return new JArray(); } - public JToken Visit(BooleanFieldProperties properties) + public JToken Visit(IField field) { - return properties.DefaultValue; + return new JArray(); + } + + public JToken Visit(IField field) + { + return field.Properties.DefaultValue; } - public JToken Visit(GeolocationFieldProperties properties) + public JToken Visit(IField field) { return JValue.CreateNull(); } - public JToken Visit(JsonFieldProperties properties) + public JToken Visit(IField field) { return JValue.CreateNull(); } - public JToken Visit(NumberFieldProperties properties) + public JToken Visit(IField field) { - return properties.DefaultValue; + return field.Properties.DefaultValue; } - public JToken Visit(ReferencesFieldProperties properties) + public JToken Visit(IField field) { return new JArray(); } - public JToken Visit(StringFieldProperties properties) + public JToken Visit(IField field) { - return properties.DefaultValue; + return field.Properties.DefaultValue; } - public JToken Visit(TagsFieldProperties properties) + public JToken Visit(IField field) { return new JArray(); } - public JToken Visit(DateTimeFieldProperties properties) + public JToken Visit(IField field) { - if (properties.CalculatedDefaultValue == DateTimeCalculatedDefaultValue.Now) + if (field.Properties.CalculatedDefaultValue == DateTimeCalculatedDefaultValue.Now) { return now.ToString(); } - if (properties.CalculatedDefaultValue == DateTimeCalculatedDefaultValue.Today) + if (field.Properties.CalculatedDefaultValue == DateTimeCalculatedDefaultValue.Today) { return now.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture); } - return properties.DefaultValue?.ToString(); + return field.Properties.DefaultValue?.ToString(); } } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesCleaner.cs b/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesCleaner.cs index 54f1e95fa..4c072e9ab 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesCleaner.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesCleaner.cs @@ -7,65 +7,95 @@ using System; using System.Collections.Generic; -using System.Linq; using Newtonsoft.Json.Linq; using Squidex.Domain.Apps.Core.Schemas; -using Squidex.Infrastructure.Json; namespace Squidex.Domain.Apps.Core.ExtractReferenceIds { - public static class ReferencesCleaner + public sealed class ReferencesCleaner : IFieldVisitor { - private static readonly List EmptyIds = new List(); + private readonly JToken value; + private readonly ICollection oldReferences; - public static JToken CleanReferences(this IField field, JToken value, ISet oldReferences) + private ReferencesCleaner(JToken value, ICollection oldReferences) { - if ((field is IField || field is IField) && !value.IsNull()) - { - switch (field) - { - case IField assetsField: - return Visit(assetsField, value, oldReferences); - - case IField referencesField: - return Visit(referencesField, value, oldReferences); - } - } + this.value = value; - return value; + this.oldReferences = oldReferences; } - private static JToken Visit(IField field, JToken value, IEnumerable oldReferences) + public static JToken CleanReferences(IField field, JToken value, ICollection oldReferences) { - var oldIds = GetIds(value); - var newIds = oldIds.Except(oldReferences).ToList(); + return field.Accept(new ReferencesCleaner(value, oldReferences)); + } - return oldIds.Count != newIds.Count ? JToken.FromObject(newIds) : value; + public JToken Visit(IArrayField field) + { + return value; } - private static JToken Visit(IField field, JToken value, ICollection oldReferences) + public JToken Visit(IField field) + { + return CleanIds(); + } + + public JToken Visit(IField field) { if (oldReferences.Contains(field.Properties.SchemaId)) { return new JArray(); } - var oldIds = GetIds(value); - var newIds = oldIds.Except(oldReferences).ToList(); - - return oldIds.Count != newIds.Count ? JToken.FromObject(newIds) : value; + return CleanIds(); } - private static List GetIds(JToken value) + private JToken CleanIds() { - try - { - return value?.ToObject>() ?? EmptyIds; - } - catch + var ids = value.ToGuidSet(); + + var isRemoved = false; + + foreach (var oldReference in oldReferences) { - return EmptyIds; + isRemoved |= ids.Remove(oldReference); } + + return isRemoved ? ids.ToJToken() : value; + } + + public JToken Visit(IField field) + { + return value; + } + + public JToken Visit(IField field) + { + return value; + } + + public JToken Visit(IField field) + { + return value; + } + + public JToken Visit(IField field) + { + return value; + } + + public JToken Visit(IField field) + { + return value; + } + + public JToken Visit(IField field) + { + return value; + } + + public JToken Visit(IField field) + { + return value; } } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesExtensions.cs b/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesExtensions.cs new file mode 100644 index 000000000..b7170f9aa --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesExtensions.cs @@ -0,0 +1,69 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using Newtonsoft.Json.Linq; +using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Infrastructure.Json; + +namespace Squidex.Domain.Apps.Core.ExtractReferenceIds +{ + public static class ReferencesExtensions + { + public static IEnumerable ExtractReferences(this IField field, JToken value) + { + return ReferencesExtractor.ExtractReferences(field, value); + } + + public static JToken CleanReferences(this IField field, JToken value, ICollection oldReferences) + { + if (value.IsNull()) + { + return value; + } + + return ReferencesCleaner.CleanReferences(field, value, oldReferences); + } + + public static JToken ToJToken(this HashSet ids) + { + var result = new JArray(); + + foreach (var id in ids) + { + result.Add(new JValue(id)); + } + + return result; + } + + public static HashSet ToGuidSet(this JToken value) + { + if (value is JArray ids) + { + var result = new HashSet(); + + foreach (var id in ids) + { + if (id.Type == JTokenType.Guid) + { + result.Add((Guid)id); + } + else if (id.Type == JTokenType.String && Guid.TryParse((string)id, out var guid)) + { + result.Add(guid); + } + } + + return result; + } + + return new HashSet(); + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesExtractor.cs b/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesExtractor.cs index 216172bc0..c39dc66fd 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesExtractor.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ReferencesExtractor.cs @@ -13,50 +13,93 @@ using Squidex.Domain.Apps.Core.Schemas; namespace Squidex.Domain.Apps.Core.ExtractReferenceIds { - public static class ReferencesExtractor + public sealed class ReferencesExtractor : IFieldVisitor> { - public static IEnumerable ExtractReferences(this IField field, JToken value) - { - switch (field) - { - case IField assetsField: - return Visit(assetsField, value); + private readonly JToken value; - case IField referencesField: - return Visit(referencesField, value); - } + private ReferencesExtractor(JToken value) + { + this.value = value; + } - return Enumerable.Empty(); + public static IEnumerable ExtractReferences(IField field, JToken value) + { + return field.Accept(new ReferencesExtractor(value)); } - public static IEnumerable Visit(IField field, JToken value) + public IEnumerable Visit(IArrayField field) { - IEnumerable result; - try - { - result = value?.ToObject>(); - } - catch + var result = new List(); + + if (value is JArray items) { - result = null; + foreach (JObject item in value) + { + foreach (var nestedField in field.Fields) + { + if (item.TryGetValue(field.Name, out var value)) + { + result.AddRange(nestedField.Accept(new ReferencesExtractor(value))); + } + } + } } - return result ?? Enumerable.Empty(); + return result; } - private static IEnumerable Visit(IField field, JToken value) + public IEnumerable Visit(IField field) { - IEnumerable result; - try - { - result = value?.ToObject>() ?? Enumerable.Empty(); - } - catch + var ids = value.ToGuidSet(); + + return ids; + } + + public IEnumerable Visit(IField field) + { + var ids = value.ToGuidSet(); + + if (field.Properties.SchemaId != Guid.Empty) { - result = Enumerable.Empty(); + ids.Add(field.Properties.SchemaId); } - return result.Union(new[] { field.Properties.SchemaId }); + return ids; + } + + public IEnumerable Visit(IField field) + { + return Enumerable.Empty(); + } + + public IEnumerable Visit(IField field) + { + return Enumerable.Empty(); + } + + public IEnumerable Visit(IField field) + { + return Enumerable.Empty(); + } + + public IEnumerable Visit(IField field) + { + return Enumerable.Empty(); + } + + public IEnumerable Visit(IField field) + { + return Enumerable.Empty(); + } + + public IEnumerable Visit(IField field) + { + return Enumerable.Empty(); + } + + public IEnumerable Visit(IField field) + { + return Enumerable.Empty(); } } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/FieldReferencesConverter.cs b/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ValueReferencesConverter.cs similarity index 63% rename from src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/FieldReferencesConverter.cs rename to src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ValueReferencesConverter.cs index 8f1a751cc..e99459cc7 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/FieldReferencesConverter.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ValueReferencesConverter.cs @@ -7,28 +7,25 @@ using System; using System.Collections.Generic; -using System.Linq; using Squidex.Domain.Apps.Core.ConvertContent; using Squidex.Infrastructure.Json; namespace Squidex.Domain.Apps.Core.ExtractReferenceIds { - public static class FieldReferencesConverter + public static class ValueReferencesConverter { - public static FieldConverter CleanReferences(IEnumerable deletedReferencedIds) + public static ValueConverter CleanReferences(IEnumerable deletedReferencedIds) { var ids = new HashSet(deletedReferencedIds); - return (data, field) => + return (value, field) => { - foreach (var partitionValue in data.Where(x => !x.Value.IsNull()).ToList()) + if (value.IsNull()) { - var newValue = field.CleanReferences(partitionValue.Value, ids); - - data[partitionValue.Key] = newValue; + return value; } - return data; + return field.CleanReferences(value, ids); }; } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/GenerateEdmSchema/EdmTypeVisitor.cs b/src/Squidex.Domain.Apps.Core.Operations/GenerateEdmSchema/EdmTypeVisitor.cs index 83d3b1a47..789da3081 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/GenerateEdmSchema/EdmTypeVisitor.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/GenerateEdmSchema/EdmTypeVisitor.cs @@ -23,6 +23,11 @@ namespace Squidex.Domain.Apps.Core.GenerateEdmSchema return field.Accept(Instance); } + public IEdmTypeReference Visit(IArrayField field) + { + return null; + } + public IEdmTypeReference Visit(IField field) { return CreatePrimitive(EdmPrimitiveTypeKind.String, field); diff --git a/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonTypeVisitor.cs b/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonTypeVisitor.cs index baff80ccb..00ad5f60f 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonTypeVisitor.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/GenerateJsonSchema/JsonTypeVisitor.cs @@ -7,6 +7,7 @@ using System; using System.Collections.ObjectModel; +using System.Linq; using NJsonSchema; using Squidex.Domain.Apps.Core.Schemas; @@ -21,6 +22,30 @@ namespace Squidex.Domain.Apps.Core.GenerateJsonSchema this.schemaResolver = schemaResolver; } + public JsonProperty Visit(IArrayField field) + { + return CreateProperty(field, jsonProperty => + { + var itemSchema = new JsonSchema4 + { + Type = JsonObjectType.Object + }; + + foreach (var nestedField in field.Fields.Where(x => !x.IsHidden)) + { + var childProperty = nestedField.Accept(this); + + childProperty.Description = nestedField.RawProperties.Hints; + childProperty.IsRequired = nestedField.RawProperties.IsRequired; + + itemSchema.Properties.Add(nestedField.Name, childProperty); + } + + jsonProperty.Type = JsonObjectType.Object; + jsonProperty.Item = itemSchema; + }); + } + public JsonProperty Visit(IField field) { return CreateProperty(field, jsonProperty => 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 79b1e14c4..6a72f9508 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataObject.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentDataObject.cs @@ -95,14 +95,14 @@ namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper { EnsurePropertiesInitialized(); - fieldProperties.GetOrAdd(propertyName, x => new ContentDataProperty(this)).Value = value; + fieldProperties.GetOrAdd(propertyName, this, (k, c) => new ContentDataProperty(c)).Value = value; } public override PropertyDescriptor GetOwnProperty(string propertyName) { EnsurePropertiesInitialized(); - return fieldProperties.GetOrAdd(propertyName, x => new ContentDataProperty(this, new ContentFieldObject(this, new ContentFieldData(), false))); + return fieldProperties.GetOrAdd(propertyName, this, (k, c) => new ContentDataProperty(c, new ContentFieldObject(c, new ContentFieldData(), false))); } public override IEnumerable> GetOwnProperties() diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ContentValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ContentValidator.cs index 5c0b24b81..38517df83 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ContentValidator.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ContentValidator.cs @@ -7,18 +7,22 @@ using System.Collections.Concurrent; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Newtonsoft.Json.Linq; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Domain.Apps.Core.ValidateContent.Validators; using Squidex.Infrastructure; -#pragma warning disable 168 +#pragma warning disable SA1028, IDE0004 // Code must not contain trailing whitespace namespace Squidex.Domain.Apps.Core.ValidateContent { public sealed class ContentValidator { + private static readonly ContentFieldData DefaultFieldData = new ContentFieldData(); + private static readonly JToken DefaultValue = JValue.CreateNull(); private readonly Schema schema; private readonly PartitionResolver partitionResolver; private readonly ValidationContext context; @@ -39,103 +43,60 @@ namespace Squidex.Domain.Apps.Core.ValidateContent this.partitionResolver = partitionResolver; } - public Task ValidatePartialAsync(NamedContentData data) + private void AddError(IEnumerable path, string message) { - Guard.NotNull(data, nameof(data)); - - var tasks = new List(); - - foreach (var fieldData in data) - { - var fieldName = fieldData.Key; - - if (!schema.FieldsByName.TryGetValue(fieldData.Key, out var field)) - { - errors.AddError(" is not a known field.", fieldName); - } - else - { - tasks.Add(ValidateFieldPartialAsync(field, fieldData.Value)); - } - } + var pathString = path.ToPathString(); - return Task.WhenAll(tasks); + errors.Add(new ValidationError($"{pathString}: {message}", pathString)); } - private Task ValidateFieldPartialAsync(Field field, ContentFieldData fieldData) + public Task ValidatePartialAsync(NamedContentData data) { - var partitioning = field.Partitioning; - var partition = partitionResolver(partitioning); - - var tasks = new List(); + Guard.NotNull(data, nameof(data)); - foreach (var partitionValues in fieldData) - { - if (partition.TryGetItem(partitionValues.Key, out var item)) - { - tasks.Add(field.ValidateAsync(partitionValues.Value, context.Optional(item.IsOptional), m => errors.AddError(m, field, item))); - } - else - { - errors.AddError($" has an unsupported {partitioning.Key} value '{partitionValues.Key}'.", field); - } - } + var validator = CreateSchemaValidator(true); - return Task.WhenAll(tasks); + return validator.ValidateAsync(data, context, AddError); } public Task ValidateAsync(NamedContentData data) { Guard.NotNull(data, nameof(data)); - ValidateUnknownFields(data); - - var tasks = new List(); - - foreach (var field in schema.FieldsByName.Values) - { - var fieldData = data.GetOrCreate(field.Name, k => new ContentFieldData()); - - tasks.Add(ValidateFieldAsync(field, fieldData)); - } + var validator = CreateSchemaValidator(false); - return Task.WhenAll(tasks); + return validator.ValidateAsync(data, context, AddError); } - private void ValidateUnknownFields(NamedContentData data) + private IValidator CreateSchemaValidator(bool isPartial) { - foreach (var fieldData in data) + var fieldsValidators = new Dictionary(); + + foreach (var field in schema.FieldsByName) { - if (!schema.FieldsByName.ContainsKey(fieldData.Key)) - { - errors.AddError(" is not a known field.", fieldData.Key); - } + fieldsValidators[field.Key] = (!field.Value.RawProperties.IsRequired, CreateFieldValidator(field.Value, isPartial)); } + + return new ObjectValidator(fieldsValidators, isPartial, "field", DefaultFieldData); } - private Task ValidateFieldAsync(Field field, ContentFieldData fieldData) + private IValidator CreateFieldValidator(IRootField field, bool isPartial) { - var partitioning = field.Partitioning; - var partition = partitionResolver(partitioning); + var partitioning = partitionResolver(field.Partitioning); - var tasks = new List(); + var fieldValidator = new FieldValidator(ValidatorsFactory.CreateValidators(field).ToArray(), field); + var fieldsValidators = new Dictionary(); - foreach (var partitionValues in fieldData) + foreach (var partition in partitioning) { - if (!partition.TryGetItem(partitionValues.Key, out var _)) - { - errors.AddError($" has an unsupported {partitioning.Key} value '{partitionValues.Key}'.", field); - } + fieldsValidators[partition.Key] = (partition.IsOptional, fieldValidator); } - foreach (var item in partition) - { - var value = fieldData.GetOrCreate(item.Key, k => JValue.CreateNull()); + var isLanguage = field.Partitioning.Equals(Partitioning.Language); - tasks.Add(field.ValidateAsync(value, context.Optional(item.IsOptional), m => errors.AddError(m, field, item))); - } + var type = isLanguage ? "language" : "invariant value"; - return Task.WhenAll(tasks); + return new ObjectValidator(fieldsValidators, isPartial, type, DefaultValue); } } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/FieldExtensions.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/FieldExtensions.cs deleted file mode 100644 index ac2c46ca3..000000000 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/FieldExtensions.cs +++ /dev/null @@ -1,57 +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.Threading.Tasks; -using Newtonsoft.Json.Linq; -using Squidex.Domain.Apps.Core.Schemas; -using Squidex.Infrastructure; -using Squidex.Infrastructure.Json; - -namespace Squidex.Domain.Apps.Core.ValidateContent -{ - public static class FieldExtensions - { - public static void AddError(this ConcurrentBag errors, string message, IField field, IFieldPartitionItem partitionItem = null) - { - AddError(errors, message, !string.IsNullOrWhiteSpace(field.RawProperties.Label) ? field.RawProperties.Label : field.Name, field.Name, partitionItem); - } - - public static void AddError(this ConcurrentBag errors, string message, string fieldName, IFieldPartitionItem partitionItem = null) - { - AddError(errors, message, fieldName, fieldName, partitionItem); - } - - public static void AddError(this ConcurrentBag errors, string message, string displayName, string fieldName, IFieldPartitionItem partitionItem = null) - { - if (partitionItem != null && partitionItem != InvariantPartitioning.Instance.Master) - { - displayName += $" ({partitionItem.Key})"; - } - - errors.Add(new ValidationError(message.Replace("", displayName), fieldName)); - } - - public static async Task ValidateAsync(this IField field, JToken value, ValidationContext context, Action addError) - { - try - { - var typedValue = value.IsNull() ? null : JsonValueConverter.ConvertValue(field, value); - - foreach (var validator in ValidatorsFactory.CreateValidators(field)) - { - await validator.ValidateAsync(typedValue, context, addError); - } - } - catch - { - addError(" is not a valid value."); - } - } - } -} diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs index 9de8f0716..a43f8a095 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/JsonValueConverter.cs @@ -16,11 +16,11 @@ namespace Squidex.Domain.Apps.Core.ValidateContent { public sealed class JsonValueConverter : IFieldVisitor { - public JToken Value { get; } + private readonly JToken value; private JsonValueConverter(JToken value) { - Value = value; + this.value = value; } public static object ConvertValue(IField field, JToken json) @@ -28,21 +28,26 @@ namespace Squidex.Domain.Apps.Core.ValidateContent return field.Accept(new JsonValueConverter(json)); } + public object Visit(IArrayField field) + { + return value.ToObject>(); + } + public object Visit(IField field) { - return Value.ToObject>(); + return value.ToObject>(); } public object Visit(IField field) { - return (bool?)Value; + return (bool?)value; } public object Visit(IField field) { - if (Value.Type == JTokenType.String) + if (value.Type == JTokenType.String) { - var parseResult = InstantPattern.General.Parse(Value.ToString()); + var parseResult = InstantPattern.General.Parse(value.ToString()); if (!parseResult.Success) { @@ -57,7 +62,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent public object Visit(IField field) { - var geolocation = (JObject)Value; + var geolocation = (JObject)value; foreach (var property in geolocation.Properties()) { @@ -81,32 +86,32 @@ namespace Squidex.Domain.Apps.Core.ValidateContent throw new InvalidCastException("Longitude must be between -180 and 180."); } - return Value; + return value; } public object Visit(IField field) { - return Value; + return value; } public object Visit(IField field) { - return (double?)Value; + return (double?)value; } public object Visit(IField field) { - return Value.ToObject>(); + return value.ToObject>(); } public object Visit(IField field) { - return Value.ToString(); + return value.ToString(); } public object Visit(IField field) { - return Value.ToObject>(); + return value.ToObject>(); } } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ObjectPath.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ObjectPath.cs new file mode 100644 index 000000000..3b1c216cb --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ObjectPath.cs @@ -0,0 +1,52 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Text; + +namespace Squidex.Domain.Apps.Core.ValidateContent +{ + public static class ObjectPath + { + public static string ToPathString(this IEnumerable path) + { + var sb = new StringBuilder(); + + var index = 0; + foreach (var property in path) + { + if (index == 0) + { + sb.Append(property); + } + else if (index == 1) + { + if (!property.Equals(InvariantPartitioning.Instance.Master.Key, StringComparison.OrdinalIgnoreCase)) + { + sb.Append("("); + sb.Append(property); + sb.Append(")"); + } + } + else + { + if (property[0] != '[') + { + sb.Append("."); + } + + sb.Append(property); + } + + index++; + } + + return sb.ToString(); + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ValidationContext.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ValidationContext.cs index 4a57b5fc8..5db995c34 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ValidationContext.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ValidationContext.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; +using System.Collections.Immutable; using System.Threading.Tasks; using Squidex.Infrastructure; @@ -16,24 +17,33 @@ namespace Squidex.Domain.Apps.Core.ValidateContent { private readonly Func, Guid, Task>> checkContent; private readonly Func, Task>> checkAsset; + private readonly ImmutableQueue propertyPath; + + public ImmutableQueue Path + { + get { return propertyPath; } + } public bool IsOptional { get; } public ValidationContext( Func, Guid, Task>> checkContent, Func, Task>> checkAsset) - : this(checkContent, checkAsset, false) + : this(checkContent, checkAsset, ImmutableQueue.Empty, false) { } private ValidationContext( Func, Guid, Task>> checkContent, Func, Task>> checkAsset, + ImmutableQueue propertyPath, bool isOptional) { Guard.NotNull(checkAsset, nameof(checkAsset)); Guard.NotNull(checkContent, nameof(checkAsset)); + this.propertyPath = propertyPath; + this.checkContent = checkContent; this.checkAsset = checkAsset; @@ -42,7 +52,12 @@ namespace Squidex.Domain.Apps.Core.ValidateContent public ValidationContext Optional(bool isOptional) { - return isOptional == IsOptional ? this : new ValidationContext(checkContent, checkAsset, isOptional); + return isOptional == IsOptional ? this : new ValidationContext(checkContent, checkAsset, propertyPath, isOptional); + } + + public ValidationContext Nested(string property) + { + return new ValidationContext(checkContent, checkAsset, propertyPath.Enqueue(property), IsOptional); } public Task> GetInvalidContentIdsAsync(IEnumerable contentIds, Guid schemaId) diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/AllowedValuesValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/AllowedValuesValidator.cs index 44aba8c60..9b1d6129d 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/AllowedValuesValidator.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/AllowedValuesValidator.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Linq; using System.Threading.Tasks; using Squidex.Infrastructure; @@ -24,7 +23,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators this.allowedValues = allowedValues; } - public Task ValidateAsync(object value, ValidationContext context, Action addError) + public Task ValidateAsync(object value, ValidationContext context, AddError addError) { if (value == null) { @@ -35,7 +34,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators if (!allowedValues.Contains(typedValue)) { - addError(" is not an allowed value."); + addError(context.Path, "Not an allowed value."); } return TaskHelper.Done; diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/AssetsValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/AssetsValidator.cs index 2c6db10d7..f1a87c283 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/AssetsValidator.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/AssetsValidator.cs @@ -23,52 +23,49 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators this.properties = properties; } - public async Task ValidateAsync(object value, ValidationContext context, Action addError) + public async Task ValidateAsync(object value, ValidationContext context, AddError addError) { - if (value is ICollection assetIds) + if (value is ICollection assetIds && assetIds.Count > 0) { var assets = await context.GetAssetInfosAsync(assetIds); - var i = 0; + var index = 0; foreach (var assetId in assetIds) { - i++; + index++; - var asset = assets.FirstOrDefault(x => x.AssetId == assetId); + var path = context.Path.Enqueue($"[{index}]"); - void Error(string message) - { - addError($" has invalid asset #{i}: {message}"); - } + var asset = assets.FirstOrDefault(x => x.AssetId == assetId); if (asset == null) { - Error($"Id '{assetId}' not found."); + addError(path, $"Id '{assetId}' not found."); continue; } if (properties.MinSize.HasValue && asset.FileSize < properties.MinSize) { - Error($"'{asset.FileSize.ToReadableSize()}' less than minimum of '{properties.MinSize.Value.ToReadableSize()}'."); + addError(path, $"'{asset.FileSize.ToReadableSize()}' less than minimum of '{properties.MinSize.Value.ToReadableSize()}'."); } if (properties.MaxSize.HasValue && asset.FileSize > properties.MaxSize) { - Error($"'{asset.FileSize.ToReadableSize()}' greater than maximum of '{properties.MaxSize.Value.ToReadableSize()}'."); + addError(path, $"'{asset.FileSize.ToReadableSize()}' greater than maximum of '{properties.MaxSize.Value.ToReadableSize()}'."); } if (properties.AllowedExtensions != null && properties.AllowedExtensions.Count > 0 && !properties.AllowedExtensions.Any(x => asset.FileName.EndsWith("." + x, StringComparison.OrdinalIgnoreCase))) { - Error("Invalid file extension."); + addError(path, "Invalid file extension."); } if (!asset.IsImage) { if (properties.MustBeImage) { - Error("Not an image."); + addError(path, "Not an image."); } continue; @@ -84,22 +81,22 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators if (properties.MinWidth.HasValue && w < properties.MinWidth) { - Error($"Width '{w}px' less than minimum of '{properties.MinWidth}px'."); + addError(path, $"Width '{w}px' less than minimum of '{properties.MinWidth}px'."); } if (properties.MaxWidth.HasValue && w > properties.MaxWidth) { - Error($"Width '{w}px' greater than maximum of '{properties.MaxWidth}px'."); + addError(path, $"Width '{w}px' greater than maximum of '{properties.MaxWidth}px'."); } if (properties.MinHeight.HasValue && h < properties.MinHeight) { - Error($"Height '{h}px' less than minimum of '{properties.MinHeight}px'."); + addError(path, $"Height '{h}px' less than minimum of '{properties.MinHeight}px'."); } if (properties.MaxHeight.HasValue && h > properties.MaxHeight) { - Error($"Height '{h}px' greater than maximum of '{properties.MaxHeight}px'."); + addError(path, $"Height '{h}px' greater than maximum of '{properties.MaxHeight}px'."); } if (properties.AspectHeight.HasValue && properties.AspectWidth.HasValue) @@ -108,7 +105,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators if (Math.Abs(expectedRatio - actualRatio) > double.Epsilon) { - Error($"Aspect ratio not '{properties.AspectWidth}:{properties.AspectHeight}'."); + addError(path, $"Aspect ratio not '{properties.AspectWidth}:{properties.AspectHeight}'."); } } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/CollectionItemValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/CollectionItemValidator.cs index ea75cdd53..8e8efdd46 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/CollectionItemValidator.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/CollectionItemValidator.cs @@ -5,14 +5,14 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; +using System.Collections; using System.Collections.Generic; using System.Threading.Tasks; using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Core.ValidateContent.Validators { - public sealed class CollectionItemValidator : IValidator + public sealed class CollectionItemValidator : IValidator { private readonly IValidator[] itemValidators; @@ -24,23 +24,26 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators this.itemValidators = itemValidators; } - public async Task ValidateAsync(object value, ValidationContext context, Action addError) + public async Task ValidateAsync(object value, ValidationContext context, AddError addError) { - if (value is ICollection items) + if (value is ICollection items && items.Count > 0) { - var innerContext = context.Optional(false); - + var innerTasks = new List(); var index = 1; foreach (var item in items) { + var innerContext = context.Nested($"[{index}]"); + foreach (var itemValidator in itemValidators) { - await itemValidator.ValidateAsync(item, innerContext, e => addError(e.Replace("", $" item #{index}"))); + innerTasks.Add(itemValidator.ValidateAsync(item, innerContext, addError)); } index++; } + + await Task.WhenAll(innerTasks); } } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/CollectionValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/CollectionValidator.cs index a1699e802..820afe308 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/CollectionValidator.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/CollectionValidator.cs @@ -5,14 +5,13 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; -using System.Collections.Generic; +using System.Collections; using System.Threading.Tasks; using Squidex.Infrastructure.Tasks; namespace Squidex.Domain.Apps.Core.ValidateContent.Validators { - public sealed class CollectionValidator : IValidator + public sealed class CollectionValidator : IValidator { private readonly bool isRequired; private readonly int? minItems; @@ -25,13 +24,13 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators this.maxItems = maxItems; } - public Task ValidateAsync(object value, ValidationContext context, Action addError) + public Task ValidateAsync(object value, ValidationContext context, AddError addError) { - if (!(value is ICollection items) || items.Count == 0) + if (!(value is ICollection items) || items.Count == 0) { if (isRequired && !context.IsOptional) { - addError(" is required."); + addError(context.Path, "Field is required."); } return TaskHelper.Done; @@ -39,12 +38,12 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators if (minItems.HasValue && items.Count < minItems.Value) { - addError($" must have at least {minItems} item(s)."); + addError(context.Path, $"Must have at least {minItems} item(s)."); } if (maxItems.HasValue && items.Count > maxItems.Value) { - addError($" must have not more than {maxItems} item(s)."); + addError(context.Path, $"Must have not more than {maxItems} item(s)."); } return TaskHelper.Done; diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/FieldValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/FieldValidator.cs new file mode 100644 index 000000000..2c8e4d680 --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/FieldValidator.cs @@ -0,0 +1,53 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using System.Threading.Tasks; +using Newtonsoft.Json.Linq; +using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Infrastructure.Json; + +namespace Squidex.Domain.Apps.Core.ValidateContent.Validators +{ + public sealed class FieldValidator : IValidator + { + private readonly IValidator[] validators; + private readonly IField field; + + public FieldValidator(IValidator[] validators, IField field) + { + this.validators = validators; + this.field = field; + } + + public async Task ValidateAsync(object value, ValidationContext context, AddError addError) + { + try + { + object typedValue = null; + + if (value is JToken jToken) + { + typedValue = jToken.IsNull() ? null : JsonValueConverter.ConvertValue(field, jToken); + } + + var tasks = new List(); + + foreach (var validator in ValidatorsFactory.CreateValidators(field)) + { + tasks.Add(validator.ValidateAsync(typedValue, context, addError)); + } + + await Task.WhenAll(tasks); + } + catch + { + addError(context.Path, "Not a valid value."); + } + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/IValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/IValidator.cs index e0d7c49f8..47592700f 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/IValidator.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/IValidator.cs @@ -5,13 +5,15 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; +using System.Collections.Generic; using System.Threading.Tasks; namespace Squidex.Domain.Apps.Core.ValidateContent.Validators { + public delegate void AddError(IEnumerable path, string message); + public interface IValidator { - Task ValidateAsync(object value, ValidationContext context, Action addError); + Task ValidateAsync(object value, ValidationContext context, AddError addError); } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/ObjectValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/ObjectValidator.cs new file mode 100644 index 000000000..6dd8a9c28 --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/ObjectValidator.cs @@ -0,0 +1,68 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using System.Threading.Tasks; + +namespace Squidex.Domain.Apps.Core.ValidateContent.Validators +{ + public sealed class ObjectValidator : IValidator + { + private readonly IDictionary schema; + private readonly bool isPartial; + private readonly string fieldType; + private readonly TValue fieldDefault; + + public ObjectValidator(IDictionary schema, bool isPartial, string fieldType, TValue fieldDefault) + { + this.schema = schema; + this.fieldDefault = fieldDefault; + this.fieldType = fieldType; + this.isPartial = isPartial; + } + + public async Task ValidateAsync(object value, ValidationContext context, AddError addError) + { + if (value is IDictionary values) + { + foreach (var fieldData in values) + { + var name = fieldData.Key; + + if (!schema.ContainsKey(name)) + { + addError(context.Path.Enqueue(name), $"Not a known {fieldType}."); + } + } + + var tasks = new List(); + + foreach (var field in schema) + { + var name = field.Key; + + if (!values.TryGetValue(name, out var fieldValue)) + { + if (isPartial) + { + continue; + } + + fieldValue = fieldDefault; + } + + var (isOptional, validator) = field.Value; + var fieldContext = context.Nested(name).Optional(isOptional); + + tasks.Add(validator.ValidateAsync(fieldValue, fieldContext, addError)); + } + + await Task.WhenAll(tasks); + } + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/PatternValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/PatternValidator.cs index ec799c0bc..c358c3bdf 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/PatternValidator.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/PatternValidator.cs @@ -25,7 +25,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators regex = new Regex("^" + pattern + "$", RegexOptions.None, Timeout); } - public Task ValidateAsync(object value, ValidationContext context, Action addError) + public Task ValidateAsync(object value, ValidationContext context, AddError addError) { if (value is string stringValue) { @@ -37,17 +37,17 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators { if (string.IsNullOrWhiteSpace(errorMessage)) { - addError(" is not valid."); + addError(context.Path, "Not valid."); } else { - addError(errorMessage); + addError(context.Path, errorMessage); } } } catch { - addError(" has a regex that is too slow."); + addError(context.Path, "Regex is too slow."); } } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/RangeValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/RangeValidator.cs index 47507c696..5c26227fd 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/RangeValidator.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/RangeValidator.cs @@ -27,7 +27,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators this.max = max; } - public Task ValidateAsync(object value, ValidationContext context, Action addError) + public Task ValidateAsync(object value, ValidationContext context, AddError addError) { if (value == null) { @@ -38,12 +38,12 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators if (min.HasValue && typedValue.CompareTo(min.Value) < 0) { - addError($" must be greater or equals than '{min}'."); + addError(context.Path, $"Must be greater or equals than '{min}'."); } if (max.HasValue && typedValue.CompareTo(max.Value) > 0) { - addError($" must be less or equals than '{max}'."); + addError(context.Path, $"Must be less or equals than '{max}'."); } return TaskHelper.Done; diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/ReferencesValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/ReferencesValidator.cs index a47f0f279..9fd97bc02 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/ReferencesValidator.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/ReferencesValidator.cs @@ -20,7 +20,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators this.schemaId = schemaId; } - public async Task ValidateAsync(object value, ValidationContext context, Action addError) + public async Task ValidateAsync(object value, ValidationContext context, AddError addError) { if (value is ICollection contentIds) { @@ -28,7 +28,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators foreach (var invalidId in invalidIds) { - addError($" contains invalid reference '{invalidId}'."); + addError(context.Path, $"Contains invalid reference '{invalidId}'."); } } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/RequiredStringValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/RequiredStringValidator.cs index fd7a39ad2..eacbcdb79 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/RequiredStringValidator.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/RequiredStringValidator.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Threading.Tasks; using Squidex.Infrastructure.Tasks; @@ -20,7 +19,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators this.validateEmptyStrings = validateEmptyStrings; } - public Task ValidateAsync(object value, ValidationContext context, Action addError) + public Task ValidateAsync(object value, ValidationContext context, AddError addError) { if (context.IsOptional || (value != null && !(value is string))) { @@ -31,7 +30,7 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators if (valueAsString == null || (validateEmptyStrings && string.IsNullOrWhiteSpace(valueAsString))) { - addError(" is required."); + addError(context.Path, "Field is required."); } return TaskHelper.Done; diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/RequiredValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/RequiredValidator.cs index 4dfeb1849..6d2d308a6 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/RequiredValidator.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/RequiredValidator.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Threading.Tasks; using Squidex.Infrastructure.Tasks; @@ -13,11 +12,11 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators { public class RequiredValidator : IValidator { - public Task ValidateAsync(object value, ValidationContext context, Action addError) + public Task ValidateAsync(object value, ValidationContext context, AddError addError) { if (value == null && !context.IsOptional) { - addError(" is required."); + addError(context.Path, "Field is required."); } return TaskHelper.Done; diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/StringLengthValidator.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/StringLengthValidator.cs index acc8e13e4..f89b1ed3e 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/StringLengthValidator.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/Validators/StringLengthValidator.cs @@ -27,18 +27,18 @@ namespace Squidex.Domain.Apps.Core.ValidateContent.Validators this.maxLength = maxLength; } - public Task ValidateAsync(object value, ValidationContext context, Action addError) + public Task ValidateAsync(object value, ValidationContext context, AddError addError) { if (value is string stringValue && !string.IsNullOrEmpty(stringValue)) { if (minLength.HasValue && stringValue.Length < minLength.Value) { - addError($" must have more than '{minLength}' characters."); + addError(context.Path, $"Must have more than '{minLength}' characters."); } if (maxLength.HasValue && stringValue.Length > maxLength.Value) { - addError($" must have less than '{maxLength}' characters."); + addError(context.Path, $"Must have less than '{maxLength}' characters."); } } diff --git a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ValidatorsFactory.cs b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ValidatorsFactory.cs index 330c3f1bb..eba15cb29 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ValidatorsFactory.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/ValidateContent/ValidatorsFactory.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Newtonsoft.Json.Linq; using NodaTime; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.ValidateContent.Validators; @@ -15,7 +16,7 @@ using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Core.ValidateContent { - public sealed class ValidatorsFactory : IFieldPropertiesVisitor> + public sealed class ValidatorsFactory : IFieldVisitor> { private static readonly ValidatorsFactory Instance = new ValidatorsFactory(); @@ -27,118 +28,135 @@ namespace Squidex.Domain.Apps.Core.ValidateContent { Guard.NotNull(field, nameof(field)); - return field.RawProperties.Accept(Instance); + return field.Accept(Instance); } - public IEnumerable Visit(AssetsFieldProperties properties) + public IEnumerable Visit(IArrayField field) { - if (properties.IsRequired || properties.MinItems.HasValue || properties.MaxItems.HasValue) + if (field.Properties.IsRequired || field.Properties.MinItems.HasValue || field.Properties.MaxItems.HasValue) { - yield return new CollectionValidator(properties.IsRequired, properties.MinItems, properties.MaxItems); + yield return new CollectionValidator(field.Properties.IsRequired, field.Properties.MinItems, field.Properties.MaxItems); } - yield return new AssetsValidator(properties); + var nestedSchema = new Dictionary(); + + foreach (var nestedField in field.Fields) + { + nestedSchema[nestedField.Name] = (false, new FieldValidator(nestedField.Accept(this).ToArray(), nestedField)); + } + + yield return new CollectionItemValidator(new ObjectValidator(nestedSchema, false, "field", JValue.CreateNull())); + } + + public IEnumerable Visit(IField field) + { + if (field.Properties.IsRequired || field.Properties.MinItems.HasValue || field.Properties.MaxItems.HasValue) + { + yield return new CollectionValidator(field.Properties.IsRequired, field.Properties.MinItems, field.Properties.MaxItems); + } + + yield return new AssetsValidator(field.Properties); } - public IEnumerable Visit(BooleanFieldProperties properties) + public IEnumerable Visit(IField field) { - if (properties.IsRequired) + if (field.Properties.IsRequired) { yield return new RequiredValidator(); } } - public IEnumerable Visit(DateTimeFieldProperties properties) + public IEnumerable Visit(IField field) { - if (properties.IsRequired) + if (field.Properties.IsRequired) { yield return new RequiredValidator(); } - if (properties.MinValue.HasValue || properties.MaxValue.HasValue) + if (field.Properties.MinValue.HasValue || field.Properties.MaxValue.HasValue) { - yield return new RangeValidator(properties.MinValue, properties.MaxValue); + yield return new RangeValidator(field.Properties.MinValue, field.Properties.MaxValue); } } - public IEnumerable Visit(GeolocationFieldProperties properties) + public IEnumerable Visit(IField field) { - if (properties.IsRequired) + if (field.Properties.IsRequired) { yield return new RequiredValidator(); } } - public IEnumerable Visit(JsonFieldProperties properties) + public IEnumerable Visit(IField field) { - if (properties.IsRequired) + if (field.Properties.IsRequired) { yield return new RequiredValidator(); } } - public IEnumerable Visit(NumberFieldProperties properties) + public IEnumerable Visit(IField field) { - if (properties.IsRequired) + if (field.Properties.IsRequired) { yield return new RequiredValidator(); } - if (properties.MinValue.HasValue || properties.MaxValue.HasValue) + if (field.Properties.MinValue.HasValue || field.Properties.MaxValue.HasValue) { - yield return new RangeValidator(properties.MinValue, properties.MaxValue); + yield return new RangeValidator(field.Properties.MinValue, field.Properties.MaxValue); } - if (properties.AllowedValues != null) + if (field.Properties.AllowedValues != null) { - yield return new AllowedValuesValidator(properties.AllowedValues.ToArray()); + yield return new AllowedValuesValidator(field.Properties.AllowedValues.ToArray()); } } - public IEnumerable Visit(ReferencesFieldProperties properties) + public IEnumerable Visit(IField field) { - if (properties.IsRequired || properties.MinItems.HasValue || properties.MaxItems.HasValue) + if (field.Properties.IsRequired || field.Properties.MinItems.HasValue || field.Properties.MaxItems.HasValue) { - yield return new CollectionValidator(properties.IsRequired, properties.MinItems, properties.MaxItems); + yield return new CollectionValidator(field.Properties.IsRequired, field.Properties.MinItems, field.Properties.MaxItems); } - if (properties.SchemaId != Guid.Empty) + if (field.Properties.SchemaId != Guid.Empty) { - yield return new ReferencesValidator(properties.SchemaId); + yield return new ReferencesValidator(field.Properties.SchemaId); } } - public IEnumerable Visit(StringFieldProperties properties) + public IEnumerable Visit(IField field) { - if (properties.IsRequired) + if (field.Properties.IsRequired) { yield return new RequiredStringValidator(); } - if (properties.MinLength.HasValue || properties.MaxLength.HasValue) + if (field.Properties.MinLength.HasValue || field.Properties.MaxLength.HasValue) { - yield return new StringLengthValidator(properties.MinLength, properties.MaxLength); + yield return new StringLengthValidator(field.Properties.MinLength, field.Properties.MaxLength); } - if (!string.IsNullOrWhiteSpace(properties.Pattern)) + if (!string.IsNullOrWhiteSpace(field.Properties.Pattern)) { - yield return new PatternValidator(properties.Pattern, properties.PatternMessage); + yield return new PatternValidator(field.Properties.Pattern, field.Properties.PatternMessage); } - if (properties.AllowedValues != null) + if (field.Properties.AllowedValues != null) { - yield return new AllowedValuesValidator(properties.AllowedValues.ToArray()); + yield return new AllowedValuesValidator(field.Properties.AllowedValues.ToArray()); } } - public IEnumerable Visit(TagsFieldProperties properties) + public IEnumerable Visit(IField field) { - if (properties.IsRequired || properties.MinItems.HasValue || properties.MaxItems.HasValue) + if (field.Properties.IsRequired || field.Properties.MinItems.HasValue || field.Properties.MaxItems.HasValue) { - yield return new CollectionValidator(properties.IsRequired, properties.MinItems, properties.MaxItems); + yield return new CollectionValidator(field.Properties.IsRequired, field.Properties.MinItems, field.Properties.MaxItems); } - yield return new CollectionItemValidator(new RequiredStringValidator()); + yield return new CollectionItemValidator(new RequiredStringValidator()); } } } diff --git a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Extensions.cs b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Extensions.cs index b4917e217..ce085a1dc 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Extensions.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Extensions.cs @@ -28,12 +28,22 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents public static NamedContentData FromMongoModel(this IdContentData result, Schema schema, List deletedIds) { - return result.ToNameModel(schema, FieldConverters.DecodeJson(), FieldReferencesConverter.CleanReferences(deletedIds)); + return result.ConvertId2Name(schema, + FieldConverters.ForValues( + ValueConverters.DecodeJson(), + ValueReferencesConverter.CleanReferences(deletedIds)), + FieldConverters.ForNestedId2Name( + ValueConverters.DecodeJson(), + ValueReferencesConverter.CleanReferences(deletedIds))); } public static IdContentData ToMongoModel(this NamedContentData result, Schema schema) { - return result.ToIdModel(schema, FieldConverters.EncodeJson()); + return result.ConvertName2Id(schema, + FieldConverters.ForValues( + ValueConverters.EncodeJson()), + FieldConverters.ForNestedName2Id( + ValueConverters.EncodeJson())); } public static string ToFullText(this ContentData data) 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 e91e02385..8393c28c3 100644 --- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs +++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentRepository_SnapshotStore.cs @@ -39,11 +39,17 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents var schema = await GetSchemaAsync(value.AppId.Id, value.SchemaId.Id); var idData = value.Data.ToMongoModel(schema.SchemaDef); + var idDraftData = idData; + + if (!ReferenceEquals(value.Data, value.DataDraft)) + { + idDraftData = value.DataDraft?.ToMongoModel(schema.SchemaDef); + } var content = SimpleMapper.Map(value, new MongoContentEntity { DataByIds = idData, - DataDraftByIds = value.DataDraft?.ToMongoModel(schema.SchemaDef), + DataDraftByIds = idDraftData, IsDeleted = value.IsDeleted, IndexedAppId = value.AppId.Id, IndexedSchemaId = value.SchemaId.Id, diff --git a/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs b/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs index 370ad85de..975b1cd36 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs @@ -200,7 +200,7 @@ namespace Squidex.Domain.Apps.Entities.Apps public void Create(CreateApp command) { - var appId = new NamedId(command.AppId, command.Name); + var appId = NamedId.Of(command.AppId, command.Name); var events = new List { @@ -308,7 +308,7 @@ namespace Squidex.Domain.Apps.Entities.Apps { if (@event.AppId == null) { - @event.AppId = new NamedId(Snapshot.Id, Snapshot.Name); + @event.AppId = NamedId.Of(Snapshot.Id, Snapshot.Name); } RaiseEvent(Envelope.Create(@event)); diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs index 536a4cd42..f2d0bf83d 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateBlogCommandMiddleware.cs @@ -32,7 +32,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates { if (context.IsCompleted && context.Command is CreateApp createApp && IsRightTemplate(createApp)) { - var appId = new NamedId(createApp.AppId, createApp.Name); + var appId = NamedId.Of(createApp.AppId, createApp.Name); var publish = new Func(command => { @@ -156,7 +156,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates await publish(command); - var schemaId = new NamedId(command.SchemaId, command.Name); + var schemaId = NamedId.Of(command.SchemaId, command.Name); await publish(new ConfigureScripts { @@ -222,7 +222,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates await publish(command); - var schemaId = new NamedId(command.SchemaId, command.Name); + var schemaId = NamedId.Of(command.SchemaId, command.Name); await publish(new ConfigureScripts { diff --git a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateProfileCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateProfileCommandMiddleware.cs index 936b0a055..15f710fd2 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateProfileCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/Templates/CreateProfileCommandMiddleware.cs @@ -27,7 +27,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates { if (context.IsCompleted && context.Command is CreateApp createApp && IsRightTemplate(createApp)) { - var appId = new NamedId(createApp.AppId, createApp.Name); + var appId = NamedId.Of(createApp.AppId, createApp.Name); var publish = new Func(command => { @@ -233,7 +233,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates await publish(command); - return new NamedId(command.SchemaId, command.Name); + return NamedId.Of(command.SchemaId, command.Name); } private async Task> CreateProjectsSchemaAsync(Func publish) @@ -324,7 +324,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates await publish(command); - return new NamedId(command.SchemaId, command.Name); + return NamedId.Of(command.SchemaId, command.Name); } private async Task> CreateExperienceSchemaAsync(Func publish) @@ -404,7 +404,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates await publish(command); - return new NamedId(command.SchemaId, command.Name); + return NamedId.Of(command.SchemaId, command.Name); } private async Task> CreateEducationSchemaAsync(Func publish) @@ -484,7 +484,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates await publish(command); - return new NamedId(command.SchemaId, command.Name); + return NamedId.Of(command.SchemaId, command.Name); } private async Task> CreatePublicationsSchemaAsync(Func publish) @@ -552,7 +552,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates await publish(command); - return new NamedId(command.SchemaId, command.Name); + return NamedId.Of(command.SchemaId, command.Name); } private async Task> CreateSkillsSchemaAsync(Func publish) @@ -597,7 +597,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.Templates await publish(command); - return new NamedId(command.SchemaId, command.Name); + return NamedId.Of(command.SchemaId, command.Name); } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs index 7e14b50e7..5ec1f122e 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs @@ -154,12 +154,12 @@ namespace Squidex.Domain.Apps.Entities.Contents result.Data = scriptEngine.Transform(new ScriptContext { User = context.User, Data = content.Data, ContentId = content.Id }, scriptText); } - result.Data = result.Data.Convert(schema.SchemaDef, converters); + result.Data = result.Data.ConvertName2Name(schema.SchemaDef, converters); } if (result.DataDraft != null) { - result.DataDraft = result.DataDraft.Convert(schema.SchemaDef, converters); + result.DataDraft = result.DataDraft.ConvertName2Name(schema.SchemaDef, converters); } yield return result; @@ -172,11 +172,13 @@ namespace Squidex.Domain.Apps.Entities.Contents if (!context.IsFrontendClient) { yield return FieldConverters.ExcludeHidden(); + yield return FieldConverters.ForNestedName2Name(ValueConverters.ExcludeHidden()); } if (checkType) { yield return FieldConverters.ExcludeChangedTypes(); + yield return FieldConverters.ForNestedName2Name(ValueConverters.ExcludeChangedTypes()); } yield return FieldConverters.ResolveInvariant(context.App.LanguagesConfig); diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/CachingGraphQLService.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/CachingGraphQLService.cs index 56f8bf48c..68bad5840 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/CachingGraphQLService.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/CachingGraphQLService.cs @@ -12,7 +12,6 @@ using Microsoft.Extensions.Caching.Memory; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Assets.Repositories; using Squidex.Infrastructure; -using Squidex.Infrastructure.Commands; namespace Squidex.Domain.Apps.Entities.Contents.GraphQL { @@ -20,7 +19,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL { private static readonly TimeSpan CacheDuration = TimeSpan.FromMinutes(10); private readonly IContentQueryService contentQuery; - private readonly ICommandBus commandBus; private readonly IGraphQLUrlGenerator urlGenerator; private readonly IAssetRepository assetRepository; private readonly IAppProvider appProvider; @@ -28,20 +26,17 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL public CachingGraphQLService(IMemoryCache cache, IAppProvider appProvider, IAssetRepository assetRepository, - ICommandBus commandBus, IContentQueryService contentQuery, IGraphQLUrlGenerator urlGenerator) : base(cache) { Guard.NotNull(appProvider, nameof(appProvider)); Guard.NotNull(assetRepository, nameof(assetRepository)); - Guard.NotNull(commandBus, nameof(commandBus)); Guard.NotNull(contentQuery, nameof(contentQuery)); Guard.NotNull(urlGenerator, nameof(urlGenerator)); this.appProvider = appProvider; this.assetRepository = assetRepository; - this.commandBus = commandBus; this.contentQuery = contentQuery; this.urlGenerator = urlGenerator; } @@ -58,7 +53,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL var modelContext = await GetModelAsync(context.App); - var ctx = new GraphQLExecutionContext(context, assetRepository, commandBus, contentQuery, urlGenerator); + var ctx = new GraphQLExecutionContext(context, assetRepository, contentQuery, urlGenerator); return await modelContext.ExecuteAsync(ctx, query); } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLExecutionContext.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLExecutionContext.cs index 8456884eb..31acd1523 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLExecutionContext.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLExecutionContext.cs @@ -11,25 +11,19 @@ using System.Threading.Tasks; using Newtonsoft.Json.Linq; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Domain.Apps.Entities.Assets.Repositories; -using Squidex.Infrastructure.Commands; namespace Squidex.Domain.Apps.Entities.Contents.GraphQL { public sealed class GraphQLExecutionContext : QueryExecutionContext { - public ICommandBus CommandBus { get; } - public IGraphQLUrlGenerator UrlGenerator { get; } public GraphQLExecutionContext(QueryContext context, IAssetRepository assetRepository, - ICommandBus commandBus, IContentQueryService contentQuery, IGraphQLUrlGenerator urlGenerator) : base(context, assetRepository, contentQuery) { - CommandBus = commandBus; - UrlGenerator = urlGenerator; } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs index 6546572fe..2b8daf4e6 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLModel.cs @@ -12,12 +12,13 @@ using System.Threading.Tasks; using GraphQL; using GraphQL.Resolvers; using GraphQL.Types; +using Newtonsoft.Json.Linq; using Squidex.Domain.Apps.Core; -using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Domain.Apps.Entities.Contents.GraphQL.Types; +using Squidex.Domain.Apps.Entities.Contents.GraphQL.Types.Utils; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using GraphQLSchema = GraphQL.Types.Schema; @@ -28,13 +29,13 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL { public sealed class GraphQLModel : IGraphModel { - private readonly QueryGraphTypeVisitor schemaTypes; private readonly Dictionary contentTypes = new Dictionary(); private readonly Dictionary contentDataTypes = new Dictionary(); private readonly Dictionary schemasById; private readonly PartitionResolver partitionResolver; private readonly IAppEntity app; private readonly IGraphType assetType; + private readonly IGraphType assetListType; private readonly GraphQLSchema graphQLSchema; public bool CanGenerateAssetSourceUrl { get; private set; } @@ -48,10 +49,12 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL CanGenerateAssetSourceUrl = urlGenerator.CanGenerateAssetSourceUrl; assetType = new AssetGraphType(this); + assetListType = new ListGraphType(new NonNullGraphType(assetType)); + schemasById = schemas.ToDictionary(x => x.Id); - schemaTypes = new QueryGraphTypeVisitor(GetContentType, new ListGraphType(new NonNullGraphType(assetType))); graphQLSchema = BuildSchema(this); + graphQLSchema.RegisterValueConverter(JsonConverter.Instance); InitializeContentTypes(); } @@ -60,7 +63,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL { var schemas = model.schemasById.Values; - return new GraphQLSchema { Query = new AppQueriesGraphType(model, schemas), Mutation = new AppMutationsGraphType(model, schemas) }; + return new GraphQLSchema { Query = new AppQueriesGraphType(model, schemas) }; } private void InitializeContentTypes() @@ -78,7 +81,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL private static (IGraphType ResolveType, IFieldResolver Resolver) ResolveDefault(IGraphType type) { - return (type, new FuncFieldResolver(c => c.Source.GetOrDefault(c.FieldName))); + return (type, new FuncFieldResolver, object>(c => c.Source.GetOrDefault(c.FieldName))); } public IFieldResolver ResolveAssetUrl() @@ -134,14 +137,9 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL return partitionResolver(key); } - public (IGraphType ResolveType, IFieldResolver Resolver) GetGraphType(IField field) + public (IGraphType ResolveType, ValueResolver Resolver) GetGraphType(ISchemaEntity schema, IField field) { - return field.Accept(schemaTypes); - } - - public IGraphType GetInputGraphType(IField field) - { - return field.GetInputGraphType(); + return field.Accept(new QueryGraphTypeVisitor(schema, GetContentType, this, assetListType)); } public IGraphType GetAssetType() @@ -158,7 +156,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL return null; } - return schema != null ? contentDataTypes.GetOrAdd(schema, s => new ContentDataGraphType()) : null; + return schema != null ? contentDataTypes.GetOrAddNew(schema) : null; } public IGraphType GetContentType(Guid schemaId) @@ -170,6 +168,8 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL return null; } + contentDataTypes.GetOrAdd(schema, s => new ContentDataGraphType()); + return contentTypes.GetOrAdd(schema, s => new ContentGraphType()); } @@ -177,13 +177,15 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL { Guard.NotNull(context, nameof(context)); + var inputs = query.Variables?.ToInputs(); + var result = await new DocumentExecuter().ExecuteAsync(options => { - options.Inputs = query.Variables?.ToInputs() ?? new Inputs(); - options.Query = query.Query; options.OperationName = query.OperationName; - options.Schema = graphQLSchema; options.UserContext = context; + options.Schema = graphQLSchema; + options.Inputs = inputs; + options.Query = query.Query; }).ConfigureAwait(false); return (result.Data, result.Errors?.Select(x => (object)new { x.Message, x.Locations }).ToArray()); diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLQuery.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLQuery.cs index db45e3672..91d17ec15 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLQuery.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/GraphQLQuery.cs @@ -9,7 +9,7 @@ using Newtonsoft.Json.Linq; namespace Squidex.Domain.Apps.Entities.Contents.GraphQL { - public class GraphQLQuery + public sealed class GraphQLQuery { public string OperationName { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/IGraphModel.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/IGraphModel.cs index 91acea708..f44c36b58 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/IGraphModel.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/IGraphModel.cs @@ -10,6 +10,7 @@ using GraphQL.Resolvers; using GraphQL.Types; using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Domain.Apps.Entities.Contents.GraphQL.Types; using Squidex.Domain.Apps.Entities.Schemas; namespace Squidex.Domain.Apps.Entities.Contents.GraphQL @@ -34,8 +35,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL IGraphType GetContentDataType(Guid schemaId); - IGraphType GetInputGraphType(IField field); - - (IGraphType ResolveType, IFieldResolver Resolver) GetGraphType(IField field); + (IGraphType ResolveType, ValueResolver Resolver) GetGraphType(ISchemaEntity schema, IField field); } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AllTypes.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AllTypes.cs index 00be09720..f9f25ad41 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AllTypes.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AllTypes.cs @@ -22,52 +22,46 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types public static readonly IGraphType Date = new DateGraphType(); + public static readonly IGraphType Json = new JsonGraphType(); + + public static readonly IGraphType Tags = new ListGraphType>(); + public static readonly IGraphType Float = new FloatGraphType(); + public static readonly IGraphType Status = new EnumerationGraphType(); + public static readonly IGraphType String = new StringGraphType(); public static readonly IGraphType Boolean = new BooleanGraphType(); - public static readonly IGraphType StatusType = new EnumerationGraphType(); + public static readonly IGraphType References = new ListGraphType>(); - public static readonly IGraphType NonNullInt = new NonNullGraphType(new IntGraphType()); + public static readonly IGraphType NonNullInt = new NonNullGraphType(Int); - public static readonly IGraphType NonNullGuid = new NonNullGraphType(new GuidGraphType()); + public static readonly IGraphType NonNullGuid = new NonNullGraphType(Guid); - public static readonly IGraphType NonNullDate = new NonNullGraphType(new DateGraphType()); + public static readonly IGraphType NonNullDate = new NonNullGraphType(Date); - public static readonly IGraphType NonNullFloat = new NonNullGraphType(new FloatGraphType()); + public static readonly IGraphType NonNullFloat = new NonNullGraphType(Float); - public static readonly IGraphType NonNullString = new NonNullGraphType(new StringGraphType()); + public static readonly IGraphType NonNullString = new NonNullGraphType(String); - public static readonly IGraphType NonNullBoolean = new NonNullGraphType(new BooleanGraphType()); + public static readonly IGraphType NonNullBoolean = new NonNullGraphType(Boolean); - public static readonly IGraphType NonNullStatusType = new NonNullGraphType(new EnumerationGraphType()); + public static readonly IGraphType NonNullStatusType = new NonNullGraphType(Status); - public static readonly IGraphType ListOfNonNullGuid = new ListGraphType(new NonNullGraphType(new GuidGraphType())); + public static readonly IGraphType NoopDate = new NoopGraphType(Date); - public static readonly IGraphType ListOfNonNullString = new ListGraphType(new NonNullGraphType(new StringGraphType())); + public static readonly IGraphType NoopJson = new NoopGraphType(Json); - public static readonly IGraphType NoopInt = new NoopGraphType("Int"); + public static readonly IGraphType NoopFloat = new NoopGraphType(Float); - public static readonly IGraphType NoopGuid = new NoopGraphType("Guid"); + public static readonly IGraphType NoopString = new NoopGraphType(String); - public static readonly IGraphType NoopDate = new NoopGraphType("Date"); - - public static readonly IGraphType NoopJson = new NoopGraphType("Json"); + public static readonly IGraphType NoopBoolean = new NoopGraphType(Boolean); public static readonly IGraphType NoopTags = new NoopGraphType("Tags"); - public static readonly IGraphType NoopFloat = new NoopGraphType("Float"); - - public static readonly IGraphType NoopString = new NoopGraphType("String"); - - public static readonly IGraphType NoopBoolean = new NoopGraphType("Boolean"); - public static readonly IGraphType NoopGeolocation = new NoopGraphType("Geolocation"); - - public static readonly IGraphType CommandVersion = new CommandVersionGraphType(); - - public static readonly IGraphType GeolocationInput = new GeolocationInputGraphType(); } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppMutationsGraphType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppMutationsGraphType.cs deleted file mode 100644 index 0da986ba6..000000000 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AppMutationsGraphType.cs +++ /dev/null @@ -1,344 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using System.Collections.Generic; -using System.Threading.Tasks; -using GraphQL; -using GraphQL.Resolvers; -using GraphQL.Types; -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; - -namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types -{ - public sealed class AppMutationsGraphType : ObjectGraphType - { - public AppMutationsGraphType(IGraphModel model, IEnumerable schemas) - { - foreach (var schema in schemas) - { - var schemaId = schema.NamedId(); - var schemaType = schema.TypeName(); - var schemaName = schema.DisplayName(); - - var contentType = model.GetContentType(schema.Id); - var contentDataType = model.GetContentDataType(schema.Id); - - var resultType = new ContentDataChangedResultGraphType(schemaType, schemaName, contentDataType); - - var inputType = new ContentDataGraphInputType(model, schema); - - AddContentCreate(schemaId, schemaType, schemaName, inputType, contentDataType, contentType); - 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."; - } - - private void AddContentCreate(NamedId schemaId, string schemaType, string schemaName, ContentDataGraphInputType inputType, IGraphType contentDataType, IGraphType contentType) - { - AddField(new FieldType - { - Name = $"create{schemaType}Content", - Arguments = new QueryArguments - { - new QueryArgument(AllTypes.None) - { - Name = "data", - Description = $"The data for the {schemaName} content.", - DefaultValue = null, - ResolvedType = new NonNullGraphType(inputType), - }, - new QueryArgument(AllTypes.None) - { - Name = "publish", - Description = "Set to true to autopublish content.", - DefaultValue = false, - ResolvedType = AllTypes.Boolean - }, - new QueryArgument(AllTypes.None) - { - Name = "expectedVersion", - Description = "The expected version", - DefaultValue = EtagVersion.Any, - ResolvedType = AllTypes.Int - } - }, - ResolvedType = new NonNullGraphType(contentType), - Resolver = ResolveAsync(async (c, publish) => - { - var argPublish = c.GetArgument("publish"); - - var contentData = GetContentData(c); - - var command = new CreateContent { SchemaId = schemaId, Data = contentData, Publish = argPublish }; - var commandContext = await publish(command); - - var result = commandContext.Result>(); - var response = ContentEntity.Create(command, result); - - return (IContentEntity)ContentEntity.Create(command, result); - }), - Description = $"Creates an {schemaName} content." - }); - } - - private void AddContentUpdate(string schemaType, string schemaName, ContentDataGraphInputType inputType, IGraphType resultType) - { - AddField(new FieldType - { - Name = $"update{schemaType}Content", - Arguments = new QueryArguments - { - new QueryArgument(AllTypes.None) - { - Name = "id", - Description = $"The id of the {schemaName} content (GUID)", - DefaultValue = string.Empty, - ResolvedType = AllTypes.NonNullGuid - }, - new QueryArgument(AllTypes.None) - { - Name = "data", - Description = $"The data for the {schemaName} content.", - DefaultValue = null, - ResolvedType = new NonNullGraphType(inputType), - }, - new QueryArgument(AllTypes.None) - { - Name = "expectedVersion", - Description = "The expected version", - DefaultValue = EtagVersion.Any, - ResolvedType = AllTypes.Int - } - }, - ResolvedType = new NonNullGraphType(resultType), - Resolver = ResolveAsync(async (c, publish) => - { - var contentId = c.GetArgument("id"); - var contentData = GetContentData(c); - - var command = new UpdateContent { ContentId = contentId, Data = contentData }; - var commandContext = await publish(command); - - var result = commandContext.Result(); - - return result; - }), - Description = $"Update an {schemaName} content by id." - }); - } - - private void AddContentPatch(string schemaType, string schemaName, ContentDataGraphInputType inputType, IGraphType resultType) - { - AddField(new FieldType - { - Name = $"patch{schemaType}Content", - Arguments = new QueryArguments - { - new QueryArgument(AllTypes.None) - { - Name = "id", - Description = $"The id of the {schemaName} content (GUID)", - DefaultValue = string.Empty, - ResolvedType = AllTypes.NonNullGuid - }, - new QueryArgument(AllTypes.None) - { - Name = "data", - Description = $"The data for the {schemaName} content.", - DefaultValue = null, - ResolvedType = new NonNullGraphType(inputType), - }, - new QueryArgument(AllTypes.None) - { - Name = "expectedVersion", - Description = "The expected version", - DefaultValue = EtagVersion.Any, - ResolvedType = AllTypes.Int - } - }, - ResolvedType = new NonNullGraphType(resultType), - Resolver = ResolveAsync(async (c, publish) => - { - var contentId = c.GetArgument("id"); - var contentData = GetContentData(c); - - var command = new PatchContent { ContentId = contentId, Data = contentData }; - var commandContext = await publish(command); - - var result = commandContext.Result(); - - return result; - }), - Description = $"Patch a {schemaName} content." - }); - } - - private void AddContentPublish(string schemaType, string schemaName) - { - AddField(new FieldType - { - Name = $"publish{schemaType}Content", - Arguments = CreateIdArguments(schemaName), - ResolvedType = AllTypes.CommandVersion, - Resolver = ResolveAsync((c, publish) => - { - var contentId = c.GetArgument("id"); - - var command = new ChangeContentStatus { ContentId = contentId, Status = Status.Published }; - - return publish(command); - }), - Description = $"Publish a {schemaName} content." - }); - } - - private void AddContentUnpublish(string schemaType, string schemaName) - { - AddField(new FieldType - { - Name = $"unpublish{schemaType}Content", - Arguments = CreateIdArguments(schemaName), - ResolvedType = AllTypes.CommandVersion, - Resolver = ResolveAsync((c, publish) => - { - var contentId = c.GetArgument("id"); - - var command = new ChangeContentStatus { ContentId = contentId, Status = Status.Draft }; - - return publish(command); - }), - Description = $"Unpublish a {schemaName} content." - }); - } - - private void AddContentArchive(string schemaType, string schemaName) - { - AddField(new FieldType - { - Name = $"archive{schemaType}Content", - Arguments = CreateIdArguments(schemaName), - ResolvedType = AllTypes.CommandVersion, - Resolver = ResolveAsync((c, publish) => - { - var contentId = c.GetArgument("id"); - - var command = new ChangeContentStatus { ContentId = contentId, Status = Status.Archived }; - - return publish(command); - }), - Description = $"Archive a {schemaName} content." - }); - } - - private void AddContentRestore(string schemaType, string schemaName) - { - AddField(new FieldType - { - Name = $"restore{schemaType}Content", - Arguments = CreateIdArguments(schemaName), - ResolvedType = AllTypes.CommandVersion, - Resolver = ResolveAsync((c, publish) => - { - var contentId = c.GetArgument("id"); - - var command = new ChangeContentStatus { ContentId = contentId, Status = Status.Draft }; - - return publish(command); - }), - Description = $"Restore a {schemaName} content." - }); - } - - private void AddContentDelete(string schemaType, string schemaName) - { - AddField(new FieldType - { - Name = $"delete{schemaType}Content", - Arguments = CreateIdArguments(schemaName), - ResolvedType = AllTypes.CommandVersion, - Resolver = ResolveAsync((c, publish) => - { - var contentId = c.GetArgument("id"); - - var command = new DeleteContent { ContentId = contentId }; - - return publish(command); - }), - Description = $"Delete an {schemaName} content." - }); - } - - private static QueryArguments CreateIdArguments(string schemaName) - { - return new QueryArguments - { - new QueryArgument(AllTypes.None) - { - Name = "id", - Description = $"The id of the {schemaName} content (GUID)", - DefaultValue = string.Empty, - ResolvedType = AllTypes.NonNullGuid - }, - new QueryArgument(AllTypes.None) - { - Name = "expectedVersion", - Description = "The expected version", - DefaultValue = EtagVersion.Any, - ResolvedType = AllTypes.Int - } - }; - } - - private static IFieldResolver ResolveAsync(Func>, Task> action) - { - return new FuncFieldResolver>(async c => - { - var e = (GraphQLExecutionContext)c.UserContext; - - try - { - return await action(c, command => - { - command.ExpectedVersion = c.GetArgument("expectedVersion", EtagVersion.Any); - - return e.CommandBus.PublishAsync(command); - }); - } - catch (ValidationException ex) - { - c.Errors.Add(new ExecutionError(ex.Message)); - - throw; - } - catch (DomainException ex) - { - c.Errors.Add(new ExecutionError(ex.Message)); - - throw; - } - }); - } - - private static NamedContentData GetContentData(ResolveFieldContext c) - { - return JObject.FromObject(c.GetArgument("data")).ToObject(); - } - } -} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/CommandVersionGraphType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/CommandVersionGraphType.cs deleted file mode 100644 index 9fdc792f2..000000000 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/CommandVersionGraphType.cs +++ /dev/null @@ -1,44 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using GraphQL.Resolvers; -using GraphQL.Types; -using Squidex.Infrastructure.Commands; - -namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types -{ - public sealed class CommandVersionGraphType : ObjectGraphType - { - public CommandVersionGraphType() - { - Name = "CommandVersionDto"; - - AddField(new FieldType - { - Name = "version", - ResolvedType = AllTypes.Int, - Resolver = ResolveVersion(), - Description = "The new version of the item." - }); - - Description = "The result of a mutation"; - } - - private static IFieldResolver ResolveVersion() - { - return new FuncFieldResolver(x => - { - if (x.Source.Result() is EntitySavedResult result) - { - return (int)result.Version; - } - - return null; - }); - } - } -} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentDataChangedResultGraphType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentDataChangedResultGraphType.cs deleted file mode 100644 index d050c3696..000000000 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentDataChangedResultGraphType.cs +++ /dev/null @@ -1,44 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using GraphQL.Resolvers; -using GraphQL.Types; - -namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types -{ - public sealed class ContentDataChangedResultGraphType : ObjectGraphType - { - public ContentDataChangedResultGraphType(string schemaType, string schemaName, IGraphType contentDataType) - { - Name = $"{schemaName}DataChangedResultDto"; - - AddField(new FieldType - { - Name = "version", - ResolvedType = AllTypes.Int, - Resolver = Resolve(x => x.Version), - Description = $"The new version of the {schemaName} content." - }); - - AddField(new FieldType - { - Name = "data", - ResolvedType = new NonNullGraphType(contentDataType), - Resolver = Resolve(x => x.Data), - Description = $"The new data of the {schemaName} content." - }); - - Description = $"The result of the {schemaName} mutation"; - } - - private static IFieldResolver Resolve(Func action) - { - return new FuncFieldResolver(c => action(c.Source)); - } - } -} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentDataGraphInputType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentDataGraphInputType.cs deleted file mode 100644 index 42512c861..000000000 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentDataGraphInputType.cs +++ /dev/null @@ -1,74 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschränkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System.Linq; -using GraphQL.Resolvers; -using GraphQL.Types; -using Squidex.Domain.Apps.Core.Contents; -using Squidex.Domain.Apps.Entities.Schemas; -using Squidex.Infrastructure; - -namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types -{ - public sealed class ContentDataGraphInputType : InputObjectGraphType - { - public ContentDataGraphInputType(IGraphModel model, ISchemaEntity schema) - { - var schemaType = schema.TypeName(); - var schemaName = schema.DisplayName(); - - Name = $"{schemaType}InputDto"; - - foreach (var field in schema.SchemaDef.Fields.Where(x => !x.IsHidden)) - { - var inputType = model.GetInputGraphType(field); - - if (inputType != null) - { - if (field.RawProperties.IsRequired) - { - inputType = new NonNullGraphType(inputType); - } - - var fieldName = field.RawProperties.Label.WithFallback(field.Name); - - var fieldGraphType = new InputObjectGraphType - { - Name = $"{schemaType}Data{field.Name.ToPascalCase()}InputDto" - }; - - var partition = model.ResolvePartition(field.Partitioning); - - foreach (var partitionItem in partition) - { - fieldGraphType.AddField(new FieldType - { - Name = partitionItem.Key, - ResolvedType = inputType, - Resolver = null, - Description = field.RawProperties.Hints - }); - } - - fieldGraphType.Description = $"The input structure of the {fieldName} of a {schemaName} content type."; - - var fieldResolver = new FuncFieldResolver(c => c.Source.GetOrDefault(field.Name)); - - AddField(new FieldType - { - Name = field.Name.ToCamelCase(), - Resolver = fieldResolver, - ResolvedType = fieldGraphType, - Description = $"The {fieldName} field." - }); - } - } - - Description = $"The structure of a {schemaName} content type."; - } - } -} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentDataGraphType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentDataGraphType.cs index d74c6e383..ab748e37a 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentDataGraphType.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/ContentDataGraphType.cs @@ -5,9 +5,11 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System.Collections.Generic; using System.Linq; using GraphQL.Resolvers; using GraphQL.Types; +using Newtonsoft.Json.Linq; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; @@ -25,33 +27,49 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types foreach (var field in schema.SchemaDef.Fields.Where(x => !x.IsHidden)) { - var fieldInfo = model.GetGraphType(field); + var fieldInfo = model.GetGraphType(schema, field); if (fieldInfo.ResolveType != null) { - var fieldName = field.RawProperties.Label.WithFallback(field.Name); + var fieldType = field.TypeName(); + var fieldName = field.DisplayName(); var fieldGraphType = new ObjectGraphType { - Name = $"{schemaType}Data{field.Name.ToPascalCase()}Dto" + Name = $"{schemaType}Data{fieldType}Dto" }; var partition = model.ResolvePartition(field.Partitioning); foreach (var partitionItem in partition) { + var resolver = new FuncFieldResolver(c => + { + if (((ContentFieldData)c.Source).TryGetValue(c.FieldName, out var value)) + { + return fieldInfo.Resolver(value, c); + } + else + { + return fieldInfo; + } + }); + fieldGraphType.AddField(new FieldType { Name = partitionItem.Key, - Resolver = fieldInfo.Resolver, + Resolver = resolver, ResolvedType = fieldInfo.ResolveType, Description = field.RawProperties.Hints }); } - fieldGraphType.Description = $"The structure of the {fieldName} of a {schemaName} content type."; + fieldGraphType.Description = $"The structure of the {fieldName} field of the {schemaName} content type."; - var fieldResolver = new FuncFieldResolver(c => c.Source.GetOrDefault(field.Name)); + var fieldResolver = new FuncFieldResolver>(c => + { + return c.Source.GetOrDefault(field.Name); + }); AddField(new FieldType { @@ -63,7 +81,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types } } - Description = $"The structure of a {schemaName} content type."; + Description = $"The structure of the {schemaName} content type."; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/GeolocationInputGraphType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/GeolocationInputGraphType.cs deleted file mode 100644 index 73ba49b5c..000000000 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/GeolocationInputGraphType.cs +++ /dev/null @@ -1,31 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using GraphQL.Types; - -namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types -{ - public sealed class GeolocationInputGraphType : InputObjectGraphType - { - public GeolocationInputGraphType() - { - Name = "GeolocationInputDto"; - - AddField(new FieldType - { - Name = "latitude", - ResolvedType = AllTypes.NonNullFloat - }); - - AddField(new FieldType - { - Name = "longitude", - ResolvedType = AllTypes.NonNullFloat - }); - } - } -} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/InputFieldVisitor.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/InputFieldVisitor.cs deleted file mode 100644 index 80ea21c4c..000000000 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/InputFieldVisitor.cs +++ /dev/null @@ -1,66 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using GraphQL.Types; -using Squidex.Domain.Apps.Core.Schemas; - -namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types -{ - public sealed class InputFieldVisitor : IFieldVisitor - { - public static readonly InputFieldVisitor Default = new InputFieldVisitor(); - - private InputFieldVisitor() - { - } - - public IGraphType Visit(IField field) - { - return AllTypes.ListOfNonNullGuid; - } - - public IGraphType Visit(IField field) - { - return AllTypes.Boolean; - } - - public IGraphType Visit(IField field) - { - return AllTypes.Date; - } - - public IGraphType Visit(IField field) - { - return AllTypes.GeolocationInput; - } - - public IGraphType Visit(IField field) - { - return AllTypes.NoopJson; - } - - public IGraphType Visit(IField field) - { - return AllTypes.Float; - } - - public IGraphType Visit(IField field) - { - return AllTypes.ListOfNonNullGuid; - } - - public IGraphType Visit(IField field) - { - return AllTypes.String; - } - - public IGraphType Visit(IField field) - { - return AllTypes.ListOfNonNullString; - } - } -} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/NestedGraphType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/NestedGraphType.cs new file mode 100644 index 000000000..5bdc36b5d --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/NestedGraphType.cs @@ -0,0 +1,61 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Linq; +using GraphQL.Resolvers; +using GraphQL.Types; +using Newtonsoft.Json.Linq; +using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Domain.Apps.Entities.Schemas; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types +{ + public sealed class NestedGraphType : ObjectGraphType + { + public NestedGraphType(IGraphModel model, ISchemaEntity schema, IArrayField field) + { + var schemaType = schema.TypeName(); + var schemaName = schema.DisplayName(); + + var fieldType = field.TypeName(); + var fieldName = field.DisplayName(); + + Name = $"{schemaType}{fieldName}ChildDto"; + + foreach (var nestedField in field.Fields.Where(x => !x.IsHidden)) + { + var fieldInfo = model.GetGraphType(schema, nestedField); + + if (fieldInfo.ResolveType != null) + { + var resolver = new FuncFieldResolver(c => + { + if (((JObject)c.Source).TryGetValue(nestedField.Name, out var value)) + { + return fieldInfo.Resolver(value, c); + } + else + { + return fieldInfo; + } + }); + + AddField(new FieldType + { + Name = nestedField.Name.ToCamelCase(), + Resolver = resolver, + ResolvedType = fieldInfo.ResolveType, + Description = $"The {fieldName}/{nestedField.DisplayName()} nested field." + }); + } + } + + Description = $"The structure of the {schemaName}.{fieldName} nested schema."; + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/QueryGraphTypeVisitor.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/QueryGraphTypeVisitor.cs index 4ca4bae5a..f330b5844 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/QueryGraphTypeVisitor.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/QueryGraphTypeVisitor.cs @@ -6,89 +6,106 @@ // ========================================================================== using System; -using GraphQL.Resolvers; using GraphQL.Types; -using Squidex.Domain.Apps.Core.Contents; +using Newtonsoft.Json.Linq; using Squidex.Domain.Apps.Core.Schemas; -using Squidex.Infrastructure; +using Squidex.Domain.Apps.Entities.Schemas; namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types { - public sealed class QueryGraphTypeVisitor : IFieldVisitor<(IGraphType ResolveType, IFieldResolver Resolver)> + public delegate object ValueResolver(JToken value, ResolveFieldContext context); + + public sealed class QueryGraphTypeVisitor : IFieldVisitor<(IGraphType ResolveType, ValueResolver Resolver)> { + private static readonly ValueResolver NoopResolver = new ValueResolver((value, c) => value); + private readonly ISchemaEntity schema; private readonly Func schemaResolver; + private readonly IGraphModel model; private readonly IGraphType assetListType; - public QueryGraphTypeVisitor(Func schemaResolver, IGraphType assetListType) + public QueryGraphTypeVisitor(ISchemaEntity schema, Func schemaResolver, IGraphModel model, IGraphType assetListType) { + this.model = model; this.assetListType = assetListType; + this.schema = schema; this.schemaResolver = schemaResolver; } - public (IGraphType ResolveType, IFieldResolver Resolver) Visit(IField field) + public (IGraphType ResolveType, ValueResolver Resolver) Visit(IArrayField field) + { + return ResolveNested(field); + } + + public (IGraphType ResolveType, ValueResolver Resolver) Visit(IField field) { - return ResolveAssets(assetListType); + return ResolveAssets(); } - public (IGraphType ResolveType, IFieldResolver Resolver) Visit(IField field) + public (IGraphType ResolveType, ValueResolver Resolver) Visit(IField field) { return ResolveDefault(AllTypes.NoopBoolean); } - public (IGraphType ResolveType, IFieldResolver Resolver) Visit(IField field) + public (IGraphType ResolveType, ValueResolver Resolver) Visit(IField field) { return ResolveDefault(AllTypes.NoopDate); } - public (IGraphType ResolveType, IFieldResolver Resolver) Visit(IField field) + public (IGraphType ResolveType, ValueResolver Resolver) Visit(IField field) { return ResolveDefault(AllTypes.NoopGeolocation); } - public (IGraphType ResolveType, IFieldResolver Resolver) Visit(IField field) + public (IGraphType ResolveType, ValueResolver Resolver) Visit(IField field) { return ResolveDefault(AllTypes.NoopJson); } - public (IGraphType ResolveType, IFieldResolver Resolver) Visit(IField field) + public (IGraphType ResolveType, ValueResolver Resolver) Visit(IField field) { return ResolveDefault(AllTypes.NoopFloat); } - public (IGraphType ResolveType, IFieldResolver Resolver) Visit(IField field) + public (IGraphType ResolveType, ValueResolver Resolver) Visit(IField field) { return ResolveReferences(field); } - public (IGraphType ResolveType, IFieldResolver Resolver) Visit(IField field) + public (IGraphType ResolveType, ValueResolver Resolver) Visit(IField field) { return ResolveDefault(AllTypes.NoopString); } - public (IGraphType ResolveType, IFieldResolver Resolver) Visit(IField field) + public (IGraphType ResolveType, ValueResolver Resolver) Visit(IField field) { return ResolveDefault(AllTypes.NoopTags); } - private static (IGraphType ResolveType, IFieldResolver Resolver) ResolveDefault(IGraphType type) + private static (IGraphType ResolveType, ValueResolver Resolver) ResolveDefault(IGraphType type) { - return (type, new FuncFieldResolver(c => c.Source.GetOrDefault(c.FieldName))); + return (type, NoopResolver); + } + + private (IGraphType ResolveType, ValueResolver Resolver) ResolveNested(IArrayField field) + { + var schemaFieldType = new ListGraphType(new NonNullGraphType(new NestedGraphType(model, schema, field))); + + return (schemaFieldType, NoopResolver); } - private static ValueTuple ResolveAssets(IGraphType assetListType) + private (IGraphType ResolveType, ValueResolver Resolver) ResolveAssets() { - var resolver = new FuncFieldResolver(c => + var resolver = new ValueResolver((value, c) => { var context = (GraphQLExecutionContext)c.UserContext; - var contentIds = c.Source.GetOrDefault(c.FieldName); - return context.GetReferencedAssetsAsync(contentIds); + return context.GetReferencedAssetsAsync(value); }); return (assetListType, resolver); } - private ValueTuple ResolveReferences(IField field) + private (IGraphType ResolveType, ValueResolver Resolver) ResolveReferences(IField field) { var schemaId = ((ReferencesFieldProperties)field.RawProperties).SchemaId; @@ -99,12 +116,11 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types return (null, null); } - var resolver = new FuncFieldResolver(c => + var resolver = new ValueResolver((value, c) => { var context = (GraphQLExecutionContext)c.UserContext; - var contentIds = c.Source.GetOrDefault(c.FieldName); - return context.GetReferencedContentsAsync(schemaId, contentIds); + return context.GetReferencedContentsAsync(schemaId, value); }); var schemaFieldType = new ListGraphType(new NonNullGraphType(contentType)); diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/GuidGraphType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/GuidGraphType.cs similarity index 95% rename from src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/GuidGraphType.cs rename to src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/GuidGraphType.cs index 196c8ed44..bbfc8ea5b 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/GuidGraphType.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/GuidGraphType.cs @@ -9,7 +9,7 @@ using System; using GraphQL.Language.AST; using GraphQL.Types; -namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types +namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types.Utils { public sealed class GuidGraphType : ScalarGraphType { diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/JsonConverter.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/JsonConverter.cs new file mode 100644 index 000000000..62bc939fb --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/JsonConverter.cs @@ -0,0 +1,32 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using GraphQL.Language.AST; +using GraphQL.Types; +using Newtonsoft.Json.Linq; + +namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types.Utils +{ + public sealed class JsonConverter : IAstFromValueConverter + { + public static readonly JsonConverter Instance = new JsonConverter(); + + private JsonConverter() + { + } + + public IValue Convert(object value, IGraphType type) + { + return new JsonValue(value as JObject); + } + + public bool Matches(object value, IGraphType type) + { + return value is JObject; + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/JsonGraphType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/JsonGraphType.cs new file mode 100644 index 000000000..3b99c8412 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/JsonGraphType.cs @@ -0,0 +1,42 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using GraphQL.Language.AST; +using GraphQL.Types; + +namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types.Utils +{ + public sealed class JsonGraphType : ScalarGraphType + { + public JsonGraphType() + { + Name = "Json"; + + Description = "Unstructured Json object"; + } + + public override object Serialize(object value) + { + return value; + } + + public override object ParseValue(object value) + { + return value; + } + + public override object ParseLiteral(IValue value) + { + if (value is JsonValue jsonGraphType) + { + return jsonGraphType.Value; + } + + return value; + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/JsonValue.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/JsonValue.cs new file mode 100644 index 000000000..4977e33d2 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/JsonValue.cs @@ -0,0 +1,25 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using GraphQL.Language.AST; +using Newtonsoft.Json.Linq; + +namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types.Utils +{ + public sealed class JsonValue : ValueNode + { + public JsonValue(JObject value) + { + Value = value; + } + + protected override bool Equals(ValueNode node) + { + return false; + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/NoopGraphType.cs b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/NoopGraphType.cs index 5be62090f..8b8c3ceea 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/NoopGraphType.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/NoopGraphType.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using GraphQL.Language.AST; using GraphQL.Types; @@ -18,6 +17,12 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types.Utils Name = name; } + public NoopGraphType(IGraphType type) + : this(type.Name) + { + Description = type.Description; + } + public override object Serialize(object value) { return value; @@ -30,7 +35,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types.Utils public override object ParseLiteral(IValue value) { - throw new NotSupportedException(); + return value.Value; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/AddField.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/AddField.cs index 8856821d6..09cc26f0a 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/AddField.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/AddField.cs @@ -11,6 +11,8 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Commands { public sealed class AddField : SchemaCommand { + public long? ParentFieldId { get; set; } + public string Name { get; set; } public string Partitioning { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/CreateSchemaField.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/CreateSchemaField.cs index 82e8876eb..dd5dd16e1 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/CreateSchemaField.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/CreateSchemaField.cs @@ -6,6 +6,7 @@ // ========================================================================== using Squidex.Domain.Apps.Core.Schemas; +using FieldNested = System.Collections.Generic.List; namespace Squidex.Domain.Apps.Entities.Schemas.Commands { @@ -21,6 +22,8 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Commands public bool IsDisabled { get; set; } + public FieldNested Nested { get; set; } + public FieldProperties Properties { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/CreateSchemaNestedField.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/CreateSchemaNestedField.cs new file mode 100644 index 000000000..409d79f99 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/CreateSchemaNestedField.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Squidex.Domain.Apps.Core.Schemas; + +namespace Squidex.Domain.Apps.Entities.Schemas.Commands +{ + public sealed class CreateSchemaNestedField + { + public string Name { get; set; } + + public bool IsHidden { get; set; } + + public bool IsDisabled { get; set; } + + public FieldProperties Properties { get; set; } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/FieldCommand.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/FieldCommand.cs index 5ad93ddf1..6246ad94c 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/FieldCommand.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/FieldCommand.cs @@ -9,6 +9,8 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Commands { public class FieldCommand : SchemaCommand { + public long? ParentFieldId { get; set; } + public long FieldId { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/ReorderFields.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/ReorderFields.cs index 9afe0346c..4c452d2ff 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Commands/ReorderFields.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Commands/ReorderFields.cs @@ -11,6 +11,8 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Commands { public sealed class ReorderFields : SchemaCommand { + public long? ParentFieldId { get; set; } + public List FieldIds { 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 e746580f9..8beb2b8f1 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Guards/FieldPropertiesValidator.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Guards/FieldPropertiesValidator.cs @@ -6,7 +6,6 @@ // ========================================================================== using System.Collections.Generic; -using System.Linq; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Infrastructure; @@ -22,7 +21,17 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards public static IEnumerable Validate(FieldProperties properties) { - return properties?.Accept(Instance) ?? Enumerable.Empty(); + return properties?.Accept(Instance); + } + + public IEnumerable Visit(ArrayFieldProperties properties) + { + if (properties.MaxItems.HasValue && properties.MinItems.HasValue && properties.MinItems.Value >= properties.MaxItems.Value) + { + yield return new ValidationError("Max items must be greater than min items.", + nameof(properties.MinItems), + nameof(properties.MaxItems)); + } } public IEnumerable Visit(AssetsFieldProperties properties) diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchema.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchema.cs index 81684f6b0..2348c1f45 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchema.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchema.cs @@ -5,6 +5,8 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; +using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Squidex.Domain.Apps.Core; @@ -32,12 +34,14 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards error(new ValidationError($"A schema with name '{command.Name}' already exists", nameof(command.Name))); } - if (command.Fields != null && command.Fields.Any()) + if (command.Fields?.Count > 0) { var index = 0; foreach (var field in command.Fields) { + index++; + var prefix = $"Fields.{index}"; if (!field.Partitioning.IsValidPartitioning()) @@ -54,12 +58,57 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards { error(new ValidationError("Properties is required.", $"{prefix}.{nameof(field.Properties)}")); } + else + { + var errors = FieldPropertiesValidator.Validate(field.Properties); - var propertyErrors = FieldPropertiesValidator.Validate(field.Properties); + foreach (var e in errors) + { + error(e.WithPrefix(prefix)); + } + } - foreach (var propertyError in propertyErrors) + if (field.Nested?.Count > 0) { - error(propertyError); + if (!(field.Properties is ArrayFieldProperties)) + { + error(new ValidationError("Only array fields can have nested fields.", $"{prefix}.{nameof(field.Partitioning)}")); + } + else + { + var nestedIndex = 0; + + foreach (var nestedField in field.Nested) + { + nestedIndex++; + + var nestedPrefix = $"Fields.{index}.Nested.{nestedIndex}"; + + if (!nestedField.Name.IsPropertyName()) + { + error(new ValidationError("Name must be a valid property name.", $"{prefix}.{nameof(nestedField.Name)}")); + } + + if (nestedField.Properties == null) + { + error(new ValidationError("Properties is required.", $"{prefix}.{nameof(nestedField.Properties)}")); + } + else + { + var errors = FieldPropertiesValidator.Validate(nestedField.Properties); + + foreach (var e in errors) + { + error(e.WithPrefix(nestedPrefix)); + } + } + } + } + + if (field.Nested.Select(x => x.Name).Distinct().Count() != field.Nested.Count) + { + error(new ValidationError("Fields cannot have duplicate names.", $"{prefix}.Nested")); + } } } @@ -75,6 +124,22 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards { Guard.NotNull(command, nameof(command)); + IArrayField arrayField = null; + + if (command.ParentFieldId.HasValue) + { + var parentId = command.ParentFieldId.Value; + + if (schema.FieldsById.TryGetValue(parentId, out var field) && field is IArrayField a) + { + arrayField = a; + } + else + { + throw new DomainObjectNotFoundException(parentId.ToString(), "Fields", typeof(Schema)); + } + } + Validate.It(() => "Cannot reorder schema fields.", error => { if (command.FieldIds == null) @@ -82,13 +147,25 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards error(new ValidationError("Field ids is required.", nameof(command.FieldIds))); } - if (command.FieldIds != null && (command.FieldIds.Count != schema.Fields.Count || command.FieldIds.Any(x => !schema.FieldsById.ContainsKey(x)))) + if (arrayField == null) { - error(new ValidationError("Ids must cover all fields.", nameof(command.FieldIds))); + CheckFields(error, command, schema.FieldsById); + } + else + { + CheckFields(error, command, arrayField.FieldsById); } }); } + private static void CheckFields(Action error, ReorderFields c, IReadOnlyDictionary fields) + { + if (c.FieldIds != null && (c.FieldIds.Count != fields.Count || c.FieldIds.Any(x => !fields.ContainsKey(x)))) + { + error(new ValidationError("Ids must cover all fields.", nameof(c.FieldIds))); + } + } + public static void CanPublish(Schema schema, PublishSchema command) { Guard.NotNull(command, nameof(command)); diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchemaField.cs b/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchemaField.cs index 73463a710..1ccbbe505 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchemaField.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/Guards/GuardSchemaField.cs @@ -20,11 +20,6 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards Validate.It(() => "Cannot add a new field.", error => { - if (!command.Partitioning.IsValidPartitioning()) - { - error(new ValidationError("Partitioning is not valid.", nameof(command.Partitioning))); - } - if (!command.Name.IsPropertyName()) { error(new ValidationError("Name must be a valid property name.", nameof(command.Name))); @@ -34,17 +29,40 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards { error(new ValidationError("Properties is required.", nameof(command.Properties))); } + else + { + var errors = FieldPropertiesValidator.Validate(command.Properties); - var propertyErrors = FieldPropertiesValidator.Validate(command.Properties); + foreach (var e in errors) + { + error(e.WithPrefix(nameof(command.Properties))); + } + } - foreach (var propertyError in propertyErrors) + if (command.ParentFieldId.HasValue) { - error(propertyError); + var parentId = command.ParentFieldId.Value; + + if (!schema.FieldsById.TryGetValue(parentId, out var rootField) || !(rootField is IArrayField arrayField)) + { + throw new DomainObjectNotFoundException(parentId.ToString(), "Fields", typeof(Schema)); + } + if (arrayField.FieldsByName.ContainsKey(command.Name)) + { + error(new ValidationError($"There is already a field with name '{command.Name}'", nameof(command.Name))); + } } - - if (schema.FieldsByName.ContainsKey(command.Name)) + else { - error(new ValidationError($"There is already a field with name '{command.Name}'", nameof(command.Name))); + if (command.ParentFieldId == null && !command.Partitioning.IsValidPartitioning()) + { + error(new ValidationError("Partitioning is not valid.", nameof(command.Partitioning))); + } + + if (schema.FieldsByName.ContainsKey(command.Name)) + { + error(new ValidationError($"There is already a field with name '{command.Name}'", nameof(command.Name))); + } } }); } @@ -53,80 +71,89 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards { Guard.NotNull(command, nameof(command)); + var field = GetFieldOrThrow(schema, command.FieldId, command.ParentFieldId); + + if (field.IsLocked) + { + throw new DomainException("Schema field is already locked."); + } + Validate.It(() => "Cannot update field.", error => { if (command.Properties == null) { error(new ValidationError("Properties is required.", nameof(command.Properties))); } - - var propertyErrors = FieldPropertiesValidator.Validate(command.Properties); - - foreach (var propertyError in propertyErrors) + else { - error(propertyError); + var errors = FieldPropertiesValidator.Validate(command.Properties); + + foreach (var e in errors) + { + error(e.WithPrefix(nameof(command.Properties))); + } } }); - - var field = GetFieldOrThrow(schema, command.FieldId); - - if (field.IsLocked) - { - throw new DomainException("Schema field is already locked."); - } } - public static void CanDelete(Schema schema, DeleteField command) + public static void CanHide(Schema schema, HideField command) { Guard.NotNull(command, nameof(command)); - var field = GetFieldOrThrow(schema, command.FieldId); + var field = GetFieldOrThrow(schema, command.FieldId, command.ParentFieldId); if (field.IsLocked) { throw new DomainException("Schema field is locked."); } + + if (field.IsHidden) + { + throw new DomainException("Schema field is already hidden."); + } } - public static void CanHide(Schema schema, HideField command) + public static void CanDisable(Schema schema, DisableField command) { Guard.NotNull(command, nameof(command)); - var field = GetFieldOrThrow(schema, command.FieldId); + var field = GetFieldOrThrow(schema, command.FieldId, command.ParentFieldId); - if (field.IsHidden) + if (field.IsDisabled) { - throw new DomainException("Schema field is already hidden."); + throw new DomainException("Schema field is already disabled."); } } - public static void CanShow(Schema schema, ShowField command) + public static void CanDelete(Schema schema, DeleteField command) { Guard.NotNull(command, nameof(command)); - var field = GetFieldOrThrow(schema, command.FieldId); + var field = GetFieldOrThrow(schema, command.FieldId, command.ParentFieldId); - if (!field.IsHidden) + if (field.IsLocked) { - throw new DomainException("Schema field is already visible."); + throw new DomainException("Schema field is locked."); } } - public static void CanDisable(Schema schema, DisableField command) + public static void CanShow(Schema schema, ShowField command) { Guard.NotNull(command, nameof(command)); - var field = GetFieldOrThrow(schema, command.FieldId); + var field = GetFieldOrThrow(schema, command.FieldId, command.ParentFieldId); - if (field.IsDisabled) + if (!field.IsHidden) { - throw new DomainException("Schema field is already disabled."); + throw new DomainException("Schema field is already visible."); } } public static void CanEnable(Schema schema, EnableField command) { - var field = GetFieldOrThrow(schema, command.FieldId); + Guard.NotNull(command, nameof(command)); + + var field = GetFieldOrThrow(schema, command.FieldId, command.ParentFieldId); if (!field.IsDisabled) { @@ -138,7 +165,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards { Guard.NotNull(command, nameof(command)); - var field = GetFieldOrThrow(schema, command.FieldId); + var field = GetFieldOrThrow(schema, command.FieldId, command.ParentFieldId); if (field.IsLocked) { @@ -146,8 +173,23 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards } } - private static Field GetFieldOrThrow(Schema schema, long fieldId) + private static IField GetFieldOrThrow(Schema schema, long fieldId, long? parentId) { + if (parentId.HasValue) + { + if (!schema.FieldsById.TryGetValue(parentId.Value, out var rootField) || !(rootField is IArrayField arrayField)) + { + throw new DomainObjectNotFoundException(parentId.ToString(), "Fields", typeof(Schema)); + } + + if (!arrayField.FieldsById.TryGetValue(fieldId, out var nestedField)) + { + throw new DomainObjectNotFoundException(fieldId.ToString(), $"Fields[{parentId}].Fields", typeof(Schema)); + } + + return nestedField; + } + if (!schema.FieldsById.TryGetValue(fieldId, out var field)) { throw new DomainObjectNotFoundException(fieldId.ToString(), "Fields", typeof(Schema)); diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaExtensions.cs b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaExtensions.cs index 5d86e5682..4d45ac893 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaExtensions.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaExtensions.cs @@ -18,11 +18,21 @@ namespace Squidex.Domain.Apps.Entities.Schemas return new NamedId(schema.Id, schema.Name); } + public static string TypeName(this IField field) + { + return field.Name.ToPascalCase(); + } + public static string TypeName(this ISchemaEntity schema) { return schema.SchemaDef.Name.ToPascalCase(); } + public static string DisplayName(this IField field) + { + return field.RawProperties.Label.WithFallback(field.TypeName()); + } + public static string DisplayName(this ISchemaEntity schema) { return schema.SchemaDef.Properties.Label.WithFallback(schema.TypeName()); diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs index 62a30e545..e7eb3a28d 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs @@ -7,7 +7,6 @@ using System; using System.Collections.Generic; -using System.Linq; using System.Threading.Tasks; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Entities.Schemas.Commands; @@ -47,14 +46,6 @@ namespace Squidex.Domain.Apps.Entities.Schemas switch (command) { - case CreateSchema createSchema: - return CreateAsync(createSchema, async c => - { - await GuardSchema.CanCreate(c, appProvider); - - Create(c); - }); - case AddField addField: return UpdateReturnAsync(addField, c => { @@ -62,7 +53,26 @@ namespace Squidex.Domain.Apps.Entities.Schemas Add(c); - return EntityCreatedResult.Create(Snapshot.SchemaDef.FieldsById.Values.First(x => x.Name == addField.Name).Id, NewVersion); + var id = 0L; + + if (c.ParentFieldId == null) + { + id = Snapshot.SchemaDef.FieldsByName[c.Name].Id; + } + else + { + id = ((IArrayField)Snapshot.SchemaDef.FieldsById[c.ParentFieldId.Value]).FieldsByName[c.Name].Id; + } + + return EntityCreatedResult.Create(id, NewVersion); + }); + + case CreateSchema createSchema: + return CreateAsync(createSchema, async c => + { + await GuardSchema.CanCreate(c, appProvider); + + Create(c); }); case DeleteField deleteField: @@ -184,7 +194,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas public void Create(CreateSchema command) { - var @event = SimpleMapper.Map(command, new SchemaCreated { SchemaId = new NamedId(command.SchemaId, command.Name) }); + var @event = SimpleMapper.Map(command, new SchemaCreated { SchemaId = NamedId.Of(command.SchemaId, command.Name) }); if (command.Fields != null) { @@ -195,6 +205,18 @@ namespace Squidex.Domain.Apps.Entities.Schemas var eventField = SimpleMapper.Map(commandField, new SchemaCreatedField()); @event.Fields.Add(eventField); + + if (commandField.Nested != null) + { + eventField.Nested = new List(); + + foreach (var nestedField in commandField.Nested) + { + var eventNestedField = SimpleMapper.Map(nestedField, new SchemaCreatedNestedField()); + + eventField.Nested.Add(eventNestedField); + } + } } } @@ -203,7 +225,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas public void Add(AddField command) { - RaiseEvent(SimpleMapper.Map(command, new FieldAdded { FieldId = new NamedId(Snapshot.TotalFields + 1, command.Name) })); + RaiseEvent(SimpleMapper.Map(command, new FieldAdded { ParentFieldId = GetFieldId(command.ParentFieldId), FieldId = CreateFieldId(command) })); } public void UpdateField(UpdateField command) @@ -243,7 +265,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas public void Reorder(ReorderFields command) { - RaiseEvent(SimpleMapper.Map(command, new SchemaFieldsReordered())); + RaiseEvent(SimpleMapper.Map(command, new SchemaFieldsReordered { ParentFieldId = GetFieldId(command.ParentFieldId) })); } public void Publish(PublishSchema command) @@ -280,19 +302,46 @@ namespace Squidex.Domain.Apps.Entities.Schemas { SimpleMapper.Map(fieldCommand, @event); - if (Snapshot.SchemaDef.FieldsById.TryGetValue(fieldCommand.FieldId, out var field)) + if (fieldCommand.ParentFieldId.HasValue) + { + if (Snapshot.SchemaDef.FieldsById.TryGetValue(fieldCommand.ParentFieldId.Value, out var field)) + { + @event.ParentFieldId = NamedId.Of(field.Id, field.Name); + + if (field is IArrayField arrayField && arrayField.FieldsById.TryGetValue(fieldCommand.FieldId, out var nestedField)) + { + @event.FieldId = NamedId.Of(nestedField.Id, nestedField.Name); + } + } + } + else { - @event.FieldId = new NamedId(field.Id, field.Name); + @event.FieldId = GetFieldId(fieldCommand.FieldId); } RaiseEvent(@event); } + private NamedId CreateFieldId(AddField command) + { + return NamedId.Of(Snapshot.TotalFields + 1L, command.Name); + } + + private NamedId GetFieldId(long? id) + { + if (id.HasValue && Snapshot.SchemaDef.FieldsById.TryGetValue(id.Value, out var field)) + { + return NamedId.Of(field.Id, field.Name); + } + + return null; + } + private void RaiseEvent(SchemaEvent @event) { if (@event.SchemaId == null) { - @event.SchemaId = new NamedId(Snapshot.Id, Snapshot.Name); + @event.SchemaId = NamedId.Of(Snapshot.Id, Snapshot.Name); } if (@event.AppId == null) diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs b/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs index 256d42673..4a787d912 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/State/SchemaState.cs @@ -83,12 +83,33 @@ namespace Squidex.Domain.Apps.Entities.Schemas.State { TotalFields++; - var partitioning = - string.Equals(eventField.Partitioning, Partitioning.Language.Key, StringComparison.OrdinalIgnoreCase) ? - Partitioning.Language : - Partitioning.Invariant; + var partitioning = Partitioning.FromString(eventField.Partitioning); - var field = registry.CreateField(TotalFields, eventField.Name, partitioning, eventField.Properties); + var field = registry.CreateRootField(TotalFields, eventField.Name, partitioning, eventField.Properties); + + if (field is ArrayField arrayField && eventField.Nested?.Count > 0) + { + foreach (var nestedEventField in eventField.Nested) + { + TotalFields++; + + var nestedField = registry.CreateNestedField(TotalFields, nestedEventField.Name, nestedEventField.Properties); + + if (nestedEventField.IsHidden) + { + nestedField = nestedField.Hide(); + } + + if (nestedEventField.IsDisabled) + { + nestedField = nestedField.Disable(); + } + + arrayField = arrayField.AddField(nestedField); + } + + field = arrayField; + } if (eventField.IsHidden) { @@ -116,15 +137,21 @@ namespace Squidex.Domain.Apps.Entities.Schemas.State protected void On(FieldAdded @event, FieldRegistry registry) { - var partitioning = - string.Equals(@event.Partitioning, Partitioning.Language.Key, StringComparison.OrdinalIgnoreCase) ? - Partitioning.Language : - Partitioning.Invariant; + if (@event.ParentFieldId != null) + { + var field = registry.CreateNestedField(@event.FieldId.Id, @event.Name, @event.Properties); + + SchemaDef = SchemaDef.UpdateField(@event.ParentFieldId.Id, x => ((ArrayField)x).AddField(field)); + } + else + { + var partitioning = Partitioning.FromString(@event.Partitioning); - var field = registry.CreateField(@event.FieldId.Id, @event.Name, partitioning, @event.Properties); + var field = registry.CreateRootField(@event.FieldId.Id, @event.Name, partitioning, @event.Properties); - SchemaDef = SchemaDef.DeleteField(@event.FieldId.Id); - SchemaDef = SchemaDef.AddField(field); + SchemaDef = SchemaDef.DeleteField(@event.FieldId.Id); + SchemaDef = SchemaDef.AddField(field); + } TotalFields++; } @@ -151,42 +178,42 @@ namespace Squidex.Domain.Apps.Entities.Schemas.State protected void On(SchemaFieldsReordered @event, FieldRegistry registry) { - SchemaDef = SchemaDef.ReorderFields(@event.FieldIds); + SchemaDef = SchemaDef.ReorderFields(@event.FieldIds, @event.ParentFieldId?.Id); } protected void On(FieldUpdated @event, FieldRegistry registry) { - SchemaDef = SchemaDef.UpdateField(@event.FieldId.Id, @event.Properties); + SchemaDef = SchemaDef.UpdateField(@event.FieldId.Id, @event.Properties, @event.ParentFieldId?.Id); } protected void On(FieldLocked @event, FieldRegistry registry) { - SchemaDef = SchemaDef.LockField(@event.FieldId.Id); + SchemaDef = SchemaDef.LockField(@event.FieldId.Id, @event.ParentFieldId?.Id); } protected void On(FieldDisabled @event, FieldRegistry registry) { - SchemaDef = SchemaDef.DisableField(@event.FieldId.Id); + SchemaDef = SchemaDef.DisableField(@event.FieldId.Id, @event.ParentFieldId?.Id); } protected void On(FieldEnabled @event, FieldRegistry registry) { - SchemaDef = SchemaDef.EnableField(@event.FieldId.Id); + SchemaDef = SchemaDef.EnableField(@event.FieldId.Id, @event.ParentFieldId?.Id); } protected void On(FieldHidden @event, FieldRegistry registry) { - SchemaDef = SchemaDef.HideField(@event.FieldId.Id); + SchemaDef = SchemaDef.HideField(@event.FieldId.Id, @event.ParentFieldId?.Id); } protected void On(FieldShown @event, FieldRegistry registry) { - SchemaDef = SchemaDef.ShowField(@event.FieldId.Id); + SchemaDef = SchemaDef.ShowField(@event.FieldId.Id, @event.ParentFieldId?.Id); } protected void On(FieldDeleted @event, FieldRegistry registry) { - SchemaDef = SchemaDef.DeleteField(@event.FieldId.Id); + SchemaDef = SchemaDef.DeleteField(@event.FieldId.Id, @event.ParentFieldId?.Id); } protected void On(SchemaDeleted @event, FieldRegistry registry) diff --git a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj index 82878f303..9dfc0d4a6 100644 --- a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj +++ b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj @@ -14,6 +14,7 @@ + diff --git a/src/Squidex.Domain.Apps.Events/Schemas/FieldEvent.cs b/src/Squidex.Domain.Apps.Events/Schemas/FieldEvent.cs index 8887bf696..0c2a9690f 100644 --- a/src/Squidex.Domain.Apps.Events/Schemas/FieldEvent.cs +++ b/src/Squidex.Domain.Apps.Events/Schemas/FieldEvent.cs @@ -12,5 +12,7 @@ namespace Squidex.Domain.Apps.Events.Schemas public abstract class FieldEvent : SchemaEvent { public NamedId FieldId { get; set; } + + public NamedId ParentFieldId { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Events/Schemas/SchemaCreatedField.cs b/src/Squidex.Domain.Apps.Events/Schemas/SchemaCreatedField.cs index 3858eb897..ce040cba5 100644 --- a/src/Squidex.Domain.Apps.Events/Schemas/SchemaCreatedField.cs +++ b/src/Squidex.Domain.Apps.Events/Schemas/SchemaCreatedField.cs @@ -6,6 +6,7 @@ // ========================================================================== using Squidex.Domain.Apps.Core.Schemas; +using FieldNested = System.Collections.Generic.List; namespace Squidex.Domain.Apps.Events.Schemas { @@ -21,6 +22,8 @@ namespace Squidex.Domain.Apps.Events.Schemas public bool IsDisabled { get; set; } + public FieldNested Nested { get; set; } + public FieldProperties Properties { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/InputFieldExtensions.cs b/src/Squidex.Domain.Apps.Events/Schemas/SchemaCreatedNestedField.cs similarity index 57% rename from src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/InputFieldExtensions.cs rename to src/Squidex.Domain.Apps.Events/Schemas/SchemaCreatedNestedField.cs index 84af9a8f0..7d8fb5878 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/InputFieldExtensions.cs +++ b/src/Squidex.Domain.Apps.Events/Schemas/SchemaCreatedNestedField.cs @@ -5,16 +5,20 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using GraphQL.Types; using Squidex.Domain.Apps.Core.Schemas; -namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types +namespace Squidex.Domain.Apps.Events.Schemas { - public static class InputFieldExtensions + public sealed class SchemaCreatedNestedField { - public static IGraphType GetInputGraphType(this IField field) - { - return field.Accept(InputFieldVisitor.Default); - } + public string Name { get; set; } + + public bool IsHidden { get; set; } + + public bool IsLocked { get; set; } + + public bool IsDisabled { get; set; } + + public FieldProperties Properties { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Events/Schemas/SchemaFieldsReordered.cs b/src/Squidex.Domain.Apps.Events/Schemas/SchemaFieldsReordered.cs index 9a34fd94e..50ad79ed8 100644 --- a/src/Squidex.Domain.Apps.Events/Schemas/SchemaFieldsReordered.cs +++ b/src/Squidex.Domain.Apps.Events/Schemas/SchemaFieldsReordered.cs @@ -6,6 +6,7 @@ // ========================================================================== using System.Collections.Generic; +using Squidex.Infrastructure; using Squidex.Infrastructure.EventSourcing; namespace Squidex.Domain.Apps.Events.Schemas @@ -13,6 +14,8 @@ namespace Squidex.Domain.Apps.Events.Schemas [EventType(nameof(SchemaFieldsReordered))] public sealed class SchemaFieldsReordered : SchemaEvent { + public NamedId ParentFieldId { get; set; } + public List FieldIds { get; set; } } } diff --git a/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj b/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj index 72e45373d..bd03eadfe 100644 --- a/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj +++ b/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj @@ -11,7 +11,6 @@ - diff --git a/src/Squidex.Infrastructure.Redis/RedisPubSub.cs b/src/Squidex.Infrastructure.Redis/RedisPubSub.cs index 353f7f295..ce14d18fb 100644 --- a/src/Squidex.Infrastructure.Redis/RedisPubSub.cs +++ b/src/Squidex.Infrastructure.Redis/RedisPubSub.cs @@ -56,7 +56,7 @@ namespace Squidex.Infrastructure { var typeName = typeof(T).FullName; - return (RedisSubscription)subscriptions.GetOrAdd(typeName, c => new RedisSubscription(redisSubscriber.Value, c, log)); + return (RedisSubscription)subscriptions.GetOrAdd(typeName, this, (k, c) => new RedisSubscription(c.redisSubscriber.Value, k, c.log)); } } } diff --git a/src/Squidex.Infrastructure/CollectionExtensions.cs b/src/Squidex.Infrastructure/CollectionExtensions.cs index febc9654d..18bcc7ae9 100644 --- a/src/Squidex.Infrastructure/CollectionExtensions.cs +++ b/src/Squidex.Infrastructure/CollectionExtensions.cs @@ -172,6 +172,18 @@ namespace Squidex.Infrastructure return result; } + public static TValue GetOrAdd(this IDictionary dictionary, TKey key, TContext context, Func creator) + { + if (!dictionary.TryGetValue(key, out var result)) + { + result = creator(key, context); + + dictionary.Add(key, result); + } + + return result; + } + public static void Foreach(this IEnumerable collection, Action action) { foreach (var item in collection) diff --git a/src/Squidex.Infrastructure/Json/NamedStringIdConverter.cs b/src/Squidex.Infrastructure/Json/NamedStringIdConverter.cs index 32e113711..3076ef02c 100644 --- a/src/Squidex.Infrastructure/Json/NamedStringIdConverter.cs +++ b/src/Squidex.Infrastructure/Json/NamedStringIdConverter.cs @@ -32,7 +32,7 @@ namespace Squidex.Infrastructure.Json throw new JsonException("Named id must have more than 2 parts divided by colon."); } - return new NamedId(parts[0], string.Join(",", parts.Skip(1))); + return NamedId.Of(parts[0], string.Join(",", parts.Skip(1))); } } } diff --git a/src/Squidex.Infrastructure/Log/ConsoleLogChannel.cs b/src/Squidex.Infrastructure/Log/ConsoleLogChannel.cs index 77ba0448e..bfc924469 100644 --- a/src/Squidex.Infrastructure/Log/ConsoleLogChannel.cs +++ b/src/Squidex.Infrastructure/Log/ConsoleLogChannel.cs @@ -13,6 +13,12 @@ namespace Squidex.Infrastructure.Log public sealed class ConsoleLogChannel : ILogChannel, IDisposable { private readonly ConsoleLogProcessor processor = new ConsoleLogProcessor(); + private readonly bool useColors; + + public ConsoleLogChannel(bool useColors = false) + { + this.useColors = useColors; + } public void Dispose() { @@ -23,13 +29,16 @@ namespace Squidex.Infrastructure.Log { var color = 0; - if (logLevel == SemanticLogLevel.Warning) - { - color = 0xffff00; - } - else if (logLevel >= SemanticLogLevel.Error) + if (useColors) { - color = 0xff0000; + if (logLevel == SemanticLogLevel.Warning) + { + color = 0xffff00; + } + else if (logLevel >= SemanticLogLevel.Error) + { + color = 0xff0000; + } } processor.EnqueueMessage(new LogMessageEntry { Message = message, Color = color }); diff --git a/src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs b/src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs index fffabfcd4..cb8ec5acc 100644 --- a/src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs +++ b/src/Squidex.Infrastructure/Log/Internal/AnsiLogConsole.cs @@ -18,6 +18,10 @@ namespace Squidex.Infrastructure.Log.Internal this.logToStdError = logToStdError; } + public void Reset() + { + } + public void WriteLine(int color, string message) { if (color != 0 && logToStdError) diff --git a/src/Squidex.Infrastructure/Log/Internal/ConsoleLogProcessor.cs b/src/Squidex.Infrastructure/Log/Internal/ConsoleLogProcessor.cs index b536f509f..06c76e40e 100644 --- a/src/Squidex.Infrastructure/Log/Internal/ConsoleLogProcessor.cs +++ b/src/Squidex.Infrastructure/Log/Internal/ConsoleLogProcessor.cs @@ -86,6 +86,10 @@ namespace Squidex.Infrastructure.Log.Internal { Debug.WriteLine($"Failed to shutdown log queue grateful: {ex}."); } + finally + { + console.Reset(); + } } } } diff --git a/src/Squidex.Infrastructure/Log/Internal/IConsole.cs b/src/Squidex.Infrastructure/Log/Internal/IConsole.cs index d5c45b274..c996fe108 100644 --- a/src/Squidex.Infrastructure/Log/Internal/IConsole.cs +++ b/src/Squidex.Infrastructure/Log/Internal/IConsole.cs @@ -10,5 +10,7 @@ namespace Squidex.Infrastructure.Log.Internal public interface IConsole { void WriteLine(int color, string message); + + void Reset(); } } diff --git a/src/Squidex.Infrastructure/Log/Internal/WindowsLogConsole.cs b/src/Squidex.Infrastructure/Log/Internal/WindowsLogConsole.cs index 7275761e2..3a0b136f6 100644 --- a/src/Squidex.Infrastructure/Log/Internal/WindowsLogConsole.cs +++ b/src/Squidex.Infrastructure/Log/Internal/WindowsLogConsole.cs @@ -18,6 +18,11 @@ namespace Squidex.Infrastructure.Log.Internal this.logToStdError = logToStdError; } + public void Reset() + { + Console.ResetColor(); + } + public void WriteLine(int color, string message) { if (color != 0) diff --git a/src/Squidex.Infrastructure/NamedId.cs b/src/Squidex.Infrastructure/NamedId.cs index e8f99f6d4..e0c8106be 100644 --- a/src/Squidex.Infrastructure/NamedId.cs +++ b/src/Squidex.Infrastructure/NamedId.cs @@ -1,70 +1,17 @@ // ========================================================================== // 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.Linq; - namespace Squidex.Infrastructure { - public delegate bool Parser(string input, out T result); - - public sealed class NamedId : IEquatable> + public static class NamedId { - public T Id { get; } - - public string Name { get; } - - public NamedId(T id, string name) + public static NamedId Of(T id, string name) { - Guard.NotNull(id, nameof(id)); - Guard.NotNull(name, nameof(name)); - - Id = id; - - Name = name; - } - - public override string ToString() - { - return $"{Id},{Name}"; - } - - public override bool Equals(object obj) - { - return Equals(obj as NamedId); - } - - public bool Equals(NamedId other) - { - return other != null && (ReferenceEquals(this, other) || (Id.Equals(other.Id) && Name.Equals(other.Name))); - } - - public override int GetHashCode() - { - 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))); + return new NamedId(id, name); } } } diff --git a/src/Squidex.Infrastructure/NamedId{T}.cs b/src/Squidex.Infrastructure/NamedId{T}.cs new file mode 100644 index 000000000..e8f99f6d4 --- /dev/null +++ b/src/Squidex.Infrastructure/NamedId{T}.cs @@ -0,0 +1,70 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +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; } + + public string Name { get; } + + public NamedId(T id, string name) + { + Guard.NotNull(id, nameof(id)); + Guard.NotNull(name, nameof(name)); + + Id = id; + + Name = name; + } + + public override string ToString() + { + return $"{Id},{Name}"; + } + + public override bool Equals(object obj) + { + return Equals(obj as NamedId); + } + + public bool Equals(NamedId other) + { + return other != null && (ReferenceEquals(this, other) || (Id.Equals(other.Id) && Name.Equals(other.Name))); + } + + public override int GetHashCode() + { + 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/ValidationError.cs b/src/Squidex.Infrastructure/ValidationError.cs index 69eca55d6..47b4f8fe1 100644 --- a/src/Squidex.Infrastructure/ValidationError.cs +++ b/src/Squidex.Infrastructure/ValidationError.cs @@ -6,6 +6,7 @@ // ========================================================================== using System.Collections.Generic; +using System.Linq; namespace Squidex.Infrastructure { @@ -33,5 +34,17 @@ namespace Squidex.Infrastructure this.propertyNames = propertyNames ?? FallbackProperties; } + + public ValidationError WithPrefix(string prefix) + { + if (propertyNames.Length > 0) + { + return new ValidationError(Message, propertyNames.Select(x => $"{prefix}.{x}").ToArray()); + } + else + { + return new ValidationError(Message, prefix); + } + } } } diff --git a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs index 03acbbdad..d52320731 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs @@ -242,7 +242,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Generator private SwaggerOperations AddOperation(SwaggerOperationMethod method, string entityName, string path, Action updater) { - var operations = document.Paths.GetOrAdd(path, k => new SwaggerOperations()); + var operations = document.Paths.GetOrAddNew(path); var operation = new SwaggerOperation(); updater(operation); diff --git a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasSwaggerGenerator.cs b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasSwaggerGenerator.cs index c88f8cad2..adf41afad 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasSwaggerGenerator.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemasSwaggerGenerator.cs @@ -78,7 +78,7 @@ namespace Squidex.Areas.Api.Controllers.Contents.Generator { name = char.ToUpperInvariant(name[0]) + name.Substring(1); - return new JsonSchema4 { Reference = document.Definitions.GetOrAdd(name, x => schema) }; + return new JsonSchema4 { Reference = document.Definitions.GetOrAdd(name, schema, (k, c) => c) }; } } } diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/AddFieldDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/AddFieldDto.cs index 8ce6cd996..b2330cfd8 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/AddFieldDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/AddFieldDto.cs @@ -31,9 +31,9 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models [Required] public FieldPropertiesDto Properties { get; set; } - public AddField ToCommand() + public AddField ToCommand(long? parentId = null) { - return SimpleMapper.Map(this, new AddField { Properties = Properties.ToProperties() }); + return SimpleMapper.Map(this, new AddField { ParentFieldId = parentId, Properties = Properties.ToProperties() }); } } } \ No newline at end of file diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs index 5dd3b2129..9750fc7c4 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Converters/FieldPropertiesDtoFactory.cs @@ -25,6 +25,11 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models.Converters return properties.Accept(Instance); } + public FieldPropertiesDto Visit(ArrayFieldProperties properties) + { + return SimpleMapper.Map(properties, new ArrayFieldPropertiesDto()); + } + public FieldPropertiesDto Visit(BooleanFieldProperties properties) { return SimpleMapper.Map(properties, new BooleanFieldPropertiesDto()); diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs index 9399ba0d0..540dcfdc2 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaDto.cs @@ -57,9 +57,22 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models foreach (var fieldDto in Fields) { var fieldProperties = fieldDto?.Properties.ToProperties(); - var fieldInstance = SimpleMapper.Map(fieldDto, new CreateSchemaField { Properties = fieldProperties }); + var field = SimpleMapper.Map(fieldDto, new CreateSchemaField { Properties = fieldProperties }); - command.Fields.Add(fieldInstance); + if (fieldDto.Nested != null) + { + field.Nested = new List(); + + foreach (var nestedFieldDto in fieldDto.Nested) + { + var nestedFieldProperties = nestedFieldDto?.Properties.ToProperties(); + var nestedField = SimpleMapper.Map(fieldDto, new CreateSchemaNestedField { Properties = fieldProperties }); + + field.Nested.Add(nestedField); + } + } + + command.Fields.Add(field); } } diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaFieldDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaFieldDto.cs index a96975669..75a09a657 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaFieldDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaFieldDto.cs @@ -5,6 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; namespace Squidex.Areas.Api.Controllers.Schemas.Models @@ -43,5 +44,10 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models /// [Required] public FieldPropertiesDto Properties { get; set; } + + /// + /// The nested fields. + /// + public List Nested { get; set; } } } \ No newline at end of file diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaNestedFieldDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaNestedFieldDto.cs new file mode 100644 index 000000000..f25e2cadb --- /dev/null +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/CreateSchemaNestedFieldDto.cs @@ -0,0 +1,37 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.ComponentModel.DataAnnotations; + +namespace Squidex.Areas.Api.Controllers.Schemas.Models +{ + public sealed class CreateSchemaNestedFieldDto + { + /// + /// The name of the field. Must be unique within the schema. + /// + [Required] + [RegularExpression("^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*$")] + public string Name { get; set; } + + /// + /// Defines if the field is hidden. + /// + public bool IsHidden { get; set; } + + /// + /// Defines if the field is disabled. + /// + public bool IsDisabled { get; set; } + + /// + /// The field properties. + /// + [Required] + public FieldPropertiesDto Properties { get; set; } + } +} \ No newline at end of file diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldDto.cs index 5296b1ece..d9eab980f 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/FieldDto.cs @@ -5,6 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System.Collections.Generic; using System.ComponentModel.DataAnnotations; namespace Squidex.Areas.Api.Controllers.Schemas.Models @@ -49,5 +50,10 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models /// [Required] public FieldPropertiesDto Properties { get; set; } + + /// + /// The nested fields. + /// + public List Nested { get; set; } } } diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/ArrayFieldPropertiesDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/ArrayFieldPropertiesDto.cs new file mode 100644 index 000000000..b818b6815 --- /dev/null +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/Fields/ArrayFieldPropertiesDto.cs @@ -0,0 +1,34 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using NJsonSchema.Annotations; +using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Infrastructure.Reflection; + +namespace Squidex.Areas.Api.Controllers.Schemas.Models.Fields +{ + [JsonSchema("Array")] + public sealed class ArrayFieldPropertiesDto : FieldPropertiesDto + { + /// + /// The minimum allowed items for the field value. + /// + public int? MinItems { get; set; } + + /// + /// The maximum allowed items for the field value. + /// + public int? MaxItems { get; set; } + + public override FieldProperties ToProperties() + { + var result = SimpleMapper.Map(this, new ArrayFieldProperties()); + + return result; + } + } +} diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/NestedFieldDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/NestedFieldDto.cs new file mode 100644 index 000000000..334c50376 --- /dev/null +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/NestedFieldDto.cs @@ -0,0 +1,47 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.ComponentModel.DataAnnotations; + +namespace Squidex.Areas.Api.Controllers.Schemas.Models +{ + public sealed class NestedFieldDto + { + /// + /// The id of the field. + /// + public long FieldId { get; set; } + + /// + /// The name of the field. Must be unique within the schema. + /// + [Required] + [RegularExpression("^[a-z0-9]+(\\-[a-z0-9]+)*$")] + public string Name { get; set; } + + /// + /// Defines if the field is hidden. + /// + public bool IsHidden { get; set; } + + /// + /// Defines if the field is locked. + /// + public bool IsLocked { get; set; } + + /// + /// Defines if the field is disabled. + /// + public bool IsDisabled { get; set; } + + /// + /// The field properties. + /// + [Required] + public FieldPropertiesDto Properties { get; set; } + } +} diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/ReorderFieldsDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/ReorderFieldsDto.cs index c7a7812ac..ab28c7f99 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/ReorderFieldsDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/ReorderFieldsDto.cs @@ -19,9 +19,9 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models [Required] public List FieldIds { get; set; } - public ReorderFields ToCommand() + public ReorderFields ToCommand(long? parentId = null) { - return new ReorderFields { FieldIds = FieldIds }; + return new ReorderFields { ParentFieldId = parentId, FieldIds = FieldIds }; } } } diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDetailsDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDetailsDto.cs index c61a19654..850c6f938 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDetailsDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/SchemaDetailsDto.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using NodaTime; using Squidex.Areas.Api.Controllers.Schemas.Models.Converters; +using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Infrastructure.Reflection; @@ -117,7 +118,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models foreach (var field in schema.SchemaDef.Fields) { var fieldPropertiesDto = FieldPropertiesDtoFactory.Create(field.RawProperties); - var fieldInstanceDto = SimpleMapper.Map(field, + var fieldDto = SimpleMapper.Map(field, new FieldDto { FieldId = field.Id, @@ -125,7 +126,25 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models Partitioning = field.Partitioning.Key }); - response.Fields.Add(fieldInstanceDto); + if (field is IArrayField arrayField) + { + fieldDto.Nested = new List(); + + foreach (var nestedField in arrayField.Fields) + { + var nestedFieldPropertiesDto = FieldPropertiesDtoFactory.Create(nestedField.RawProperties); + var nestedFieldDto = SimpleMapper.Map(nestedField, + new NestedFieldDto + { + FieldId = nestedField.Id, + Properties = nestedFieldPropertiesDto, + }); + + fieldDto.Nested.Add(nestedFieldDto); + } + } + + response.Fields.Add(fieldDto); } return response; diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/Models/UpdateFieldDto.cs b/src/Squidex/Areas/Api/Controllers/Schemas/Models/UpdateFieldDto.cs index 36cff85e4..0a55fe8e9 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/Models/UpdateFieldDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/Models/UpdateFieldDto.cs @@ -18,9 +18,9 @@ namespace Squidex.Areas.Api.Controllers.Schemas.Models [Required] public FieldPropertiesDto Properties { get; set; } - public UpdateField ToCommand(long id) + public UpdateField ToCommand(long id, long? parentId = null) { - return new UpdateField { FieldId = id, Properties = Properties?.ToProperties() }; + return new UpdateField { ParentFieldId = parentId, FieldId = id, Properties = Properties?.ToProperties() }; } } } diff --git a/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs b/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs index 245205873..0299cee87 100644 --- a/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs +++ b/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs @@ -58,6 +58,35 @@ namespace Squidex.Areas.Api.Controllers.Schemas return StatusCode(201, response); } + /// + /// Add a nested schema field. + /// + /// The name of the app. + /// The name of the schema. + /// The parent field id. + /// The field object that needs to be added to the schema. + /// + /// 201 => Schema field created. + /// 400 => Schema field properties not valid. + /// 409 => Schema field name already in use. + /// 404 => Schema, field or app not found. + /// + [HttpPost] + [Route("apps/{app}/schemas/{name}/fields/{parentId:long}/nested/")] + [ProducesResponseType(typeof(EntityCreatedDto), 201)] + [ProducesResponseType(typeof(ErrorDto), 409)] + [ProducesResponseType(typeof(ErrorDto), 400)] + [ApiCosts(1)] + public async Task PostNestedField(string app, string name, long parentId, [FromBody] AddFieldDto request) + { + var context = await CommandBus.PublishAsync(request.ToCommand(parentId)); + + var result = context.Result>(); + var response = EntityCreatedDto.FromResult(result); + + return StatusCode(201, response); + } + /// /// Reorders the fields. /// @@ -73,13 +102,36 @@ namespace Squidex.Areas.Api.Controllers.Schemas [Route("apps/{app}/schemas/{name}/fields/ordering/")] [ProducesResponseType(typeof(ErrorDto), 400)] [ApiCosts(1)] - public async Task PutFieldOrdering(string app, string name, [FromBody] ReorderFieldsDto request) + public async Task PutSchemaFieldOrdering(string app, string name, [FromBody] ReorderFieldsDto request) { await CommandBus.PublishAsync(request.ToCommand()); return NoContent(); } + /// + /// Reorders the nested fields. + /// + /// The name of the app. + /// The name of the schema. + /// The parent field id. + /// The request that contains the field ids. + /// + /// 204 => Schema fields reorderd. + /// 400 => Schema field ids do not cover the fields of the schema. + /// 404 => Schema, field or app not found. + /// + [HttpPut] + [Route("apps/{app}/schemas/{name}/fields/{parentId:long}/nested/ordering/")] + [ProducesResponseType(typeof(ErrorDto), 400)] + [ApiCosts(1)] + public async Task PutNestedFieldOrdering(string app, string name, long parentId, [FromBody] ReorderFieldsDto request) + { + await CommandBus.PublishAsync(request.ToCommand(parentId)); + + return NoContent(); + } + /// /// Update a schema field. /// @@ -104,6 +156,31 @@ namespace Squidex.Areas.Api.Controllers.Schemas return NoContent(); } + /// + /// Update a nested schema field. + /// + /// The name of the app. + /// The name of the schema. + /// The parent field id. + /// The id of the field to update. + /// The field object that needs to be added to the schema. + /// + /// 204 => Schema field updated. + /// 400 => Schema field properties not valid or field is locked. + /// 404 => Schema, field or app not found. + /// + [HttpPut] + [Route("apps/{app}/schemas/{name}/fields/{parentId:long}/nested/{id:long}/")] + [ProducesResponseType(typeof(ErrorDto), 409)] + [ProducesResponseType(typeof(ErrorDto), 400)] + [ApiCosts(1)] + public async Task PutNestedField(string app, string name, long parentId, long id, [FromBody] UpdateFieldDto request) + { + await CommandBus.PublishAsync(request.ToCommand(id, parentId)); + + return NoContent(); + } + /// /// Lock a schema field. /// @@ -116,7 +193,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas /// 404 => Schema, field or app not found. /// /// - /// A hidden field is not part of the API response, but can still be edited in the portal. + /// A locked field cannot be updated or deleted. /// [HttpPut] [Route("apps/{app}/schemas/{name}/fields/{id:long}/lock/")] @@ -129,6 +206,32 @@ namespace Squidex.Areas.Api.Controllers.Schemas return NoContent(); } + /// + /// Lock a nested schema field. + /// + /// The name of the app. + /// The name of the schema. + /// The parent field id. + /// The id of the field to lock. + /// + /// 204 => Schema field hidden. + /// 400 => Schema field already hidden. + /// 404 => Field, schema, or app not found. + /// + /// + /// A locked field cannot be edited or deleted. + /// + [HttpPut] + [Route("apps/{app}/schemas/{name}/fields/{parentId:long}/nested/{id:long}/lock/")] + [ProducesResponseType(typeof(ErrorDto), 400)] + [ApiCosts(1)] + public async Task LockNestedField(string app, string name, long parentId, long id) + { + await CommandBus.PublishAsync(new LockField { ParentFieldId = parentId, FieldId = id }); + + return NoContent(); + } + /// /// Hide a schema field. /// @@ -141,7 +244,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas /// 404 => Schema, field or app not found. /// /// - /// A locked field cannot be edited or deleted. + /// A hidden field is not part of the API response, but can still be edited in the portal. /// [HttpPut] [Route("apps/{app}/schemas/{name}/fields/{id:long}/hide/")] @@ -154,6 +257,32 @@ namespace Squidex.Areas.Api.Controllers.Schemas return NoContent(); } + /// + /// Hide a nested schema field. + /// + /// The name of the app. + /// The name of the schema. + /// The parent field id. + /// The id of the field to hide. + /// + /// 204 => Schema field hidden. + /// 400 => Schema field already hidden. + /// 404 => Field, schema, or app not found. + /// + /// + /// A hidden field is not part of the API response, but can still be edited in the portal. + /// + [HttpPut] + [Route("apps/{app}/schemas/{name}/fields/{parentId:long}/nested/{id:long}/hide/")] + [ProducesResponseType(typeof(ErrorDto), 400)] + [ApiCosts(1)] + public async Task HideNestedField(string app, string name, long parentId, long id) + { + await CommandBus.PublishAsync(new HideField { ParentFieldId = parentId, FieldId = id }); + + return NoContent(); + } + /// /// Show a schema field. /// @@ -179,6 +308,32 @@ namespace Squidex.Areas.Api.Controllers.Schemas return NoContent(); } + /// + /// Show a nested schema field. + /// + /// The name of the app. + /// The name of the schema. + /// The parent field id. + /// The id of the field to show. + /// + /// 204 => Schema field shown. + /// 400 => Schema field already visible. + /// 404 => Schema, field or app not found. + /// + /// + /// A hidden field is not part of the API response, but can still be edited in the portal. + /// + [HttpPut] + [Route("apps/{app}/schemas/{name}/fields/{parentId:long}/nested/{id:long}/show/")] + [ProducesResponseType(typeof(ErrorDto), 400)] + [ApiCosts(1)] + public async Task ShowNestedField(string app, string name, long parentId, long id) + { + await CommandBus.PublishAsync(new ShowField { ParentFieldId = parentId, FieldId = id }); + + return NoContent(); + } + /// /// Enable a schema field. /// @@ -191,8 +346,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas /// 404 => Schema, field or app not found. /// /// - /// A disabled field cannot not be edited in the squidex portal anymore, - /// but will be part of the API response. + /// A disabled field cannot not be edited in the squidex portal anymore, but will be part of the API response. /// [HttpPut] [Route("apps/{app}/schemas/{name}/fields/{id:long}/enable/")] @@ -205,6 +359,32 @@ namespace Squidex.Areas.Api.Controllers.Schemas return NoContent(); } + /// + /// Enable a nested schema field. + /// + /// The name of the app. + /// The name of the schema. + /// The parent field id. + /// The id of the field to enable. + /// + /// 204 => Schema field enabled. + /// 400 => Schema field already enabled. + /// 404 => Schema, field or app not found. + /// + /// + /// A disabled field cannot not be edited in the squidex portal anymore, but will be part of the API response. + /// + [HttpPut] + [Route("apps/{app}/schemas/{name}/fields/{parentId:long}/nested/{id:long}/enable/")] + [ProducesResponseType(typeof(ErrorDto), 400)] + [ApiCosts(1)] + public async Task EnableNestedField(string app, string name, long parentId, long id) + { + await CommandBus.PublishAsync(new EnableField { ParentFieldId = parentId, FieldId = id }); + + return NoContent(); + } + /// /// Disable a schema field. /// @@ -217,8 +397,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas /// 404 => Schema, field or app not found. /// /// - /// A disabled field cannot not be edited in the squidex portal anymore, - /// but will be part of the API response. + /// A disabled field cannot not be edited in the squidex portal anymore, but will be part of the API response. /// [HttpPut] [Route("apps/{app}/schemas/{name}/fields/{id:long}/disable/")] @@ -231,6 +410,32 @@ namespace Squidex.Areas.Api.Controllers.Schemas return NoContent(); } + /// + /// Disable nested a schema field. + /// + /// The name of the app. + /// The name of the schema. + /// The parent field id. + /// The id of the field to disable. + /// + /// 204 => Schema field disabled. + /// 400 => Schema field already disabled. + /// 404 => Schema, field or app not found. + /// + /// + /// A disabled field cannot not be edited in the squidex portal anymore, but will be part of the API response. + /// + [HttpPut] + [Route("apps/{app}/schemas/{name}/fields/{parentId:long}/nested/{id:long}/disable/")] + [ProducesResponseType(typeof(ErrorDto), 400)] + [ApiCosts(1)] + public async Task DisableNestedField(string app, string name, long parentId, long id) + { + await CommandBus.PublishAsync(new DisableField { ParentFieldId = parentId, FieldId = id }); + + return NoContent(); + } + /// /// Delete a schema field. /// @@ -251,5 +456,27 @@ namespace Squidex.Areas.Api.Controllers.Schemas return NoContent(); } + + /// + /// Delete a nested schema field. + /// + /// The name of the app. + /// The name of the schema. + /// The parent field id. + /// The id of the field to disable. + /// + /// 204 => Schema field deleted. + /// 400 => Field is locked. + /// 404 => Schema, field or app not found. + /// + [HttpDelete] + [Route("apps/{app}/schemas/{name}/fields/{parentId:long}/nested/{id:long}/")] + [ApiCosts(1)] + public async Task DeleteNestedField(string app, string name, long parentId, long id) + { + await CommandBus.PublishAsync(new DeleteField { ParentFieldId = parentId, FieldId = id }); + + return NoContent(); + } } } \ No newline at end of file diff --git a/src/Squidex/Config/Domain/LoggingServices.cs b/src/Squidex/Config/Domain/LoggingServices.cs index e4ee51850..486c29dff 100644 --- a/src/Squidex/Config/Domain/LoggingServices.cs +++ b/src/Squidex/Config/Domain/LoggingServices.cs @@ -42,6 +42,13 @@ namespace Squidex.Config.Domain .As(); } + var useColors = config.GetValue("logging:colors"); + + if (console == null) + { + console = new ConsoleLogChannel(useColors); + } + services.AddSingletonAs(console) .As(); diff --git a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs b/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs index 8f724b1a9..f41214737 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs +++ b/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddleware.cs @@ -57,7 +57,7 @@ namespace Squidex.Pipeline.CommandMiddlewares throw new InvalidOperationException("Cannot resolve app."); } - return new NamedId(appFeature.App.Id, appFeature.App.Name); + return NamedId.Of(appFeature.App.Id, appFeature.App.Name); } } } \ No newline at end of file diff --git a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs b/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs index e385b6025..2825ad8f6 100644 --- a/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs +++ b/src/Squidex/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddleware.cs @@ -68,7 +68,7 @@ namespace Squidex.Pipeline.CommandMiddlewares if (appFeature != null && appFeature.App != null) { - appId = new NamedId(appFeature.App.Id, appFeature.App.Name); + appId = NamedId.Of(appFeature.App.Id, appFeature.App.Name); } } @@ -96,7 +96,7 @@ namespace Squidex.Pipeline.CommandMiddlewares throw new DomainObjectNotFoundException(schemaName, typeof(ISchemaEntity)); } - return new NamedId(schema.Id, schema.Name); + return NamedId.Of(schema.Id, schema.Name); } } diff --git a/src/Squidex/app-config/fix-coverage-loader.js b/src/Squidex/app-config/fix-coverage-loader.js deleted file mode 100644 index d5e5f2ff9..000000000 --- a/src/Squidex/app-config/fix-coverage-loader.js +++ /dev/null @@ -1,47 +0,0 @@ -function fixCoverage(contents) { - this.cacheable(); - - var ignores = [ - { name: 'arguments', line: 'var _a' }, - { name: 'decorate', line: 'var __decorate =', }, - { name: 'metadata', line: 'var __metadata =', }, - { name: 'extends', line: 'var __extends =', }, - { name: 'export', line: 'function __export' } - ]; - - var updates = 0; - var rows = contents.split('\n'); - - for (var rowIndex = 0; rowIndex < rows.length; rowIndex++) { - var row = rows[rowIndex].trim(); - - for (var ignoreIndex = 0; ignoreIndex < ignores.length; ignoreIndex++) { - var ignore = ignores[ignoreIndex]; - - if (row.indexOf(ignore.line) >= 0) { - rows.splice(rowIndex, 0, '/* istanbul ignore next: TypeScript ' + ignore.name + ' */'); - rowIndex++; - updates++; - break; - } - } - - if (row.indexOf('hasOwnProperty') >= 0) { - rows.splice(rowIndex, 0, '/* istanbul ignore else */'); - rowIndex++; - updates++; - } - - if (updates === ignores.length) { - break; - } - } - - if (updates > 0) { - return rows.join('\n'); - } else { - return contents; - } -} - -module.exports = fixCoverage; \ No newline at end of file diff --git a/src/Squidex/app-config/karma-test-shim.js b/src/Squidex/app-config/karma-test-shim.js index 13e285d15..cd4be9556 100644 --- a/src/Squidex/app-config/karma-test-shim.js +++ b/src/Squidex/app-config/karma-test-shim.js @@ -11,8 +11,6 @@ require('zone.js/dist/jasmine-patch'); require('zone.js/dist/async-test'); require('zone.js/dist/fake-async-test'); -require('rxjs/Rx'); - var testing = require('@angular/core/testing'); var browser = require('@angular/platform-browser-dynamic/testing'); diff --git a/src/Squidex/app-config/webpack.config.js b/src/Squidex/app-config/webpack.config.js index e0746044b..8497259b1 100644 --- a/src/Squidex/app-config/webpack.config.js +++ b/src/Squidex/app-config/webpack.config.js @@ -1,9 +1,13 @@ - var webpack = require('webpack'), - path = require('path'), - HtmlWebpackPlugin = require('html-webpack-plugin'), - ExtractTextPlugin = require('extract-text-webpack-plugin'), -TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin'), - helpers = require('./helpers'); +const webpack = require('webpack'), + path = require('path'), + helpers = require('./helpers'); + +const plugins = { + // https://github.com/webpack-contrib/mini-css-extract-plugin + MiniCssExtractPlugin: require('mini-css-extract-plugin'), + // https://github.com/dividab/tsconfig-paths-webpack-plugin + TsconfigPathsPlugin: require('tsconfig-paths-webpack-plugin') +}; module.exports = { /** @@ -21,12 +25,11 @@ module.exports = { modules: [ helpers.root('app'), helpers.root('app', 'theme'), - helpers.root('app-libs'), helpers.root('node_modules') ], plugins: [ - new TsconfigPathsPlugin() + new plugins.TsconfigPathsPlugin() ] }, @@ -45,19 +48,19 @@ module.exports = { { test: /\.ts$/, use: [{ - loader: 'awesome-typescript-loader' + loader: 'awesome-typescript-loader' }, { loader: 'angular2-router-loader' }, { loader: 'angular2-template-loader' }, { - loader: 'tslint-loader' + loader: 'tslint-loader' }], exclude: /node_modules/ }, { test: /\.ts$/, use: [{ - loader: 'awesome-typescript-loader' + loader: 'awesome-typescript-loader' }], include: /node_modules/ }, { @@ -83,21 +86,17 @@ module.exports = { }] }, { test: /\.css$/, - /* - * Extract the content from a bundle to a file - * - * See: https://github.com/webpack-contrib/extract-text-webpack-plugin - */ - use: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader?sourceMap' }) + use: [ + plugins.MiniCssExtractPlugin.loader, + { + loader: 'css-loader' + }] }, { test: /\.scss$/, use: [{ loader: 'raw-loader' }, { - loader: 'sass-loader', - options: { - includePaths: [helpers.root('app', 'theme')] - } + loader: 'sass-loader', options: { includePaths: [helpers.root('app', 'theme')] } }], exclude: helpers.root('app', 'theme') } @@ -105,6 +104,13 @@ module.exports = { }, plugins: [ + /* + * Puts each bundle into a file and appends the hash of the file to the path. + * + * See: https://github.com/webpack-contrib/mini-css-extract-plugin + */ + new plugins.MiniCssExtractPlugin('[name].css'), + new webpack.LoaderOptionsPlugin({ options: { tslint: { diff --git a/src/Squidex/app-config/webpack.run.base.js b/src/Squidex/app-config/webpack.run.base.js index 18274c8fc..e32a69fd2 100644 --- a/src/Squidex/app-config/webpack.run.base.js +++ b/src/Squidex/app-config/webpack.run.base.js @@ -1,8 +1,12 @@ - var webpack = require('webpack'), - webpackMerge = require('webpack-merge'), -HtmlWebpackPlugin = require('html-webpack-plugin'), - commonConfig = require('./webpack.config.js'), - helpers = require('./helpers'); +const webpack = require('webpack'), + webpackMerge = require('webpack-merge'), + path = require('path'), + helpers = require('./helpers'), + commonConfig = require('./webpack.config.js'); + +const plugins = { + HtmlWebpackPlugin: require('html-webpack-plugin') +}; module.exports = webpackMerge(commonConfig, { /** @@ -17,28 +21,15 @@ module.exports = webpackMerge(commonConfig, { }, plugins: [ - /** - * Shares common code between the pages. - * - * See: https://webpack.js.org/plugins/commons-chunk-plugin/ - */ - new webpack.optimize.CommonsChunkPlugin({ - name: ['app', 'shims'] - }), - - /** - * Simplifies creation of HTML files to serve your webpack bundles. - * This is especially useful for webpack bundles that include a hash in the filename - * which changes every compilation. - * - * See: https://github.com/ampedandwired/html-webpack-plugin - */ - new HtmlWebpackPlugin({ - template: 'wwwroot/index.html', hash: true + new plugins.HtmlWebpackPlugin({ + hash: true, + chunks: ['shims', 'app'], + chunksSortMode: 'manual', + template: 'wwwroot/index.html' }), - new HtmlWebpackPlugin({ - template: 'wwwroot/theme.html', hash: true, filename: 'theme.html' + new plugins.HtmlWebpackPlugin({ + template: 'wwwroot/theme.html', hash: true, chunksSortMode: 'none', filename: 'theme.html' }) ] }); \ No newline at end of file diff --git a/src/Squidex/app-config/webpack.run.dev.js b/src/Squidex/app-config/webpack.run.dev.js index 21a138e16..357dd1f5a 100644 --- a/src/Squidex/app-config/webpack.run.dev.js +++ b/src/Squidex/app-config/webpack.run.dev.js @@ -1,19 +1,17 @@ - var webpackMerge = require('webpack-merge'), - ExtractTextPlugin = require('extract-text-webpack-plugin'), - runConfig = require('./webpack.run.base.js'), - helpers = require('./helpers'); +const webpack = require('webpack'), + webpackMerge = require('webpack-merge'), + path = require('path'), + helpers = require('./helpers'), + runConfig = require('./webpack.run.base.js'); module.exports = webpackMerge(runConfig, { - /** - * Developer tool to enhance debugging - * - * See: https://webpack.js.org/configuration/devtool/#devtool - * See: https://webpack.js.org/guides/build-performance/ - */ - devtool: 'cheap-module-source-map', + mode: 'development', + + devtool: 'source-map', output: { filename: '[name].js', + // Set the public path, because we are running the website from another port (5000) publicPath: 'http://localhost:3000/' }, @@ -37,24 +35,17 @@ module.exports = webpackMerge(runConfig, { }, { loader: 'css-loader' }, { - loader: 'sass-loader?sourceMap', - options: { - includePaths: [helpers.root('app', 'theme')] - } + loader: 'sass-loader?sourceMap', options: { includePaths: [helpers.root('app', 'theme')] } }], include: helpers.root('app', 'theme') } ] }, - plugins: [ - new ExtractTextPlugin('[name].css') - ], - devServer: { - historyApiFallback: true, stats: 'minimal', headers: { 'Access-Control-Allow-Origin': '*' - } + }, + historyApiFallback: true } }); \ No newline at end of file diff --git a/src/Squidex/app-config/webpack.run.prod.js b/src/Squidex/app-config/webpack.run.prod.js index 6e1e076db..097661ea9 100644 --- a/src/Squidex/app-config/webpack.run.prod.js +++ b/src/Squidex/app-config/webpack.run.prod.js @@ -1,16 +1,20 @@ - var webpack = require('webpack'), - webpackMerge = require('webpack-merge'), -ExtractTextPlugin = require('extract-text-webpack-plugin'), - ngToolsWebpack = require('@ngtools/webpack'), - runConfig = require('./webpack.run.base.js'), - helpers = require('./helpers'); - -var ENV = process.env.NODE_ENV = process.env.ENV = 'production'; +const webpack = require('webpack'), + webpackMerge = require('webpack-merge'), + path = require('path'), + helpers = require('./helpers'), + runConfig = require('./webpack.run.base.js'); +const plugins = { + // https://www.npmjs.com/package/@ngtools/webpack + NgToolsWebpack: require('@ngtools/webpack'), + // https://github.com/webpack-contrib/mini-css-extract-plugin + MiniCssExtractPlugin: require('mini-css-extract-plugin') +}; + helpers.removeLoaders(runConfig, ['scss', 'ts']); module.exports = webpackMerge(runConfig, { - devtool: 'source-map', + mode: 'production', output: { /** @@ -58,7 +62,13 @@ module.exports = webpackMerge(runConfig, { * * See: https://github.com/webpack-contrib/extract-text-webpack-plugin */ - use: ExtractTextPlugin.extract({ fallback: 'style-loader', use: 'css-loader?minimize!sass-loader?sourceMap' }), + use: [ + plugins.MiniCssExtractPlugin.loader, + { + loader: 'css-loader', options: { minimize: true }, + }, { + loader: 'sass-loader' + }], /* * Do not include component styles */ @@ -68,10 +78,7 @@ module.exports = webpackMerge(runConfig, { use: [{ loader: 'raw-loader' }, { - loader: 'sass-loader', - options: { - includePaths: [helpers.root('app', 'theme')] - } + loader: 'sass-loader', options: { includePaths: [helpers.root('app', 'theme')] } }], exclude: helpers.root('app', 'theme'), }, { @@ -84,31 +91,11 @@ 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. - * - * 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 ngToolsWebpack.AngularCompilerPlugin({ - tsConfigPath: './tsconfig.json', - entryModule: 'app/app.module#AppModule' - }), + new plugins.NgToolsWebpack.AngularCompilerPlugin({ + entryModule: 'app/app.module#AppModule', + sourceMap: false, + skipSourceGeneration: false, + tsConfigPath: './tsconfig.json' + }) ] }); \ No newline at end of file diff --git a/src/Squidex/app-config/webpack.test.coverage.js b/src/Squidex/app-config/webpack.test.coverage.js index 4bfdb9654..e6e63f882 100644 --- a/src/Squidex/app-config/webpack.test.coverage.js +++ b/src/Squidex/app-config/webpack.test.coverage.js @@ -1,8 +1,8 @@ - -var webpackMerge = require('webpack-merge'), - path = require('path'), - helpers = require('./helpers'), - testConfig = require('./webpack.test.js'); +const webpack = require('webpack'), + webpackMerge = require('webpack-merge'), + path = require('path'), + helpers = require('./helpers'), + testConfig = require('./webpack.test.js'); helpers.removeLoaders(testConfig, ['ts']); @@ -25,9 +25,7 @@ module.exports = webpackMerge(testConfig, { test: /\.ts$/, use: [{ loader: 'istanbul-instrumenter-loader' - }, { - loader: helpers.root('app-config', 'fix-coverage-loader') - }, { + },{ loader: 'awesome-typescript-loader' }, { loader: 'angular2-router-loader' diff --git a/src/Squidex/app-config/webpack.test.js b/src/Squidex/app-config/webpack.test.js index 04955323e..1dd89b9e3 100644 --- a/src/Squidex/app-config/webpack.test.js +++ b/src/Squidex/app-config/webpack.test.js @@ -1,14 +1,17 @@ - var webpack = require('webpack'), -webpackMerge = require('webpack-merge'), -commonConfig = require('./webpack.config.js'), - helpers = require('./helpers'); + const webpack = require('webpack'), + webpackMerge = require('webpack-merge'), + path = require('path'), + helpers = require('./helpers'), + commonConfig = require('./webpack.config.js'); module.exports = webpackMerge(commonConfig, { + mode: 'development', + /** * Source map for Karma from the help of karma-sourcemap-loader & karma-webpack * * Do not change, leave as is or it wont work. * See: https://webpack.js.org/configuration/devtool/ */ - devtool: 'inline-source-map', + devtool: 'inline-source-map' }); \ No newline at end of file diff --git a/src/Squidex/app/app.ts b/src/Squidex/app/app.ts index bb9ddbbf5..4b7765637 100644 --- a/src/Squidex/app/app.ts +++ b/src/Squidex/app/app.ts @@ -12,7 +12,7 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app.module'; -if (process.env.ENV === 'production') { +if (process.env.NODE_ENV === 'production') { enableProdMode(); } diff --git a/src/Squidex/app/features/administration/guards/unset-user.guard.spec.ts b/src/Squidex/app/features/administration/guards/unset-user.guard.spec.ts index 57860d68d..15414e732 100644 --- a/src/Squidex/app/features/administration/guards/unset-user.guard.spec.ts +++ b/src/Squidex/app/features/administration/guards/unset-user.guard.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { UsersState } from './../state/users.state'; @@ -22,7 +22,7 @@ describe('UnsetUserGuard', () => { it('should unset user', () => { usersState.setup(x => x.select(null)) - .returns(() => Observable.of(null)); + .returns(() => of(null)); let result: boolean; diff --git a/src/Squidex/app/features/administration/guards/unset-user.guard.ts b/src/Squidex/app/features/administration/guards/unset-user.guard.ts index 50937ac96..1a8d42be2 100644 --- a/src/Squidex/app/features/administration/guards/unset-user.guard.ts +++ b/src/Squidex/app/features/administration/guards/unset-user.guard.ts @@ -8,6 +8,7 @@ import { Injectable } from '@angular/core'; import { CanActivate } from '@angular/router'; import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; import { UsersState } from './../state/users.state'; @@ -19,6 +20,6 @@ export class UnsetUserGuard implements CanActivate { } public canActivate(): Observable { - return this.usersState.select(null).map(u => u === null); + return this.usersState.select(null).pipe(map(u => u === null)); } } \ No newline at end of file diff --git a/src/Squidex/app/features/administration/guards/user-must-exist.guard.spec.ts b/src/Squidex/app/features/administration/guards/user-must-exist.guard.spec.ts index 783214daa..8fb04cde5 100644 --- a/src/Squidex/app/features/administration/guards/user-must-exist.guard.spec.ts +++ b/src/Squidex/app/features/administration/guards/user-must-exist.guard.spec.ts @@ -6,7 +6,7 @@ */ import { Router } from '@angular/router'; -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { UserDto } from './../services/users.service'; @@ -32,7 +32,7 @@ describe('UserMustExistGuard', () => { it('should load user and return true when found', () => { usersState.setup(x => x.select('123')) - .returns(() => Observable.of({})); + .returns(() => of({})); let result: boolean; @@ -47,7 +47,7 @@ describe('UserMustExistGuard', () => { it('should load user and return false when not found', () => { usersState.setup(x => x.select('123')) - .returns(() => Observable.of(null)); + .returns(() => of(null)); let result: boolean; diff --git a/src/Squidex/app/features/administration/guards/user-must-exist.guard.ts b/src/Squidex/app/features/administration/guards/user-must-exist.guard.ts index 7f6994db0..db67514f9 100644 --- a/src/Squidex/app/features/administration/guards/user-must-exist.guard.ts +++ b/src/Squidex/app/features/administration/guards/user-must-exist.guard.ts @@ -8,6 +8,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { Observable } from 'rxjs'; +import { map, tap } from 'rxjs/operators'; import { allParams } from '@app/framework'; @@ -25,13 +26,13 @@ export class UserMustExistGuard implements CanActivate { const userId = allParams(route)['userId']; const result = - this.usersState.select(userId) - .do(dto => { + this.usersState.select(userId).pipe( + tap(dto => { if (!dto) { this.router.navigate(['/404']); } - }) - .map(u => u !== null); + }), + map(u => u !== null)); return result; } diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts index 0c0464b1e..2813e338f 100644 --- a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts +++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.ts @@ -6,7 +6,8 @@ */ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Observable, Subscription } from 'rxjs'; +import { Subscription, timer } from 'rxjs'; +import { onErrorResumeNext, switchMap } from 'rxjs/operators'; import { ModalView } from '@app/shared'; @@ -34,28 +35,28 @@ export class EventConsumersPageComponent implements OnDestroy, OnInit { } public ngOnInit() { - this.eventConsumersState.load(false, true).onErrorResumeNext().subscribe(); + this.eventConsumersState.load(false, true).pipe(onErrorResumeNext()).subscribe(); this.timerSubscription = - Observable.timer(2000, 2000) - .switchMap(x => this.eventConsumersState.load(true, true).onErrorResumeNext()) + timer(2000, 2000).pipe( + switchMap(x => this.eventConsumersState.load(true, true)), onErrorResumeNext()) .subscribe(); } public reload() { - this.eventConsumersState.load(true, false).onErrorResumeNext().subscribe(); + this.eventConsumersState.load(true, false).pipe(onErrorResumeNext()).subscribe(); } public start(es: EventConsumerDto) { - this.eventConsumersState.start(es).onErrorResumeNext().subscribe(); + this.eventConsumersState.start(es).pipe(onErrorResumeNext()).subscribe(); } public stop(es: EventConsumerDto) { - this.eventConsumersState.stop(es).onErrorResumeNext().subscribe(); + this.eventConsumersState.stop(es).pipe(onErrorResumeNext()).subscribe(); } public reset(es: EventConsumerDto) { - this.eventConsumersState.reset(es).onErrorResumeNext().subscribe(); + this.eventConsumersState.reset(es).pipe(onErrorResumeNext()).subscribe(); } public trackByEventConsumer(index: number, es: EventConsumerDto) { diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.ts b/src/Squidex/app/features/administration/pages/users/users-page.component.ts index aac5aea12..8d8c5c052 100644 --- a/src/Squidex/app/features/administration/pages/users/users-page.component.ts +++ b/src/Squidex/app/features/administration/pages/users/users-page.component.ts @@ -7,6 +7,7 @@ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; +import { onErrorResumeNext } from 'rxjs/operators'; import { UserDto } from './../../services/users.service'; import { UsersState } from './../../state/users.state'; @@ -25,31 +26,31 @@ export class UsersPageComponent implements OnInit { } public ngOnInit() { - this.usersState.load().onErrorResumeNext().subscribe(); + this.usersState.load().pipe(onErrorResumeNext()).subscribe(); } public reload() { - this.usersState.load(true).onErrorResumeNext().subscribe(); + this.usersState.load(true).pipe(onErrorResumeNext()).subscribe(); } public search() { - this.usersState.search(this.usersFilter.value).onErrorResumeNext().subscribe(); + this.usersState.search(this.usersFilter.value).pipe(onErrorResumeNext()).subscribe(); } public goPrev() { - this.usersState.goPrev().onErrorResumeNext().subscribe(); + this.usersState.goPrev().pipe(onErrorResumeNext()).subscribe(); } public goNext() { - this.usersState.goNext().onErrorResumeNext().subscribe(); + this.usersState.goNext().pipe(onErrorResumeNext()).subscribe(); } public lock(user: UserDto) { - this.usersState.lock(user).onErrorResumeNext().subscribe(); + this.usersState.lock(user).pipe(onErrorResumeNext()).subscribe(); } public unlock(user: UserDto) { - this.usersState.unlock(user).onErrorResumeNext().subscribe(); + this.usersState.unlock(user).pipe(onErrorResumeNext()).subscribe(); } public trackByUser(index: number, userInfo: { user: UserDto }) { diff --git a/src/Squidex/app/features/administration/services/event-consumers.service.spec.ts b/src/Squidex/app/features/administration/services/event-consumers.service.spec.ts index e870f1d24..5eacb6d62 100644 --- a/src/Squidex/app/features/administration/services/event-consumers.service.spec.ts +++ b/src/Squidex/app/features/administration/services/event-consumers.service.spec.ts @@ -32,7 +32,7 @@ describe('EventConsumersService', () => { it('should make get request to get event consumers', inject([EventConsumersService, HttpTestingController], (eventConsumersService: EventConsumersService, httpMock: HttpTestingController) => { - let eventConsumers: EventConsumerDto[] | null = null; + let eventConsumers: EventConsumerDto[]; eventConsumersService.getEventConsumers().subscribe(result => { eventConsumers = result; @@ -60,10 +60,11 @@ describe('EventConsumersService', () => { } ]); - expect(eventConsumers).toEqual([ - new EventConsumerDto('event-consumer1', true, true, 'an error 1', '13'), - new EventConsumerDto('event-consumer2', true, true, 'an error 2', '29') - ]); + expect(eventConsumers!).toEqual( + [ + new EventConsumerDto('event-consumer1', true, true, 'an error 1', '13'), + new EventConsumerDto('event-consumer2', true, true, 'an error 2', '29') + ]); })); it('should make put request to start event consumer', diff --git a/src/Squidex/app/features/administration/services/event-consumers.service.ts b/src/Squidex/app/features/administration/services/event-consumers.service.ts index 45b32a9db..c768c9231 100644 --- a/src/Squidex/app/features/administration/services/event-consumers.service.ts +++ b/src/Squidex/app/features/administration/services/event-consumers.service.ts @@ -8,12 +8,16 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; -import '@app/framework/angular/http/http-extensions'; +import { + ApiUrlConfig, + HTTP, + Model, + pretifyError +} from '@app/shared'; -import { ApiUrlConfig, HTTP } from '@app/shared'; - -export class EventConsumerDto { +export class EventConsumerDto extends Model { constructor( public readonly name: string, public readonly isStopped: boolean, @@ -21,6 +25,11 @@ export class EventConsumerDto { public readonly error: string, public readonly position: string ) { + super(); + } + + public with(value: Partial): EventConsumerDto { + return this.clone(value); } } @@ -35,8 +44,8 @@ export class EventConsumersService { public getEventConsumers(): Observable { const url = this.apiUrl.buildUrl('/api/event-consumers'); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body; @@ -49,28 +58,28 @@ export class EventConsumersService { item.error, item.position); }); - }) - .pretifyError('Failed to load event consumers. Please reload.'); + }), + pretifyError('Failed to load event consumers. Please reload.')); } public putStart(name: string): Observable { const url = this.apiUrl.buildUrl(`api/event-consumers/${name}/start`); - return HTTP.putVersioned(this.http, url, {}) - .pretifyError('Failed to start event consumer. Please reload.'); + return HTTP.putVersioned(this.http, url, {}).pipe( + pretifyError('Failed to start event consumer. Please reload.')); } public putStop(name: string): Observable { const url = this.apiUrl.buildUrl(`api/event-consumers/${name}/stop`); - return HTTP.putVersioned(this.http, url, {}) - .pretifyError('Failed to stop event consumer. Please reload.'); + return HTTP.putVersioned(this.http, url, {}).pipe( + pretifyError('Failed to stop event consumer. Please reload.')); } public putReset(name: string): Observable { const url = this.apiUrl.buildUrl(`api/event-consumers/${name}/reset`); - return HTTP.putVersioned(this.http, url, {}) - .pretifyError('Failed to reset event consumer. Please reload.'); + return HTTP.putVersioned(this.http, url, {}).pipe( + pretifyError('Failed to reset event consumer. Please reload.')); } } \ No newline at end of file diff --git a/src/Squidex/app/features/administration/services/users.service.spec.ts b/src/Squidex/app/features/administration/services/users.service.spec.ts index 06b3e974d..4e769e6e7 100644 --- a/src/Squidex/app/features/administration/services/users.service.spec.ts +++ b/src/Squidex/app/features/administration/services/users.service.spec.ts @@ -38,7 +38,7 @@ describe('UsersService', () => { it('should make get request to get many users', inject([UsersService, HttpTestingController], (userManagementService: UsersService, httpMock: HttpTestingController) => { - let users: UsersDto | null = null; + let users: UsersDto; userManagementService.getUsers(20, 30).subscribe(result => { users = result; @@ -67,7 +67,7 @@ describe('UsersService', () => { ] }); - expect(users).toEqual( + expect(users!).toEqual( new UsersDto(100, [ new UserDto('123', 'mail1@domain.com', 'User1', true), new UserDto('456', 'mail2@domain.com', 'User2', true) @@ -77,7 +77,7 @@ describe('UsersService', () => { it('should make get request with query to get many users', inject([UsersService, HttpTestingController], (userManagementService: UsersService, httpMock: HttpTestingController) => { - let users: UsersDto | null = null; + let users: UsersDto; userManagementService.getUsers(20, 30, 'my-query').subscribe(result => { users = result; @@ -106,7 +106,7 @@ describe('UsersService', () => { ] }); - expect(users).toEqual( + expect(users!).toEqual( new UsersDto(100, [ new UserDto('123', 'mail1@domain.com', 'User1', true), new UserDto('456', 'mail2@domain.com', 'User2', true) @@ -116,7 +116,7 @@ describe('UsersService', () => { it('should make get request to get single user', inject([UsersService, HttpTestingController], (userManagementService: UsersService, httpMock: HttpTestingController) => { - let user: UserDto | null = null; + let user: UserDto; userManagementService.getUser('123').subscribe(result => { user = result; @@ -135,7 +135,7 @@ describe('UsersService', () => { isLocked: true }); - expect(user).toEqual(new UserDto('123', 'mail1@domain.com', 'User1', true)); + expect(user!).toEqual(new UserDto('123', 'mail1@domain.com', 'User1', true)); })); it('should make post request to create user', @@ -143,7 +143,7 @@ describe('UsersService', () => { const dto = new CreateUserDto('mail@squidex.io', 'Squidex User', 'password'); - let user: UserDto | null = null; + let user: UserDto; userManagementService.postUser(dto).subscribe(result => { user = result; @@ -156,7 +156,7 @@ describe('UsersService', () => { req.flush({ id: '123', pictureUrl: 'path/to/image1' }); - expect(user).toEqual(new UserDto('123', dto.email, dto.displayName, false)); + expect(user!).toEqual(new UserDto('123', dto.email, dto.displayName, false)); })); it('should make put request to update user', diff --git a/src/Squidex/app/features/administration/services/users.service.ts b/src/Squidex/app/features/administration/services/users.service.ts index e604ba0e8..4b23dbff4 100644 --- a/src/Squidex/app/features/administration/services/users.service.ts +++ b/src/Squidex/app/features/administration/services/users.service.ts @@ -8,26 +8,40 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; -import '@app/framework/angular/http/http-extensions'; +import { + ApiUrlConfig, + HTTP, + Model, + pretifyError +} from '@app/shared'; -import { ApiUrlConfig, HTTP } from '@app/shared'; - -export class UsersDto { +export class UsersDto extends Model { constructor( public readonly total: number, public readonly items: UserDto[] ) { + super(); + } + + public with(value: Partial): UsersDto { + return this.clone(value); } } -export class UserDto { +export class UserDto extends Model { constructor( public readonly id: string, public readonly email: string, public readonly displayName: string, public readonly isLocked: boolean ) { + super(); + } + + public with(value: Partial): UserDto { + return this.clone(value); } } @@ -60,8 +74,8 @@ export class UsersService { public getUsers(take: number, skip: number, query?: string): Observable { const url = this.apiUrl.buildUrl(`api/user-management?take=${take}&skip=${skip}&query=${query || ''}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body.items; @@ -75,15 +89,15 @@ export class UsersService { }); return new UsersDto(body.total, users); - }) - .pretifyError('Failed to load users. Please reload.'); + }), + pretifyError('Failed to load users. Please reload.')); } public getUser(id: string): Observable { const url = this.apiUrl.buildUrl(`api/user-management/${id}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; return new UserDto( @@ -91,15 +105,15 @@ export class UsersService { body.email, body.displayName, body.isLocked); - }) - .pretifyError('Failed to load user. Please reload.'); + }), + pretifyError('Failed to load user. Please reload.')); } public postUser(dto: CreateUserDto): Observable { const url = this.apiUrl.buildUrl('api/user-management'); - return HTTP.postVersioned(this.http, url, dto) - .map(response => { + return HTTP.postVersioned(this.http, url, dto).pipe( + map(response => { const body = response.payload.body; return new UserDto( @@ -107,28 +121,28 @@ export class UsersService { dto.email, dto.displayName, false); - }) - .pretifyError('Failed to create user. Please reload.'); + }), + pretifyError('Failed to create user. Please reload.')); } public putUser(id: string, dto: UpdateUserDto): Observable { const url = this.apiUrl.buildUrl(`api/user-management/${id}`); - return HTTP.putVersioned(this.http, url, dto) - .pretifyError('Failed to update user. Please reload.'); + return HTTP.putVersioned(this.http, url, dto).pipe( + pretifyError('Failed to update user. Please reload.')); } public lockUser(id: string): Observable { const url = this.apiUrl.buildUrl(`api/user-management/${id}/lock`); - return HTTP.putVersioned(this.http, url, {}) - .pretifyError('Failed to load users. Please retry.'); + return HTTP.putVersioned(this.http, url, {}).pipe( + pretifyError('Failed to load users. Please retry.')); } public unlockUser(id: string): Observable { const url = this.apiUrl.buildUrl(`api/user-management/${id}/unlock`); - return HTTP.putVersioned(this.http, url, {}) - .pretifyError('Failed to load users. Please retry.'); + return HTTP.putVersioned(this.http, url, {}).pipe( + pretifyError('Failed to load users. Please retry.')); } } \ No newline at end of file diff --git a/src/Squidex/app/features/administration/state/event-consumers.state.spec.ts b/src/Squidex/app/features/administration/state/event-consumers.state.spec.ts index 514ca72d7..45aa75468 100644 --- a/src/Squidex/app/features/administration/state/event-consumers.state.spec.ts +++ b/src/Squidex/app/features/administration/state/event-consumers.state.spec.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of, throwError } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { DialogService } from '@app/shared'; @@ -29,7 +30,7 @@ describe('EventConsumersState', () => { eventConsumersService = Mock.ofType(); eventConsumersService.setup(x => x.getEventConsumers()) - .returns(() => Observable.of(oldConsumers)); + .returns(() => of(oldConsumers)); eventConsumersState = new EventConsumersState(dialogs.object, eventConsumersService.object); eventConsumersState.load().subscribe(); @@ -39,36 +40,44 @@ describe('EventConsumersState', () => { expect(eventConsumersState.snapshot.eventConsumers.values).toEqual(oldConsumers); expect(eventConsumersState.snapshot.isLoaded).toBeTruthy(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); it('should show notification on load when reload is true', () => { eventConsumersState.load(true).subscribe(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); it('should show notification on load error when silent is true', () => { eventConsumersService.setup(x => x.getEventConsumers()) - .returns(() => Observable.throw({})); + .returns(() => throwError({})); - eventConsumersState.load(true, true).onErrorResumeNext().subscribe(); + eventConsumersState.load(true, true).pipe(onErrorResumeNext()).subscribe(); + + expect().nothing(); dialogs.verify(x => x.notifyError(It.isAny()), Times.once()); }); it('should not show notification on load error when flag is false', () => { eventConsumersService.setup(x => x.getEventConsumers()) - .returns(() => Observable.throw({})); + .returns(() => throwError({})); + + eventConsumersState.load().pipe(onErrorResumeNext()).subscribe(); - eventConsumersState.load().onErrorResumeNext().subscribe(); + expect().nothing(); dialogs.verify(x => x.notifyError(It.isAny()), Times.never()); }); it('should unmark as stopped when started', () => { eventConsumersService.setup(x => x.putStart(oldConsumers[1].name)) - .returns(() => Observable.of({})); + .returns(() => of({})); eventConsumersState.start(oldConsumers[1]).subscribe(); @@ -79,7 +88,7 @@ describe('EventConsumersState', () => { it('should mark as stopped when stopped', () => { eventConsumersService.setup(x => x.putStop(oldConsumers[0].name)) - .returns(() => Observable.of({})); + .returns(() => of({})); eventConsumersState.stop(oldConsumers[0]).subscribe(); @@ -90,7 +99,7 @@ describe('EventConsumersState', () => { it('should mark as resetting when reset', () => { eventConsumersService.setup(x => x.putReset(oldConsumers[0].name)) - .returns(() => Observable.of({})); + .returns(() => of({})); eventConsumersState.reset(oldConsumers[0]).subscribe(); diff --git a/src/Squidex/app/features/administration/state/event-consumers.state.ts b/src/Squidex/app/features/administration/state/event-consumers.state.ts index bb43f806c..ef14e7963 100644 --- a/src/Squidex/app/features/administration/state/event-consumers.state.ts +++ b/src/Squidex/app/features/administration/state/event-consumers.state.ts @@ -6,13 +6,13 @@ */ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { Observable, throwError } from 'rxjs'; +import { catchError, distinctUntilChanged, map, tap } from 'rxjs/operators'; import { DialogService, ImmutableArray, + notify, State } from '@app/shared'; @@ -27,12 +27,12 @@ interface Snapshot { @Injectable() export class EventConsumersState extends State { public eventConsumers = - this.changes.map(x => x.eventConsumers) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.eventConsumers), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); constructor( private readonly dialogs: DialogService, @@ -46,8 +46,8 @@ export class EventConsumersState extends State { this.resetState(); } - return this.eventConsumersService.getEventConsumers() - .do(dtos => { + return this.eventConsumersService.getEventConsumers().pipe( + tap(dtos => { if (isReload && !silent) { this.dialogs.notifyInfo('Event Consumers reloaded.'); } @@ -57,51 +57,51 @@ export class EventConsumersState extends State { return { ...s, eventConsumers, isLoaded: true }; }); - }) - .catch(error => { + }), + catchError(error => { if (silent) { this.dialogs.notifyError(error); } - return Observable.throw(error); - }); + return throwError(error); + })); } - public start(es: EventConsumerDto): Observable { - return this.eventConsumersService.putStart(es.name) - .do(() => { - this.replaceEventConsumer(setStopped(es, false)); - }) - .notify(this.dialogs); + public start(eventConsumer: EventConsumerDto): Observable { + return this.eventConsumersService.putStart(eventConsumer.name).pipe( + tap(() => { + this.replaceEventConsumer(setStopped(eventConsumer, false)); + }), + notify(this.dialogs)); } - public stop(es: EventConsumerDto): Observable { - return this.eventConsumersService.putStop(es.name) - .do(() => { - this.replaceEventConsumer(setStopped(es, true)); - }) - .notify(this.dialogs); + public stop(eventConsumer: EventConsumerDto): Observable { + return this.eventConsumersService.putStop(eventConsumer.name).pipe( + tap(() => { + this.replaceEventConsumer(setStopped(eventConsumer, true)); + }), + notify(this.dialogs)); } - public reset(es: EventConsumerDto): Observable { - return this.eventConsumersService.putReset(es.name) - .do(() => { - this.replaceEventConsumer(reset(es)); - }) - .notify(this.dialogs); + public reset(eventConsumer: EventConsumerDto): Observable { + return this.eventConsumersService.putReset(eventConsumer.name).pipe( + tap(() => { + this.replaceEventConsumer(reset(eventConsumer)); + }), + notify(this.dialogs)); } - private replaceEventConsumer(es: EventConsumerDto) { + private replaceEventConsumer(eventConsumer: EventConsumerDto) { this.next(s => { - const eventConsumers = s.eventConsumers.replaceBy('name', es); + const eventConsumers = s.eventConsumers.replaceBy('name', eventConsumer); return { ...s, eventConsumers }; }); } } -const setStopped = (es: EventConsumerDto, isStoped: boolean) => - new EventConsumerDto(es.name, isStoped, false, es.error, es.position); +const setStopped = (eventConsumer: EventConsumerDto, isStopped: boolean) => + eventConsumer.with({ isStopped }); -const reset = (es: EventConsumerDto) => - new EventConsumerDto(es.name, es.isStopped, true, es.error, es.position); \ No newline at end of file +const reset = (eventConsumer: EventConsumerDto) => + eventConsumer.with({ isResetting: true }); \ No newline at end of file diff --git a/src/Squidex/app/features/administration/state/users.state.spec.ts b/src/Squidex/app/features/administration/state/users.state.spec.ts index 664feb8d7..a81b1ab0c 100644 --- a/src/Squidex/app/features/administration/state/users.state.spec.ts +++ b/src/Squidex/app/features/administration/state/users.state.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of, throwError } from 'rxjs'; import { IMock, It, Mock, Times } from 'typemoq'; import { AuthService, DialogService } from '@app/shared'; @@ -44,7 +44,7 @@ describe('UsersState', () => { usersService = Mock.ofType(); usersService.setup(x => x.getUsers(10, 0, undefined)) - .returns(() => Observable.of(new UsersDto(200, oldUsers))); + .returns(() => of(new UsersDto(200, oldUsers))); usersState = new UsersState(authService.object, dialogs.object, usersService.object); usersState.load().subscribe(); @@ -64,6 +64,8 @@ describe('UsersState', () => { it('should show notification on load when reload is true', () => { usersState.load(true).subscribe(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); @@ -76,7 +78,7 @@ describe('UsersState', () => { ]; usersService.setup(x => x.getUsers(10, 0, undefined)) - .returns(() => Observable.of(new UsersDto(200, newUsers))); + .returns(() => of(new UsersDto(200, newUsers))); usersState.load().subscribe(); @@ -98,7 +100,7 @@ describe('UsersState', () => { it('should return user on select and load when not loaded', () => { usersService.setup(x => x.getUser('id3')) - .returns(() => Observable.of(newUser)); + .returns(() => of(newUser)); let selectedUser: UserDto; @@ -127,7 +129,7 @@ describe('UsersState', () => { it('should return null on select when user is not found', () => { usersService.setup(x => x.getUser('unknown')) - .returns(() => Observable.throw({})); + .returns(() => throwError({})); let selectedUser: UserDto; @@ -141,7 +143,7 @@ describe('UsersState', () => { it('should mark as locked when locked', () => { usersService.setup(x => x.lockUser('id1')) - .returns(() => Observable.of({})); + .returns(() => of({})); usersState.select('id1').subscribe(); usersState.lock(oldUsers[0]).subscribe(); @@ -149,12 +151,12 @@ describe('UsersState', () => { const user_1 = usersState.snapshot.users.at(0); expect(user_1.user.isLocked).toBeTruthy(); - expect(user_1).toBe(usersState.snapshot.selectedUser); + expect(user_1).toBe(usersState.snapshot.selectedUser!); }); it('should unmark as locked when unlocked', () => { usersService.setup(x => x.unlockUser('id2')) - .returns(() => Observable.of({})); + .returns(() => of({})); usersState.select('id2').subscribe(); usersState.unlock(oldUsers[1]).subscribe(); @@ -162,14 +164,14 @@ describe('UsersState', () => { const user_1 = usersState.snapshot.users.at(1); expect(user_1.user.isLocked).toBeFalsy(); - expect(user_1).toBe(usersState.snapshot.selectedUser); + expect(user_1).toBe(usersState.snapshot.selectedUser!); }); it('should update user properties when updated', () => { const request = new UpdateUserDto('new@mail.com', 'New'); usersService.setup(x => x.putUser('id1', request)) - .returns(() => Observable.of({})); + .returns(() => of({})); usersState.select('id1').subscribe(); usersState.update(oldUsers[0], request).subscribe(); @@ -178,14 +180,14 @@ describe('UsersState', () => { expect(user_1.user.email).toEqual('new@mail.com'); expect(user_1.user.displayName).toEqual('New'); - expect(user_1).toBe(usersState.snapshot.selectedUser); + expect(user_1).toBe(usersState.snapshot.selectedUser!); }); it('should add user to snapshot when created', () => { const request = new CreateUserDto(newUser.email, newUser.displayName, 'password'); usersService.setup(x => x.postUser(request)) - .returns(() => Observable.of(newUser)); + .returns(() => of(newUser)); usersState.create(request).subscribe(); @@ -199,18 +201,20 @@ describe('UsersState', () => { it('should load next page and prev page when paging', () => { usersService.setup(x => x.getUsers(10, 10, undefined)) - .returns(() => Observable.of(new UsersDto(200, []))); + .returns(() => of(new UsersDto(200, []))); usersState.goNext().subscribe(); usersState.goPrev().subscribe(); + expect().nothing(); + usersService.verify(x => x.getUsers(10, 10, undefined), Times.once()); usersService.verify(x => x.getUsers(10, 0, undefined), Times.exactly(2)); }); it('should load with query when searching', () => { usersService.setup(x => x.getUsers(10, 0, 'my-query')) - .returns(() => Observable.of(new UsersDto(0, []))); + .returns(() => of(new UsersDto(0, []))); usersState.search('my-query').subscribe(); diff --git a/src/Squidex/app/features/administration/state/users.state.ts b/src/Squidex/app/features/administration/state/users.state.ts index cd871f0d7..1caad1047 100644 --- a/src/Squidex/app/features/administration/state/users.state.ts +++ b/src/Squidex/app/features/administration/state/users.state.ts @@ -7,7 +7,8 @@ import { Injectable } from '@angular/core'; import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { Observable } from 'rxjs'; +import { Observable, of } from 'rxjs'; +import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'; import '@app/framework/utils/rxjs-extensions'; @@ -16,6 +17,7 @@ import { DialogService, Form, ImmutableArray, + notify, Pager, State, ValidatorsEx @@ -89,20 +91,20 @@ interface Snapshot { @Injectable() export class UsersState extends State { public users = - this.changes.map(x => x.users) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.users), + distinctUntilChanged()); public usersPager = - this.changes.map(x => x.usersPager) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.usersPager), + distinctUntilChanged()); public selectedUser = - this.changes.map(x => x.selectedUser) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.selectedUser), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); constructor( private readonly authState: AuthService, @@ -113,24 +115,24 @@ export class UsersState extends State { } public select(id: string | null): Observable { - return this.loadUser(id) - .do(selectedUser => { + return this.loadUser(id).pipe( + tap(selectedUser => { this.next(s => ({ ...s, selectedUser })); - }) - .map(x => x && x.user); + }), + map(x => x && x.user)); } private loadUser(id: string | null) { return !id ? - Observable.of(null) : - Observable.of(this.snapshot.users.find(x => x.user.id === id)) - .switchMap(user => { + of(null) : + of(this.snapshot.users.find(x => x.user.id === id)).pipe( + switchMap(user => { if (!user) { - return this.usersService.getUser(id).map(x => this.createUser(x)).catch(() => Observable.of(null)); + return this.usersService.getUser(id).pipe(map(x => this.createUser(x)), catchError(() => of(null))); } else { - return Observable.of(user); + return of(user); } - }); + })); } public load(isReload = false): Observable { @@ -145,8 +147,8 @@ export class UsersState extends State { return this.usersService.getUsers( this.snapshot.usersPager.pageSize, this.snapshot.usersPager.skip, - this.snapshot.usersQuery) - .do(dtos => { + this.snapshot.usersQuery).pipe( + tap(dtos => { if (isReload) { this.dialogs.notifyInfo('Users reloaded.'); } @@ -163,43 +165,43 @@ export class UsersState extends State { return { ...s, users, usersPager, selectedUser, isLoaded: true }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public create(request: CreateUserDto): Observable { - return this.usersService.postUser(request) - .do(dto => { + return this.usersService.postUser(request).pipe( + tap(dto => { this.next(s => { const users = s.users.pushFront(this.createUser(dto)); const usersPager = s.usersPager.incrementCount(); return { ...s, users, usersPager }; }); - }); + })); } public update(user: UserDto, request: UpdateUserDto): Observable { - return this.usersService.putUser(user.id, request) - .do(() => { + return this.usersService.putUser(user.id, request).pipe( + tap(() => { this.replaceUser(update(user, request)); - }); + })); } public lock(user: UserDto): Observable { - return this.usersService.lockUser(user.id) - .do(() => { + return this.usersService.lockUser(user.id).pipe( + tap(() => { this.replaceUser(setLocked(user, true)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public unlock(user: UserDto): Observable { - return this.usersService.unlockUser(user.id) - .do(() => { + return this.usersService.unlockUser(user.id).pipe( + tap(() => { this.replaceUser(setLocked(user, false)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public search(query: string): Observable { @@ -247,7 +249,7 @@ export class UsersState extends State { const update = (user: UserDto, request: UpdateUserDto) => - new UserDto(user.id, request.email, request.displayName, user.isLocked); + user.with(request); const setLocked = (user: UserDto, isLocked: boolean) => - new UserDto(user.id, user.email, user.displayName, isLocked); \ No newline at end of file + user.with({ isLocked }); \ No newline at end of file diff --git a/src/Squidex/app/features/api/module.ts b/src/Squidex/app/features/api/module.ts index 7f7614cdc..f4701b425 100644 --- a/src/Squidex/app/features/api/module.ts +++ b/src/Squidex/app/features/api/module.ts @@ -7,7 +7,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { DndModule } from 'ng2-dnd'; import { SqxFrameworkModule, @@ -37,7 +36,6 @@ const routes: Routes = [ @NgModule({ imports: [ - DndModule, SqxFrameworkModule, SqxSharedModule, RouterModule.forChild(routes) 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 41707fac7..6d3c84b1c 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 @@ -18,4 +18,8 @@ overflow: hidden; } } + + .CodeMirror-linenumbers { + min-width: 29px; + } } \ No newline at end of file diff --git a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts index 9744728ff..8c59c1a4b 100644 --- a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts +++ b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.ts @@ -5,8 +5,9 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, ElementRef, OnInit, ViewChild } from '@angular/core'; -import { Observable } from 'rxjs'; +import { AfterViewInit, Component, ElementRef, ViewChild } from '@angular/core'; +import { of } from 'rxjs'; +import { catchError } from 'rxjs/operators'; import * as React from 'react'; import * as ReactDOM from 'react-dom'; @@ -20,7 +21,7 @@ import { AppsState, GraphQlService } from '@app/shared'; styleUrls: ['./graphql-page.component.scss'], templateUrl: './graphql-page.component.html' }) -export class GraphQLPageComponent implements OnInit { +export class GraphQLPageComponent implements AfterViewInit { @ViewChild('graphiQLContainer') public graphiQLContainer: ElementRef; @@ -30,7 +31,7 @@ export class GraphQLPageComponent implements OnInit { ) { } - public ngOnInit() { + public ngAfterViewInit() { ReactDOM.render( React.createElement(GraphiQL, { fetcher: (params: any) => { @@ -42,7 +43,7 @@ export class GraphQLPageComponent implements OnInit { } private request(params: any) { - return this.graphQlService.query(this.appsState.appName, params).catch(response => Observable.of(response.error)).toPromise(); + return this.graphQlService.query(this.appsState.appName, params).pipe(catchError(response => of(response.error))).toPromise(); } } diff --git a/src/Squidex/app/features/apps/pages/apps-page.component.ts b/src/Squidex/app/features/apps/pages/apps-page.component.ts index fc78b8020..93a2d5fa6 100644 --- a/src/Squidex/app/features/apps/pages/apps-page.component.ts +++ b/src/Squidex/app/features/apps/pages/apps-page.component.ts @@ -6,6 +6,7 @@ */ import { Component, OnInit } from '@angular/core'; +import { take } from 'rxjs/operators'; import { AppsState, @@ -33,7 +34,8 @@ export class AppsPageComponent implements OnInit { } public ngOnInit() { - this.appsState.apps.take(1) + this.appsState.apps.pipe( + take(1)) .subscribe(apps => { if (this.onboardingService.shouldShow('dialog') && apps.length === 0) { this.onboardingService.disable('dialog'); diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.ts b/src/Squidex/app/features/assets/pages/assets-page.component.ts index ad35b6020..18173f82b 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.ts +++ b/src/Squidex/app/features/assets/pages/assets-page.component.ts @@ -9,6 +9,7 @@ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AppsState, AssetsState } from '@app/shared'; @@ -27,23 +28,23 @@ export class AssetsPageComponent implements OnInit { } public ngOnInit() { - this.assetsState.load().onErrorResumeNext().subscribe(); + this.assetsState.load().pipe(onErrorResumeNext()).subscribe(); } public reload() { - this.assetsState.load(true).onErrorResumeNext().subscribe(); + this.assetsState.load(true).pipe(onErrorResumeNext()).subscribe(); } public search() { - this.assetsState.search(this.assetsFilter.value).onErrorResumeNext().subscribe(); + this.assetsState.search(this.assetsFilter.value).pipe(onErrorResumeNext()).subscribe(); } public goNext() { - this.assetsState.goNext().onErrorResumeNext().subscribe(); + this.assetsState.goNext().pipe(onErrorResumeNext()).subscribe(); } public goPrev() { - this.assetsState.goPrev().onErrorResumeNext().subscribe(); + this.assetsState.goPrev().pipe(onErrorResumeNext()).subscribe(); } } diff --git a/src/Squidex/app/features/content/declarations.ts b/src/Squidex/app/features/content/declarations.ts index 7fdcbae6e..cd59c22c5 100644 --- a/src/Squidex/app/features/content/declarations.ts +++ b/src/Squidex/app/features/content/declarations.ts @@ -12,9 +12,11 @@ export * from './pages/contents/contents-page.component'; export * from './pages/contents/search-form.component'; export * from './pages/schemas/schemas-page.component'; +export * from './shared/array-editor.component'; export * from './shared/assets-editor.component'; export * from './shared/content-item.component'; export * from './shared/content-status.component'; export * from './shared/contents-selector.component'; export * from './shared/due-time-selector.component'; +export * from './shared/field-editor.component'; export * from './shared/references-editor.component'; \ No newline at end of file diff --git a/src/Squidex/app/features/content/module.ts b/src/Squidex/app/features/content/module.ts index e7064c595..a372b141c 100644 --- a/src/Squidex/app/features/content/module.ts +++ b/src/Squidex/app/features/content/module.ts @@ -7,7 +7,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { DndModule } from 'ng2-dnd'; import { CanDeactivateGuard, @@ -20,6 +19,7 @@ import { } from '@app/shared'; import { + ArrayEditorComponent, AssetsEditorComponent, ContentFieldComponent, ContentHistoryComponent, @@ -29,6 +29,7 @@ import { ContentsSelectorComponent, ContentStatusComponent, DueTimeSelectorComponent, + FieldEditorComponent, ReferencesEditorComponent, SchemasPageComponent, SearchFormComponent @@ -82,10 +83,10 @@ const routes: Routes = [ imports: [ SqxFrameworkModule, SqxSharedModule, - DndModule, RouterModule.forChild(routes) ], declarations: [ + ArrayEditorComponent, AssetsEditorComponent, ContentFieldComponent, ContentHistoryComponent, @@ -95,6 +96,7 @@ const routes: Routes = [ ContentsPageComponent, ContentsSelectorComponent, DueTimeSelectorComponent, + FieldEditorComponent, ReferencesEditorComponent, SchemasPageComponent, SearchFormComponent diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.html b/src/Squidex/app/features/content/pages/content/content-field.component.html index 7d69f79db..3b7f60e12 100644 --- a/src/Squidex/app/features/content/pages/content/content-field.component.html +++ b/src/Squidex/app/features/content/pages/content/content-field.component.html @@ -1,10 +1,4 @@
- - - Disabled -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - {{hints}} - - + +
diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.ts b/src/Squidex/app/features/content/pages/content/content-field.component.ts index b03bede89..00480b402 100644 --- a/src/Squidex/app/features/content/pages/content/content-field.component.ts +++ b/src/Squidex/app/features/content/pages/content/content-field.component.ts @@ -10,9 +10,11 @@ import { AbstractControl, FormGroup } from '@angular/forms'; import { AppLanguageDto, - FieldDto, + EditContentForm, fieldInvariant, - ImmutableArray + ImmutableArray, + RootFieldDto, + Types } from '@app/shared'; @Component({ @@ -22,7 +24,10 @@ import { }) export class ContentFieldComponent implements OnChanges { @Input() - public field: FieldDto; + public form: EditContentForm; + + @Input() + public field: RootFieldDto; @Input() public fieldForm: FormGroup; @@ -30,14 +35,11 @@ export class ContentFieldComponent implements OnChanges { @Input() public language: AppLanguageDto; - @Output() - public languageChange = new EventEmitter(); - @Input() public languages: ImmutableArray; - @Input() - public contentFormSubmitted: boolean; + @Output() + public languageChange = new EventEmitter(); public selectedFormControl: AbstractControl; @@ -49,7 +51,9 @@ export class ContentFieldComponent implements OnChanges { } if (changes['language']) { - this.selectedFormControl['_clearChangeFns'](); + if (Types.isFunction(this.selectedFormControl['_clearChangeFns'])) { + this.selectedFormControl['_clearChangeFns'](); + } } } } diff --git a/src/Squidex/app/features/content/pages/content/content-history.component.ts b/src/Squidex/app/features/content/pages/content/content-history.component.ts index f16610367..09763dc08 100644 --- a/src/Squidex/app/features/content/pages/content/content-history.component.ts +++ b/src/Squidex/app/features/content/pages/content/content-history.component.ts @@ -7,7 +7,8 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Observable } from 'rxjs'; +import { merge, Observable, timer } from 'rxjs'; +import { delay, switchMap } from 'rxjs/operators'; import { allParams, @@ -48,8 +49,11 @@ export class ContentHistoryComponent { } public events: Observable = - Observable.timer(0, 10000).merge(this.messageBus.of(HistoryChannelUpdated).delay(1000)) - .switchMap(app => this.historyService.getHistory(this.appsState.appName, this.channel)); + merge( + timer(0, 10000), + this.messageBus.of(HistoryChannelUpdated).pipe(delay(1000)) + ).pipe( + switchMap(app => this.historyService.getHistory(this.appsState.appName, this.channel))); constructor( private readonly appsState: AppsState, diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.html b/src/Squidex/app/features/content/pages/content/content-page.component.html index 83b038a5e..35ba07fa3 100644 --- a/src/Squidex/app/features/content/pages/content/content-page.component.html +++ b/src/Squidex/app/features/content/pages/content/content-page.component.html @@ -31,7 +31,7 @@ -
+
- @@ -104,11 +104,11 @@
+ [languages]="languages">
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 617cd242d..63b1354cb 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 @@ -7,7 +7,8 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable, Subscription } from 'rxjs'; +import { Observable, of, Subscription } from 'rxjs'; +import { filter, map, onErrorResumeNext, switchMap } from 'rxjs/operators'; import { ContentVersionSelected } from './../messages'; @@ -87,7 +88,7 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, }); this.selectedSchemaSubscription = - this.schemasState.selectedSchema.filter(s => !!s).map(s => s!) + this.schemasState.selectedSchema.pipe(filter(s => !!s), map(s => s!)) .subscribe(schema => { this.schema = schema; @@ -95,7 +96,7 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, }); this.contentSubscription = - this.contentsState.selectedContent.filter(c => !!c).map(c => c!) + this.contentsState.selectedContent.pipe(filter(c => !!c), map(c => c!)) .subscribe(content => { this.content = content; @@ -111,7 +112,7 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, public canDeactivate(): Observable { if (!this.contentForm.form.dirty || !this.content) { - return Observable.of(true); + return of(true); } else { return this.dialogs.confirmUnsavedChanges(); } @@ -171,11 +172,11 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, } private loadContent(data: any) { - this.contentForm.loadData(data, this.content && this.content.status === 'Archived'); + this.contentForm.loadContent(data, this.content && this.content.status === 'Archived'); } public discardChanges() { - this.contentsState.discardChanges(this.content).onErrorResumeNext().subscribe(); + this.contentsState.discardChanges(this.content).pipe(onErrorResumeNext()).subscribe(); } public publish() { @@ -195,21 +196,21 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, } public delete() { - this.contentsState.deleteMany([this.content]).onErrorResumeNext() + this.contentsState.deleteMany([this.content]).pipe(onErrorResumeNext()) .subscribe(() => { this.back(); }); } public publishChanges() { - this.dueTimeSelector.selectDueTime('Publish') - .switchMap(d => this.contentsState.publishChanges(this.content, d)).onErrorResumeNext() + this.dueTimeSelector.selectDueTime('Publish').pipe( + switchMap(d => this.contentsState.publishChanges(this.content, d)), onErrorResumeNext()) .subscribe(); } private changeContentItems(action: string, status: string) { - this.dueTimeSelector.selectDueTime(action) - .switchMap(d => this.contentsState.changeStatus(this.content, action, status, d)).onErrorResumeNext() + this.dueTimeSelector.selectDueTime(action).pipe( + switchMap(d => this.contentsState.changeStatus(this.content, action, status, d)), onErrorResumeNext()) .subscribe(); } 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 c061bbb25..eabb9bf18 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 @@ -7,6 +7,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { Subscription } from 'rxjs'; +import { onErrorResumeNext, switchMap, tap } from 'rxjs/operators'; import { AppLanguageDto, @@ -72,7 +73,7 @@ export class ContentsPageComponent implements OnDestroy, OnInit { this.schema = schema!; - this.contentsState.init().onErrorResumeNext().subscribe(); + this.contentsState.init().pipe(onErrorResumeNext()).subscribe(); }); this.contentsSubscription = @@ -90,15 +91,15 @@ export class ContentsPageComponent implements OnDestroy, OnInit { } public reload() { - this.contentsState.load(true).onErrorResumeNext().subscribe(); + this.contentsState.load(true).pipe(onErrorResumeNext()).subscribe(); } public deleteSelected() { - this.contentsState.deleteMany(this.select()).onErrorResumeNext().subscribe(); + this.contentsState.deleteMany(this.select()).pipe(onErrorResumeNext()).subscribe(); } public delete(content: ContentDto) { - this.contentsState.deleteMany([content]).onErrorResumeNext().subscribe(); + this.contentsState.deleteMany([content]).pipe(onErrorResumeNext()).subscribe(); } public publish(content: ContentDto) { @@ -138,36 +139,37 @@ export class ContentsPageComponent implements OnDestroy, OnInit { return; } - this.dueTimeSelector.selectDueTime(action) - .do(() => { - this.resetSelection(); - }) - .switchMap(d => this.contentsState.changeManyStatus(contents, action, d)).onErrorResumeNext() + this.dueTimeSelector.selectDueTime(action).pipe( + tap(() => { + this.resetSelection(); + }), + switchMap(d => this.contentsState.changeManyStatus(contents, action, d)), + onErrorResumeNext()) .subscribe(); } public goArchive(isArchive: boolean) { this.resetSelection(); - this.contentsState.goArchive(isArchive).onErrorResumeNext().subscribe(); + this.contentsState.goArchive(isArchive).pipe(onErrorResumeNext()).subscribe(); } public goPrev() { this.resetSelection(); - this.contentsState.goPrev().onErrorResumeNext().subscribe(); + this.contentsState.goPrev().pipe(onErrorResumeNext()).subscribe(); } public goNext() { this.resetSelection(); - this.contentsState.goNext().onErrorResumeNext().subscribe(); + this.contentsState.goNext().pipe(onErrorResumeNext()).subscribe(); } public search(query: string) { this.resetSelection(); - this.contentsState.search(query).onErrorResumeNext().subscribe(); + this.contentsState.search(query).pipe(onErrorResumeNext()).subscribe(); } public isItemSelected(content: ContentDto): boolean { diff --git a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html index 589002432..1903873f2 100644 --- a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html +++ b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html @@ -16,12 +16,14 @@ - - + + + + diff --git a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts index 9070402df..a2184efee 100644 --- a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts +++ b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.ts @@ -7,6 +7,7 @@ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AppsState, SchemasState } from '@app/shared'; @@ -25,7 +26,7 @@ export class SchemasPageComponent implements OnInit { } public ngOnInit() { - this.schemasState.load().onErrorResumeNext().subscribe(); + this.schemasState.load().pipe(onErrorResumeNext()).subscribe(); } public trackByCategory(index: number, category: string) { diff --git a/src/Squidex/app/features/content/shared/array-editor.component.html b/src/Squidex/app/features/content/shared/array-editor.component.html new file mode 100644 index 000000000..aa44bdf7a --- /dev/null +++ b/src/Squidex/app/features/content/shared/array-editor.component.html @@ -0,0 +1,23 @@ +
+
+ + +
+ + + + +
+
+
+ + \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/array-editor.component.scss b/src/Squidex/app/features/content/shared/array-editor.component.scss new file mode 100644 index 000000000..d17caf2f6 --- /dev/null +++ b/src/Squidex/app/features/content/shared/array-editor.component.scss @@ -0,0 +1,34 @@ +@import '_vars'; +@import '_mixins'; + +.array { + &-container { + background: $color-border; + padding: 1rem; + position: relative; + margin-bottom: 1rem; + } + + &-item { + & { + background: $panel-light-background; + border: 1px solid darken($color-border, 5%); + border-left-width: 4px; + padding: 1rem; + position: relative; + margin-bottom: 1rem; + } + + &:last-child { + margin-bottom: 0; + } + } + + &-item-remove { + @include absolute(.5rem, .5rem, auto, auto); + } +} + +.invalid { + border-left-color: $color-theme-error; +} \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/array-editor.component.ts b/src/Squidex/app/features/content/shared/array-editor.component.ts new file mode 100644 index 000000000..08686a426 --- /dev/null +++ b/src/Squidex/app/features/content/shared/array-editor.component.ts @@ -0,0 +1,46 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { Component, Input } from '@angular/core'; +import { FormArray } from '@angular/forms'; + +import { + AppLanguageDto, + EditContentForm, + ImmutableArray, + RootFieldDto +} from '@app/shared'; + +@Component({ + selector: 'sqx-array-editor', + styleUrls: ['./array-editor.component.scss'], + templateUrl: './array-editor.component.html' +}) +export class ArrayEditorComponent { + @Input() + public form: EditContentForm; + + @Input() + public field: RootFieldDto; + + @Input() + public language: AppLanguageDto; + + @Input() + public languages: ImmutableArray; + + @Input() + public arrayControl: FormArray; + + public removeItem(index: number) { + this.form.removeArrayItem(this.field, this.language, index); + } + + public addItem() { + this.form.insertArrayItem(this.field, this.language); + } +} \ No newline at end of file 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 31123e43e..ef7dfb3e9 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.html +++ b/src/Squidex/app/features/content/shared/content-item.component.html @@ -6,7 +6,7 @@ -
+
@@ -51,7 +51,7 @@
-
+
{{values[i]}}
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 99893ea9b..68f18d763 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.ts +++ b/src/Squidex/app/features/content/shared/content-item.component.ts @@ -12,10 +12,11 @@ import { ContentDto, ContentsState, fadeAnimation, - FieldDto, + FieldFormatter, fieldInvariant, ModalView, PatchContentForm, + RootFieldDto, SchemaDetailsDto, Types } from '@app/shared'; @@ -123,7 +124,7 @@ export class ContentItemComponent implements OnChanges { if (Types.isUndefined(value)) { this.values.push(''); } else { - this.values.push(field.formatValue(value)); + this.values.push(FieldFormatter.format(field, value)); } if (this.patchForm) { @@ -136,7 +137,7 @@ export class ContentItemComponent implements OnChanges { } } - private getRawValue(field: FieldDto): any { + private getRawValue(field: RootFieldDto): any { const contentField = this.content.dataDraft[field.name]; if (contentField) { diff --git a/src/Squidex/app/features/content/shared/content-status.component.html b/src/Squidex/app/features/content/shared/content-status.component.html index 946265d21..7166be180 100644 --- a/src/Squidex/app/features/content/shared/content-status.component.html +++ b/src/Squidex/app/features/content/shared/content-status.component.html @@ -1,5 +1,5 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/src/Squidex/app/features/content/shared/contents-selector.component.ts b/src/Squidex/app/features/content/shared/contents-selector.component.ts index 7534258bd..aaa5169f2 100644 --- a/src/Squidex/app/features/content/shared/contents-selector.component.ts +++ b/src/Squidex/app/features/content/shared/contents-selector.component.ts @@ -6,6 +6,7 @@ */ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { onErrorResumeNext } from 'rxjs/operators'; import { ContentDto, @@ -51,23 +52,23 @@ export class ContentsSelectorComponent implements OnInit { public ngOnInit() { this.contentsState.schema = this.schema; - this.contentsState.load().onErrorResumeNext().subscribe(); + this.contentsState.load().pipe(onErrorResumeNext()).subscribe(); } public reload() { - this.contentsState.load(true).onErrorResumeNext().subscribe(); + this.contentsState.load(true).pipe(onErrorResumeNext()).subscribe(); } public search(query: string) { - this.contentsState.search(query).onErrorResumeNext().subscribe(); + this.contentsState.search(query).pipe(onErrorResumeNext()).subscribe(); } public goNext() { - this.contentsState.goNext().onErrorResumeNext().subscribe(); + this.contentsState.goNext().pipe(onErrorResumeNext()).subscribe(); } public goPrev() { - this.contentsState.goPrev().onErrorResumeNext().subscribe(); + this.contentsState.goPrev().pipe(onErrorResumeNext()).subscribe(); } public isItemSelected(content: ContentDto) { diff --git a/src/Squidex/app/features/content/shared/field-editor.component.html b/src/Squidex/app/features/content/shared/field-editor.component.html new file mode 100644 index 000000000..6ba9ecc81 --- /dev/null +++ b/src/Squidex/app/features/content/shared/field-editor.component.html @@ -0,0 +1,124 @@ + + + +Disabled + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + {{hints}} + + \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/field-editor.component.scss b/src/Squidex/app/features/content/shared/field-editor.component.scss new file mode 100644 index 000000000..8cb38413e --- /dev/null +++ b/src/Squidex/app/features/content/shared/field-editor.component.scss @@ -0,0 +1,14 @@ +@import '_vars'; +@import '_mixins'; + +.field { + &-required { + color: $color-theme-error; + } + + &-disabled { + color: $color-border-dark; + font-size: .8rem; + font-weight: normal; + } +} \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/field-editor.component.ts b/src/Squidex/app/features/content/shared/field-editor.component.ts new file mode 100644 index 000000000..ed3e0ee9c --- /dev/null +++ b/src/Squidex/app/features/content/shared/field-editor.component.ts @@ -0,0 +1,39 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { FormControl } from '@angular/forms'; + +import { + AppLanguageDto, + EditContentForm, + FieldDto, + ImmutableArray +} from '@app/shared'; + +@Component({ + selector: 'sqx-field-editor', + styleUrls: ['./field-editor.component.scss'], + templateUrl: './field-editor.component.html', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class FieldEditorComponent { + @Input() + public form: EditContentForm; + + @Input() + public field: FieldDto; + + @Input() + public control: FormControl; + + @Input() + public language: AppLanguageDto; + + @Input() + public languages: ImmutableArray; +} \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/references-editor.component.html b/src/Squidex/app/features/content/shared/references-editor.component.html index caa531af3..be514e0df 100644 --- a/src/Squidex/app/features/content/shared/references-editor.component.html +++ b/src/Squidex/app/features/content/shared/references-editor.component.html @@ -7,9 +7,9 @@
- - - + + !!x).map(x => x); + public app = this.appsState.selectedApp.pipe(filter(x => !!x), map(x => x)); public chartOptions = { responsive: true, @@ -86,31 +87,31 @@ export class DashboardPageComponent implements OnDestroy, OnInit { public ngOnInit() { this.subscriptions.push( - this.app - .switchMap(app => this.usagesService.getTodayStorage(app.name)) + this.app.pipe( + switchMap(app => this.usagesService.getTodayStorage(app.name))) .subscribe(dto => { this.assetsCurrent = dto.size; this.assetsMax = dto.maxAllowed; })); this.subscriptions.push( - this.app - .switchMap(app => this.usagesService.getMonthCalls(app.name)) + this.app.pipe( + switchMap(app => this.usagesService.getMonthCalls(app.name))) .subscribe(dto => { this.callsCurrent = dto.count; this.callsMax = dto.maxAllowed; })); this.subscriptions.push( - this.app - .switchMap(app => this.historyService.getHistory(app.name, '')) + this.app.pipe( + switchMap(app => this.historyService.getHistory(app.name, ''))) .subscribe(dto => { this.history = dto; })); this.subscriptions.push( - this.app - .switchMap(app => this.usagesService.getStorageUsages(app.name, DateTime.today().addDays(-20), DateTime.today())) + this.app.pipe( + switchMap(app => this.usagesService.getStorageUsages(app.name, DateTime.today().addDays(-20), DateTime.today()))) .subscribe(dtos => { this.chartStorageCount = { labels: createLabels(dtos), @@ -144,8 +145,8 @@ export class DashboardPageComponent implements OnDestroy, OnInit { })); this.subscriptions.push( - this.app - .switchMap(app => this.usagesService.getCallsUsages(app.name, DateTime.today().addDays(-20), DateTime.today())) + this.app.pipe( + switchMap(app => this.usagesService.getCallsUsages(app.name, DateTime.today().addDays(-20), DateTime.today()))) .subscribe(dtos => { this.chartCallsCount = { labels: createLabels(dtos), diff --git a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts index 4576ec94f..e56dafa48 100644 --- a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts +++ b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts @@ -6,6 +6,7 @@ */ import { Component, OnInit } from '@angular/core'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AppsState, @@ -28,23 +29,23 @@ export class RuleEventsPageComponent implements OnInit { } public ngOnInit() { - this.ruleEventsState.load().onErrorResumeNext().subscribe(); + this.ruleEventsState.load().pipe(onErrorResumeNext()).subscribe(); } public reload() { - this.ruleEventsState.load(true).onErrorResumeNext().subscribe(); + this.ruleEventsState.load(true).pipe(onErrorResumeNext()).subscribe(); } public goNext() { - this.ruleEventsState.goNext().onErrorResumeNext().subscribe(); + this.ruleEventsState.goNext().pipe(onErrorResumeNext()).subscribe(); } public goPrev() { - this.ruleEventsState.goPrev().onErrorResumeNext().subscribe(); + this.ruleEventsState.goPrev().pipe(onErrorResumeNext()).subscribe(); } public enqueue(event: RuleEventDto) { - this.ruleEventsState.enqueue(event).onErrorResumeNext().subscribe(); + this.ruleEventsState.enqueue(event).pipe(onErrorResumeNext()).subscribe(); } public selectEvent(id: string) { diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts b/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts index e644d8c57..8884fd630 100644 --- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts +++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.ts @@ -6,6 +6,7 @@ */ import { Component, OnInit } from '@angular/core'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AppsState, @@ -39,24 +40,24 @@ export class RulesPageComponent implements OnInit { } public ngOnInit() { - this.schemasState.load().onErrorResumeNext().subscribe(); + this.schemasState.load().pipe(onErrorResumeNext()).subscribe(); - this.rulesState.load().onErrorResumeNext().subscribe(); + this.rulesState.load().pipe(onErrorResumeNext()).subscribe(); } public reload() { - this.rulesState.load(true).onErrorResumeNext().subscribe(); + this.rulesState.load(true).pipe(onErrorResumeNext()).subscribe(); } public delete(rule: RuleDto) { - this.rulesState.delete(rule).onErrorResumeNext().subscribe(); + this.rulesState.delete(rule).pipe(onErrorResumeNext()).subscribe(); } public toggle(rule: RuleDto) { if (rule.isEnabled) { - this.rulesState.disable(rule).onErrorResumeNext().subscribe(); + this.rulesState.disable(rule).pipe(onErrorResumeNext()).subscribe(); } else { - this.rulesState.enable(rule).onErrorResumeNext().subscribe(); + this.rulesState.enable(rule).pipe(onErrorResumeNext()).subscribe(); } } diff --git a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html index 866e6808a..3b9b50684 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html @@ -1,7 +1,13 @@
- Create Field + + Add Nested Field + + + + Add Field + @@ -36,7 +42,7 @@ -
+
-
-
-
- -
+ +
+
-
+ diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss index e4adeb7bb..fcbc34891 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss @@ -58,8 +58,4 @@ &-text { font-size: .9rem; } -} - -.dnd-sortable-drag { - border: 0; } \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts index f3f4fa1ca..5070e938d 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts @@ -8,6 +8,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { Subscription } from 'rxjs'; +import { filter, map, onErrorResumeNext } from 'rxjs/operators'; import { AppsState, @@ -65,10 +66,10 @@ export class SchemaPageComponent implements OnDestroy, OnInit { } public ngOnInit() { - this.patternsState.load().onErrorResumeNext().subscribe(); + this.patternsState.load().pipe(onErrorResumeNext()).subscribe(); this.selectedSchemaSubscription = - this.schemasState.selectedSchema.filter(s => !!s).map(s => s!) + this.schemasState.selectedSchema.pipe(filter(s => !!s), map(s => s!)) .subscribe(schema => { this.schema = schema; @@ -88,6 +89,10 @@ export class SchemaPageComponent implements OnDestroy, OnInit { this.schemasState.sortFields(this.schema, fields).subscribe(); } + public trackByField(index: number, field: FieldDto) { + return field.fieldId; + } + public deleteSchema() { this.schemasState.delete(this.schema) .subscribe(() => { diff --git a/src/Squidex/app/features/schemas/pages/schema/types/boolean-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/boolean-validation.component.ts index 983c1a31e..7d3d95408 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/boolean-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/boolean-validation.component.ts @@ -8,6 +8,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { Observable } from 'rxjs'; +import { map, startWith } from 'rxjs/operators'; import { BooleanFieldPropertiesDto, FieldDto } from '@app/shared'; @@ -36,8 +37,7 @@ export class BooleanValidationComponent implements OnInit { new FormControl(this.properties.inlineEditable)); this.showDefaultValue = - this.editForm.controls['isRequired'].valueChanges - .startWith(this.properties.isRequired) - .map(x => !x); + this.editForm.controls['isRequired'].valueChanges.pipe( + startWith(this.properties.isRequired), map(x => !x)); } } \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/types/date-time-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/date-time-validation.component.ts index 66413a03c..a6b1bda2d 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/date-time-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/date-time-validation.component.ts @@ -8,6 +8,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { Observable } from 'rxjs'; +import { map, startWith } from 'rxjs/operators'; import { DateTimeFieldPropertiesDto, FieldDto, ValidatorsEx } from '@app/shared'; @@ -51,13 +52,11 @@ export class DateTimeValidationComponent implements OnInit { ])); this.showDefaultValues = - this.editForm.controls['isRequired'].valueChanges - .startWith(this.properties.isRequired) - .map(x => !x); + this.editForm.controls['isRequired'].valueChanges.pipe( + startWith(this.properties.isRequired), map(x => !x)); this.showDefaultValue = - this.editForm.controls['calculatedDefaultValue'].valueChanges - .startWith(this.properties.calculatedDefaultValue) - .map(x => !x); + this.editForm.controls['calculatedDefaultValue'].valueChanges.pipe( + startWith(this.properties.calculatedDefaultValue), map(x => !x)); } } \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts index 94b6a6e7d..5a1394aaf 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/number-ui.component.ts @@ -8,6 +8,7 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Observable, Subscription } from 'rxjs'; +import { map, startWith } from 'rxjs/operators'; import { FieldDto, FloatConverter, NumberFieldPropertiesDto } from '@app/shared'; @@ -52,14 +53,12 @@ export class NumberUIComponent implements OnDestroy, OnInit { new FormControl(this.properties.inlineEditable)); this.hideAllowedValues = - this.editForm.controls['editor'].valueChanges - .startWith(this.properties.editor) - .map(x => !(x && (x === 'Radio' || x === 'Dropdown'))); + this.editForm.controls['editor'].valueChanges.pipe( + startWith(this.properties.editor), map(x => !(x && (x === 'Radio' || x === 'Dropdown')))); this.hideInlineEditable = - this.editForm.controls['editor'].valueChanges - .startWith(this.properties.editor) - .map(x => !(x && (x === 'Input' || x === 'Dropdown'))); + this.editForm.controls['editor'].valueChanges.pipe( + startWith(this.properties.editor), map(x => !(x && (x === 'Input' || x === 'Dropdown')))); this.hideAllowedValuesSubscription = this.hideAllowedValues.subscribe(isSelection => { diff --git a/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts index 513de5737..18cd9e1bf 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/number-validation.component.ts @@ -8,6 +8,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { Observable } from 'rxjs'; +import { map, startWith } from 'rxjs/operators'; import { FieldDto, NumberFieldPropertiesDto } from '@app/shared'; @@ -39,8 +40,7 @@ export class NumberValidationComponent implements OnInit { new FormControl(this.properties.defaultValue)); this.showDefaultValue = - this.editForm.controls['isRequired'].valueChanges - .startWith(this.properties.isRequired) - .map(x => !x); + this.editForm.controls['isRequired'].valueChanges.pipe( + startWith(this.properties.isRequired), map(x => !x)); } } \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts index 06991f00d..cee172769 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.ts @@ -8,6 +8,7 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { Observable, Subscription } from 'rxjs'; +import { map, startWith } from 'rxjs/operators'; import { FieldDto, StringFieldPropertiesDto } from '@app/shared'; @@ -50,14 +51,12 @@ export class StringUIComponent implements OnDestroy, OnInit { new FormControl(this.properties.inlineEditable)); this.hideAllowedValues = - this.editForm.controls['editor'].valueChanges - .startWith(this.properties.editor) - .map(x => !(x && (x === 'Radio' || x === 'Dropdown'))); + this.editForm.controls['editor'].valueChanges.pipe( + startWith(this.properties.editor), map(x => !(x && (x === 'Radio' || x === 'Dropdown')))); this.hideInlineEditable = - this.editForm.controls['editor'].valueChanges - .startWith(this.properties.editor) - .map(x => !(x && (x === 'Input' || x === 'Dropdown' || x === 'Slug'))); + this.editForm.controls['editor'].valueChanges.pipe( + startWith(this.properties.editor), map(x => !(x && (x === 'Input' || x === 'Dropdown' || x === 'Slug')))); this.hideAllowedValuesSubscription = this.hideAllowedValues.subscribe(isSelection => { diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts index 08e6f5cd1..392fa8a1a 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.ts @@ -8,6 +8,7 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; import { Observable, Subscription } from 'rxjs'; +import { map, startWith } from 'rxjs/operators'; import { AppPatternDto, @@ -65,14 +66,12 @@ export class StringValidationComponent implements OnDestroy, OnInit { new FormControl(this.properties.defaultValue)); this.showDefaultValue = - this.editForm.controls['isRequired'].valueChanges - .startWith(this.properties.isRequired) - .map(x => !x); + this.editForm.controls['isRequired'].valueChanges.pipe( + startWith(this.properties.isRequired), map(x => !x)); this.showPatternSuggestions = - this.editForm.controls['pattern'].valueChanges - .startWith('') - .map(x => !x || x.trim().length === 0); + this.editForm.controls['pattern'].valueChanges.pipe( + startWith(''), map(x => !x || x.trim().length === 0)); this.showPatternMessage = this.editForm.controls['pattern'].value && this.editForm.controls['pattern'].value.trim().length > 0; diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts index b381ea8ab..87af6628b 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts +++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts @@ -9,6 +9,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder, FormControl } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; import { Subscription } from 'rxjs'; +import { map, onErrorResumeNext } from 'rxjs/operators'; import { AppsState, @@ -59,14 +60,14 @@ export class SchemasPageComponent implements OnDestroy, OnInit { this.addSchemaDialog.show(); }); - this.route.params.map(q => q['showDialog']) + this.route.params.pipe(map(q => q['showDialog'])) .subscribe(showDialog => { if (showDialog) { this.addSchemaDialog.show(); } }); - this.schemasState.load().onErrorResumeNext().subscribe(); + this.schemasState.load().pipe(onErrorResumeNext()).subscribe(); } public removeCategory(name: string) { diff --git a/src/Squidex/app/features/settings/module.ts b/src/Squidex/app/features/settings/module.ts index 5672f29ac..f43871ef9 100644 --- a/src/Squidex/app/features/settings/module.ts +++ b/src/Squidex/app/features/settings/module.ts @@ -7,7 +7,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { DndModule } from 'ng2-dnd'; import { HelpComponent, @@ -156,7 +155,6 @@ const routes: Routes = [ @NgModule({ imports: [ - DndModule, SqxFrameworkModule, SqxSharedModule, RouterModule.forChild(routes) diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts b/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts index 8be6e612e..825410d14 100644 --- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts +++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts @@ -6,7 +6,8 @@ */ import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Observable, Subscription } from 'rxjs'; +import { Subscription, timer } from 'rxjs'; +import { onErrorResumeNext, switchMap } from 'rxjs/operators'; import { AppsState, @@ -33,24 +34,24 @@ export class BackupsPageComponent implements OnInit, OnDestroy { } public ngOnInit() { - this.backupsState.load(false, true).onErrorResumeNext().subscribe(); + this.backupsState.load(false, true).pipe(onErrorResumeNext()).subscribe(); this.timerSubscription = - Observable.timer(3000, 3000) - .switchMap(t => this.backupsState.load(true, true).onErrorResumeNext()) + timer(3000, 3000).pipe( + switchMap(t => this.backupsState.load(true, true)), onErrorResumeNext()) .subscribe(); } public reload() { - this.backupsState.load(true, false).onErrorResumeNext().subscribe(); + this.backupsState.load(true, false).pipe(onErrorResumeNext()).subscribe(); } public start() { - this.backupsState.start().onErrorResumeNext().subscribe(); + this.backupsState.start().pipe(onErrorResumeNext()).subscribe(); } public delete(backup: BackupDto) { - this.backupsState.delete(backup).onErrorResumeNext().subscribe(); + this.backupsState.delete(backup).pipe(onErrorResumeNext()).subscribe(); } public trackByBackup(index: number, item: BackupDto) { diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.ts b/src/Squidex/app/features/settings/pages/clients/client.component.ts index 5aa67914a..445860bf0 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.ts +++ b/src/Squidex/app/features/settings/pages/clients/client.component.ts @@ -7,6 +7,7 @@ import { Component, Input, OnChanges } from '@angular/core'; import { FormBuilder } from '@angular/forms'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AccessTokenDto, @@ -54,11 +55,11 @@ export class ClientComponent implements OnChanges { } public revoke() { - this.clientsState.revoke(this.client).onErrorResumeNext().subscribe(); + this.clientsState.revoke(this.client).pipe(onErrorResumeNext()).subscribe(); } public update(permission: string) { - this.clientsState.update(this.client, new UpdateAppClientDto(undefined, permission)).onErrorResumeNext().subscribe(); + this.clientsState.update(this.client, new UpdateAppClientDto(undefined, permission)).pipe(onErrorResumeNext()).subscribe(); } public toggleRename() { diff --git a/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts b/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts index 51b58e5d2..fb56fa480 100644 --- a/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts +++ b/src/Squidex/app/features/settings/pages/clients/clients-page.component.ts @@ -7,6 +7,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder } from '@angular/forms'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AppClientDto, @@ -32,11 +33,11 @@ export class ClientsPageComponent implements OnInit { } public ngOnInit() { - this.clientsState.load().onErrorResumeNext().subscribe(); + this.clientsState.load().pipe(onErrorResumeNext()).subscribe(); } public reload() { - this.clientsState.load(true).onErrorResumeNext().subscribe(); + this.clientsState.load(true).pipe(onErrorResumeNext()).subscribe(); } public attachClient() { @@ -45,7 +46,7 @@ export class ClientsPageComponent implements OnInit { if (value) { const requestDto = new CreateAppClientDto(value.name); - this.clientsState.attach(requestDto).onErrorResumeNext() + this.clientsState.attach(requestDto).pipe(onErrorResumeNext()) .subscribe(() => { this.addClientForm.submitCompleted(); }, error => { diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts index 6e80b4379..1be74e48b 100644 --- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts +++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.ts @@ -8,6 +8,7 @@ import { Component, Injectable, OnInit } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { Observable } from 'rxjs'; +import { filter, onErrorResumeNext, withLatestFrom } from 'rxjs/operators'; import { AppContributorDto, @@ -29,8 +30,8 @@ export class UsersDataSource implements AutocompleteSource { } public find(query: string): Observable { - return this.usersService.getUsers(query) - .withLatestFrom(this.contributorsState.contributors.filter(x => !!x), (users, contributors) => { + return this.usersService.getUsers(query).pipe( + withLatestFrom(this.contributorsState.contributors.pipe(filter(x => !!x)), (users, contributors) => { const results: any[] = []; for (let user of users) { @@ -39,7 +40,7 @@ export class UsersDataSource implements AutocompleteSource { } } return results; - }); + })); } } @@ -65,19 +66,19 @@ export class ContributorsPageComponent implements OnInit { } public ngOnInit() { - this.contributorsState.load().onErrorResumeNext().subscribe(); + this.contributorsState.load().pipe(onErrorResumeNext()).subscribe(); } public reload() { - this.contributorsState.load(true).onErrorResumeNext().subscribe(); + this.contributorsState.load(true).pipe(onErrorResumeNext()).subscribe(); } public remove(contributor: AppContributorDto) { - this.contributorsState.revoke(contributor).onErrorResumeNext().subscribe(); + this.contributorsState.revoke(contributor).pipe(onErrorResumeNext()).subscribe(); } public changePermission(contributor: AppContributorDto, permission: string) { - this.contributorsState.assign(new AppContributorDto(contributor.contributorId, permission)).onErrorResumeNext().subscribe(); + this.contributorsState.assign(new AppContributorDto(contributor.contributorId, permission)).pipe(onErrorResumeNext()).subscribe(); } public assignContributor() { diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.html b/src/Squidex/app/features/settings/pages/languages/language.component.html index 6a1c88efb..fb6a2f7a8 100644 --- a/src/Squidex/app/features/settings/pages/languages/language.component.html +++ b/src/Squidex/app/features/settings/pages/languages/language.component.html @@ -38,8 +38,8 @@
-
-
+
+
{{language.englishName}} diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.ts b/src/Squidex/app/features/settings/pages/languages/language.component.ts index 1d7919105..67da727e0 100644 --- a/src/Squidex/app/features/settings/pages/languages/language.component.ts +++ b/src/Squidex/app/features/settings/pages/languages/language.component.ts @@ -7,6 +7,7 @@ import { Component, Input, OnChanges } from '@angular/core'; import { FormBuilder } from '@angular/forms'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AppLanguageDto, @@ -56,7 +57,7 @@ export class LanguageComponent implements OnChanges { } public remove() { - this.languagesState.remove(this.language).onErrorResumeNext().subscribe(); + this.languagesState.remove(this.language).pipe(onErrorResumeNext()).subscribe(); } public save() { diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts index 2b0faf618..179323835 100644 --- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts +++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts @@ -8,6 +8,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { Subscription } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AddLanguageForm, @@ -46,11 +47,11 @@ export class LanguagesPageComponent implements OnDestroy, OnInit { } }); - this.languagesState.load().onErrorResumeNext().subscribe(); + this.languagesState.load().pipe(onErrorResumeNext()).subscribe(); } public reload() { - this.languagesState.load(true).onErrorResumeNext().subscribe(); + this.languagesState.load(true).pipe(onErrorResumeNext()).subscribe(); } public addLanguage() { diff --git a/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts b/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts index 5e1beb9c4..d37976ef0 100644 --- a/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts +++ b/src/Squidex/app/features/settings/pages/patterns/pattern.component.ts @@ -7,6 +7,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormBuilder } from '@angular/forms'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AppPatternDto, @@ -40,7 +41,7 @@ export class PatternComponent implements OnInit { } public delete() { - this.patternsState.delete(this.pattern).onErrorResumeNext().subscribe(); + this.patternsState.delete(this.pattern).pipe(onErrorResumeNext()).subscribe(); } public save() { diff --git a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts index 1ff546665..57db136ae 100644 --- a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts +++ b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.ts @@ -6,6 +6,7 @@ */ import { Component, OnInit } from '@angular/core'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AppPatternDto, @@ -26,11 +27,11 @@ export class PatternsPageComponent implements OnInit { } public ngOnInit() { - this.patternsState.load().onErrorResumeNext().subscribe(); + this.patternsState.load().pipe(onErrorResumeNext()).subscribe(); } public reload() { - this.patternsState.load(true).onErrorResumeNext().subscribe(); + this.patternsState.load(true).pipe(onErrorResumeNext()).subscribe(); } public trackByPattern(index: number, pattern: AppPatternDto) { diff --git a/src/Squidex/app/features/settings/pages/plans/plans-page.component.ts b/src/Squidex/app/features/settings/pages/plans/plans-page.component.ts index 6222cb148..8c1d125e5 100644 --- a/src/Squidex/app/features/settings/pages/plans/plans-page.component.ts +++ b/src/Squidex/app/features/settings/pages/plans/plans-page.component.ts @@ -7,6 +7,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; +import { onErrorResumeNext } from 'rxjs/operators'; import { ApiUrlConfig, @@ -38,15 +39,15 @@ export class PlansPageComponent implements OnInit { this.overridePlanId = params['planId']; }).unsubscribe(); - this.plansState.load(false, this.overridePlanId).onErrorResumeNext().subscribe(); + this.plansState.load(false, this.overridePlanId).pipe(onErrorResumeNext()).subscribe(); } public reload() { - this.plansState.load(true, this.overridePlanId).onErrorResumeNext().subscribe(); + this.plansState.load(true, this.overridePlanId).pipe(onErrorResumeNext()).subscribe(); } public change(planId: string) { - this.plansState.change(planId).onErrorResumeNext().subscribe(); + this.plansState.change(planId).pipe(onErrorResumeNext()).subscribe(); } public trackByPlan(index: number, planInfo: { plan: PlanDto }) { diff --git a/src/Squidex/app/framework/angular/animations.ts b/src/Squidex/app/framework/angular/animations.ts index 4a47d6abc..66777ef26 100644 --- a/src/Squidex/app/framework/angular/animations.ts +++ b/src/Squidex/app/framework/angular/animations.ts @@ -7,14 +7,14 @@ import { animate, - AnimationEntryMetadata, + AnimationTriggerMetadata, state, style, transition, trigger -} from '@angular/core'; +} from '@angular/animations'; -export function buildSlideRightAnimation(name = 'slideRight', timing = '150ms'): AnimationEntryMetadata { +export function buildSlideRightAnimation(name = 'slideRight', timing = '150ms'): AnimationTriggerMetadata { return trigger( name, [ transition(':enter', [ @@ -37,7 +37,7 @@ export function buildSlideRightAnimation(name = 'slideRight', timing = '150ms'): ); } -export function buildSlideAnimation(name = 'slide', timing = '400ms'): AnimationEntryMetadata { +export function buildSlideAnimation(name = 'slide', timing = '400ms'): AnimationTriggerMetadata { return trigger( name, [ transition(':enter', [ @@ -60,7 +60,7 @@ export function buildSlideAnimation(name = 'slide', timing = '400ms'): Animation ); } -export function buildFadeAnimation(name = 'fade', timing = '150ms'): AnimationEntryMetadata { +export function buildFadeAnimation(name = 'fade', timing = '150ms'): AnimationTriggerMetadata { return trigger( name, [ transition(':enter', [ @@ -83,7 +83,7 @@ export function buildFadeAnimation(name = 'fade', timing = '150ms'): AnimationEn ); } -export function buildHeightAnimation(name = 'height', timing = '200ms'): AnimationEntryMetadata { +export function buildHeightAnimation(name = 'height', timing = '200ms'): AnimationTriggerMetadata { return trigger( name, [ transition(':enter', [ diff --git a/src/Squidex/app/framework/angular/forms/autocomplete.component.ts b/src/Squidex/app/framework/angular/forms/autocomplete.component.ts index 4c3710c68..5d4592462 100644 --- a/src/Squidex/app/framework/angular/forms/autocomplete.component.ts +++ b/src/Squidex/app/framework/angular/forms/autocomplete.component.ts @@ -7,7 +7,8 @@ import { Component, ContentChild, forwardRef, Input, OnDestroy, OnInit, TemplateRef } from '@angular/core'; import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Observable, Subscription } from 'rxjs'; +import { Observable, of, Subscription } from 'rxjs'; +import { catchError, debounceTime, distinctUntilChanged, filter, map, switchMap, tap } from 'rxjs/operators'; export interface AutocompleteSource { find(query: string): Observable; @@ -60,21 +61,22 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O public ngOnInit() { this.subscription = - this.queryInput.valueChanges - .do(query => { - this.callChange(query); - }) - .map(query => query) - .map(query => query ? query.trim() : query) - .do(query => { - if (!query) { - this.reset(); - } - }) - .distinctUntilChanged() - .debounceTime(200) - .filter(query => !!query && !!this.source) - .switchMap(query => this.source.find(query)).catch(error => Observable.of([])) + this.queryInput.valueChanges.pipe( + tap(query => { + this.callChange(query); + }), + map(query => query), + map(query => query ? query.trim() : query), + tap(query => { + if (!query) { + this.reset(); + } + }), + distinctUntilChanged(), + debounceTime(200), + filter(query => !!query && !!this.source), + switchMap(query => this.source.find(query)), + catchError(error => of([]))) .subscribe(items => { this.reset(); this.items = items || []; diff --git a/src/Squidex/app/framework/angular/forms/control-errors.component.ts b/src/Squidex/app/framework/angular/forms/control-errors.component.ts index c6c2cb653..2ef361a64 100644 --- a/src/Squidex/app/framework/angular/forms/control-errors.component.ts +++ b/src/Squidex/app/framework/angular/forms/control-errors.component.ts @@ -7,7 +7,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Host, Input, OnChanges, OnDestroy, Optional } from '@angular/core'; import { AbstractControl, FormGroupDirective } from '@angular/forms'; -import { Observable, Subscription } from 'rxjs'; +import { merge, Subscription } from 'rxjs'; import { fadeAnimation, Types } from '@app/framework/internal'; @@ -93,7 +93,7 @@ export class ControlErrorsComponent implements OnChanges, OnDestroy { if (control) { this.controlSubscription = - Observable.merge(control.valueChanges, control.statusChanges) + merge(control.valueChanges, control.statusChanges) .subscribe(() => { this.createMessages(); }); diff --git a/src/Squidex/app/framework/angular/forms/forms-helper.ts b/src/Squidex/app/framework/angular/forms/forms-helper.ts new file mode 100644 index 000000000..d38f8125e --- /dev/null +++ b/src/Squidex/app/framework/angular/forms/forms-helper.ts @@ -0,0 +1,44 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + + import { AbstractControl, FormArray, FormGroup } from '@angular/forms'; + +import { Types } from '@app/framework/internal'; + +export const formControls = (form: AbstractControl): AbstractControl[] => { + if (Types.is(form, FormGroup)) { + return Object.values(form.controls); + } else if (Types.is(form, FormArray)) { + return form.controls; + } else { + return []; + } +}; + +export const fullValue = (form: AbstractControl): any => { + if (Types.is(form, FormGroup)) { + const groupValue = {}; + + for (let key in form.controls) { + if (form.controls.hasOwnProperty(key)) { + groupValue[key] = fullValue(form.controls[key]); + } + } + + return groupValue; + } else if (Types.is(form, FormArray)) { + const arrayValue = []; + + for (let child of form.controls) { + arrayValue.push(fullValue(child)); + } + + return arrayValue; + } else { + return form.value; + } +}; \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/jscript-editor.component.ts b/src/Squidex/app/framework/angular/forms/jscript-editor.component.ts index fbe344263..ba54c6150 100644 --- a/src/Squidex/app/framework/angular/forms/jscript-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/jscript-editor.component.ts @@ -8,6 +8,7 @@ import { AfterViewInit, Component, ElementRef, forwardRef, ViewChild } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { Subject } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; import { ResourceLoaderService, Types } from '@app/framework/internal'; @@ -64,7 +65,8 @@ export class JscriptEditorComponent implements ControlValueAccessor, AfterViewIn } public ngAfterViewInit() { - this.valueChanged.debounceTime(500) + this.valueChanged.pipe( + debounceTime(500)) .subscribe(() => { this.changeValue(); }); diff --git a/src/Squidex/app/framework/angular/forms/json-editor.component.ts b/src/Squidex/app/framework/angular/forms/json-editor.component.ts index 0e182da13..3a97d3eb0 100644 --- a/src/Squidex/app/framework/angular/forms/json-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/json-editor.component.ts @@ -8,6 +8,7 @@ import { AfterViewInit, Component, ElementRef, forwardRef, ViewChild } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { Subject } from 'rxjs'; +import { debounceTime } from 'rxjs/operators'; import { ResourceLoaderService } from '@app/framework/internal'; @@ -71,7 +72,8 @@ export class JsonEditorComponent implements ControlValueAccessor, AfterViewInit } public ngAfterViewInit() { - this.valueChanged.debounceTime(500) + this.valueChanged.pipe( + debounceTime(500)) .subscribe(() => { this.changeValue(); }); diff --git a/src/Squidex/app/framework/angular/http/http-extensions-impl.ts b/src/Squidex/app/framework/angular/http/http-extensions-impl.ts deleted file mode 100644 index 8fad99a21..000000000 --- a/src/Squidex/app/framework/angular/http/http-extensions-impl.ts +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { HttpClient, HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http'; -import { Observable } from 'rxjs'; - -import { ErrorDto } from './../../utils/error'; -import { Types} from './../../utils/types'; -import { Version, Versioned } from './../../utils/version'; - -export module HTTP { - export function getVersioned(http: HttpClient, url: string, version?: Version): Observable>> { - const headers = createHeaders(version); - - return handleVersion(http.get(url, { observe: 'response', headers }), version); - } - - export function postVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable>> { - const headers = createHeaders(version); - - return handleVersion(http.post(url, body, { observe: 'response', headers }), version); - } - - export function putVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable>> { - const headers = createHeaders(version); - - return handleVersion(http.put(url, body, { observe: 'response', headers }), version); - } - - export function patchVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable>> { - const headers = createHeaders(version); - - return handleVersion(http.request('PATCH', url, { body, observe: 'response', headers }), version); - } - - export function deleteVersioned(http: HttpClient, url: string, version?: Version): Observable>> { - const headers = createHeaders(version); - - return handleVersion(http.delete(url, { observe: 'response', headers }), version); - } - - function createHeaders(version?: Version): HttpHeaders { - if (version && version.value && version.value.length > 0) { - return new HttpHeaders().set('If-Match', version.value); - } else { - return new HttpHeaders(); - } - } - - function handleVersion(httpRequest: Observable>, version?: Version): Observable>> { - return httpRequest.map((response: HttpResponse) => { - const etag = response.headers.get('etag') || ''; - - return new Versioned(new Version(etag), response); - }); - } -} - -export function pretifyError(message: string): Observable { - return this.catch((response: HttpErrorResponse) => { - let result: ErrorDto | null = null; - - if (!Types.is(response.error, Error)) { - try { - const errorDto = Types.isObject(response.error) ? response.error : JSON.parse(response.error); - - if (response.status === 412) { - result = new ErrorDto(response.status, 'Failed to make the update. Another user has made a change. Please reload.'); - } else if (response.status !== 500) { - result = new ErrorDto(response.status, errorDto.message, errorDto.details); - } - } catch (e) { - result = new ErrorDto(500, 'Failed to make the request.'); - } - } - - result = result || new ErrorDto(500, message); - - return Observable.throw(result); - }); -} \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/http/http-extensions.ts b/src/Squidex/app/framework/angular/http/http-extensions.ts index 140efb151..b215d1ce9 100644 --- a/src/Squidex/app/framework/angular/http/http-extensions.ts +++ b/src/Squidex/app/framework/angular/http/http-extensions.ts @@ -5,16 +5,81 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs/Observable'; +import { HttpClient, HttpErrorResponse, HttpHeaders, HttpResponse } from '@angular/common/http'; +import { Observable, throwError } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; -import { pretifyError } from './http-extensions-impl'; +import { ErrorDto } from './../../utils/error'; +import { Types} from './../../utils/types'; +import { Version, Versioned } from './../../utils/version'; -/* tslint:disable:no-shadowed-variable */ +export module HTTP { + export function getVersioned(http: HttpClient, url: string, version?: Version): Observable>> { + const headers = createHeaders(version); -declare module 'rxjs/Observable' { - interface Observable { - pretifyError(message: string): Observable; + return handleVersion(http.get(url, { observe: 'response', headers }), version); + } + + export function postVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable>> { + const headers = createHeaders(version); + + return handleVersion(http.post(url, body, { observe: 'response', headers }), version); + } + + export function putVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable>> { + const headers = createHeaders(version); + + return handleVersion(http.put(url, body, { observe: 'response', headers }), version); + } + + export function patchVersioned(http: HttpClient, url: string, body: any, version?: Version): Observable>> { + const headers = createHeaders(version); + + return handleVersion(http.request('PATCH', url, { body, observe: 'response', headers }), version); + } + + export function deleteVersioned(http: HttpClient, url: string, version?: Version): Observable>> { + const headers = createHeaders(version); + + return handleVersion(http.delete(url, { observe: 'response', headers }), version); + } + + function createHeaders(version?: Version): HttpHeaders { + if (version && version.value && version.value.length > 0) { + return new HttpHeaders().set('If-Match', version.value); + } else { + return new HttpHeaders(); + } + } + + function handleVersion(httpRequest: Observable>, version?: Version): Observable>> { + return httpRequest.pipe(map((response: HttpResponse) => { + const etag = response.headers.get('etag') || ''; + + return new Versioned(new Version(etag), response); + })); } } -Observable.prototype['pretifyError'] = pretifyError; \ No newline at end of file +export const pretifyError = (message: string) => (source: Observable) => + source.pipe(catchError((response: HttpErrorResponse) => { + let result: ErrorDto | null = null; + + if (!Types.is(response.error, Error)) { + try { + const errorDto = Types.isObject(response.error) ? response.error : JSON.parse(response.error); + + if (response.status === 412) { + result = new ErrorDto(response.status, 'Failed to make the update. Another user has made a change. Please reload.'); + } else if (response.status !== 500) { + result = new ErrorDto(response.status, errorDto.message, errorDto.details); + } + } catch (e) { + result = new ErrorDto(500, 'Failed to make the request.'); + } + } + + result = result || new ErrorDto(500, message); + + return throwError(result); + })); \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/routers/can-deactivate.guard.spec.ts b/src/Squidex/app/framework/angular/routers/can-deactivate.guard.spec.ts index fefff79df..4daac3531 100644 --- a/src/Squidex/app/framework/angular/routers/can-deactivate.guard.spec.ts +++ b/src/Squidex/app/framework/angular/routers/can-deactivate.guard.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { CanDeactivateGuard } from './can-deactivate.guard'; @@ -17,7 +17,7 @@ describe('CanDeactivateGuard', () => { canDeactivate: () => { called = true; - return Observable.of(true); + return of(true); } }; diff --git a/src/Squidex/app/framework/angular/shortcut.component.spec.ts b/src/Squidex/app/framework/angular/shortcut.component.spec.ts index c64a5cc54..146285756 100644 --- a/src/Squidex/app/framework/angular/shortcut.component.spec.ts +++ b/src/Squidex/app/framework/angular/shortcut.component.spec.ts @@ -28,6 +28,8 @@ describe('ShortcutComponent', () => { shortcutComponent.keys = null!; shortcutComponent.ngOnInit(); + + expect().nothing(); }); it('should destroy without keys', () => { @@ -35,6 +37,8 @@ describe('ShortcutComponent', () => { shortcutComponent.keys = null!; shortcutComponent.ngOnDestroy(); + + expect().nothing(); }); it('should raise event when triggered', () => { diff --git a/src/Squidex/app/framework/angular/sorted.directive.ts b/src/Squidex/app/framework/angular/sorted.directive.ts index 9a2f573af..5a82887d1 100644 --- a/src/Squidex/app/framework/angular/sorted.directive.ts +++ b/src/Squidex/app/framework/angular/sorted.directive.ts @@ -6,56 +6,90 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Directive, EventEmitter, Output } from '@angular/core'; +import { Directive, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, Renderer2 } from '@angular/core'; -import { - DragDropSortableService, - SortableComponent, - SortableContainer -} from 'ng2-dnd'; +import * as dragula from 'dragula'; @Directive({ - selector: '[sqxSorted]' + selector: '[sqxSortModel]' }) -export class SortedDirective { - private oldArray: any[]; +export class SortedDirective implements OnDestroy, OnInit { + private drake: dragula.Drake; + + @Input('sqxSortModel') + public sortModel: any[]; + + @Input() + public handleClass: string | null = null; @Output('sqxSorted') - public sorted = new EventEmitter>(); + public sorted = new EventEmitter(); constructor( - sortableComponent: SortableComponent, - sortableContainer: SortableContainer, - sortableDragDropService: DragDropSortableService + private readonly elementRef: ElementRef, + private readonly renderer: Renderer2 ) { - const oldDragStartCallback = sortableComponent._onDragStartCallback.bind(sortableComponent); + } - if (Array.isArray(sortableContainer.sortableData)) { - sortableComponent._onDragStartCallback = () => { - oldDragStartCallback(); + public ngOnDestroy() { + this.drake.destroy(); + } - this.oldArray = [...sortableContainer.sortableData]; - }; + public ngOnInit() { + const handleClass = this.handleClass; - const oldDropCallback = sortableComponent._onDropCallback.bind(sortableComponent); + this.drake = dragula([this.elementRef.nativeElement], { + ignoreInputTextSelection: true, - sortableComponent._onDropCallback = (event: Event) => { - oldDropCallback(event); + moves: (element, container, handle: HTMLElement) => { + if (!handleClass) { + return true; + } - if (sortableDragDropService.isDragged) { - const newArray: any[] = sortableContainer.sortableData; - const oldArray = this.oldArray; + let current: HTMLElement | null = handle; - if (newArray && oldArray && newArray.length === oldArray.length) { - for (let i = 0; i < oldArray.length; i++) { - if (oldArray[i] !== newArray[i]) { - this.sorted.emit(newArray); - break; - } - } + while (current && current !== container) { + if (current.classList.contains(handleClass)) { + return true; } + + current = current.parentNode; } - }; - } + + return false; + } + }); + + let dragIndex: number; + let dropIndex: number; + + this.drake.on('dragend', (element: any, container: any) => { + this.renderer.removeClass(element, 'sorting'); + }); + + this.drake.on('drag', (element: any, container: any) => { + this.renderer.addClass(element, 'sorting'); + + dragIndex = this.domIndexOf(container, element); + }); + + this.drake.on('drop', (element: any, container: any) => { + dropIndex = this.domIndexOf(container, element); + + if (this.sortModel && dragIndex !== dropIndex) { + const newModel = [...this.sortModel]; + + const item = this.sortModel[dragIndex]; + + newModel.splice(dragIndex, 1); + newModel.splice(dropIndex, 0, item); + + this.sorted.emit(newModel); + } + }); + } + + private domIndexOf(parent: any, child: any): any { + return Array.prototype.indexOf.call(parent.children, child); } -} +} \ No newline at end of file diff --git a/src/Squidex/app/framework/declarations.ts b/src/Squidex/app/framework/declarations.ts index 56fce1cfc..9c56f81e6 100644 --- a/src/Squidex/app/framework/declarations.ts +++ b/src/Squidex/app/framework/declarations.ts @@ -14,6 +14,7 @@ export * from './angular/forms/dropdown.component'; export * from './angular/forms/file-drop.directive'; export * from './angular/forms/focus-on-init.directive'; export * from './angular/forms/form-error.component'; +export * from './angular/forms/forms-helper'; export * from './angular/forms/iframe-editor.component'; export * from './angular/forms/indeterminate-value.directive'; export * from './angular/forms/jscript-editor.component'; @@ -26,7 +27,7 @@ export * from './angular/forms/toggle.component'; export * from './angular/forms/transform-input.directive'; export * from './angular/forms/validators'; -export * from './angular/http/http-extensions-impl'; +export * from './angular/http/http-extensions'; export * from './angular/modals/dialog-renderer.component'; export * from './angular/modals/modal-dialog.component'; diff --git a/src/Squidex/app/framework/internal.ts b/src/Squidex/app/framework/internal.ts index b6dca6cbc..b3771aa42 100644 --- a/src/Squidex/app/framework/internal.ts +++ b/src/Squidex/app/framework/internal.ts @@ -23,9 +23,11 @@ export * from './utils/date-time'; export * from './utils/duration'; export * from './utils/error'; export * from './utils/immutable-array'; +export * from './utils/lazy'; export * from './utils/math-helper'; export * from './utils/modal-view'; export * from './utils/pager'; +export * from './utils/rxjs-extensions'; export * from './utils/string-helper'; export * from './utils/types'; export * from './utils/version'; diff --git a/src/Squidex/app/framework/services/analytics.service.ts b/src/Squidex/app/framework/services/analytics.service.ts index c452e792a..4b94c2279 100644 --- a/src/Squidex/app/framework/services/analytics.service.ts +++ b/src/Squidex/app/framework/services/analytics.service.ts @@ -7,6 +7,7 @@ import { Injectable } from '@angular/core'; import { NavigationEnd, Router } from '@angular/router'; +import { filter } from 'rxjs/operators'; import { AnalyticsIdConfig } from '../configurations'; import { Types } from './../utils/types'; @@ -32,7 +33,8 @@ export class AnalyticsService { if (analyticsId && router && resourceLoader && window.location.hostname !== 'localhost') { this.gtag('config', analyticsId.value, { anonymize_ip: true }); - router.events.filter(e => Types.is(e, NavigationEnd)) + router.events.pipe( + filter(e => Types.is(e, NavigationEnd))) .subscribe(() => { this.gtag('config', analyticsId.value, { page_path: window.location.pathname, anonymize_ip: true }); }); diff --git a/src/Squidex/app/framework/services/dialog.service.spec.ts b/src/Squidex/app/framework/services/dialog.service.spec.ts index d483092cb..6826ab33a 100644 --- a/src/Squidex/app/framework/services/dialog.service.spec.ts +++ b/src/Squidex/app/framework/services/dialog.service.spec.ts @@ -70,7 +70,7 @@ describe('DialogService', () => { const dialogService = new DialogService(); const notification = Notification.error('Message'); - let publishedNotification: Notification | null = null; + let publishedNotification: Notification; dialogService.notifications.subscribe(result => { publishedNotification = result; @@ -78,13 +78,13 @@ describe('DialogService', () => { dialogService.notify(notification); - expect(publishedNotification).toBe(notification); + expect(publishedNotification!).toBe(notification); }); it('should publish dialog request', () => { const dialogService = new DialogService(); - let pushedDialog: DialogRequest | null = null; + let pushedDialog: DialogRequest; dialogService.dialogs.subscribe(result => { pushedDialog = result; @@ -92,6 +92,6 @@ describe('DialogService', () => { dialogService.confirm('MyTitle', 'MyText'); - expect(pushedDialog).toEqual(new DialogRequest('MyTitle', 'MyText')); + expect(pushedDialog!).toEqual(new DialogRequest('MyTitle', 'MyText')); }); }); diff --git a/src/Squidex/app/framework/services/dialog.service.ts b/src/Squidex/app/framework/services/dialog.service.ts index b7d77d543..639917797 100644 --- a/src/Squidex/app/framework/services/dialog.service.ts +++ b/src/Squidex/app/framework/services/dialog.service.ts @@ -6,7 +6,7 @@ */ import { Injectable } from '@angular/core'; -import { Observable, Subject } from 'rxjs'; +import { Observable, Subject, throwError } from 'rxjs'; import { ErrorDto } from './../utils/error'; import { Types } from './../utils/types'; @@ -71,7 +71,7 @@ export class DialogService { this.notify(Notification.error(error)); } - return Observable.throw(error); + return throwError(error); } public notifyInfo(text: string) { diff --git a/src/Squidex/app/framework/services/message-bus.service.ts b/src/Squidex/app/framework/services/message-bus.service.ts index 02c1df4d6..1046b37e0 100644 --- a/src/Squidex/app/framework/services/message-bus.service.ts +++ b/src/Squidex/app/framework/services/message-bus.service.ts @@ -7,6 +7,7 @@ import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs'; +import { filter, map } from 'rxjs/operators'; interface Message { channel: string; @@ -30,6 +31,6 @@ export class MessageBus { public of(messageType: { new(...args: any[]): T }): Observable { const channel = (messageType).name; - return this.message$.filter(m => m.channel === channel).map(m => m.data); + return this.message$.pipe(filter(m => m.channel === channel), map(m => m.data)); } } \ No newline at end of file diff --git a/src/Squidex/app/framework/services/onboarding.service.spec.ts b/src/Squidex/app/framework/services/onboarding.service.spec.ts index 37bac41ab..0dc5042ae 100644 --- a/src/Squidex/app/framework/services/onboarding.service.spec.ts +++ b/src/Squidex/app/framework/services/onboarding.service.spec.ts @@ -20,7 +20,11 @@ class LocalStoreMock { } describe('OnboardingService', () => { - const localStore = new LocalStoreMock(); + let localStore: LocalStoreMock; + + beforeEach(() => { + localStore = new LocalStoreMock(); + }); it('should instantiate from factory', () => { const onboardingService = OnboardingServiceFactory(localStore); @@ -35,29 +39,27 @@ describe('OnboardingService', () => { }); it('should return true when value not in store', () => { - localStore.set('squidex.onboarding.disable.feature1', '0'); + localStore.set('squidex.onboarding.disable.feature-a1', '0'); const onboardingService = new OnboardingService(localStore); - onboardingService.disable('feature2'); - - expect(onboardingService.shouldShow('feature1')).toBeTruthy(); + expect(onboardingService.shouldShow('feature-a2')).toBeTruthy(); }); it('should return false when value in store', () => { - localStore.set('squidex.onboarding.disable.feature1', '1'); + localStore.set('squidex.onboarding.disable.feature-b1', '1'); const onboardingService = new OnboardingService(localStore); - expect(onboardingService.shouldShow('feature1')).toBeFalsy(); + expect(onboardingService.shouldShow('feature-b1')).toBeFalsy(); }); it('should return false when disabled', () => { const onboardingService = new OnboardingService(localStore); - onboardingService.disable('feature1'); + onboardingService.disable('feature-c1'); - expect(onboardingService.shouldShow('feature1')).toBeFalsy(); + expect(onboardingService.shouldShow('feature-c1')).toBeFalsy(); }); it('should return false when all disabled', () => { @@ -65,6 +67,6 @@ describe('OnboardingService', () => { onboardingService.disableAll(); - expect(onboardingService.shouldShow('feature1')).toBeFalsy(); + expect(onboardingService.shouldShow('feature-d1')).toBeFalsy(); }); }); \ No newline at end of file diff --git a/src/Squidex/app/framework/state.ts b/src/Squidex/app/framework/state.ts index a53b4c1e4..03ed7e181 100644 --- a/src/Squidex/app/framework/state.ts +++ b/src/Squidex/app/framework/state.ts @@ -7,9 +7,10 @@ import { AbstractControl } from '@angular/forms'; import { BehaviorSubject, Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; -import { ErrorDto } from './utils/error'; -import { Types } from './utils/types'; +import { ErrorDto, Types } from '@app/framework/internal'; +import { fullValue} from './angular/forms/forms-helper'; export interface FormState { submitted: boolean; @@ -21,29 +22,45 @@ export class Form { private readonly state = new State({ submitted: false }); public submitted = - this.state.changes.map(s => s.submitted); + this.state.changes.pipe(map(s => s.submitted)); public error = - this.state.changes.map(s => s.error); + this.state.changes.pipe(map(s => s.error)); constructor( public readonly form: T ) { } + protected disable() { + this.form.disable(); + } + + protected enable() { + this.form.enable(); + } + + protected reset(value: any) { + this.form.reset(value); + } + + protected setValue(value: any) { + this.form.reset(value, { emitEvent: true }); + } + public load(value: any) { this.state.next({ submitted: false, error: null }); - this.form.reset(value, { emitEvent: true }); + this.setValue(value); } public submit(): any | null { this.state.next({ submitted: true }); if (this.form.valid) { - const value = this.form.value; + const value = fullValue(this.form); - this.form.disable(); + this.disable(); return value; } else { @@ -54,10 +71,10 @@ export class Form { public submitCompleted(newValue?: any) { this.state.next({ submitted: false, error: null }); - this.form.enable(); + this.enable(); if (newValue) { - this.form.reset(newValue); + this.reset(newValue); } else { this.form.markAsPristine(); } @@ -66,7 +83,7 @@ export class Form { public submitFailed(error?: string | ErrorDto) { this.state.next({ submitted: false, error: this.getError(error) }); - this.form.enable(); + this.enable(); } private getError(error?: string | ErrorDto) { @@ -78,6 +95,25 @@ export class Form { } } +export class Model { + protected clone(update: ((v: any) => object) | object): any { + let values: object; + if (Types.isFunction(update)) { + values = update(this); + } else { + values = update; + } + + const clone = Object.assign(Object.create(Object.getPrototypeOf(this)), this, values); + + if (Types.isFunction(clone.onCloned)) { + clone.onCloned(); + } + + return clone; + } +} + export class State { private readonly state: BehaviorSubject; private readonly initialState: T; diff --git a/src/Squidex/app/framework/utils/date-helper.spec.ts b/src/Squidex/app/framework/utils/date-helper.spec.ts index a538d2d0d..f182ac4d9 100644 --- a/src/Squidex/app/framework/utils/date-helper.spec.ts +++ b/src/Squidex/app/framework/utils/date-helper.spec.ts @@ -11,7 +11,7 @@ import { DateHelper } from './date-helper'; describe('DateHelper', () => { it('should call config method of moment object', () => { - let called: string | null = null; + let called: string; DateHelper.setMoment({ locale: (l: string) => { called = l; } @@ -19,7 +19,7 @@ describe('DateHelper', () => { DateHelper.locale('en'); - expect(called).toBe('en'); + expect(called!).toBe('en'); }); it('should use global moment if not configured', () => { diff --git a/src/Squidex/app/framework/utils/immutable-array.spec.ts b/src/Squidex/app/framework/utils/immutable-array.spec.ts index 967bf58c1..0a047ab42 100644 --- a/src/Squidex/app/framework/utils/immutable-array.spec.ts +++ b/src/Squidex/app/framework/utils/immutable-array.spec.ts @@ -20,9 +20,9 @@ describe('ImmutableArray', () => { const array_c = ImmutableArray.of([]); const array_d = ImmutableArray.empty(); - expect(array_b).toBe(array_a); - expect(array_c).toBe(array_a); - expect(array_d).toBe(array_a); + expect(array_b).toBe(array_a); + expect(array_c).toBe(array_a); + expect(array_d).toBe(array_a); }); it('should create non empty instance', () => { diff --git a/src/Squidex/app/framework/utils/lazy.spec.ts b/src/Squidex/app/framework/utils/lazy.spec.ts new file mode 100644 index 000000000..60d720ab1 --- /dev/null +++ b/src/Squidex/app/framework/utils/lazy.spec.ts @@ -0,0 +1,42 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { Lazy } from './lazy'; + +describe('Lazy', () => { + it('should provider value', () => { + const lazy = new Lazy(() => 1); + + expect(lazy.value).toBe(1); + }); + + it('should call delegate once', () => { + let called = 0; + + const lazy = new Lazy(() => { + called++; + return 13; + }); + + expect(lazy.value).toBe(13); + expect(lazy.value).toBe(13); + expect(called).toBe(1); + }); + + it('should call delegate once when returned undefined', () => { + let called = 0; + + const lazy = new Lazy(() => { + called++; + return undefined; + }); + + expect(lazy.value).toBeUndefined(); + expect(lazy.value).toBeUndefined(); + expect(called).toBe(1); + }); +}); \ No newline at end of file diff --git a/src/Squidex/app/framework/utils/lazy.ts b/src/Squidex/app/framework/utils/lazy.ts new file mode 100644 index 000000000..4227aed92 --- /dev/null +++ b/src/Squidex/app/framework/utils/lazy.ts @@ -0,0 +1,24 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +export class Lazy { + private valueSet = false; + private valueField: T; + + public get value(): T { + if (!this.valueSet) { + this.valueField = this.factory(); + this.valueSet = true; + } + + return this.valueField; + } + constructor( + private readonly factory: () => T + ) { + } +} \ No newline at end of file diff --git a/src/Squidex/app/framework/utils/modal-view.spec.ts b/src/Squidex/app/framework/utils/modal-view.spec.ts index 97ae82c02..6b1e23438 100644 --- a/src/Squidex/app/framework/utils/modal-view.spec.ts +++ b/src/Squidex/app/framework/utils/modal-view.spec.ts @@ -67,13 +67,13 @@ describe('ModalView', () => { }); function checkValue(dialog: ModalView, expected: boolean) { - let result: boolean | null = null; + let result: boolean; dialog.isOpen.subscribe(value => { result = value; }).unsubscribe(); - expect(result).toBe(expected); + expect(result!).toBe(expected); } }); diff --git a/src/Squidex/app/framework/utils/pager.spec.ts b/src/Squidex/app/framework/utils/pager.spec.ts index 2851fbdc7..0d85d512c 100644 --- a/src/Squidex/app/framework/utils/pager.spec.ts +++ b/src/Squidex/app/framework/utils/pager.spec.ts @@ -11,7 +11,7 @@ describe('Pager', () => { it('should init with default values', () => { const pager_1 = new Pager(0); - expect(Object.assign({}, pager_1)).toEqual({ + expect(Object.assign({}, pager_1)).toEqual({ page: 0, pageSize: 10, itemFirst: 0, @@ -26,7 +26,7 @@ describe('Pager', () => { it('should init with page size and page', () => { const pager_1 = new Pager(23, 2, 10); - expect(Object.assign({}, pager_1)).toEqual({ + expect(Object.assign({}, pager_1)).toEqual({ page: 2, pageSize: 10, itemFirst: 21, @@ -42,7 +42,7 @@ describe('Pager', () => { const pager_1 = new Pager(23, 2, 10); const pager_2 = pager_1.reset(); - expect(Object.assign({}, pager_2)).toEqual({ + expect(Object.assign({}, pager_2)).toEqual({ page: 0, pageSize: 10, itemFirst: 0, @@ -65,7 +65,7 @@ describe('Pager', () => { const pager_1 = new Pager(23, 0, 10); const pager_2 = pager_1.goNext(); - expect(Object.assign({}, pager_2)).toEqual({ + expect(Object.assign({}, pager_2)).toEqual({ page: 1, pageSize: 10, itemFirst: 11, @@ -88,7 +88,7 @@ describe('Pager', () => { const pager_1 = new Pager(23, 2, 10); const pager_2 = pager_1.goPrev(); - expect(Object.assign({}, pager_2)).toEqual({ + expect(Object.assign({}, pager_2)).toEqual({ page: 1, pageSize: 10, itemFirst: 11, @@ -104,7 +104,7 @@ describe('Pager', () => { const pager_1 = new Pager(23, 2, 10); const pager_2 = pager_1.setCount(30); - expect(Object.assign({}, pager_2)).toEqual({ + expect(Object.assign({}, pager_2)).toEqual({ page: 2, pageSize: 10, itemFirst: 21, @@ -120,7 +120,7 @@ describe('Pager', () => { const pager_1 = new Pager(23, 1, 10); const pager_2 = pager_1.incrementCount().incrementCount(); - expect(Object.assign({}, pager_2)).toEqual({ + expect(Object.assign({}, pager_2)).toEqual({ page: 1, pageSize: 10, itemFirst: 11, @@ -136,7 +136,7 @@ describe('Pager', () => { const pager_1 = new Pager(23, 2, 10); const pager_2 = pager_1.incrementCount(); - expect(Object.assign({}, pager_2)).toEqual({ + expect(Object.assign({}, pager_2)).toEqual({ page: 2, pageSize: 10, itemFirst: 21, @@ -152,7 +152,7 @@ describe('Pager', () => { const pager_1 = new Pager(23, 1, 10); const pager_2 = pager_1.decrementCount().decrementCount(); - expect(Object.assign({}, pager_2)).toEqual({ + expect(Object.assign({}, pager_2)).toEqual({ page: 1, pageSize: 10, itemFirst: 11, @@ -168,7 +168,7 @@ describe('Pager', () => { const pager_1 = new Pager(23, 2, 10); const pager_2 = pager_1.decrementCount(); - expect(Object.assign({}, pager_2)).toEqual({ + expect(Object.assign({}, pager_2)).toEqual({ page: 2, pageSize: 10, itemFirst: 21, @@ -184,7 +184,7 @@ describe('Pager', () => { const pager_1 = new Pager(21, 2, 10); const pager_2 = pager_1.decrementCount(); - expect(Object.assign({}, pager_2)).toEqual({ + expect(Object.assign({}, pager_2)).toEqual({ page: 1, pageSize: 10, itemFirst: 11, diff --git a/src/Squidex/app/framework/utils/rxjs-extensions-impl.ts b/src/Squidex/app/framework/utils/rxjs-extensions-impl.ts deleted file mode 100644 index fc9ef25ec..000000000 --- a/src/Squidex/app/framework/utils/rxjs-extensions-impl.ts +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { Observable } from 'rxjs'; - -import { DialogService } from './../services/dialog.service'; - -export function nextBy(updater: (value: T) => T): void { - return this.next(updater(this.value)); -} - -export function notify(dialogs: DialogService) { - return this.catch((error: any) => { - dialogs.notifyError(error); - - return Observable.throw(error); - }); -} \ No newline at end of file diff --git a/src/Squidex/app/framework/utils/rxjs-extensions.ts b/src/Squidex/app/framework/utils/rxjs-extensions.ts index 753993ec3..2d2d86786 100644 --- a/src/Squidex/app/framework/utils/rxjs-extensions.ts +++ b/src/Squidex/app/framework/utils/rxjs-extensions.ts @@ -5,27 +5,18 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { BehaviorSubject } from 'rxjs/BehaviorSubject'; -import { Observable } from 'rxjs/Observable'; +import { BehaviorSubject, Observable, throwError } from 'rxjs'; +import { catchError } from 'rxjs/operators'; import { DialogService } from './../services/dialog.service'; -import { nextBy, notify } from './rxjs-extensions-impl'; - /* tslint:disable:no-shadowed-variable */ -declare module 'rxjs/BehaviorSubject' { - interface Observable { - notify(dialogs: DialogService): Observable; - } -} - -BehaviorSubject.prototype['nextBy'] = nextBy; +export const notify = (dialogs: DialogService) => (source: Observable) => + source.pipe(catchError(error => { + dialogs.notifyError(error); -declare module 'rxjs/Observable' { - interface Observable { - notify(dialogs: DialogService): Observable; - } -} + return throwError(error); + })); -Observable.prototype['notify'] = notify; \ No newline at end of file +export const nextBy = (subject: BehaviorSubject, updater: (value: T) => T) => subject.next(updater(this.value)); \ No newline at end of file diff --git a/src/Squidex/app/framework/utils/types.spec.ts b/src/Squidex/app/framework/utils/types.spec.ts index 54bd0a2f3..6ce7d78d2 100644 --- a/src/Squidex/app/framework/utils/types.spec.ts +++ b/src/Squidex/app/framework/utils/types.spec.ts @@ -10,7 +10,7 @@ import { Types } from './types'; describe('Types', () => { it('should calculate hash string', () => { expect(Types.hash(null)).toBe('null'); - expect(Types.hash(undefined)).toBe(undefined); + expect(Types.hash(undefined)).toBeUndefined(); expect(Types.hash(new RegExp('.*'))).toEqual('{}'); }); diff --git a/src/Squidex/app/shared/components/asset.component.html b/src/Squidex/app/shared/components/asset.component.html index 2e826bb30..1a25cb889 100644 --- a/src/Squidex/app/shared/components/asset.component.html +++ b/src/Squidex/app/shared/components/asset.component.html @@ -16,17 +16,17 @@
- + - + - + - +
diff --git a/src/Squidex/app/shared/components/assets-list.component.ts b/src/Squidex/app/shared/components/assets-list.component.ts index 3657f69cf..e7dd32ce6 100644 --- a/src/Squidex/app/shared/components/assets-list.component.ts +++ b/src/Squidex/app/shared/components/assets-list.component.ts @@ -8,6 +8,7 @@ // tslint:disable:prefer-for-of import { Component, EventEmitter, Input, Output } from '@angular/core'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AssetDto, @@ -42,19 +43,19 @@ export class AssetsListComponent { } public search() { - this.state.load().onErrorResumeNext().subscribe(); + this.state.load().pipe(onErrorResumeNext()).subscribe(); } public delete(asset: AssetDto) { - this.state.delete(asset).onErrorResumeNext().subscribe(); + this.state.delete(asset).pipe(onErrorResumeNext()).subscribe(); } public goNext() { - this.state.goNext().onErrorResumeNext().subscribe(); + this.state.goNext().pipe(onErrorResumeNext()).subscribe(); } public goPrev() { - this.state.goPrev().onErrorResumeNext().subscribe(); + this.state.goPrev().pipe(onErrorResumeNext()).subscribe(); } public trackByAsset(index: number, asset: AssetDto) { diff --git a/src/Squidex/app/shared/components/assets-selector.component.ts b/src/Squidex/app/shared/components/assets-selector.component.ts index e12031ec2..68d86692d 100644 --- a/src/Squidex/app/shared/components/assets-selector.component.ts +++ b/src/Squidex/app/shared/components/assets-selector.component.ts @@ -9,6 +9,7 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core'; import { FormControl } from '@angular/forms'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AssetDto, @@ -39,17 +40,17 @@ export class AssetsSelectorComponent implements OnInit { } public ngOnInit() { - this.state.load().onErrorResumeNext().subscribe(); + this.state.load().pipe(onErrorResumeNext()).subscribe(); this.assetsFilter.setValue(this.state.snapshot.assetsQuery); } public reload() { - this.state.load(true).onErrorResumeNext().subscribe(); + this.state.load(true).pipe(onErrorResumeNext()).subscribe(); } public search() { - this.state.search(this.assetsFilter.value).onErrorResumeNext().subscribe(); + this.state.search(this.assetsFilter.value).pipe(onErrorResumeNext()).subscribe(); } public complete() { diff --git a/src/Squidex/app/shared/components/help.component.html b/src/Squidex/app/shared/components/help.component.html index 6824f2d17..2332909c0 100644 --- a/src/Squidex/app/shared/components/help.component.html +++ b/src/Squidex/app/shared/components/help.component.html @@ -1,4 +1,4 @@ - + Help diff --git a/src/Squidex/app/shared/components/history.component.html b/src/Squidex/app/shared/components/history.component.html index d7d34312c..ce0bfc4cd 100644 --- a/src/Squidex/app/shared/components/history.component.html +++ b/src/Squidex/app/shared/components/history.component.html @@ -1,4 +1,4 @@ - + Activity diff --git a/src/Squidex/app/shared/components/history.component.ts b/src/Squidex/app/shared/components/history.component.ts index 63db929fc..727e53247 100644 --- a/src/Squidex/app/shared/components/history.component.ts +++ b/src/Squidex/app/shared/components/history.component.ts @@ -7,7 +7,8 @@ import { Component } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Observable } from 'rxjs'; +import { merge, Observable, timer } from 'rxjs'; +import { delay, switchMap } from 'rxjs/operators'; import { allParams, @@ -27,8 +28,11 @@ export class HistoryComponent { private readonly channel = this.calculateChannel(); public events: Observable = - Observable.timer(0, 10000).merge(this.messageBus.of(HistoryChannelUpdated).delay(1000)) - .switchMap(app => this.historyService.getHistory(this.appsState.appName, this.channel)); + merge( + timer(0, 10000), + this.messageBus.of(HistoryChannelUpdated).pipe(delay(1000)) + ).pipe( + switchMap(app => this.historyService.getHistory(this.appsState.appName, this.channel))); constructor( private readonly appsState: AppsState, diff --git a/src/Squidex/app/shared/components/pipes.ts b/src/Squidex/app/shared/components/pipes.ts index 00e001756..860296f39 100644 --- a/src/Squidex/app/shared/components/pipes.ts +++ b/src/Squidex/app/shared/components/pipes.ts @@ -6,7 +6,8 @@ */ import { ChangeDetectorRef, OnDestroy, Pipe, PipeTransform } from '@angular/core'; -import { Observable, Subscription } from 'rxjs'; +import { Observable, of, Subscription } from 'rxjs'; +import { map } from 'rxjs/operators'; import { ApiUrlConfig, @@ -61,7 +62,7 @@ export class UserNamePipe extends UserAsyncPipe implements PipeTransform { } public transform(userId: string, placeholder = 'Me'): string | null { - return super.transformInternal(userId, users => users.getUser(userId, placeholder).map(u => u.displayName)); + return super.transformInternal(userId, users => users.getUser(userId, placeholder).pipe(map(u => u.displayName))); } } @@ -79,12 +80,12 @@ export class UserNameRefPipe extends UserAsyncPipe implements PipeTransform { const parts = userId.split(':'); if (parts[0] === 'subject') { - return users.getUser(parts[1], placeholder).map(u => u.displayName); + return users.getUser(parts[1], placeholder).pipe(map(u => u.displayName)); } else { if (parts[1].endsWith('client')) { - return Observable.of(parts[1]); + return of(parts[1]); } else { - return Observable.of(`${parts[1]}-client`); + return of(`${parts[1]}-client`); } } }); @@ -133,7 +134,7 @@ export class UserPicturePipe extends UserAsyncPipe implements PipeTransform { } public transform(userId: string): string | null { - return super.transformInternal(userId, users => users.getUser(userId).map(u => this.apiUrl.buildUrl(`api/users/${u.id}/picture`))); + return super.transformInternal(userId, users => users.getUser(userId).pipe(map(u => this.apiUrl.buildUrl(`api/users/${u.id}/picture`)))); } } @@ -153,9 +154,9 @@ export class UserPictureRefPipe extends UserAsyncPipe implements PipeTransform { const parts = userId.split(':'); if (parts[0] === 'subject') { - return users.getUser(parts[1]).map(u => this.apiUrl.buildUrl(`api/users/${u.id}/picture`)); + return users.getUser(parts[1]).pipe(map(u => this.apiUrl.buildUrl(`api/users/${u.id}/picture`))); } else { - return Observable.of('/images/client.png'); + return of('/images/client.png'); } }); } diff --git a/src/Squidex/app/shared/components/schema-category.component.html b/src/Squidex/app/shared/components/schema-category.component.html index 6c989e85b..6739850db 100644 --- a/src/Squidex/app/shared/components/schema-category.component.html +++ b/src/Squidex/app/shared/components/schema-category.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/src/Squidex/app/shared/components/schema-category.component.ts b/src/Squidex/app/shared/components/schema-category.component.ts index 69ebdc739..8ab0803e4 100644 --- a/src/Squidex/app/shared/components/schema-category.component.ts +++ b/src/Squidex/app/shared/components/schema-category.component.ts @@ -6,6 +6,7 @@ */ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; +import { onErrorResumeNext } from 'rxjs/operators'; import { fadeAnimation, @@ -90,7 +91,7 @@ export class SchemaCategoryComponent implements OnInit, OnChanges { } public changeCategory(schema: SchemaDto) { - this.schemasState.changeCategory(schema, this.name).onErrorResumeNext().subscribe(); + this.schemasState.changeCategory(schema, this.name).pipe(onErrorResumeNext()).subscribe(); } public trackBySchema(index: number, schema: SchemaDto) { diff --git a/src/Squidex/app/shared/guards/app-must-exist.guard.spec.ts b/src/Squidex/app/shared/guards/app-must-exist.guard.spec.ts index 174e7cd03..b9fc9d884 100644 --- a/src/Squidex/app/shared/guards/app-must-exist.guard.spec.ts +++ b/src/Squidex/app/shared/guards/app-must-exist.guard.spec.ts @@ -6,7 +6,7 @@ */ import { Router } from '@angular/router'; -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { AppsState } from '@app/shared'; @@ -34,7 +34,7 @@ describe('AppMustExistGuard', () => { it('should navigate to 404 page if app is not found', () => { appsState.setup(x => x.select('my-app')) - .returns(() => Observable.of(null)); + .returns(() => of(null)); let result: boolean; @@ -49,7 +49,7 @@ describe('AppMustExistGuard', () => { it('should return true if app is found', () => { appsState.setup(x => x.select('my-app')) - .returns(() => Observable.of({})); + .returns(() => of({})); let result: boolean; diff --git a/src/Squidex/app/shared/guards/app-must-exist.guard.ts b/src/Squidex/app/shared/guards/app-must-exist.guard.ts index 7dc5b0055..156845fbe 100644 --- a/src/Squidex/app/shared/guards/app-must-exist.guard.ts +++ b/src/Squidex/app/shared/guards/app-must-exist.guard.ts @@ -8,6 +8,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { Observable } from 'rxjs'; +import { map, tap } from 'rxjs/operators'; import { AppsState } from './../state/apps.state'; @@ -23,12 +24,13 @@ export class AppMustExistGuard implements CanActivate { const appName = route.params['appName']; const result = - this.appsState.select(appName) - .do(dto => { + this.appsState.select(appName).pipe( + tap(dto => { if (!dto) { this.router.navigate(['/404']); } - }).map(a => !!a); + }), + map(a => !!a)); return result; } diff --git a/src/Squidex/app/shared/guards/content-must-exist.guard.spec.ts b/src/Squidex/app/shared/guards/content-must-exist.guard.spec.ts index de7489d2d..9bcadd2bf 100644 --- a/src/Squidex/app/shared/guards/content-must-exist.guard.spec.ts +++ b/src/Squidex/app/shared/guards/content-must-exist.guard.spec.ts @@ -6,7 +6,7 @@ */ import { Router } from '@angular/router'; -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { ContentDto } from './../services/contents.service'; @@ -32,7 +32,7 @@ describe('ContentMustExistGuard', () => { it('should load content and return true when found', () => { contentsState.setup(x => x.select('123')) - .returns(() => Observable.of({})); + .returns(() => of({})); let result: boolean; @@ -47,7 +47,7 @@ describe('ContentMustExistGuard', () => { it('should load content and return false when not found', () => { contentsState.setup(x => x.select('123')) - .returns(() => Observable.of(null)); + .returns(() => of(null)); let result: boolean; diff --git a/src/Squidex/app/shared/guards/content-must-exist.guard.ts b/src/Squidex/app/shared/guards/content-must-exist.guard.ts index 4bc373e9d..a96463a27 100644 --- a/src/Squidex/app/shared/guards/content-must-exist.guard.ts +++ b/src/Squidex/app/shared/guards/content-must-exist.guard.ts @@ -8,6 +8,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { Observable } from 'rxjs'; +import { map, tap } from 'rxjs/operators'; import { allParams } from '@app/framework'; @@ -25,13 +26,13 @@ export class ContentMustExistGuard implements CanActivate { const contentId = allParams(route)['contentId']; const result = - this.contentsState.select(contentId) - .do(dto => { + this.contentsState.select(contentId).pipe( + tap(dto => { if (!dto) { this.router.navigate(['/404']); } - }) - .map(u => u !== null); + }), + map(u => u !== null)); return result; } diff --git a/src/Squidex/app/shared/guards/load-apps.guard.spec.ts b/src/Squidex/app/shared/guards/load-apps.guard.spec.ts index 5c1d7f99f..b8acca1de 100644 --- a/src/Squidex/app/shared/guards/load-apps.guard.spec.ts +++ b/src/Squidex/app/shared/guards/load-apps.guard.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { AppsState } from '@app/shared'; @@ -23,7 +23,7 @@ describe('LoadAppsGuard', () => { it('should load apps', () => { appsState.setup(x => x.load()) - .returns(() => Observable.of(null)); + .returns(() => of(null)); let result = false; diff --git a/src/Squidex/app/shared/guards/load-apps.guard.ts b/src/Squidex/app/shared/guards/load-apps.guard.ts index 6d78b9d71..75ae3dfbe 100644 --- a/src/Squidex/app/shared/guards/load-apps.guard.ts +++ b/src/Squidex/app/shared/guards/load-apps.guard.ts @@ -8,6 +8,7 @@ import { Injectable } from '@angular/core'; import { CanActivate } from '@angular/router'; import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; import { AppsState } from './../state/apps.state'; @@ -19,6 +20,6 @@ export class LoadAppsGuard implements CanActivate { } public canActivate(): Observable { - return this.appsState.load().map(a => true); + return this.appsState.load().pipe(map(a => true)); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/guards/load-languages.guard.spec.ts b/src/Squidex/app/shared/guards/load-languages.guard.spec.ts index 6817bc3e9..7b160142d 100644 --- a/src/Squidex/app/shared/guards/load-languages.guard.spec.ts +++ b/src/Squidex/app/shared/guards/load-languages.guard.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { LanguagesState } from '@app/shared'; @@ -23,7 +23,7 @@ describe('LoadLanguagesGuard', () => { it('should load languages', () => { languagesState.setup(x => x.load()) - .returns(() => Observable.of(null)); + .returns(() => of(null)); let result = false; diff --git a/src/Squidex/app/shared/guards/load-languages.guard.ts b/src/Squidex/app/shared/guards/load-languages.guard.ts index 3ff215eaf..4565b82c0 100644 --- a/src/Squidex/app/shared/guards/load-languages.guard.ts +++ b/src/Squidex/app/shared/guards/load-languages.guard.ts @@ -8,6 +8,7 @@ import { Injectable } from '@angular/core'; import { CanActivate } from '@angular/router'; import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; import { LanguagesState } from './../state/languages.state'; @@ -19,6 +20,6 @@ export class LoadLanguagesGuard implements CanActivate { } public canActivate(): Observable { - return this.languagesState.load().map(a => true); + return this.languagesState.load().pipe(map(a => true)); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/guards/must-be-authenticated.guard.spec.ts b/src/Squidex/app/shared/guards/must-be-authenticated.guard.spec.ts index 41e785d59..7d49f0dc8 100644 --- a/src/Squidex/app/shared/guards/must-be-authenticated.guard.spec.ts +++ b/src/Squidex/app/shared/guards/must-be-authenticated.guard.spec.ts @@ -6,7 +6,7 @@ */ import { Router } from '@angular/router'; -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { AuthService } from '@app/shared'; @@ -28,7 +28,7 @@ describe('MustBeAuthenticatedGuard', () => { it('should navigate to default page if not authenticated', () => { authService.setup(x => x.userChanges) - .returns(() => Observable.of(null)); + .returns(() => of(null)); let result: boolean; @@ -43,7 +43,7 @@ describe('MustBeAuthenticatedGuard', () => { it('should return true if authenticated', () => { authService.setup(x => x.userChanges) - .returns(() => Observable.of({})); + .returns(() => of({})); let result: boolean; diff --git a/src/Squidex/app/shared/guards/must-be-authenticated.guard.ts b/src/Squidex/app/shared/guards/must-be-authenticated.guard.ts index eb35753fe..bdf76f49b 100644 --- a/src/Squidex/app/shared/guards/must-be-authenticated.guard.ts +++ b/src/Squidex/app/shared/guards/must-be-authenticated.guard.ts @@ -8,6 +8,7 @@ import { Injectable } from '@angular/core'; import { CanActivate, Router } from '@angular/router'; import { Observable } from 'rxjs'; +import { map, take, tap } from 'rxjs/operators'; import { AuthService } from './../services/auth.service'; @@ -20,12 +21,13 @@ export class MustBeAuthenticatedGuard implements CanActivate { } public canActivate(): Observable { - return this.authService.userChanges.take(1) - .do(user => { + return this.authService.userChanges.pipe( + take(1), + tap(user => { if (!user) { this.router.navigate(['']); } - }) - .map(user => !!user); + }), + map(user => !!user)); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/guards/must-be-not-authenticated.guard.spec.ts b/src/Squidex/app/shared/guards/must-be-not-authenticated.guard.spec.ts index 7255c2c03..303d67ef4 100644 --- a/src/Squidex/app/shared/guards/must-be-not-authenticated.guard.spec.ts +++ b/src/Squidex/app/shared/guards/must-be-not-authenticated.guard.spec.ts @@ -6,7 +6,7 @@ */ import { Router } from '@angular/router'; -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { AuthService } from '@app/shared'; @@ -28,7 +28,7 @@ describe('MustNotBeAuthenticatedGuard', () => { it('should navigate to app page if authenticated', () => { authService.setup(x => x.userChanges) - .returns(() => Observable.of({})); + .returns(() => of({})); let result: boolean; @@ -43,7 +43,7 @@ describe('MustNotBeAuthenticatedGuard', () => { it('should return true if not authenticated', () => { authService.setup(x => x.userChanges) - .returns(() => Observable.of(null)); + .returns(() => of(null)); let result: boolean; diff --git a/src/Squidex/app/shared/guards/must-be-not-authenticated.guard.ts b/src/Squidex/app/shared/guards/must-be-not-authenticated.guard.ts index 73fe70d83..67c4a346d 100644 --- a/src/Squidex/app/shared/guards/must-be-not-authenticated.guard.ts +++ b/src/Squidex/app/shared/guards/must-be-not-authenticated.guard.ts @@ -8,6 +8,7 @@ import { Injectable } from '@angular/core'; import { CanActivate, Router } from '@angular/router'; import { Observable } from 'rxjs'; +import { map, take, tap } from 'rxjs/operators'; import { AuthService } from './../services/auth.service'; @@ -20,12 +21,13 @@ export class MustBeNotAuthenticatedGuard implements CanActivate { } public canActivate(): Observable { - return this.authService.userChanges.take(1) - .do(user => { + return this.authService.userChanges.pipe( + take(1), + tap(user => { if (user) { this.router.navigate(['app']); } - }) - .map(user => !user); + }), + map(user => !user)); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/guards/schema-must-exist-published.guard.spec.ts b/src/Squidex/app/shared/guards/schema-must-exist-published.guard.spec.ts index 62065d231..20fb774bb 100644 --- a/src/Squidex/app/shared/guards/schema-must-exist-published.guard.spec.ts +++ b/src/Squidex/app/shared/guards/schema-must-exist-published.guard.spec.ts @@ -6,7 +6,7 @@ */ import { Router } from '@angular/router'; -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { SchemaDetailsDto } from './../services/schemas.service'; @@ -32,7 +32,7 @@ describe('SchemaMustExistPublishedGuard', () => { it('should load schema and return true when found', () => { schemasState.setup(x => x.select('123')) - .returns(() => Observable.of({ isPublished: true })); + .returns(() => of({ isPublished: true })); let result: boolean; @@ -47,7 +47,7 @@ describe('SchemaMustExistPublishedGuard', () => { it('should load schema and return false when not found', () => { schemasState.setup(x => x.select('123')) - .returns(() => Observable.of({ isPublished: false })); + .returns(() => of({ isPublished: false })); let result: boolean; @@ -62,7 +62,7 @@ describe('SchemaMustExistPublishedGuard', () => { it('should load schema and return false when not found', () => { schemasState.setup(x => x.select('123')) - .returns(() => Observable.of(null)); + .returns(() => of(null)); let result: boolean; diff --git a/src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts b/src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts index b02c94e59..633718986 100644 --- a/src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts +++ b/src/Squidex/app/shared/guards/schema-must-exist-published.guard.ts @@ -8,6 +8,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { Observable } from 'rxjs'; +import { map, tap } from 'rxjs/operators'; import { allParams } from '@app/framework'; @@ -25,13 +26,13 @@ export class SchemaMustExistPublishedGuard implements CanActivate { const schemaName = allParams(route)['schemaName']; const result = - this.schemasState.select(schemaName) - .do(dto => { + this.schemasState.select(schemaName).pipe( + tap(dto => { if (!dto || !dto.isPublished) { this.router.navigate(['/404']); } - }) - .map(s => s !== null && s.isPublished); + }), + map(s => s !== null && s.isPublished)); return result; } diff --git a/src/Squidex/app/shared/guards/schema-must-exist.guard.spec.ts b/src/Squidex/app/shared/guards/schema-must-exist.guard.spec.ts index 984541251..efa0a15dd 100644 --- a/src/Squidex/app/shared/guards/schema-must-exist.guard.spec.ts +++ b/src/Squidex/app/shared/guards/schema-must-exist.guard.spec.ts @@ -6,7 +6,7 @@ */ import { Router } from '@angular/router'; -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { SchemaDetailsDto } from './../services/schemas.service'; @@ -32,7 +32,7 @@ describe('SchemaMustExistGuard', () => { it('should load schema and return true when found', () => { schemasState.setup(x => x.select('123')) - .returns(() => Observable.of({})); + .returns(() => of({})); let result: boolean; @@ -47,7 +47,7 @@ describe('SchemaMustExistGuard', () => { it('should load schema and return false when not found', () => { schemasState.setup(x => x.select('123')) - .returns(() => Observable.of(null)); + .returns(() => of(null)); let result: boolean; diff --git a/src/Squidex/app/shared/guards/schema-must-exist.guard.ts b/src/Squidex/app/shared/guards/schema-must-exist.guard.ts index ae7bfe87d..bcdf3f632 100644 --- a/src/Squidex/app/shared/guards/schema-must-exist.guard.ts +++ b/src/Squidex/app/shared/guards/schema-must-exist.guard.ts @@ -8,6 +8,7 @@ import { Injectable } from '@angular/core'; import { ActivatedRouteSnapshot, CanActivate, Router } from '@angular/router'; import { Observable } from 'rxjs'; +import { map, tap } from 'rxjs/operators'; import { allParams } from '@app/framework'; @@ -25,13 +26,13 @@ export class SchemaMustExistGuard implements CanActivate { const schemaName = allParams(route)['schemaName']; const result = - this.schemasState.select(schemaName) - .do(dto => { + this.schemasState.select(schemaName).pipe( + tap(dto => { if (!dto) { this.router.navigate(['/404']); } - }) - .map(s => s !== null); + }), + map(s => s !== null)); return result; } diff --git a/src/Squidex/app/shared/guards/unset-app.guard.spec.ts b/src/Squidex/app/shared/guards/unset-app.guard.spec.ts index cd726dcc7..14ed0f21d 100644 --- a/src/Squidex/app/shared/guards/unset-app.guard.spec.ts +++ b/src/Squidex/app/shared/guards/unset-app.guard.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { AppsState } from '@app/shared'; @@ -23,7 +23,7 @@ describe('UnsetAppGuard', () => { it('should unselect app', () => { appsState.setup(x => x.select(null)) - .returns(() => Observable.of(null)); + .returns(() => of(null)); let result = false; diff --git a/src/Squidex/app/shared/guards/unset-app.guard.ts b/src/Squidex/app/shared/guards/unset-app.guard.ts index 87c5cdceb..7087d1831 100644 --- a/src/Squidex/app/shared/guards/unset-app.guard.ts +++ b/src/Squidex/app/shared/guards/unset-app.guard.ts @@ -8,6 +8,7 @@ import { Injectable } from '@angular/core'; import { CanActivate } from '@angular/router'; import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; import { AppsState } from './../state/apps.state'; @@ -19,6 +20,6 @@ export class UnsetAppGuard implements CanActivate { } public canActivate(): Observable { - return this.appsState.select(null).map(a => a === null); + return this.appsState.select(null).pipe(map(a => a === null)); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/guards/unset-content.guard.spec.ts b/src/Squidex/app/shared/guards/unset-content.guard.spec.ts index dbfcbf3b9..8c0e6905f 100644 --- a/src/Squidex/app/shared/guards/unset-content.guard.spec.ts +++ b/src/Squidex/app/shared/guards/unset-content.guard.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { ContentsState } from './../state/contents.state'; @@ -22,7 +22,7 @@ describe('UnsetContentGuard', () => { it('should unset content', () => { contentsState.setup(x => x.select(null)) - .returns(() => Observable.of(null)); + .returns(() => of(null)); let result: boolean; diff --git a/src/Squidex/app/shared/guards/unset-content.guard.ts b/src/Squidex/app/shared/guards/unset-content.guard.ts index ab178985f..eec755434 100644 --- a/src/Squidex/app/shared/guards/unset-content.guard.ts +++ b/src/Squidex/app/shared/guards/unset-content.guard.ts @@ -8,6 +8,7 @@ import { Injectable } from '@angular/core'; import { CanActivate } from '@angular/router'; import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; import { ContentsState } from './../state/contents.state'; @@ -19,6 +20,6 @@ export class UnsetContentGuard implements CanActivate { } public canActivate(): Observable { - return this.usersState.select(null).map(u => u === null); + return this.usersState.select(null).pipe(map(u => u === null)); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/interceptors/auth.interceptor.spec.ts b/src/Squidex/app/shared/interceptors/auth.interceptor.spec.ts index 1625c9dcc..11b66ab1a 100644 --- a/src/Squidex/app/shared/interceptors/auth.interceptor.spec.ts +++ b/src/Squidex/app/shared/interceptors/auth.interceptor.spec.ts @@ -8,7 +8,8 @@ import { HTTP_INTERCEPTORS, HttpClient, HttpHeaders } from '@angular/common/http'; import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; import { inject, TestBed } from '@angular/core/testing'; -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, Mock, Times } from 'typemoq'; import { @@ -46,7 +47,7 @@ describe('AuthInterceptor', () => { it('should append headers to request', inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => { - authService.setup(x => x.userChanges).returns(() => Observable.of({ authToken: 'letmein' })); + authService.setup(x => x.userChanges).returns(() => of({ authToken: 'letmein' })); http.get('http://service/p/apps').subscribe(); @@ -61,7 +62,7 @@ describe('AuthInterceptor', () => { it('should not append headers for no auth headers', inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => { - authService.setup(x => x.userChanges).returns(() => Observable.of({ authToken: 'letmein' })); + authService.setup(x => x.userChanges).returns(() => of({ authToken: 'letmein' })); http.get('http://service/p/apps', { headers: new HttpHeaders().set('NoAuth', '') }).subscribe(); @@ -76,7 +77,7 @@ describe('AuthInterceptor', () => { it('should not append headers for other requests', inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => { - authService.setup(x => x.userChanges).returns(() => Observable.of({ authToken: 'letmein' })); + authService.setup(x => x.userChanges).returns(() => of({ authToken: 'letmein' })); http.get('http://cloud/p/apps').subscribe(); @@ -91,14 +92,16 @@ describe('AuthInterceptor', () => { it(`should logout for 401 status code`, inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => { - authService.setup(x => x.userChanges).returns(() => Observable.of({ authToken: 'letmein' })); - authService.setup(x => x.loginSilent()).returns(() => Observable.of({ authToken: 'letmereallyin' })); + authService.setup(x => x.userChanges).returns(() => of({ authToken: 'letmein' })); + authService.setup(x => x.loginSilent()).returns(() => of({ authToken: 'letmereallyin' })); - http.get('http://service/p/apps').onErrorResumeNext().subscribe(); + http.get('http://service/p/apps').pipe(onErrorResumeNext()).subscribe(); httpMock.expectOne('http://service/p/apps').error({}, { status: 401 }); httpMock.expectOne('http://service/p/apps').error({}, { status: 401 }); + expect().nothing(); + authService.verify(x => x.logoutRedirect(), Times.once()); })); @@ -106,14 +109,16 @@ describe('AuthInterceptor', () => { it(`should logout for ${statusCode} status code`, inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => { - authService.setup(x => x.userChanges).returns(() => Observable.of({ authToken: 'letmein' })); + authService.setup(x => x.userChanges).returns(() => of({ authToken: 'letmein' })); - http.get('http://service/p/apps').onErrorResumeNext().subscribe(); + http.get('http://service/p/apps').pipe(onErrorResumeNext()).subscribe(); const req = httpMock.expectOne('http://service/p/apps'); req.error({}, { status: statusCode }); + expect().nothing(); + authService.verify(x => x.logoutRedirect(), Times.once()); })); }); @@ -122,14 +127,16 @@ describe('AuthInterceptor', () => { it(`should not logout for ${statusCode} status code`, inject([HttpClient, HttpTestingController], (http: HttpClient, httpMock: HttpTestingController) => { - authService.setup(x => x.userChanges).returns(() => Observable.of({ authToken: 'letmein' })); + authService.setup(x => x.userChanges).returns(() => of({ authToken: 'letmein' })); - http.get('http://service/p/apps').onErrorResumeNext().subscribe(); + http.get('http://service/p/apps').pipe(onErrorResumeNext()).subscribe(); const req = httpMock.expectOne('http://service/p/apps'); req.error({}, { status: statusCode }); + expect().nothing(); + authService.verify(x => x.logoutRedirect(), Times.never()); })); }); diff --git a/src/Squidex/app/shared/interceptors/auth.interceptor.ts b/src/Squidex/app/shared/interceptors/auth.interceptor.ts index b5e40ec40..ce6559fb8 100644 --- a/src/Squidex/app/shared/interceptors/auth.interceptor.ts +++ b/src/Squidex/app/shared/interceptors/auth.interceptor.ts @@ -7,7 +7,8 @@ import { HttpErrorResponse, HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http'; import { Injectable} from '@angular/core'; -import { Observable } from 'rxjs'; +import { empty, Observable, throwError } from 'rxjs'; +import { catchError, switchMap, take } from 'rxjs/operators'; import { ApiUrlConfig } from '@app/framework'; @@ -25,9 +26,11 @@ export class AuthInterceptor implements HttpInterceptor { public intercept(req: HttpRequest, next: HttpHandler): Observable> { if (req.url.indexOf(this.baseUrl) === 0 && !req.headers.has('NoAuth')) { - return this.authService.userChanges.take(1).switchMap(user => { - return this.makeRequest(req, next, user, true); - }); + return this.authService.userChanges.pipe( + take(1), + switchMap(user => { + return this.makeRequest(req, next, user, true); + })); } else { return next.handle(req); } @@ -43,22 +46,23 @@ export class AuthInterceptor implements HttpInterceptor { .set('Pragma', 'no-cache') }); - return next.handle(authReq) - .catch((error: HttpErrorResponse) => { + return next.handle(authReq).pipe( + catchError((error: HttpErrorResponse) => { if (error.status === 401 && renew) { - return this.authService.loginSilent() - .catch(_ => { + return this.authService.loginSilent().pipe( + catchError(_ => { this.authService.logoutRedirect(); - return Observable.empty(); - }) - .switchMap(u => this.makeRequest(req, next, u)); + return empty(); + }), + switchMap(u => this.makeRequest(req, next, u))); } else if (error.status === 401 || error.status === 403) { this.authService.logoutRedirect(); - return Observable.empty>(); + return empty(); } - return Observable.throw(error); - }); + + return throwError(error); + })); } } diff --git a/src/Squidex/app/shared/internal.ts b/src/Squidex/app/shared/internal.ts index 439b10224..02a02f1fa 100644 --- a/src/Squidex/app/shared/internal.ts +++ b/src/Squidex/app/shared/internal.ts @@ -34,22 +34,31 @@ export * from './services/languages.service'; export * from './services/plans.service'; export * from './services/rules.service'; export * from './services/schemas.service'; +export * from './services/schemas.types'; export * from './services/ui.service'; export * from './services/usages.service'; export * from './services/users-provider.service'; export * from './services/users.service'; +export * from './state/apps.forms'; export * from './state/apps.state'; +export * from './state/assets.forms'; export * from './state/assets.state'; export * from './state/backups.state'; +export * from './state/clients.forms'; export * from './state/clients.state'; +export * from './state/contents.forms'; export * from './state/contents.state'; +export * from './state/contributors.forms'; export * from './state/contributors.state'; +export * from './state/languages.forms'; export * from './state/languages.state'; +export * from './state/patterns.forms'; export * from './state/patterns.state'; export * from './state/plans.state'; export * from './state/rule-events.state'; export * from './state/rules.state'; +export * from './state/schemas.forms'; export * from './state/schemas.state'; export * from './utils/messages'; diff --git a/src/Squidex/app/shared/services/app-clients.service.spec.ts b/src/Squidex/app/shared/services/app-clients.service.spec.ts index 4e7a03756..6f06075af 100644 --- a/src/Squidex/app/shared/services/app-clients.service.spec.ts +++ b/src/Squidex/app/shared/services/app-clients.service.spec.ts @@ -43,7 +43,7 @@ describe('AppClientsService', () => { it('should make get request to get app clients', inject([AppClientsService, HttpTestingController], (appClientsService: AppClientsService, httpMock: HttpTestingController) => { - let clients: AppClientsDto | null = null; + let clients: AppClientsDto; appClientsService.getClients('my-app').subscribe(result => { clients = result; @@ -73,7 +73,7 @@ describe('AppClientsService', () => { } }); - expect(clients).toEqual( + expect(clients!).toEqual( new AppClientsDto([ new AppClientDto('client1', 'Client 1', 'secret1', 'Editor'), new AppClientDto('client2', 'Client 2', 'secret2', 'Developer') @@ -85,7 +85,7 @@ describe('AppClientsService', () => { const dto = new CreateAppClientDto('client1'); - let client: AppClientDto | null = null; + let client: AppClientDto; appClientsService.postClient('my-app', dto, version).subscribe(result => { client = result.payload; @@ -98,8 +98,7 @@ describe('AppClientsService', () => { req.flush({ id: 'client1', name: 'Client 1', secret: 'secret1', permission: 'Developer' }); - expect(client).toEqual( - new AppClientDto('client1', 'Client 1', 'secret1', 'Developer')); + expect(client!).toEqual(new AppClientDto('client1', 'Client 1', 'secret1', 'Developer')); })); it('should make put request to rename client', @@ -133,7 +132,7 @@ describe('AppClientsService', () => { it('should make form request to create token', inject([AppClientsService, HttpTestingController], (appClientsService: AppClientsService, httpMock: HttpTestingController) => { - let accessTokenDto: AccessTokenDto | null = null; + let accessTokenDto: AccessTokenDto; appClientsService.createToken('my-app', new AppClientDto('myClientId', 'myClient', 'mySecret', 'Editor')).subscribe(result => { accessTokenDto = result; @@ -148,7 +147,6 @@ describe('AppClientsService', () => { req.flush({ access_token: 'token1', token_type: 'type1' }); - expect(accessTokenDto).toEqual( - new AccessTokenDto('token1', 'type1')); + expect(accessTokenDto!).toEqual(new AccessTokenDto('token1', 'type1')); })); }); \ No newline at end of file diff --git a/src/Squidex/app/shared/services/app-clients.service.ts b/src/Squidex/app/shared/services/app-clients.service.ts index d46b89b27..2d4186ecd 100644 --- a/src/Squidex/app/shared/services/app-clients.service.ts +++ b/src/Squidex/app/shared/services/app-clients.service.ts @@ -8,32 +8,43 @@ import { HttpClient, HttpHeaders } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { map, tap } from 'rxjs/operators'; import { AnalyticsService, ApiUrlConfig, HTTP, + Model, + pretifyError, Version, Versioned } from '@app/framework'; -export class AppClientsDto { +export class AppClientsDto extends Model { constructor( public readonly clients: AppClientDto[], public readonly version: Version ) { + super(); + } + + public with(value: Partial): AppClientsDto { + return this.clone(value); } } -export class AppClientDto { +export class AppClientDto extends Model { constructor( public readonly id: string, public readonly name: string, public readonly secret: string, public readonly permission: string ) { + super(); + } + + public with(value: Partial): AppClientDto { + return this.clone(value); } } @@ -72,8 +83,8 @@ export class AppClientsService { public getClients(appName: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/clients`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body; @@ -87,15 +98,15 @@ export class AppClientsService { }); return new AppClientsDto(clients, response.version); - }) - .pretifyError('Failed to load clients. Please reload.'); + }), + pretifyError('Failed to load clients. Please reload.')); } public postClient(appName: string, dto: CreateAppClientDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/clients`); - return HTTP.postVersioned(this.http, url, dto, version) - .map(response => { + return HTTP.postVersioned(this.http, url, dto, version).pipe( + map(response => { const body = response.payload.body; const client = new AppClientDto( @@ -105,31 +116,31 @@ export class AppClientsService { body.permission); return new Versioned(response.version, client); - }) - .do(() => { + }), + tap(() => { this.analytics.trackEvent('Client', 'Created', appName); - }) - .pretifyError('Failed to add client. Please reload.'); + }), + pretifyError('Failed to add client. Please reload.')); } public putClient(appName: string, id: string, dto: UpdateAppClientDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/clients/${id}`); - return HTTP.putVersioned(this.http, url, dto, version) - .do(() => { + return HTTP.putVersioned(this.http, url, dto, version).pipe( + tap(() => { this.analytics.trackEvent('Client', 'Updated', appName); - }) - .pretifyError('Failed to revoke client. Please reload.'); + }), + pretifyError('Failed to revoke client. Please reload.')); } public deleteClient(appName: string, id: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/clients/${id}`); - return HTTP.deleteVersioned(this.http, url, version) - .do(() => { + return HTTP.deleteVersioned(this.http, url, version).pipe( + tap(() => { this.analytics.trackEvent('Client', 'Deleted', appName); - }) - .pretifyError('Failed to revoke client. Please reload.'); + }), + pretifyError('Failed to revoke client. Please reload.')); } public createToken(appName: string, client: AppClientDto): Observable { @@ -143,10 +154,10 @@ export class AppClientsService { const url = this.apiUrl.buildUrl('identity-server/connect/token'); - return this.http.post(url, body, options) - .map((response: any) => { + return this.http.post(url, body, options).pipe( + map((response: any) => { return new AccessTokenDto(response.access_token, response.token_type); - }) - .pretifyError('Failed to create token. Please retry.'); + }), + pretifyError('Failed to create token. Please retry.')); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/app-contributors.service.spec.ts b/src/Squidex/app/shared/services/app-contributors.service.spec.ts index 3398b5631..2cf00271b 100644 --- a/src/Squidex/app/shared/services/app-contributors.service.spec.ts +++ b/src/Squidex/app/shared/services/app-contributors.service.spec.ts @@ -41,7 +41,7 @@ describe('AppContributorsService', () => { it('should make get request to get app contributors', inject([AppContributorsService, HttpTestingController], (appContributorsService: AppContributorsService, httpMock: HttpTestingController) => { - let contributors: AppContributorsDto | null = null; + let contributors: AppContributorsDto; appContributorsService.getContributors('my-app').subscribe(result => { contributors = result; @@ -70,7 +70,7 @@ describe('AppContributorsService', () => { } }); - expect(contributors).toEqual( + expect(contributors!).toEqual( new AppContributorsDto([ new AppContributorDto('123', 'Owner'), new AppContributorDto('456', 'Owner') @@ -82,7 +82,7 @@ describe('AppContributorsService', () => { const dto = new AppContributorDto('123', 'Owner'); - let contributorAssignedDto: ContributorAssignedDto | null = null; + let contributorAssignedDto: ContributorAssignedDto; appContributorsService.postContributor('my-app', dto, version).subscribe(result => { contributorAssignedDto = result.payload; diff --git a/src/Squidex/app/shared/services/app-contributors.service.ts b/src/Squidex/app/shared/services/app-contributors.service.ts index 8e4c9b689..9b90e4ad9 100644 --- a/src/Squidex/app/shared/services/app-contributors.service.ts +++ b/src/Squidex/app/shared/services/app-contributors.service.ts @@ -8,31 +8,42 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { map, tap } from 'rxjs/operators'; import { AnalyticsService, ApiUrlConfig, HTTP, + Model, + pretifyError, Version, Versioned } from '@app/framework'; -export class AppContributorsDto { +export class AppContributorsDto extends Model { constructor( public readonly contributors: AppContributorDto[], public readonly maxContributors: number, public readonly version: Version ) { + super(); + } + + public with(value: Partial): AppContributorsDto { + return this.clone(value); } } -export class AppContributorDto { +export class AppContributorDto extends Model { constructor( public readonly contributorId: string, public readonly permission: string ) { + super(); + } + + public with(value: Partial): AppContributorDto { + return this.clone(value); } } @@ -55,8 +66,8 @@ export class AppContributorsService { public getContributors(appName: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/contributors`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body.contributors; @@ -68,34 +79,34 @@ export class AppContributorsService { item.permission); }), body.maxContributors, response.version); - }) - .pretifyError('Failed to load contributors. Please reload.'); + }), + pretifyError('Failed to load contributors. Please reload.')); } public postContributor(appName: string, dto: AppContributorDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/contributors`); - return HTTP.postVersioned(this.http, url, dto, version) - .map(response => { + return HTTP.postVersioned(this.http, url, dto, version).pipe( + map(response => { const body: any = response.payload.body; const result = new ContributorAssignedDto(body.contributorId); return new Versioned(response.version, result); - }) - .do(() => { + }), + tap(() => { this.analytics.trackEvent('Contributor', 'Configured', appName); - }) - .pretifyError('Failed to add contributors. Please reload.'); + }), + pretifyError('Failed to add contributors. Please reload.')); } public deleteContributor(appName: string, contributorId: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/contributors/${contributorId}`); - return HTTP.deleteVersioned(this.http, url, version) - .do(() => { + return HTTP.deleteVersioned(this.http, url, version).pipe( + tap(() => { this.analytics.trackEvent('Contributor', 'Deleted', appName); - }) - .pretifyError('Failed to delete contributors. Please reload.'); + }), + pretifyError('Failed to delete contributors. Please reload.')); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/app-languages.service.spec.ts b/src/Squidex/app/shared/services/app-languages.service.spec.ts index eaf936b63..b17284dc7 100644 --- a/src/Squidex/app/shared/services/app-languages.service.spec.ts +++ b/src/Squidex/app/shared/services/app-languages.service.spec.ts @@ -42,7 +42,7 @@ describe('AppLanguagesService', () => { it('should make get request to get app languages', inject([AppLanguagesService, HttpTestingController], (appLanguagesService: AppLanguagesService, httpMock: HttpTestingController) => { - let languages: AppLanguagesDto | null = null; + let languages: AppLanguagesDto; appLanguagesService.getLanguages('my-app').subscribe(result => { languages = result; @@ -73,7 +73,7 @@ describe('AppLanguagesService', () => { } }); - expect(languages).toEqual( + expect(languages!).toEqual( new AppLanguagesDto([ new AppLanguageDto('en', 'English', true, true, ['de', 'en']), new AppLanguageDto('it', 'Italian', false, false, []) @@ -85,7 +85,7 @@ describe('AppLanguagesService', () => { const dto = new AddAppLanguageDto('de'); - let language: AppLanguageDto | null = null; + let language: AppLanguageDto; appLanguagesService.postLanguage('my-app', dto, version).subscribe(result => { language = result.payload; @@ -98,8 +98,7 @@ describe('AppLanguagesService', () => { req.flush({ iso2Code: 'de', englishName: 'German' }); - expect(language).toEqual( - new AppLanguageDto('de', 'German', false, false, [])); + expect(language!).toEqual(new AppLanguageDto('de', 'German', false, false, [])); })); it('should make put request to make master language', diff --git a/src/Squidex/app/shared/services/app-languages.service.ts b/src/Squidex/app/shared/services/app-languages.service.ts index 03f6a921e..936c30f04 100644 --- a/src/Squidex/app/shared/services/app-languages.service.ts +++ b/src/Squidex/app/shared/services/app-languages.service.ts @@ -8,26 +8,32 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { map, tap } from 'rxjs/operators'; import { AnalyticsService, ApiUrlConfig, HTTP, + Model, + pretifyError, Version, Versioned } from '@app/framework'; -export class AppLanguagesDto { +export class AppLanguagesDto extends Model { constructor( public readonly languages: AppLanguageDto[], public readonly version: Version ) { + super(); + } + + public with(value: Partial): AppLanguagesDto { + return this.clone(value); } } -export class AppLanguageDto { +export class AppLanguageDto extends Model { constructor( public readonly iso2Code: string, public readonly englishName: string, @@ -35,6 +41,11 @@ export class AppLanguageDto { public readonly isOptional: boolean, public readonly fallback: string[] ) { + super(); + } + + public with(value: Partial): AppLanguageDto { + return this.clone(value); } } @@ -66,8 +77,8 @@ export class AppLanguagesService { public getLanguages(appName: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/languages`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body; @@ -82,15 +93,15 @@ export class AppLanguagesService { }); return new AppLanguagesDto(languages, response.version); - }) - .pretifyError('Failed to load languages. Please reload.'); + }), + pretifyError('Failed to load languages. Please reload.')); } public postLanguage(appName: string, dto: AddAppLanguageDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/languages`); - return HTTP.postVersioned(this.http, url, dto, version) - .map(response => { + return HTTP.postVersioned(this.http, url, dto, version).pipe( + map(response => { const body = response.payload.body; const language = new AppLanguageDto( @@ -101,30 +112,30 @@ export class AppLanguagesService { body.fallback || []); return new Versioned(response.version, language); - }) - .do(() => { + }), + tap(() => { this.analytics.trackEvent('Language', 'Added', appName); - }) - .pretifyError('Failed to add language. Please reload.'); + }), + pretifyError('Failed to add language. Please reload.')); } public putLanguage(appName: string, languageCode: string, dto: UpdateAppLanguageDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/languages/${languageCode}`); - return HTTP.putVersioned(this.http, url, dto, version) - .do(() => { + return HTTP.putVersioned(this.http, url, dto, version).pipe( + tap(() => { this.analytics.trackEvent('Language', 'Updated', appName); - }) - .pretifyError('Failed to change language. Please reload.'); + }), + pretifyError('Failed to change language. Please reload.')); } public deleteLanguage(appName: string, languageCode: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/languages/${languageCode}`); - return HTTP.deleteVersioned(this.http, url, version) - .do(() => { + return HTTP.deleteVersioned(this.http, url, version).pipe( + tap(() => { this.analytics.trackEvent('Language', 'Deleted', appName); - }) - .pretifyError('Failed to add language. Please reload.'); + }), + pretifyError('Failed to add language. Please reload.')); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/app-patterns.service.spec.ts b/src/Squidex/app/shared/services/app-patterns.service.spec.ts index 8a376fe17..1594f7f1f 100644 --- a/src/Squidex/app/shared/services/app-patterns.service.spec.ts +++ b/src/Squidex/app/shared/services/app-patterns.service.spec.ts @@ -39,7 +39,7 @@ describe('AppPatternsService', () => { it('should make get request to get patterns', inject([AppPatternsService, HttpTestingController], (patternService: AppPatternsService, httpMock: HttpTestingController) => { - let patterns: AppPatternsDto | null = null; + let patterns: AppPatternsDto; patternService.getPatterns('my-app').subscribe(result => { patterns = result; @@ -68,7 +68,7 @@ describe('AppPatternsService', () => { } }); - expect(patterns).toEqual( + expect(patterns!).toEqual( new AppPatternsDto([ new AppPatternDto('1', 'Number', '[0-9]', 'Message1'), new AppPatternDto('2', 'Numbers', '[0-9]*', 'Message2') @@ -80,7 +80,7 @@ describe('AppPatternsService', () => { const dto = new EditAppPatternDto('Number', '[0-9]', 'Message1'); - let pattern: AppPatternDto | null = null; + let pattern: AppPatternDto; patternService.postPattern('my-app', dto, version).subscribe(result => { pattern = result.payload; @@ -98,7 +98,7 @@ describe('AppPatternsService', () => { message: 'Message1' }); - expect(pattern).toEqual(new AppPatternDto('1', 'Number', '[0-9]', 'Message1')); + expect(pattern!).toEqual(new AppPatternDto('1', 'Number', '[0-9]', 'Message1')); })); it('should make put request to update pattern', diff --git a/src/Squidex/app/shared/services/app-patterns.service.ts b/src/Squidex/app/shared/services/app-patterns.service.ts index 4eb5918c2..b32979415 100644 --- a/src/Squidex/app/shared/services/app-patterns.service.ts +++ b/src/Squidex/app/shared/services/app-patterns.service.ts @@ -8,31 +8,42 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { map } from 'rxjs/operators'; import { ApiUrlConfig, HTTP, + Model, + pretifyError, Version, Versioned } from '@app/framework'; -export class AppPatternsDto { +export class AppPatternsDto extends Model { constructor( public readonly patterns: AppPatternDto[], public readonly version: Version ) { + super(); + } + + public with(value: Partial): AppPatternsDto { + return this.clone(value); } } -export class AppPatternDto { +export class AppPatternDto extends Model { constructor( public readonly id: string, public readonly name: string, public readonly pattern: string, public readonly message: string ) { + super(); + } + + public with(value: Partial): AppPatternDto { + return this.clone(value); } } @@ -57,8 +68,8 @@ export class AppPatternsService { public getPatterns(appName: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body; @@ -72,15 +83,15 @@ export class AppPatternsService { item.message); }), response.version); - }) - .pretifyError('Failed to add pattern. Please reload.'); + }), + pretifyError('Failed to add pattern. Please reload.')); } public postPattern(appName: string, dto: EditAppPatternDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns`); - return HTTP.postVersioned(this.http, url, dto, version) - .map(response => { + return HTTP.postVersioned(this.http, url, dto, version).pipe( + map(response => { const body = response.payload.body; const pattern = new AppPatternDto( @@ -90,21 +101,21 @@ export class AppPatternsService { body.message); return new Versioned(response.version, pattern); - }) - .pretifyError('Failed to add pattern. Please reload.'); + }), + pretifyError('Failed to add pattern. Please reload.')); } public putPattern(appName: string, id: string, dto: EditAppPatternDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns/${id}`); - return HTTP.putVersioned(this.http, url, dto, version) - .pretifyError('Failed to update pattern. Please reload.'); + return HTTP.putVersioned(this.http, url, dto, version).pipe( + pretifyError('Failed to update pattern. Please reload.')); } public deletePattern(appName: string, id: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/patterns/${id}`); - return HTTP.deleteVersioned(this.http, url, version) - .pretifyError('Failed to remove pattern. Please reload.'); + return HTTP.deleteVersioned(this.http, url, version).pipe( + pretifyError('Failed to remove pattern. Please reload.')); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/apps.service.spec.ts b/src/Squidex/app/shared/services/apps.service.spec.ts index bb75bd4c8..eb2ef2b6a 100644 --- a/src/Squidex/app/shared/services/apps.service.spec.ts +++ b/src/Squidex/app/shared/services/apps.service.spec.ts @@ -40,7 +40,7 @@ describe('AppsService', () => { it('should make get request to get apps', inject([AppsService, HttpTestingController], (appsService: AppsService, httpMock: HttpTestingController) => { - let apps: AppDto[] | null = null; + let apps: AppDto[]; appsService.getApps().subscribe(result => { apps = result; @@ -72,10 +72,11 @@ describe('AppsService', () => { } ]); - expect(apps).toEqual([ - new AppDto('123', 'name1', 'Owner', DateTime.parseISO('2016-01-01'), DateTime.parseISO('2016-02-02'), 'Free', 'Basic'), - new AppDto('456', 'name2', 'Owner', DateTime.parseISO('2017-01-01'), DateTime.parseISO('2017-02-02'), 'Basic', 'Enterprise') - ]); + expect(apps!).toEqual( + [ + new AppDto('123', 'name1', 'Owner', DateTime.parseISO('2016-01-01'), DateTime.parseISO('2016-02-02'), 'Free', 'Basic'), + new AppDto('456', 'name2', 'Owner', DateTime.parseISO('2017-01-01'), DateTime.parseISO('2017-02-02'), 'Basic', 'Enterprise') + ]); })); it('should make post request to create app', @@ -83,7 +84,7 @@ describe('AppsService', () => { const dto = new CreateAppDto('new-app'); - let app: AppDto | null = null; + let app: AppDto; appsService.postApp(dto, now).subscribe(result => { app = result; @@ -101,7 +102,7 @@ describe('AppsService', () => { planUpgrade: 'Enterprise' }); - expect(app).toEqual(new AppDto('123', dto.name, 'Reader', now, now, 'Basic', 'Enterprise')); + expect(app!).toEqual(new AppDto('123', dto.name, 'Reader', now, now, 'Basic', 'Enterprise')); })); it('should make delete request to archive app', diff --git a/src/Squidex/app/shared/services/apps.service.ts b/src/Squidex/app/shared/services/apps.service.ts index 7ec4b489c..59d647ac4 100644 --- a/src/Squidex/app/shared/services/apps.service.ts +++ b/src/Squidex/app/shared/services/apps.service.ts @@ -8,17 +8,18 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { map, tap } from 'rxjs/operators'; import { AnalyticsService, ApiUrlConfig, DateTime, - HTTP + HTTP, + Model, + pretifyError } from '@app/framework'; -export class AppDto { +export class AppDto extends Model { constructor( public readonly id: string, public readonly name: string, @@ -28,6 +29,11 @@ export class AppDto { public readonly planName: string, public readonly planUpgrade: string ) { + super(); + } + + public with(value: Partial): AppDto { + return this.clone(value); } } @@ -51,8 +57,8 @@ export class AppsService { public getApps(): Observable { const url = this.apiUrl.buildUrl('/api/apps'); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body; @@ -67,34 +73,34 @@ export class AppsService { item.planName, item.planUpgrade); }); - }) - .pretifyError('Failed to load apps. Please reload.'); + }), + pretifyError('Failed to load apps. Please reload.')); } public postApp(dto: CreateAppDto, now?: DateTime): Observable { const url = this.apiUrl.buildUrl('api/apps'); - return HTTP.postVersioned(this.http, url, dto) - .map(response => { + return HTTP.postVersioned(this.http, url, dto).pipe( + map(response => { const body = response.payload.body; now = now || DateTime.now(); return new AppDto(body.id, dto.name, body.permission, now, now, body.planName, body.planUpgrade); - }) - .do(() => { + }), + tap(() => { this.analytics.trackEvent('App', 'Created', dto.name); - }) - .pretifyError('Failed to create app. Please reload.'); + }), + pretifyError('Failed to create app. Please reload.')); } public deleteApp(appName: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}`); - return this.http.delete(url) - .do(() => { + return this.http.delete(url).pipe( + tap(() => { this.analytics.trackEvent('App', 'Archived', appName); - }) - .pretifyError('Failed to archive app. Please reload.'); + }), + pretifyError('Failed to archive app. Please reload.')); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/assets.service.spec.ts b/src/Squidex/app/shared/services/assets.service.spec.ts index 316ec8978..3021e91f3 100644 --- a/src/Squidex/app/shared/services/assets.service.spec.ts +++ b/src/Squidex/app/shared/services/assets.service.spec.ts @@ -82,7 +82,7 @@ describe('AssetsService', () => { it('should make get request to get assets', inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => { - let assets: AssetsDto | null = null; + let assets: AssetsDto; assetsService.getAssets('my-app', 17, 13).subscribe(result => { assets = result; @@ -131,7 +131,7 @@ describe('AssetsService', () => { ] }); - expect(assets).toEqual( + expect(assets!).toEqual( new AssetsDto(10, [ new AssetDto( 'id1', 'Created1', 'LastModifiedBy1', @@ -166,7 +166,7 @@ describe('AssetsService', () => { it('should make get request to get asset', inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => { - let asset: AssetDto | null = null; + let asset: AssetDto; assetsService.getAsset('my-app', '123').subscribe(result => { asset = result; @@ -197,7 +197,7 @@ describe('AssetsService', () => { } }); - expect(asset).toEqual( + expect(asset!).toEqual( new AssetDto( 'id1', 'Created1', 'LastModifiedBy1', DateTime.parseISO_UTC('2016-12-12T10:10'), @@ -243,7 +243,7 @@ describe('AssetsService', () => { it('should make post request to create asset', inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => { - let asset: AssetDto | null = null; + let asset: AssetDto; assetsService.uploadFile('my-app', null!, user, now).subscribe(result => { asset = result; @@ -270,7 +270,7 @@ describe('AssetsService', () => { } }); - expect(asset).toEqual( + expect(asset!).toEqual( new AssetDto( 'id1', user, @@ -291,7 +291,7 @@ describe('AssetsService', () => { it('should make put request to replace asset content', inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => { - let asset: AssetReplacedDto | null = null; + let asset: AssetReplacedDto; assetsService.replaceFile('my-app', '123', null!, version).subscribe(result => { asset = (>result).payload; @@ -311,7 +311,7 @@ describe('AssetsService', () => { pixelHeight: 2048 }); - expect(asset).toEqual( + expect(asset!).toEqual( new AssetReplacedDto( 1024, 2, 'image/png', diff --git a/src/Squidex/app/shared/services/assets.service.ts b/src/Squidex/app/shared/services/assets.service.ts index 7f58faa6b..b3601f6e3 100644 --- a/src/Squidex/app/shared/services/assets.service.ts +++ b/src/Squidex/app/shared/services/assets.service.ts @@ -8,26 +8,34 @@ import { HttpClient, HttpEventType, HttpHeaders, HttpRequest, HttpResponse } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; +import { filter, map, tap } from 'rxjs/operators'; import { AnalyticsService, ApiUrlConfig, DateTime, HTTP, + Model, + pretifyError, Types, Version, Versioned } from '@app/framework'; -export class AssetsDto { +export class AssetsDto extends Model { constructor( public readonly total: number, public readonly items: AssetDto[] ) { + super(); + } + + public with(value: Partial): AssetsDto { + return this.clone(value); } } -export class AssetDto { +export class AssetDto extends Model { constructor( public readonly id: string, public readonly createdBy: string, @@ -45,40 +53,29 @@ export class AssetDto { public readonly url: string, public readonly version: Version ) { + super(); + } + + public with(value: Partial): AssetDto { + return this.clone(value); } public update(update: AssetReplacedDto, user: string, version: Version, now?: DateTime): AssetDto { - return new AssetDto( - this.id, - this.createdBy, user, - this.created, now || DateTime.now(), - this.fileName, - this.fileType, - update.fileSize, - update.fileVersion, - update.mimeType, - update.isImage, - update.pixelWidth, - update.pixelHeight, - this.url, - version); + return this.with({ + ...update, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); } - public rename(name: string, user: string, version: Version, now?: DateTime): AssetDto { - return new AssetDto( - this.id, - this.createdBy, user, - this.created, now || DateTime.now(), - name, - this.fileType, - this.fileSize, - this.fileVersion, - this.mimeType, - this.isImage, - this.pixelWidth, - this.pixelHeight, - this.url, - version); + public rename(fileName: string, user: string, version: Version, now?: DateTime): AssetDto { + return this.with({ + fileName, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); } } @@ -131,8 +128,8 @@ export class AssetsService { const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets?${fullQuery}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body.items; @@ -157,8 +154,8 @@ export class AssetsService { assetUrl, new Version(item.version.toString())); })); - }) - .pretifyError('Failed to load assets. Please reload.'); + }), + pretifyError('Failed to load assets. Please reload.')); } public uploadFile(appName: string, file: File, user: string, now: DateTime): Observable { @@ -168,11 +165,11 @@ export class AssetsService { reportProgress: true }); - return this.http.request(req) - .filter(event => + return this.http.request(req).pipe( + filter(event => event.type === HttpEventType.UploadProgress || - event.type === HttpEventType.Response) - .map(event => { + event.type === HttpEventType.Response), + map(event => { if (event.type === HttpEventType.UploadProgress) { const percentDone = event.total ? Math.round(100 * event.loaded / event.total) : 0; @@ -201,19 +198,21 @@ export class AssetsService { new Version(event.headers.get('etag')!)); return dto; + } else { + throw 'Invalid'; } - }) - .do(dto => { + }), + tap(dto => { this.analytics.trackEvent('Asset', 'Uploaded', appName); - }) - .pretifyError('Failed to upload asset. Please reload.'); + }), + pretifyError('Failed to upload asset. Please reload.')); } public getAsset(appName: string, id: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets/${id}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const assetUrl = this.apiUrl.buildUrl(`api/assets/${body.id}`); @@ -234,8 +233,8 @@ export class AssetsService { body.pixelHeight, assetUrl, response.version); - }) - .pretifyError('Failed to load assets. Please reload.'); + }), + pretifyError('Failed to load assets. Please reload.')); } public replaceFile(appName: string, id: string, file: File, version: Version): Observable> { @@ -248,11 +247,11 @@ export class AssetsService { reportProgress: true }); - return this.http.request(req) - .filter(event => + return this.http.request(req).pipe( + filter(event => event.type === HttpEventType.UploadProgress || - event.type === HttpEventType.Response) - .map(event => { + event.type === HttpEventType.Response), + map(event => { if (event.type === HttpEventType.UploadProgress) { const percentDone = event.total ? Math.round(100 * event.loaded / event.total) : 0; @@ -269,32 +268,34 @@ export class AssetsService { response.pixelHeight); return new Versioned(new Version(event.headers.get('etag')!), replaced); + } else { + throw 'Invalid'; } - }) - .do(() => { + }), + tap(() => { this.analytics.trackEvent('Analytics', 'Replaced', appName); - }) - .pretifyError('Failed to replace asset. Please reload.'); + }), + pretifyError('Failed to replace asset. Please reload.')); } public deleteAsset(appName: string, id: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets/${id}`); - return HTTP.deleteVersioned(this.http, url, version) - .do(() => { + return HTTP.deleteVersioned(this.http, url, version).pipe( + tap(() => { this.analytics.trackEvent('Analytics', 'Deleted', appName); - }) - .pretifyError('Failed to delete asset. Please reload.'); + }), + pretifyError('Failed to delete asset. Please reload.')); } public putAsset(appName: string, id: string, dto: UpdateAssetDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets/${id}`); - return HTTP.putVersioned(this.http, url, dto, version) - .do(() => { + return HTTP.putVersioned(this.http, url, dto, version).pipe( + tap(() => { this.analytics.trackEvent('Analytics', 'Updated', appName); - }) - .pretifyError('Failed to delete asset. Please reload.'); + }), + pretifyError('Failed to delete asset. Please reload.')); } } diff --git a/src/Squidex/app/shared/services/auth.service.ts b/src/Squidex/app/shared/services/auth.service.ts index 235c88461..1b2be5eb8 100644 --- a/src/Squidex/app/shared/services/auth.service.ts +++ b/src/Squidex/app/shared/services/auth.service.ts @@ -6,7 +6,8 @@ */ import { Injectable } from '@angular/core'; -import { Observable, Observer, ReplaySubject, TimeoutError } from 'rxjs'; +import { Observable, Observer, of, ReplaySubject, throwError, TimeoutError } from 'rxjs'; +import { concat, delay, mergeMap, retryWhen, take } from 'rxjs/operators'; import { Log, @@ -16,6 +17,7 @@ import { } from 'oidc-client'; import { ApiUrlConfig, Types } from '@app/framework'; +import { timeout } from 'rxjs/internal/operators/timeout'; export class Profile { public get id(): string { @@ -161,12 +163,13 @@ export class AuthService { }); }); - return observable.timeout(2000) - .retryWhen(errors => errors - .mergeMap(e => Types.is(e, TimeoutError) ? Observable.of(e) : Observable.throw(e)) - .delay(500) - .take(5) - .concat(Observable.throw(new Error('Retry limit exceeded.')))); + return observable.pipe( + timeout(2000), + retryWhen(errors => errors.pipe( + mergeMap(e => Types.is(e, TimeoutError) ? of(e) : throwError(e)), + delay(500), + take(5), + concat(throwError(new Error('Retry limit exceeded.')))))); } private createProfile(user: User): Profile { diff --git a/src/Squidex/app/shared/services/backups.service.spec.ts b/src/Squidex/app/shared/services/backups.service.spec.ts index 37d65c638..77e24c9aa 100644 --- a/src/Squidex/app/shared/services/backups.service.spec.ts +++ b/src/Squidex/app/shared/services/backups.service.spec.ts @@ -37,7 +37,7 @@ describe('BackupsService', () => { it('should make get request to get backups', inject([BackupsService, HttpTestingController], (backupsService: BackupsService, httpMock: HttpTestingController) => { - let backups: BackupDto[] | null = null; + let backups: BackupDto[]; backupsService.getBackups('my-app').subscribe(result => { backups = result; @@ -67,10 +67,11 @@ describe('BackupsService', () => { } ]); - expect(backups).toEqual([ - new BackupDto('1', DateTime.parseISO_UTC('2017-02-03'), DateTime.parseISO_UTC('2017-02-04'), 13, 17, false), - new BackupDto('2', DateTime.parseISO_UTC('2018-02-03'), null, 23, 27, true) - ]); + expect(backups!).toEqual( + [ + new BackupDto('1', DateTime.parseISO_UTC('2017-02-03'), DateTime.parseISO_UTC('2017-02-04'), 13, 17, false), + new BackupDto('2', DateTime.parseISO_UTC('2018-02-03'), null, 23, 27, true) + ]); })); it('should make post request to start backup', diff --git a/src/Squidex/app/shared/services/backups.service.ts b/src/Squidex/app/shared/services/backups.service.ts index 7879b456d..d29099d8f 100644 --- a/src/Squidex/app/shared/services/backups.service.ts +++ b/src/Squidex/app/shared/services/backups.service.ts @@ -8,16 +8,17 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { map, tap } from 'rxjs/operators'; import { AnalyticsService, ApiUrlConfig, - DateTime + DateTime, + Model, + pretifyError } from '@app/framework'; -export class BackupDto { +export class BackupDto extends Model { constructor( public readonly id: string, public readonly started: DateTime, @@ -26,6 +27,11 @@ export class BackupDto { public readonly handledAssets: number, public readonly isFailed: boolean ) { + super(); + } + + public with(value: Partial): BackupDto { + return this.clone(value); } } @@ -41,8 +47,8 @@ export class BackupsService { public getBackups(appName: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/backups`); - return this.http.get(url) - .map(response => { + return this.http.get(url).pipe( + map(response => { const items: any[] = response; return items.map(item => { @@ -54,27 +60,27 @@ export class BackupsService { item.handledAssets, item.isFailed); }); - }) - .pretifyError('Failed to load backups.'); + }), + pretifyError('Failed to load backups.')); } public postBackup(appName: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/backups`); - return this.http.post(url, {}) - .do(() => { + return this.http.post(url, {}).pipe( + tap(() => { this.analytics.trackEvent('Backup', 'Started', appName); - }) - .pretifyError('Failed to start backup.'); + }), + pretifyError('Failed to start backup.')); } public deleteBackup(appName: string, id: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/backups/${id}`); - return this.http.delete(url) - .do(() => { + return this.http.delete(url).pipe( + tap(() => { this.analytics.trackEvent('Backup', 'Deleted', appName); - }) - .pretifyError('Failed to delete backup.'); + }), + pretifyError('Failed to delete backup.')); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/contents.service.spec.ts b/src/Squidex/app/shared/services/contents.service.spec.ts index ff512c801..8d92f9763 100644 --- a/src/Squidex/app/shared/services/contents.service.spec.ts +++ b/src/Squidex/app/shared/services/contents.service.spec.ts @@ -42,7 +42,7 @@ describe('ContentsService', () => { it('should make get request to get contents', inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => { - let contents: ContentsDto | null = null; + let contents: ContentsDto; contentsService.getContents('my-app', 'my-schema', 17, 13, undefined, undefined, true).subscribe(result => { contents = result; @@ -87,19 +87,19 @@ describe('ContentsService', () => { ] }); - expect(contents).toEqual( + expect(contents!).toEqual( new ContentsDto(10, [ - new ContentDto('id1', 'Published', 'Created1', 'LastModifiedBy1', - DateTime.parseISO_UTC('2016-12-12T10:10'), - DateTime.parseISO_UTC('2017-12-12T10:10'), + new ContentDto('id1', 'Published', + DateTime.parseISO_UTC('2016-12-12T10:10'), 'Created1', + DateTime.parseISO_UTC('2017-12-12T10:10'), 'LastModifiedBy1', new ScheduleDto('Draft', 'Scheduler1', DateTime.parseISO_UTC('2018-12-12T10:10')), true, {}, {}, new Version('11')), - new ContentDto('id2', 'Published', 'Created2', 'LastModifiedBy2', - DateTime.parseISO_UTC('2016-10-12T10:10'), - DateTime.parseISO_UTC('2017-10-12T10:10'), + new ContentDto('id2', 'Published', + DateTime.parseISO_UTC('2016-10-12T10:10'), 'Created2', + DateTime.parseISO_UTC('2017-10-12T10:10'), 'LastModifiedBy2', null, false, {}, @@ -150,7 +150,7 @@ describe('ContentsService', () => { it('should make get request to get content', inject([ContentsService, HttpTestingController], (contentsService: ContentsService, httpMock: HttpTestingController) => { - let content: ContentDto | null = null; + let content: ContentDto; contentsService.getContent('my-app', 'my-schema', '1').subscribe(result => { content = result; @@ -182,10 +182,10 @@ describe('ContentsService', () => { } }); - expect(content).toEqual( - new ContentDto('id1', 'Published', 'Created1', 'LastModifiedBy1', - DateTime.parseISO_UTC('2016-12-12T10:10'), - DateTime.parseISO_UTC('2017-12-12T10:10'), + expect(content!).toEqual( + new ContentDto('id1', 'Published', + DateTime.parseISO_UTC('2016-12-12T10:10'), 'Created1', + DateTime.parseISO_UTC('2017-12-12T10:10'), 'LastModifiedBy1', new ScheduleDto('Draft', 'Scheduler1', DateTime.parseISO_UTC('2018-12-12T10:10')), true, {}, @@ -198,7 +198,7 @@ describe('ContentsService', () => { const dto = {}; - let content: ContentDto | null = null; + let content: ContentDto; contentsService.postContent('my-app', 'my-schema', dto, true).subscribe(result => { content = result; @@ -223,10 +223,10 @@ describe('ContentsService', () => { } }); - expect(content).toEqual( - new ContentDto('id1', 'Published', 'Created1', 'LastModifiedBy1', - DateTime.parseISO_UTC('2016-12-12T10:10'), - DateTime.parseISO_UTC('2017-12-12T10:10'), + expect(content!).toEqual( + new ContentDto('id1', 'Published', + DateTime.parseISO_UTC('2016-12-12T10:10'), 'Created1', + DateTime.parseISO_UTC('2017-12-12T10:10'), 'LastModifiedBy1', null, true, null, @@ -239,7 +239,7 @@ describe('ContentsService', () => { const response = {}; - let data: any | null = null; + let data: any; contentsService.getVersionData('my-app', 'my-schema', 'content1', version).subscribe(result => { data = result; diff --git a/src/Squidex/app/shared/services/contents.service.ts b/src/Squidex/app/shared/services/contents.service.ts index 859cf6007..d1a2eed27 100644 --- a/src/Squidex/app/shared/services/contents.service.ts +++ b/src/Squidex/app/shared/services/contents.service.ts @@ -8,50 +8,66 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { map, tap } from 'rxjs/operators'; import { AnalyticsService, ApiUrlConfig, DateTime, HTTP, + Model, + pretifyError, Version, Versioned } from '@app/framework'; -export class ContentsDto { +export class ContentsDto extends Model { constructor( public readonly total: number, public readonly items: ContentDto[] ) { + + super(); } -} + public with(value: Partial): ContentsDto { + return this.clone(value); + }} -export class ScheduleDto { + +export class ScheduleDto extends Model { constructor( public readonly status: string, public readonly scheduledBy: string, public readonly dueTime: DateTime ) { + super(); + } + + public with(value: Partial): ScheduleDto { + return this.clone(value); } } -export class ContentDto { +export class ContentDto extends Model { constructor( public readonly id: string, public readonly status: string, - public readonly createdBy: string, - public readonly lastModifiedBy: string, public readonly created: DateTime, + public readonly createdBy: string, public readonly lastModified: DateTime, + public readonly lastModifiedBy: string, public readonly scheduleJob: ScheduleDto | null, public readonly isPending: boolean, public readonly data: object | any, public readonly dataDraft: object, public readonly version: Version ) { + super(); + } + + public with(value: Partial): ContentDto { + return this.clone(value); } } @@ -97,8 +113,8 @@ export class ContentsService { const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}?${fullQuery}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body.items; @@ -107,10 +123,8 @@ export class ContentsService { return new ContentDto( item.id, item.status, - item.createdBy, - item.lastModifiedBy, - DateTime.parseISO_UTC(item.created), - DateTime.parseISO_UTC(item.lastModified), + DateTime.parseISO_UTC(item.created), item.createdBy, + DateTime.parseISO_UTC(item.lastModified), item.lastModifiedBy, item.scheduleJob ? new ScheduleDto( item.scheduleJob.status, @@ -122,24 +136,22 @@ export class ContentsService { item.dataDraft, new Version(item.version.toString())); })); - }) - .pretifyError('Failed to load contents. Please reload.'); + }), + pretifyError('Failed to load contents. Please reload.')); } public getContent(appName: string, schemaName: string, id: string): Observable { const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; return new ContentDto( body.id, body.status, - body.createdBy, - body.lastModifiedBy, - DateTime.parseISO_UTC(body.created), - DateTime.parseISO_UTC(body.lastModified), + DateTime.parseISO_UTC(body.created), body.createdBy, + DateTime.parseISO_UTC(body.lastModified), body.lastModifiedBy, body.scheduleJob ? new ScheduleDto( body.scheduleJob.status, @@ -150,94 +162,92 @@ export class ContentsService { body.data, body.dataDraft, response.version); - }) - .pretifyError('Failed to load content. Please reload.'); + }), + pretifyError('Failed to load content. Please reload.')); } public getVersionData(appName: string, schemaName: string, id: string, version: Version): Observable { const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}/${version.value}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { return response.payload.body; - }) - .pretifyError('Failed to load data. Please reload.'); + }), + pretifyError('Failed to load data. Please reload.')); } public postContent(appName: string, schemaName: string, dto: any, publish: boolean): Observable { const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}?publish=${publish}`); - return HTTP.postVersioned(this.http, url, dto) - .map(response => { + return HTTP.postVersioned(this.http, url, dto).pipe( + map(response => { const body = response.payload.body; return new ContentDto( body.id, body.status, - body.createdBy, - body.lastModifiedBy, - DateTime.parseISO_UTC(body.created), - DateTime.parseISO_UTC(body.lastModified), + DateTime.parseISO_UTC(body.created), body.createdBy, + DateTime.parseISO_UTC(body.lastModified), body.lastModifiedBy, null, true, null, body.data, response.version); - }) - .do(content => { + }), + tap(content => { this.analytics.trackEvent('Content', 'Created', appName); - }) - .pretifyError('Failed to create content. Please reload.'); + }), + pretifyError('Failed to create content. Please reload.')); } public putContent(appName: string, schemaName: string, id: string, dto: any, asDraft: boolean, version: Version): Observable> { const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}?asDraft=${asDraft}`); - return HTTP.putVersioned(this.http, url, dto, version) - .map(response => { + return HTTP.putVersioned(this.http, url, dto, version).pipe( + map(response => { const body = response.payload.body; return new Versioned(response.version, body); - }) - .do(() => { + }), + tap(() => { this.analytics.trackEvent('Content', 'Updated', appName); - }) - .pretifyError('Failed to update content. Please reload.'); + }), + pretifyError('Failed to update content. Please reload.')); } public patchContent(appName: string, schemaName: string, id: string, dto: any, version: Version): Observable> { const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}`); - return HTTP.patchVersioned(this.http, url, dto, version) - .map(response => { + return HTTP.patchVersioned(this.http, url, dto, version).pipe( + map(response => { const body = response.payload.body; return new Versioned(response.version, body); - }) - .do(() => { + }), + tap(() => { this.analytics.trackEvent('Content', 'Updated', appName); - }) - .pretifyError('Failed to update content. Please reload.'); + }), + pretifyError('Failed to update content. Please reload.')); } public discardChanges(appName: string, schemaName: string, id: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}/discard`); - return HTTP.putVersioned(this.http, url, version) - .do(() => { + return HTTP.putVersioned(this.http, url, version).pipe( + tap(() => { this.analytics.trackEvent('Content', 'Discarded', appName); - }) - .pretifyError('Failed to discard changes. Please reload.'); + }), + pretifyError('Failed to discard changes. Please reload.')); } public deleteContent(appName: string, schemaName: string, id: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`/api/content/${appName}/${schemaName}/${id}`); - return HTTP.deleteVersioned(this.http, url, version) - .do(() => { + return HTTP.deleteVersioned(this.http, url, version).pipe( + tap(() => { this.analytics.trackEvent('Content', 'Deleted', appName); - }) - .pretifyError('Failed to delete content. Please reload.'); + }), + pretifyError('Failed to delete content. Please reload.')); } public changeContentStatus(appName: string, schemaName: string, id: string, action: string, dueTime: string | null, version: Version): Observable> { @@ -247,10 +257,10 @@ export class ContentsService { url += `?dueTime=${dueTime}`; } - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { + return HTTP.putVersioned(this.http, url, {}, version).pipe( + tap(() => { this.analytics.trackEvent('Content', 'Archived', appName); - }) - .pretifyError(`Failed to ${action} content. Please reload.`); + }), + pretifyError(`Failed to ${action} content. Please reload.`)); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/help.service.spec.ts b/src/Squidex/app/shared/services/help.service.spec.ts index 34c49f746..887eef055 100644 --- a/src/Squidex/app/shared/services/help.service.spec.ts +++ b/src/Squidex/app/shared/services/help.service.spec.ts @@ -29,7 +29,7 @@ describe('AppClientsService', () => { it('should make get request to get help sections', inject([HelpService, HttpTestingController], (helpService: HelpService, httpMock: HttpTestingController) => { - let helpSections: string[] | null = null; + let helpSections: string[]; helpService.getHelp('01-chapter/02-article').subscribe(result => { helpSections = result; @@ -54,17 +54,18 @@ describe('AppClientsService', () => { ] }); - expect(helpSections).toEqual([ - 'A test content with', - 'A test content with a A Link', - 'A test content with a Glossary Link' - ]); + expect(helpSections!).toEqual( + [ + 'A test content with', + 'A test content with a A Link', + 'A test content with a Glossary Link' + ]); })); it('should return empty sections if get request fails', inject([HelpService, HttpTestingController], (helpService: HelpService, httpMock: HttpTestingController) => { - let helpSections: string[] | null = null; + let helpSections: string[]; helpService.getHelp('01-chapter/02-article').subscribe(result => { helpSections = result; @@ -77,6 +78,6 @@ describe('AppClientsService', () => { req.error({}); - expect(helpSections).toEqual([]); + expect(helpSections!).toEqual([]); })); }); \ No newline at end of file diff --git a/src/Squidex/app/shared/services/help.service.ts b/src/Squidex/app/shared/services/help.service.ts index 4279a3174..794a815f6 100644 --- a/src/Squidex/app/shared/services/help.service.ts +++ b/src/Squidex/app/shared/services/help.service.ts @@ -7,7 +7,8 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; +import { Observable, of } from 'rxjs'; +import { catchError, map } from 'rxjs/operators'; @Injectable() export class HelpService { @@ -19,8 +20,8 @@ export class HelpService { public getHelp(helpPage: string): Observable { const url = `https://api.gitbook.com/book/squidex/squidex/contents/${helpPage}.json`; - return this.http.get(url) - .map((response: any) => { + return this.http.get(url).pipe( + map((response: any) => { const result: string[] = []; for (let section of response.sections) { @@ -30,7 +31,7 @@ export class HelpService { } return result; - }) - .catch(error => Observable.of([])); + }), + catchError(error => of([]))); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/history.service.spec.ts b/src/Squidex/app/shared/services/history.service.spec.ts index 8e1b83be4..a8662865f 100644 --- a/src/Squidex/app/shared/services/history.service.spec.ts +++ b/src/Squidex/app/shared/services/history.service.spec.ts @@ -36,7 +36,7 @@ describe('HistoryService', () => { it('should make get request to get history events', inject([HistoryService, HttpTestingController], (historyService: HistoryService, httpMock: HttpTestingController) => { - let events: HistoryEventDto[] | null = null; + let events: HistoryEventDto[]; historyService.getHistory('my-app', 'settings.contributors').subscribe(result => { events = result; @@ -64,7 +64,7 @@ describe('HistoryService', () => { } ]); - expect(events).toEqual( + expect(events!).toEqual( [ new HistoryEventDto('1', 'User1', 'Message 1', 2, DateTime.parseISO_UTC('2016-12-12T10:10')), new HistoryEventDto('2', 'User2', 'Message 2', 3, DateTime.parseISO_UTC('2016-12-13T10:10')) diff --git a/src/Squidex/app/shared/services/history.service.ts b/src/Squidex/app/shared/services/history.service.ts index d13a36d7a..0a3e14b0e 100644 --- a/src/Squidex/app/shared/services/history.service.ts +++ b/src/Squidex/app/shared/services/history.service.ts @@ -7,16 +7,16 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { Observable, of } from 'rxjs'; +import { map } from 'rxjs/operators'; import { UsersProviderService } from './users-provider.service'; import { ApiUrlConfig, DateTime, - HTTP + HTTP, + pretifyError } from '@app/framework'; export class HistoryEventDto { @@ -37,14 +37,14 @@ export function formatHistoryMessage(message: string, users: UsersProviderServic const parts = userId.split(':'); if (parts.length === 1) { - return users.getUser(parts[0], null).map(u => u.displayName); + return users.getUser(parts[0], null).pipe(map(u => u.displayName)); } else if (parts[0] === 'subject') { - return users.getUser(parts[1], null).map(u => u.displayName); + return users.getUser(parts[1], null).pipe(map(u => u.displayName)); } else { if (parts[1].endsWith('client')) { - return Observable.of(parts[1]); + return of(parts[1]); } else { - return Observable.of(`${parts[1]}-client`); + return of(`${parts[1]}-client`); } } }; @@ -65,10 +65,10 @@ export function formatHistoryMessage(message: string, users: UsersProviderServic }); if (foundUserId) { - return userName(foundUserId).map(t => message.replace(REPLACEMENT_TEMP, `${t}`)); + return userName(foundUserId).pipe(map(t => message.replace(REPLACEMENT_TEMP, `${t}`))); } - return Observable.of(message); + return of(message); } @Injectable() @@ -82,8 +82,8 @@ export class HistoryService { public getHistory(appName: string, channel: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/history?channel=${channel}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body; @@ -96,7 +96,7 @@ export class HistoryService { item.version, DateTime.parseISO_UTC(item.created)); }); - }) - .pretifyError('Failed to load history. Please reload.'); + }), + pretifyError('Failed to load history. Please reload.')); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/languages.service.spec.ts b/src/Squidex/app/shared/services/languages.service.spec.ts index c4a4d104c..ee55ea9f1 100644 --- a/src/Squidex/app/shared/services/languages.service.spec.ts +++ b/src/Squidex/app/shared/services/languages.service.spec.ts @@ -34,7 +34,7 @@ describe('LanguageService', () => { it('should make get request to get languages', inject([LanguagesService, HttpTestingController], (languagesService: LanguagesService, httpMock: HttpTestingController) => { - let languages: LanguageDto[] | null = null; + let languages: LanguageDto[]; languagesService.getLanguages().subscribe(result => { languages = result; @@ -56,7 +56,7 @@ describe('LanguageService', () => { } ]); - expect(languages).toEqual( + expect(languages!).toEqual( [ new LanguageDto('de', 'German'), new LanguageDto('en', 'English') diff --git a/src/Squidex/app/shared/services/languages.service.ts b/src/Squidex/app/shared/services/languages.service.ts index 89d1b7300..f396eba1a 100644 --- a/src/Squidex/app/shared/services/languages.service.ts +++ b/src/Squidex/app/shared/services/languages.service.ts @@ -8,10 +8,13 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; -import '@app/framework/angular/http/http-extensions'; - -import { ApiUrlConfig, HTTP } from '@app/framework'; +import { + ApiUrlConfig, + HTTP, + pretifyError +} from '@app/framework'; export class LanguageDto { constructor( @@ -32,8 +35,8 @@ export class LanguagesService { public getLanguages(): Observable { const url = this.apiUrl.buildUrl('api/languages'); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body; @@ -43,7 +46,7 @@ export class LanguagesService { item.iso2Code, item.englishName); }); - }) - .pretifyError('Failed to load languages. Please reload.'); + }), + pretifyError('Failed to load languages. Please reload.')); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/plans.service.spec.ts b/src/Squidex/app/shared/services/plans.service.spec.ts index 6eef78bd3..d3139bc1b 100644 --- a/src/Squidex/app/shared/services/plans.service.spec.ts +++ b/src/Squidex/app/shared/services/plans.service.spec.ts @@ -42,7 +42,7 @@ describe('PlansService', () => { it('should make get request to get app plans', inject([PlansService, HttpTestingController], (plansService: PlansService, httpMock: HttpTestingController) => { - let plans: PlansDto | null = null; + let plans: PlansDto; plansService.getPlans('my-app').subscribe(result => { plans = result; @@ -85,7 +85,7 @@ describe('PlansService', () => { } }); - expect(plans).toEqual( + expect(plans!).toEqual( new PlansDto( '123', '456', @@ -103,7 +103,7 @@ describe('PlansService', () => { const dto = new ChangePlanDto('enterprise'); - let planChanged: PlanChangedDto | null = null; + let planChanged: PlanChangedDto; plansService.putPlan('my-app', dto, version).subscribe(result => { planChanged = result.payload; @@ -116,6 +116,6 @@ describe('PlansService', () => { expect(req.request.method).toEqual('PUT'); expect(req.request.headers.get('If-Match')).toBe(version.value); - expect(planChanged).toEqual(new PlanChangedDto('my-url')); + expect(planChanged!).toEqual(new PlanChangedDto('my-url')); })); }); \ No newline at end of file diff --git a/src/Squidex/app/shared/services/plans.service.ts b/src/Squidex/app/shared/services/plans.service.ts index 23f8c82af..491a6062c 100644 --- a/src/Squidex/app/shared/services/plans.service.ts +++ b/src/Squidex/app/shared/services/plans.service.ts @@ -8,18 +8,19 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { map, tap } from 'rxjs/operators'; import { AnalyticsService, ApiUrlConfig, HTTP, + Model, + pretifyError, Version, Versioned } from '@app/framework'; -export class PlansDto { +export class PlansDto extends Model { constructor( public readonly currentPlanId: string, public readonly planOwner: string, @@ -27,10 +28,15 @@ export class PlansDto { public readonly plans: PlanDto[], public readonly version: Version ) { + super(); + } + + public with(value: Partial): PlansDto { + return this.clone(value); } } -export class PlanDto { +export class PlanDto extends Model { constructor( public readonly id: string, public readonly name: string, @@ -41,6 +47,11 @@ export class PlanDto { public readonly maxAssetSize: number, public readonly maxContributors: number ) { + super(); + } + + public with(value: Partial): PlanDto { + return this.clone(value); } } @@ -70,8 +81,8 @@ export class PlansService { public getPlans(appName: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/plans`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body.plans; @@ -92,22 +103,22 @@ export class PlansService { item.maxContributors); }), response.version); - }) - .pretifyError('Failed to load plans. Please reload.'); + }), + pretifyError('Failed to load plans. Please reload.')); } public putPlan(appName: string, dto: ChangePlanDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/plan`); - return HTTP.putVersioned(this.http, url, dto, version) - .map(response => { + return HTTP.putVersioned(this.http, url, dto, version).pipe( + map(response => { const body = response.payload.body; return new Versioned(response.version, new PlanChangedDto(body.redirectUri)); - }) - .do(() => { + }), + tap(() => { this.analytics.trackEvent('Plan', 'Changed', appName); - }) - .pretifyError('Failed to change plan. Please reload.'); + }), + pretifyError('Failed to change plan. Please reload.')); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/rules.service.spec.ts b/src/Squidex/app/shared/services/rules.service.spec.ts index d65898f61..3905ffa67 100644 --- a/src/Squidex/app/shared/services/rules.service.spec.ts +++ b/src/Squidex/app/shared/services/rules.service.spec.ts @@ -47,7 +47,7 @@ describe('RulesService', () => { it('should make get request to get app rules', inject([RulesService, HttpTestingController], (rulesService: RulesService, httpMock: HttpTestingController) => { - let rules: RuleDto[] | null = null; + let rules: RuleDto[]; rulesService.getRules('my-app').subscribe(result => { rules = result; @@ -81,25 +81,26 @@ describe('RulesService', () => { } ]); - expect(rules).toEqual([ - new RuleDto('id1', 'CreatedBy1', 'LastModifiedBy1', - DateTime.parseISO_UTC('2016-12-12T10:10'), - DateTime.parseISO_UTC('2017-12-12T10:10'), - version, - true, - { - param1: 1, - param2: 2, - triggerType: 'ContentChanged' - }, - 'ContentChanged', - { - param3: 3, - param4: 4, - actionType: 'Webhook' - }, - 'Webhook') - ]); + expect(rules!).toEqual( + [ + new RuleDto('id1', 'CreatedBy1', 'LastModifiedBy1', + DateTime.parseISO_UTC('2016-12-12T10:10'), + DateTime.parseISO_UTC('2017-12-12T10:10'), + version, + true, + { + param1: 1, + param2: 2, + triggerType: 'ContentChanged' + }, + 'ContentChanged', + { + param3: 3, + param4: 4, + actionType: 'Webhook' + }, + 'Webhook') + ]); })); it('should make post request to create rule', @@ -115,7 +116,7 @@ describe('RulesService', () => { actionType: 'Webhook' }); - let rule: RuleDto | null = null; + let rule: RuleDto; rulesService.postRule('my-app', dto, user, now).subscribe(result => { rule = result; @@ -132,7 +133,7 @@ describe('RulesService', () => { } }); - expect(rule).toEqual( + expect(rule!).toEqual( new RuleDto('id1', user, user, now, now, version, true, @@ -205,7 +206,7 @@ describe('RulesService', () => { it('should make get request to get app rule events', inject([RulesService, HttpTestingController], (rulesService: RulesService, httpMock: HttpTestingController) => { - let rules: RuleEventsDto | null = null; + let rules: RuleEventsDto; rulesService.getEvents('my-app', 10, 20).subscribe(result => { rules = result; @@ -243,7 +244,7 @@ describe('RulesService', () => { ] }); - expect(rules).toEqual( + expect(rules!).toEqual( new RuleEventsDto(20, [ new RuleEventDto('id1', DateTime.parseISO_UTC('2017-12-12T10:10'), diff --git a/src/Squidex/app/shared/services/rules.service.ts b/src/Squidex/app/shared/services/rules.service.ts index 5711c50e1..15914ad45 100644 --- a/src/Squidex/app/shared/services/rules.service.ts +++ b/src/Squidex/app/shared/services/rules.service.ts @@ -8,14 +8,15 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { map, tap } from 'rxjs/operators'; import { AnalyticsService, ApiUrlConfig, DateTime, HTTP, + Model, + pretifyError, Version, Versioned } from '@app/framework'; @@ -50,7 +51,7 @@ export const ruleActions: any = { } }; -export class RuleDto { +export class RuleDto extends Model { constructor( public readonly id: string, public readonly createdBy: string, @@ -64,10 +65,28 @@ export class RuleDto { public readonly action: any, public readonly actionType: string ) { + super(); + } + + public with(value: Partial): RuleDto { + return this.clone(value); } } -export class RuleEventDto { +export class RuleEventsDto extends Model { + constructor( + public readonly total: number, + public readonly items: RuleEventDto[] + ) { + super(); + } + + public with(value: Partial): RuleEventsDto { + return this.clone(value); + } +} + +export class RuleEventDto extends Model { constructor( public readonly id: string, public readonly created: DateTime, @@ -79,14 +98,11 @@ export class RuleEventDto { public readonly jobResult: string, public readonly numCalls: number ) { + super(); } -} -export class RuleEventsDto { - constructor( - public readonly total: number, - public readonly items: RuleEventDto[] - ) { + public with(value: Partial): RuleEventDto { + return this.clone(value); } } @@ -118,8 +134,8 @@ export class RulesService { public getRules(appName: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const items: any[] = response.payload.body; return items.map(item => { @@ -136,15 +152,15 @@ export class RulesService { item.action, item.action.actionType); }); - }) - .pretifyError('Failed to load Rules. Please reload.'); + }), + pretifyError('Failed to load Rules. Please reload.')); } public postRule(appName: string, dto: CreateRuleDto, user: string, now: DateTime): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules`); - return HTTP.postVersioned(this.http, url, dto) - .map(response => { + return HTTP.postVersioned(this.http, url, dto).pipe( + map(response => { const body = response.payload.body; return new RuleDto( @@ -159,58 +175,58 @@ export class RulesService { dto.trigger.triggerType, dto.action, dto.action.actionType); - }) - .do(() => { + }), + tap(() => { this.analytics.trackEvent('Rule', 'Created', appName); - }) - .pretifyError('Failed to create rule. Please reload.'); + }), + pretifyError('Failed to create rule. Please reload.')); } public putRule(appName: string, id: string, dto: UpdateRuleDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules/${id}`); - return HTTP.putVersioned(this.http, url, dto, version) - .do(() => { + return HTTP.putVersioned(this.http, url, dto, version).pipe( + tap(() => { this.analytics.trackEvent('Rule', 'Updated', appName); - }) - .pretifyError('Failed to update rule. Please reload.'); + }), + pretifyError('Failed to update rule. Please reload.')); } public enableRule(appName: string, id: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules/${id}/enable`); - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { + return HTTP.putVersioned(this.http, url, {}, version).pipe( + tap(() => { this.analytics.trackEvent('Rule', 'Updated', appName); - }) - .pretifyError('Failed to enable rule. Please reload.'); + }), + pretifyError('Failed to enable rule. Please reload.')); } public disableRule(appName: string, id: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules/${id}/disable`); - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { + return HTTP.putVersioned(this.http, url, {}, version).pipe( + tap(() => { this.analytics.trackEvent('Rule', 'Updated', appName); - }) - .pretifyError('Failed to disable rule. Please reload.'); + }), + pretifyError('Failed to disable rule. Please reload.')); } public deleteRule(appName: string, id: string, version: Version): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules/${id}`); - return HTTP.deleteVersioned(this.http, url, version) - .do(() => { + return HTTP.deleteVersioned(this.http, url, version).pipe( + tap(() => { this.analytics.trackEvent('Rule', 'Deleted', appName); - }) - .pretifyError('Failed to delete rule. Please reload.'); + }), + pretifyError('Failed to delete rule. Please reload.')); } public getEvents(appName: string, take: number, skip: number): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules/events?take=${take}&skip=${skip}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body.items; @@ -227,17 +243,17 @@ export class RulesService { item.jobResult, item.numCalls); })); - }) - .pretifyError('Failed to load events. Please reload.'); + }), + pretifyError('Failed to load events. Please reload.')); } public enqueueEvent(appName: string, id: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/rules/events/${id}`); - return HTTP.putVersioned(this.http, url, {}) - .do(() => { + return HTTP.putVersioned(this.http, url, {}).pipe( + tap(() => { this.analytics.trackEvent('Rule', 'EventEnqueued', appName); - }) - .pretifyError('Failed to enqueue rule event. Please reload.'); + }), + pretifyError('Failed to enqueue rule event. Please reload.')); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/schemas.fields.spec.ts b/src/Squidex/app/shared/services/schemas.fields.spec.ts deleted file mode 100644 index 323cac607..000000000 --- a/src/Squidex/app/shared/services/schemas.fields.spec.ts +++ /dev/null @@ -1,351 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { DateTime } from '@app/framework'; - -import { - AssetsFieldPropertiesDto, - BooleanFieldPropertiesDto, - DateTimeFieldPropertiesDto, - FieldDto, - FieldPropertiesDto, - GeolocationFieldPropertiesDto, - JsonFieldPropertiesDto, - NumberFieldPropertiesDto, - ReferencesFieldPropertiesDto, - SchemaDetailsDto, - SchemaPropertiesDto, - StringFieldPropertiesDto, - TagsFieldPropertiesDto -} from './../'; - -describe('SchemaDetailsDto', () => { - it('should return label as display name', () => { - const schema = createSchema(new SchemaPropertiesDto('Label'), 1, []); - - expect(schema.displayName).toBe('Label'); - }); - - it('should return name as display name if label is undefined', () => { - const schema = createSchema(new SchemaPropertiesDto(undefined), 1, []); - - expect(schema.displayName).toBe('schema1'); - }); - - it('should return name as display name label is empty', () => { - const schema = createSchema(new SchemaPropertiesDto(''), 1, []); - - expect(schema.displayName).toBe('schema1'); - }); - - it('should return configured fields as list fields if no schema field are declared', () => { - const field1 = createField(new AssetsFieldPropertiesDto(null, null, null, null, false, true), 1); - const field2 = createField(new AssetsFieldPropertiesDto(null, null, null, null, false, false), 2); - const field3 = createField(new AssetsFieldPropertiesDto(null, null, null, null, false, true), 3); - - const schema = createSchema(new SchemaPropertiesDto(''), 1, [field1, field2, field3]); - - expect(schema.listFields).toEqual([field1, field3]); - }); - - it('should return first fields as list fields if no schema field is declared', () => { - const field1 = createField(new AssetsFieldPropertiesDto(null, null, null, null, false, false), 1); - const field2 = createField(new AssetsFieldPropertiesDto(null, null, null, null, false, false), 2); - const field3 = createField(new AssetsFieldPropertiesDto(null, null, null, null, false, false), 3); - - const schema = createSchema(new SchemaPropertiesDto(''), 1, [field1, field2, field3]); - - expect(schema.listFields).toEqual([field1]); - }); - - it('should return empty list fields if fields is empty', () => { - const schema = createSchema(new SchemaPropertiesDto(''), 1, []); - - expect(schema.listFields).toEqual([{ properties: {} }]); - }); -}); - -describe('FieldDto', () => { - it('should return label as display name', () => { - const field = createField(new AssetsFieldPropertiesDto('Label', null, null, null, true, false), 1); - - expect(field.displayName).toBe('Label'); - }); - - it('should return name as display name if label is null', () => { - const field = createField(new AssetsFieldPropertiesDto(null, null, null, null, true, false), 1); - - expect(field.displayName).toBe('field1'); - }); - - it('should return name as display name label is empty', () => { - const field = createField(new AssetsFieldPropertiesDto('', null, null, null, true, false), 1); - - expect(field.displayName).toBe('field1'); - }); - - it('should return placeholder as display placeholder', () => { - const field = createField(new AssetsFieldPropertiesDto(null, null, 'Placeholder', null, true, false), 1); - - expect(field.displayPlaceholder).toBe('Placeholder'); - }); - - it('should return empty as display placeholder if placeholder is null', () => { - const field = createField(new AssetsFieldPropertiesDto(null, null, null, null, true, false)); - - expect(field.displayPlaceholder).toBe(''); - }); - - it('should return localizable if partitioning is language', () => { - const field = createField(new AssetsFieldPropertiesDto(null, null, null, null, true, false), 1, 'language'); - - expect(field.isLocalizable).toBeTruthy(); - }); - - it('should not return localizable if partitioning is invarient', () => { - const field = createField(new AssetsFieldPropertiesDto(null, null, null, null, true, false), 1, 'invariant'); - - expect(field.isLocalizable).toBeFalsy(); - }); -}); - -describe('AssetsField', () => { - const field = createField(new AssetsFieldPropertiesDto(null, null, null, null, true, false, 1, 1)); - - it('should create validators', () => { - expect(field.createValidators(false).length).toBe(3); - }); - - it('should format to empty string if null', () => { - expect(field.formatValue(null)).toBe(''); - }); - - it('should format to asset count', () => { - expect(field.formatValue([1, 2, 3])).toBe('3 Asset(s)'); - }); - - it('should return zero formatting if other type', () => { - expect(field.formatValue(1)).toBe('0 Assets'); - }); - - it('should return null for default properties', () => { - expect(field.defaultValue()).toBeNull(); - }); -}); - -describe('TagsField', () => { - const field = createField(new TagsFieldPropertiesDto(null, null, null, null, true, false, 1, 1)); - - it('should create validators', () => { - expect(field.createValidators(false).length).toBe(3); - }); - - it('should format to empty string if null', () => { - expect(field.formatValue(null)).toBe(''); - }); - - it('should format to asset count', () => { - expect(field.formatValue(['hello', 'squidex', 'cms'])).toBe('hello, squidex, cms'); - }); - - it('should return zero formatting if other type', () => { - expect(field.formatValue(1)).toBe(''); - }); - - it('should return null for default properties', () => { - expect(field.defaultValue()).toBeNull(); - }); -}); - -describe('BooleanField', () => { - const field = createField(new BooleanFieldPropertiesDto(null, null, null, null, true, false, false, 'Checkbox')); - - it('should create validators', () => { - expect(field.createValidators(false).length).toBe(1); - }); - - it('should format to empty string if null', () => { - expect(field.formatValue(null)).toBe(''); - }); - - it('should format to Yes if true', () => { - expect(field.formatValue(true)).toBe('Yes'); - }); - - it('should format to No if false', () => { - expect(field.formatValue(false)).toBe('No'); - }); - - it('should return default value for default properties', () => { - Object.assign(field.properties, { defaultValue: true }); - - expect(field.defaultValue()).toBeTruthy(); - }); -}); - -describe('DateTimeField', () => { - const now = DateTime.parseISO_UTC('2017-10-12T16:30:10Z'); - const field = createField(new DateTimeFieldPropertiesDto(null, null, null, null, true, false, 'Date')); - - it('should create validators', () => { - expect(field.createValidators(false).length).toBe(1); - }); - - it('should format to empty string if null', () => { - expect(field.formatValue(null)).toBe(''); - }); - - it('should format to input if parsing failed', () => { - expect(field.formatValue(true)).toBe(true); - }); - - it('should format to date', () => { - const dateField = createField(new DateTimeFieldPropertiesDto(null, null, null, null, true, false, 'Date')); - - expect(dateField.formatValue('2017-12-12T16:00:00Z')).toBe('2017-12-12'); - }); - - it('should format to date time', () => { - const dateTimeField = createField(new DateTimeFieldPropertiesDto(null, null, null, null, true, false, 'DateTime')); - - expect(dateTimeField.formatValue('2017-12-12T16:00:00Z')).toBe('2017-12-12 16:00:00'); - }); - - it('should return default for DateFieldProperties', () => { - Object.assign(field.properties, { defaultValue: '2017-10-12T16:00:00Z' }); - - expect(field.defaultValue()).toEqual('2017-10-12T16:00:00Z'); - }); - - it('should return calculated date when Today for DateFieldProperties', () => { - Object.assign(field.properties, { calculatedDefaultValue: 'Today' }); - - expect((field).properties.getDefaultValue(now)).toEqual('2017-10-12'); - }); - - it('should return calculated date when Now for DateFieldProperties', () => { - Object.assign(field.properties, { calculatedDefaultValue: 'Now' }); - - expect((field).properties.getDefaultValue(now)).toEqual('2017-10-12T16:30:10Z'); - }); -}); - -describe('GeolocationField', () => { - const field = createField(new GeolocationFieldPropertiesDto(null, null, null, null, true, false, 'Default')); - - it('should create validators', () => { - expect(field.createValidators(false).length).toBe(1); - }); - - it('should format to empty string if null', () => { - expect(field.formatValue(null)).toBe(''); - }); - - it('should format to latitude and longitude', () => { - expect(field.formatValue({ latitude: 42, longitude: 3.14 })).toBe('3.14, 42'); - }); - - it('should return null for default properties', () => { - expect(field.defaultValue()).toBeNull(); - }); -}); - -describe('JsonField', () => { - const field = createField(new JsonFieldPropertiesDto(null, null, null, null, true, false)); - - it('should create validators', () => { - expect(field.createValidators(false).length).toBe(1); - }); - - it('should format to empty string if null', () => { - expect(field.formatValue(null)).toBe(''); - }); - - it('should format to constant', () => { - expect(field.formatValue({})).toBe(''); - }); - - it('should return null for default properties', () => { - expect(field.defaultValue()).toBeNull(); - }); -}); - -describe('NumberField', () => { - const field = createField(new NumberFieldPropertiesDto(null, null, null, null, true, false, false, 'Input', undefined, 3, 1, [1, 2, 3])); - - it('should create validators', () => { - expect(field.createValidators(false).length).toBe(4); - }); - - it('should format to empty string if null', () => { - expect(field.formatValue(null)).toBe(''); - }); - - it('should format to number', () => { - expect(field.formatValue(42)).toBe(42); - }); - - it('should return default value for default properties', () => { - Object.assign(field.properties, { defaultValue: 13 }); - - expect(field.defaultValue()).toEqual(13); - }); -}); - -describe('ReferencesField', () => { - const field = createField(new ReferencesFieldPropertiesDto(null, null, null, null, true, false, 1, 1)); - - it('should create validators', () => { - expect(field.createValidators(false).length).toBe(3); - }); - - it('should format to empty string if null', () => { - expect(field.formatValue(null)).toBe(''); - }); - - it('should format to asset count', () => { - expect(field.formatValue([1, 2, 3])).toBe('3 Reference(s)'); - }); - - it('should return zero formatting if other type', () => { - expect(field.formatValue(1)).toBe('0 References'); - }); - - it('should return null for default properties', () => { - expect(field.defaultValue()).toBeNull(); - }); -}); - -describe('StringField', () => { - const field = createField(new StringFieldPropertiesDto(null, null, null, null, true, false, false, 'Input', undefined, 'pattern', undefined, 3, 1, ['1', '2'])); - - it('should create validators', () => { - expect(field.createValidators(false).length).toBe(5); - }); - - it('should format to empty string if null', () => { - expect(field.formatValue(null)).toBe(''); - }); - - it('should format to string', () => { - expect(field.formatValue('hello')).toBe('hello'); - }); - - it('should return default value for default properties', () => { - Object.assign(field.properties, { defaultValue: 'MyDefault' }); - - expect(field.defaultValue()).toEqual('MyDefault'); - }); -}); - -function createSchema(properties: SchemaPropertiesDto, index = 1, fields: FieldDto[]) { - return new SchemaDetailsDto('id' + index, 'schema' + index, '', properties, true, null!, null!, null!, null!, null!, fields); -} - -function createField(properties: FieldPropertiesDto, index = 1, partitioning = 'languages') { - return new FieldDto(index, 'field' + index, false, false, false, partitioning, properties); -} \ No newline at end of file diff --git a/src/Squidex/app/shared/services/schemas.service.spec.ts b/src/Squidex/app/shared/services/schemas.service.spec.ts index efbc37b83..b5d99e774 100644 --- a/src/Squidex/app/shared/services/schemas.service.spec.ts +++ b/src/Squidex/app/shared/services/schemas.service.spec.ts @@ -16,6 +16,8 @@ import { CreateSchemaDto, DateTime, FieldDto, + NestedFieldDto, + RootFieldDto, SchemaDetailsDto, SchemaDto, SchemaPropertiesDto, @@ -56,7 +58,7 @@ describe('SchemasService', () => { it('should make get request to get schemas', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - let schemas: SchemaDto[] | null = null; + let schemas: SchemaDto[]; schemasService.getSchemas('my-app').subscribe(result => { schemas = result; @@ -102,22 +104,23 @@ describe('SchemasService', () => { } ]); - expect(schemas).toEqual([ - new SchemaDto('id1', 'name1', 'category1', new SchemaPropertiesDto('label1', 'hints1'), true, 'Created1', 'LastModifiedBy1', - DateTime.parseISO_UTC('2016-12-12T10:10'), - DateTime.parseISO_UTC('2017-12-12T10:10'), - new Version('11')), - new SchemaDto('id2', 'name2', 'category2', new SchemaPropertiesDto('label2', 'hints2'), true, 'Created2', 'LastModifiedBy2', - DateTime.parseISO_UTC('2016-10-12T10:10'), - DateTime.parseISO_UTC('2017-10-12T10:10'), - new Version('22')) - ]); + expect(schemas!).toEqual( + [ + new SchemaDto('id1', 'name1', 'category1', new SchemaPropertiesDto('label1', 'hints1'), true, + DateTime.parseISO_UTC('2016-12-12T10:10'), 'Created1', + DateTime.parseISO_UTC('2017-12-12T10:10'), 'LastModifiedBy1', + new Version('11')), + new SchemaDto('id2', 'name2', 'category2', new SchemaPropertiesDto('label2', 'hints2'), true, + DateTime.parseISO_UTC('2016-10-12T10:10'), 'Created2', + DateTime.parseISO_UTC('2017-10-12T10:10'), 'LastModifiedBy2', + new Version('22')) + ]); })); it('should make get request to get schema', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - let schema: SchemaDetailsDto | null = null; + let schema: SchemaDetailsDto; schemasService.getSchema('my-app', 'my-schema').subscribe(result => { schema = result; @@ -143,30 +146,52 @@ describe('SchemasService', () => { }, fields: [ { - fieldId: 1, - name: 'field1', + fieldId: 11, + name: 'field11', isLocked: true, isHidden: true, isDisabled: true, partitioning: 'language', properties: { - fieldType: 'Number' - } + fieldType: 'Array' + }, + nested: [ + { + fieldId: 101, + name: 'field101', + isLocked: true, + isHidden: true, + isDisabled: true, + properties: { + fieldType: 'String' + } + }, + { + fieldId: 102, + name: 'field102', + isLocked: true, + isHidden: true, + isDisabled: true, + properties: { + fieldType: 'Number' + } + } + ] }, { - fieldId: 2, - name: 'field2', + fieldId: 12, + name: 'field12', isLocked: true, isHidden: true, isDisabled: true, partitioning: 'language', properties: { - fieldType: 'String' + fieldType: 'Assets' } }, { - fieldId: 3, - name: 'field3', + fieldId: 13, + name: 'field13', isLocked: true, isHidden: true, isDisabled: true, @@ -176,8 +201,8 @@ describe('SchemasService', () => { } }, { - fieldId: 4, - name: 'field4', + fieldId: 14, + name: 'field14', isLocked: true, isHidden: true, isDisabled: true, @@ -187,41 +212,41 @@ describe('SchemasService', () => { } }, { - fieldId: 5, - name: 'field5', + fieldId: 15, + name: 'field15', isLocked: true, isHidden: true, isDisabled: true, partitioning: 'language', properties: { - fieldType: 'Json' + fieldType: 'Geolocation' } }, { - fieldId: 6, - name: 'field6', + fieldId: 16, + name: 'field16', isLocked: true, isHidden: true, isDisabled: true, partitioning: 'language', properties: { - fieldType: 'Geolocation' + fieldType: 'Json' } }, { - fieldId: 7, - name: 'field7', + fieldId: 17, + name: 'field17', isLocked: true, isHidden: true, isDisabled: true, partitioning: 'language', properties: { - fieldType: 'Assets' + fieldType: 'Number' } }, { - fieldId: 8, - name: 'field8', + fieldId: 18, + name: 'field18', isLocked: true, isHidden: true, isDisabled: true, @@ -231,8 +256,19 @@ describe('SchemasService', () => { } }, { - fieldId: 9, - name: 'field9', + fieldId: 19, + name: 'field19', + isLocked: true, + isHidden: true, + isDisabled: true, + partitioning: 'language', + properties: { + fieldType: 'String' + } + }, + { + fieldId: 20, + name: 'field20', isLocked: true, isHidden: true, isDisabled: true, @@ -253,21 +289,25 @@ describe('SchemasService', () => { } }); - expect(schema).toEqual( - new SchemaDetailsDto('id1', 'name1', 'category1', new SchemaPropertiesDto('label1', 'hints1'), true, 'Created1', 'LastModifiedBy1', - DateTime.parseISO_UTC('2016-12-12T10:10'), - DateTime.parseISO_UTC('2017-12-12T10:10'), + expect(schema!).toEqual( + new SchemaDetailsDto('id1', 'name1', 'category1', new SchemaPropertiesDto('label1', 'hints1'), true, + DateTime.parseISO_UTC('2016-12-12T10:10'), 'Created1', + DateTime.parseISO_UTC('2017-12-12T10:10'), 'LastModifiedBy1', new Version('2'), [ - new FieldDto(1, 'field1', true, true, true, 'language', createProperties('Number')), - new FieldDto(2, 'field2', true, true, true, 'language', createProperties('String')), - new FieldDto(3, 'field3', true, true, true, 'language', createProperties('Boolean')), - new FieldDto(4, 'field4', true, true, true, 'language', createProperties('DateTime')), - new FieldDto(5, 'field5', true, true, true, 'language', createProperties('Json')), - new FieldDto(6, 'field6', true, true, true, 'language', createProperties('Geolocation')), - new FieldDto(7, 'field7', true, true, true, 'language', createProperties('Assets')), - new FieldDto(8, 'field8', true, true, true, 'language', createProperties('References')), - new FieldDto(9, 'field9', true, true, true, 'language', createProperties('Tags')) + new RootFieldDto(11, 'field11', createProperties('Array'), 'language', true, true, true, [ + new NestedFieldDto(101, 'field101', createProperties('String'), 11, true, true, true), + new NestedFieldDto(102, 'field102', createProperties('Number'), 11, true, true, true) + ]), + new RootFieldDto(12, 'field12', createProperties('Assets'), 'language', true, true, true), + new RootFieldDto(13, 'field13', createProperties('Boolean'), 'language', true, true, true), + new RootFieldDto(14, 'field14', createProperties('DateTime'), 'language', true, true, true), + new RootFieldDto(15, 'field15', createProperties('Geolocation'), 'language', true, true, true), + new RootFieldDto(16, 'field16', createProperties('Json'), 'language', true, true, true), + new RootFieldDto(17, 'field17', createProperties('Number'), 'language', true, true, true), + new RootFieldDto(18, 'field18', createProperties('References'), 'language', true, true, true), + new RootFieldDto(19, 'field19', createProperties('String'), 'language', true, true, true), + new RootFieldDto(20, 'field20', createProperties('Tags'), 'language', true, true, true) ], '', '', @@ -281,7 +321,7 @@ describe('SchemasService', () => { const dto = new CreateSchemaDto('name'); - let schema: SchemaDetailsDto | null = null; + let schema: SchemaDetailsDto; schemasService.postSchema('my-app', dto, user, now).subscribe(result => { schema = result; @@ -300,8 +340,53 @@ describe('SchemasService', () => { } }); - expect(schema).toEqual( - new SchemaDetailsDto('1', dto.name, '', new SchemaPropertiesDto(), false, user, user, now, now, new Version('2'), [])); + expect(schema!).toEqual( + new SchemaDetailsDto('1', dto.name, '', new SchemaPropertiesDto(), false, now, user, now, user, new Version('2'), [])); + })); + + it('should make put request to update schema', + inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { + + const dto = new UpdateSchemaDto('label', 'hints'); + + schemasService.putSchema('my-app', 'my-schema', dto, version).subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema'); + + expect(req.request.method).toEqual('PUT'); + expect(req.request.headers.get('If-Match')).toBe(version.value); + + req.flush({}); + })); + + it('should make put request to update schema scripts', + inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { + + const dto = new UpdateSchemaScriptsDto(); + + schemasService.putScripts('my-app', 'my-schema', dto, version).subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/scripts'); + + expect(req.request.method).toEqual('PUT'); + expect(req.request.headers.get('If-Match')).toBe(version.value); + + req.flush({}); + })); + + it('should make put request to update category', + inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { + + const dto = new UpdateSchemaCategoryDto(); + + schemasService.putCategory('my-app', 'my-schema', dto, version).subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/category'); + + expect(req.request.method).toEqual('PUT'); + expect(req.request.headers.get('If-Match')).toBe(version.value); + + req.flush({}); })); it('should make post request to add field', @@ -309,9 +394,9 @@ describe('SchemasService', () => { const dto = new AddFieldDto('name', 'invariant', createProperties('Number')); - let field: FieldDto | null = null; + let field: FieldDto; - schemasService.postField('my-app', 'my-schema', dto, version).subscribe(result => { + schemasService.postField('my-app', 'my-schema', dto, undefined, version).subscribe(result => { field = result.payload; }); @@ -322,18 +407,15 @@ describe('SchemasService', () => { req.flush({ id: 123 }); - expect(field).toEqual( - new FieldDto(123, dto.name, false, false, false, dto.partitioning, dto.properties)); + expect(field!).toEqual(new RootFieldDto(123, dto.name, dto.properties, dto.partitioning)); })); - it('should make put request to update schema', + it('should make put request to publish schema', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - const dto = new UpdateSchemaDto('label', 'hints'); - - schemasService.putSchema('my-app', 'my-schema', dto, version).subscribe(); + schemasService.publishSchema('my-app', 'my-schema', version).subscribe(); - const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema'); + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/publish'); expect(req.request.method).toEqual('PUT'); expect(req.request.headers.get('If-Match')).toBe(version.value); @@ -341,14 +423,12 @@ describe('SchemasService', () => { req.flush({}); })); - it('should make put request to update schema scripts', + it('should make put request to unpublish schema', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - const dto = new UpdateSchemaScriptsDto(); - - schemasService.putScripts('my-app', 'my-schema', dto, version).subscribe(); + schemasService.unpublishSchema('my-app', 'my-schema', version).subscribe(); - const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/scripts'); + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/unpublish'); expect(req.request.method).toEqual('PUT'); expect(req.request.headers.get('If-Match')).toBe(version.value); @@ -356,19 +436,25 @@ describe('SchemasService', () => { req.flush({}); })); - it('should make put request to update category', + it('should make post request to add nested field', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - const dto = new UpdateSchemaCategoryDto(); + const dto = new AddFieldDto('name', 'invariant', createProperties('Number')); - schemasService.putCategory('my-app', 'my-schema', dto, version).subscribe(); + let field: FieldDto; - const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/category'); + schemasService.postField('my-app', 'my-schema', dto, 13, version).subscribe(result => { + field = result.payload; + }); - expect(req.request.method).toEqual('PUT'); + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/13/nested'); + + expect(req.request.method).toEqual('POST'); expect(req.request.headers.get('If-Match')).toBe(version.value); - req.flush({}); + req.flush({ id: 123 }); + + expect(field!).toEqual(new NestedFieldDto(123, dto.name, dto.properties, 13)); })); it('should make put request to update field', @@ -376,7 +462,7 @@ describe('SchemasService', () => { const dto = new UpdateFieldDto(createProperties('Number')); - schemasService.putField('my-app', 'my-schema', 1, dto, version).subscribe(); + schemasService.putField('my-app', 'my-schema', 1, dto, undefined, version).subscribe(); const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/1'); @@ -386,12 +472,27 @@ describe('SchemasService', () => { req.flush({}); })); + it('should make put request to update nested field', + inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { + + const dto = new UpdateFieldDto(createProperties('Number')); + + schemasService.putField('my-app', 'my-schema', 1, dto, 13, version).subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/13/nested/1'); + + expect(req.request.method).toEqual('PUT'); + expect(req.request.headers.get('If-Match')).toBe(version.value); + + req.flush({}); + })); + it('should make put request to update field ordering', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { const dto = [1, 2, 3]; - schemasService.putFieldOrdering('my-app', 'my-schema', dto, version).subscribe(); + schemasService.putFieldOrdering('my-app', 'my-schema', dto, undefined, version).subscribe(); const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/ordering'); @@ -401,12 +502,14 @@ describe('SchemasService', () => { req.flush({}); })); - it('should make put request to publish schema', + it('should make put request to update nested field ordering', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - schemasService.publishSchema('my-app', 'my-schema', version).subscribe(); + const dto = [1, 2, 3]; - const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/publish'); + schemasService.putFieldOrdering('my-app', 'my-schema', dto, 13, version).subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/13/nested/ordering'); expect(req.request.method).toEqual('PUT'); expect(req.request.headers.get('If-Match')).toBe(version.value); @@ -414,12 +517,25 @@ describe('SchemasService', () => { req.flush({}); })); - it('should make put request to unpublish schema', + it('should make put request to lock field', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - schemasService.unpublishSchema('my-app', 'my-schema', version).subscribe(); + schemasService.lockField('my-app', 'my-schema', 1, undefined, version).subscribe(); - const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/unpublish'); + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/1/lock'); + + expect(req.request.method).toEqual('PUT'); + expect(req.request.headers.get('If-Match')).toBe(version.value); + + req.flush({}); + })); + + it('should make put request to lock nested field', + inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { + + schemasService.lockField('my-app', 'my-schema', 1, 13, version).subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/13/nested/1/lock'); expect(req.request.method).toEqual('PUT'); expect(req.request.headers.get('If-Match')).toBe(version.value); @@ -430,7 +546,7 @@ describe('SchemasService', () => { it('should make put request to enable field', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - schemasService.enableField('my-app', 'my-schema', 1, version).subscribe(); + schemasService.enableField('my-app', 'my-schema', 1, undefined, version).subscribe(); const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/1/enable'); @@ -440,10 +556,23 @@ describe('SchemasService', () => { req.flush({}); })); + it('should make put request to enable nested field', + inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { + + schemasService.enableField('my-app', 'my-schema', 1, 13, version).subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/13/nested/1/enable'); + + expect(req.request.method).toEqual('PUT'); + expect(req.request.headers.get('If-Match')).toBe(version.value); + + req.flush({}); + })); + it('should make put request to disable field', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - schemasService.disableField('my-app', 'my-schema', 1, version).subscribe(); + schemasService.disableField('my-app', 'my-schema', 1, undefined, version).subscribe(); const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/1/disable'); @@ -453,12 +582,12 @@ describe('SchemasService', () => { req.flush({}); })); - it('should make put request to lock field', + it('should make put request to disable nested field', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - schemasService.lockField('my-app', 'my-schema', 1, version).subscribe(); + schemasService.disableField('my-app', 'my-schema', 1, 13, version).subscribe(); - const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/1/lock'); + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/13/nested/1/disable'); expect(req.request.method).toEqual('PUT'); expect(req.request.headers.get('If-Match')).toBe(version.value); @@ -469,7 +598,7 @@ describe('SchemasService', () => { it('should make put request to show field', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - schemasService.showField('my-app', 'my-schema', 1, version).subscribe(); + schemasService.showField('my-app', 'my-schema', 1, undefined, version).subscribe(); const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/1/show'); @@ -479,10 +608,23 @@ describe('SchemasService', () => { req.flush({}); })); + it('should make put request to show nested field', + inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { + + schemasService.showField('my-app', 'my-schema', 1, 13, version).subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/13/nested/1/show'); + + expect(req.request.method).toEqual('PUT'); + expect(req.request.headers.get('If-Match')).toBe(version.value); + + req.flush({}); + })); + it('should make put request to hide field', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - schemasService.hideField('my-app', 'my-schema', 1, version).subscribe(); + schemasService.hideField('my-app', 'my-schema', 1, undefined, version).subscribe(); const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/1/hide'); @@ -492,10 +634,23 @@ describe('SchemasService', () => { req.flush({}); })); + it('should make put request to hide nested field', + inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { + + schemasService.hideField('my-app', 'my-schema', 1, 13, version).subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/13/nested/1/hide'); + + expect(req.request.method).toEqual('PUT'); + expect(req.request.headers.get('If-Match')).toBe(version.value); + + req.flush({}); + })); + it('should make delete request to delete field', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { - schemasService.deleteField('my-app', 'my-schema', 1, version).subscribe(); + schemasService.deleteField('my-app', 'my-schema', 1, undefined, version).subscribe(); const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/1'); @@ -505,6 +660,19 @@ describe('SchemasService', () => { req.flush({}); })); + it('should make delete request to delete nested field', + inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { + + schemasService.deleteField('my-app', 'my-schema', 1, 13, version).subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/schemas/my-schema/fields/13/nested/1'); + + expect(req.request.method).toEqual('DELETE'); + expect(req.request.headers.get('If-Match')).toBe(version.value); + + req.flush({}); + })); + it('should make delete request to delete schema', inject([SchemasService, HttpTestingController], (schemasService: SchemasService, httpMock: HttpTestingController) => { diff --git a/src/Squidex/app/shared/services/schemas.service.ts b/src/Squidex/app/shared/services/schemas.service.ts index 2b56c4a6b..6d4f3eb5e 100644 --- a/src/Squidex/app/shared/services/schemas.service.ts +++ b/src/Squidex/app/shared/services/schemas.service.ts @@ -7,99 +7,27 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { ValidatorFn, Validators } from '@angular/forms'; import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { map, tap } from 'rxjs/operators'; import { AnalyticsService, ApiUrlConfig, DateTime, HTTP, + Model, + pretifyError, StringHelper, - ValidatorsEx, Version, Versioned } from '@app/framework'; -export const fieldTypes = [ - { - type: 'String', - description: 'Titles, names, paragraphs.' - }, { - type: 'Assets', - description: 'Images, videos, documents.' - }, { - type: 'Boolean', - description: 'Yes or no, true or false.' - }, { - type: 'DateTime', - description: 'Events date, opening hours.' - }, { - type: 'Geolocation', - description: 'Coordinates: latitude and longitude.' - }, { - type: 'Json', - description: 'Data in JSON format, for developers.' - }, { - type: 'Number', - description: 'ID, order number, rating, quantity.' - }, { - type: 'References', - description: 'Links to other content items.' - }, { - type: 'Tags', - description: 'Special format for tags.' - } -]; - -export const fieldInvariant = 'iv'; - -export function createProperties(fieldType: string, values: Object | null = null): FieldPropertiesDto { - let properties: FieldPropertiesDto; - - switch (fieldType) { - case 'Number': - properties = new NumberFieldPropertiesDto(null, null, null, null, false, false, false, 'Input'); - break; - case 'String': - properties = new StringFieldPropertiesDto(null, null, null, null, false, false, false, 'Input'); - break; - case 'Boolean': - properties = new BooleanFieldPropertiesDto(null, null, null, null, false, false, false, 'Checkbox'); - break; - case 'DateTime': - properties = new DateTimeFieldPropertiesDto(null, null, null, null, false, false, 'DateTime'); - break; - case 'Geolocation': - properties = new GeolocationFieldPropertiesDto(null, null, null, null, false, false, 'Map'); - break; - case 'Json': - properties = new JsonFieldPropertiesDto(null, null, null, null, false, false); - break; - case 'References': - properties = new ReferencesFieldPropertiesDto(null, null, null, null, false, false); - break; - case 'Assets': - properties = new AssetsFieldPropertiesDto(null, null, null, null, false, false); - break; - case 'Tags': - properties = new TagsFieldPropertiesDto(null, null, null, null, false, false); - break; - default: - throw 'Invalid properties type'; - } - - if (values) { - Object.assign(properties, values); - } - - return properties; -} +import { createProperties, FieldPropertiesDto } from './schemas.types'; -export class SchemaDto { - public readonly displayName = StringHelper.firstNonEmpty(this.properties.label, this.name); +export class SchemaDto extends Model { + public get displayName() { + return StringHelper.firstNonEmpty(this.properties.label, this.name); + } constructor( public readonly id: string, @@ -107,481 +35,124 @@ export class SchemaDto { public readonly category: string, public readonly properties: SchemaPropertiesDto, public readonly isPublished: boolean, - public readonly createdBy: string, - public readonly lastModifiedBy: string, public readonly created: DateTime, + public readonly createdBy: string, public readonly lastModified: DateTime, + public readonly lastModifiedBy: string, public readonly version: Version ) { + super(); + } + + public with(value: Partial): SchemaDto { + return this.clone(value); } } export class SchemaDetailsDto extends SchemaDto { - public readonly listFields: FieldDto[]; + public listFields: RootFieldDto[]; + public listFieldsEditable: RootFieldDto[]; - constructor(id: string, name: string, category: string, properties: SchemaPropertiesDto, isPublished: boolean, createdBy: string, lastModifiedBy: string, created: DateTime, lastModified: DateTime, version: Version, - public readonly fields: FieldDto[], + constructor(id: string, name: string, category: string, properties: SchemaPropertiesDto, isPublished: boolean, created: DateTime, createdBy: string, lastModified: DateTime, lastModifiedBy: string, version: Version, + public readonly fields: RootFieldDto[], public readonly scriptQuery?: string, public readonly scriptCreate?: string, public readonly scriptUpdate?: string, public readonly scriptDelete?: string, public readonly scriptChange?: string ) { - super(id, name, category, properties, isPublished, createdBy, lastModifiedBy, created, lastModified, version); - - this.listFields = this.fields.filter(x => x.properties.isListField); - - if (this.listFields.length === 0 && this.fields.length > 0) { - this.listFields = [this.fields[0]]; - } - - if (this.listFields.length === 0) { - this.listFields = [{ properties: {} }]; - } - } -} - -export class FieldDto { - public readonly displayName = StringHelper.firstNonEmpty(this.properties.label, this.name); - public readonly displayPlaceholder = this.properties.placeholder || ''; - - public readonly isLocalizable = this.partitioning !== 'invariant'; - - constructor( - public readonly fieldId: number, - public readonly name: string, - public readonly isLocked: boolean, - public readonly isHidden: boolean, - public readonly isDisabled: boolean, - public readonly partitioning: string, - public readonly properties: FieldPropertiesDto - ) { - } - - public formatValue(value: any): string { - return this.properties.formatValue(value); - } - - public createValidators(isOptional: boolean): ValidatorFn[] { - return this.properties.createValidators(isOptional); - } - - public defaultValue(): any { - return this.properties.getDefaultValue(); - } -} - -export abstract class FieldPropertiesDto { - constructor( - public readonly fieldType: string, - public readonly label: string | null, - public readonly hints: string | null, - public readonly placeholder: string | null, - public readonly editorUrl: string | null, - public readonly isRequired: boolean, - public readonly isListField: boolean - ) { - } - - public abstract formatValue(value: any): string; - - public abstract createValidators(isOptional: boolean): ValidatorFn[]; - - public getDefaultValue(): any { - return null; - } -} - -export class StringFieldPropertiesDto extends FieldPropertiesDto { - constructor(label: string | null, hints: string | null, placeholder: string | null, editorUrl: string | null, - isRequired: boolean, - isListField: boolean, - public readonly inlineEditable: boolean, - public readonly editor: string, - public readonly defaultValue?: string, - public readonly pattern?: string, - public readonly patternMessage?: string, - public readonly minLength?: number, - public readonly maxLength?: number, - public readonly allowedValues?: string[] - ) { - super('String', label, hints, placeholder, editorUrl, isRequired, isListField); - } - - public formatValue(value: any): string { - if (!value) { - return ''; - } - - return value; - } - - public createValidators(isOptional: false): ValidatorFn[] { - const validators: ValidatorFn[] = []; - - if (this.isRequired && !isOptional) { - validators.push(Validators.required); - } - - if (this.minLength) { - validators.push(Validators.minLength(this.minLength)); - } - - if (this.maxLength) { - validators.push(Validators.maxLength(this.maxLength)); - } - - if (this.pattern && this.pattern.length > 0) { - validators.push(ValidatorsEx.pattern(this.pattern, this.patternMessage)); - } - - if (this.allowedValues && this.allowedValues.length > 0) { - const values: (string | null)[] = this.allowedValues; - - if (this.isRequired && !isOptional) { - validators.push(ValidatorsEx.validValues(values)); - } else { - validators.push(ValidatorsEx.validValues(values.concat([null]))); - } - } - - return validators; - } - - public getDefaultValue(): any { - return this.defaultValue; - } -} - -export class NumberFieldPropertiesDto extends FieldPropertiesDto { - constructor(label: string | null, hints: string | null, placeholder: string | null, editorUrl: string | null, - isRequired: boolean, - isListField: boolean, - public readonly inlineEditable: boolean, - public readonly editor: string, - public readonly defaultValue?: number, - public readonly maxValue?: number, - public readonly minValue?: number, - public readonly allowedValues?: number[] - ) { - super('Number', label, hints, placeholder, editorUrl, isRequired, isListField); - } + super(id, name, category, properties, isPublished, created, createdBy, lastModified, lastModifiedBy, version); - public formatValue(value: any): string { - if (!value) { - return ''; - } - - return value; + this.onCloned(); } - public createValidators(isOptional: boolean): ValidatorFn[] { - const validators: ValidatorFn[] = []; + protected onCloned() { + if (this.fields) { + let fields = this.fields.filter(x => x.properties.isListField); - if (this.isRequired && !isOptional) { - validators.push(Validators.required); - } - - if (this.minValue) { - validators.push(Validators.min(this.minValue)); - } - - if (this.maxValue) { - validators.push(Validators.max(this.maxValue)); - } - - if (this.allowedValues && this.allowedValues.length > 0) { - const values: (number | null)[] = this.allowedValues; - - if (this.isRequired && !isOptional) { - validators.push(ValidatorsEx.validValues(values)); - } else { - validators.push(ValidatorsEx.validValues(values.concat([null]))); + if (fields.length === 0 && this.fields.length > 0) { + fields = [this.fields[0]]; } - } - - return validators; - } - - public getDefaultValue(): any { - return this.defaultValue; - } -} - -export class DateTimeFieldPropertiesDto extends FieldPropertiesDto { - constructor(label: string | null, hints: string | null, placeholder: string | null, editorUrl: string | null, - isRequired: boolean, - isListField: boolean, - public readonly editor: string, - public readonly defaultValue?: string, - public readonly maxValue?: string, - public readonly minValue?: string, - public readonly calculatedDefaultValue?: string - ) { - super('DateTime', label, hints, placeholder, editorUrl, isRequired, isListField); - } - - public formatValue(value: any): string { - if (!value) { - return ''; - } - - try { - const parsed = DateTime.parseISO_UTC(value); - if (this.editor === 'Date') { - return parsed.toUTCStringFormat('YYYY-MM-DD'); - } else { - return parsed.toUTCStringFormat('YYYY-MM-DD HH:mm:ss'); + if (fields.length === 0) { + fields = [{ properties: {} }]; } - } catch (ex) { - return value; - } - } - public createValidators(isOptional: boolean): ValidatorFn[] { - const validators: ValidatorFn[] = []; - - if (this.isRequired && !isOptional) { - validators.push(Validators.required); + this.listFields = fields; + this.listFieldsEditable = fields.filter(x => x.isInlineEditable); } - - return validators; } - public getDefaultValue(now?: DateTime): any { - now = now || DateTime.now(); - - if (this.calculatedDefaultValue === 'Now') { - return now.toUTCStringFormat('YYYY-MM-DDTHH:mm:ss') + 'Z'; - } else if (this.calculatedDefaultValue === 'Today') { - return now.toUTCStringFormat('YYYY-MM-DD'); - } else { - return this.defaultValue; - } + public with(value: Partial): SchemaDetailsDto { + return this.clone(value); } } -export class BooleanFieldPropertiesDto extends FieldPropertiesDto { - constructor(label: string | null, hints: string | null, placeholder: string | null, editorUrl: string | null, - isRequired: boolean, - isListField: boolean, - public readonly inlineEditable: boolean, - public readonly editor: string, - public readonly defaultValue?: boolean - ) { - super('Boolean', label, hints, placeholder, editorUrl, isRequired, isListField); +export class FieldDto extends Model { + public get isInlineEditable(): boolean { + return !this.isDisabled && this.properties['inlineEditable'] === true; } - public formatValue(value: any): string { - if (value === null || value === undefined) { - return ''; - } - - return value ? 'Yes' : 'No'; + public get displayName() { + return StringHelper.firstNonEmpty(this.properties.label, this.name); } - public createValidators(isOptional: boolean): ValidatorFn[] { - const validators: ValidatorFn[] = []; - - if (this.isRequired && !isOptional) { - validators.push(Validators.required); - } - - return validators; - } - - public getDefaultValue(): any { - return this.defaultValue; - } -} - -export class GeolocationFieldPropertiesDto extends FieldPropertiesDto { - constructor(label: string | null, hints: string | null, placeholder: string | null, editorUrl: string | null, - isRequired: boolean, - isListField: boolean, - public readonly editor: string - ) { - super('Geolocation', label, hints, placeholder, editorUrl, isRequired, isListField); + public get displayPlaceholder() { + return this.properties.placeholder || ''; } - public formatValue(value: any): string { - if (!value) { - return ''; - } - - return `${value.longitude}, ${value.latitude}`; - } - - public createValidators(isOptional: boolean): ValidatorFn[] { - const validators: ValidatorFn[] = []; - - if (this.isRequired && !isOptional) { - validators.push(Validators.required); - } - - return validators; - } -} - -export class ReferencesFieldPropertiesDto extends FieldPropertiesDto { - constructor(label: string | null, hints: string | null, placeholder: string | null, editorUrl: string | null, - isRequired: boolean, - isListField: boolean, - public readonly minItems?: number, - public readonly maxItems?: number, - public readonly schemaId?: string + constructor( + public readonly fieldId: number, + public readonly name: string, + public readonly properties: FieldPropertiesDto, + public readonly isLocked: boolean = false, + public readonly isHidden: boolean = false, + public readonly isDisabled: boolean = false ) { - super('References', label, hints, placeholder, editorUrl, isRequired, isListField); + super(); } - public formatValue(value: any): string { - if (!value) { - return ''; - } - - if (value.length) { - return `${value.length} Reference(s)`; - } else { - return '0 References'; - } - } - - public createValidators(isOptional: boolean): ValidatorFn[] { - const validators: ValidatorFn[] = []; - - if (this.isRequired && !isOptional) { - validators.push(Validators.required); - } - - if (this.minItems) { - validators.push(Validators.minLength(this.minItems)); - } - - if (this.maxItems) { - validators.push(Validators.maxLength(this.maxItems)); - } - - return validators; + public with(value: Partial): FieldDto { + return this.clone(value); } } -export class AssetsFieldPropertiesDto extends FieldPropertiesDto { - constructor(label: string | null, hints: string | null, placeholder: string | null, editorUrl: string | null, - isRequired: boolean, - isListField: boolean, - public readonly minItems?: number, - public readonly maxItems?: number, - public readonly minSize?: number, - public readonly maxSize?: number, - public readonly allowedExtensions?: string[], - public readonly mustBeImage?: boolean, - public readonly minWidth?: number, - public readonly maxWidth?: number, - public readonly minHeight?: number, - public readonly maxHeight?: number, - public readonly aspectWidth?: number, - public readonly aspectHeight?: number - ) { - super('Assets', label, hints, placeholder, editorUrl, isRequired, isListField); - } - - public formatValue(value: any): string { - if (!value) { - return ''; - } - - if (value.length) { - return `${value.length} Asset(s)`; - } else { - return '0 Assets'; - } +export class RootFieldDto extends FieldDto { + public get isLocalizable() { + return this.partitioning === 'language'; } - public createValidators(isOptional: boolean): ValidatorFn[] { - const validators: ValidatorFn[] = []; - - if (this.isRequired && !isOptional) { - validators.push(Validators.required); - } - - if (this.minItems) { - validators.push(Validators.minLength(this.minItems)); - } - - if (this.maxItems) { - validators.push(Validators.maxLength(this.maxItems)); - } - - return validators; + public get isArray() { + return this.properties.fieldType === 'Array'; } -} -export class TagsFieldPropertiesDto extends FieldPropertiesDto { - constructor(label: string | null, hints: string | null, placeholder: string | null, editorUrl: string | null, - isRequired: boolean, - isListField: boolean, - public readonly minItems?: number, - public readonly maxItems?: number + constructor(fieldId: number, name: string, properties: FieldPropertiesDto, + public readonly partitioning: string, + isLocked: boolean = false, + isHidden: boolean = false, + isDisabled: boolean = false, + public readonly nested: NestedFieldDto[] = [] ) { - super('Tags', label, hints, placeholder, editorUrl, isRequired, isListField); + super(fieldId, name, properties, isLocked, isHidden, isDisabled); } - public formatValue(value: any): string { - if (!value) { - return ''; - } - - if (value.length) { - return value.join(', '); - } else { - return ''; - } - } - - public createValidators(isOptional: boolean): ValidatorFn[] { - const validators: ValidatorFn[] = []; - - if (this.isRequired && !isOptional) { - validators.push(Validators.required); - } - - if (this.minItems) { - validators.push(Validators.minLength(this.minItems)); - } - - if (this.maxItems) { - validators.push(Validators.maxLength(this.maxItems)); - } - - return validators; + public with(value: Partial): RootFieldDto { + return this.clone(value); } } -export class JsonFieldPropertiesDto extends FieldPropertiesDto { - constructor(label: string | null, hints: string | null, placeholder: string | null, editorUrl: string | null, - isRequired: boolean, - isListField: boolean +export class NestedFieldDto extends FieldDto { + constructor(fieldId: number, name: string, properties: FieldPropertiesDto, + public readonly parentId: number, + isLocked: boolean = false, + isHidden: boolean = false, + isDisabled: boolean = false ) { - super('Json', label, hints, placeholder, editorUrl, isRequired, isListField); + super(fieldId, name, properties, isLocked, isHidden, isDisabled); } - public formatValue(value: any): string { - if (!value) { - return ''; - } - - return ''; - } - - public createValidators(isOptional: boolean): ValidatorFn[] { - const validators: ValidatorFn[] = []; - - if (this.isRequired && !isOptional) { - validators.push(Validators.required); - } - - return validators; + public with(value: Partial): NestedFieldDto { + return this.clone(value); } } @@ -593,26 +164,27 @@ export class SchemaPropertiesDto { } } -export class UpdateSchemaDto { +export class AddFieldDto { constructor( - public readonly label?: string, - public readonly hints?: string + public readonly name: string, + public readonly partitioning: string, + public readonly properties: FieldPropertiesDto ) { } } -export class UpdateSchemaCategoryDto { +export class CreateSchemaDto { constructor( - public readonly name?: string + public readonly name: string, + public readonly fields?: RootFieldDto[], + public readonly properties?: SchemaPropertiesDto ) { } } -export class AddFieldDto { +export class UpdateSchemaCategoryDto { constructor( - public readonly name: string, - public readonly partitioning: string, - public readonly properties: FieldPropertiesDto + public readonly name?: string ) { } } @@ -624,11 +196,10 @@ export class UpdateFieldDto { } } -export class CreateSchemaDto { +export class UpdateSchemaDto { constructor( - public readonly name: string, - public readonly fields?: FieldDto[], - public readonly properties?: SchemaPropertiesDto + public readonly label?: string, + public readonly hints?: string ) { } } @@ -656,8 +227,8 @@ export class SchemasService { public getSchemas(appName: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body; @@ -668,24 +239,21 @@ export class SchemasService { return new SchemaDto( item.id, item.name, - item.category, - properties, + item.category, properties, item.isPublished, - item.createdBy, - item.lastModifiedBy, - DateTime.parseISO_UTC(item.created), - DateTime.parseISO_UTC(item.lastModified), + DateTime.parseISO_UTC(item.created), item.createdBy, + DateTime.parseISO_UTC(item.lastModified), item.lastModifiedBy, new Version(item.version.toString())); }); - }) - .pretifyError('Failed to load schemas. Please reload.'); + }), + pretifyError('Failed to load schemas. Please reload.')); } public getSchema(appName: string, id: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${id}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const fields = body.fields.map((item: any) => { @@ -694,14 +262,35 @@ export class SchemasService { item.properties.fieldType, item.properties); - return new FieldDto( + let nested: NestedFieldDto[] | null = null; + + if (item.nested && item.nested.length > 0) { + nested = item.nested.map((nestedItem: any) => { + const nestedPropertiesDto = + createProperties( + nestedItem.properties.fieldType, + nestedItem.properties); + + return new NestedFieldDto( + nestedItem.fieldId, + nestedItem.name, + nestedPropertiesDto, + item.fieldId, + nestedItem.isLocked, + nestedItem.isHidden, + nestedItem.isDisabled); + }); + } + + return new RootFieldDto( item.fieldId, item.name, + propertiesDto, + item.partitioning, item.isLocked, item.isHidden, item.isDisabled, - item.partitioning, - propertiesDto); + nested || []); }); const properties = new SchemaPropertiesDto(body.properties.label, body.properties.hints); @@ -712,10 +301,8 @@ export class SchemasService { body.category, properties, body.isPublished, - body.createdBy, - body.lastModifiedBy, - DateTime.parseISO_UTC(body.created), - DateTime.parseISO_UTC(body.lastModified), + DateTime.parseISO_UTC(body.created), body.createdBy, + DateTime.parseISO_UTC(body.lastModified), body.lastModifiedBy, response.version, fields, body.scriptQuery, @@ -723,15 +310,15 @@ export class SchemasService { body.scriptUpdate, body.scriptDelete, body.scriptChange); - }) - .pretifyError('Failed to load schema. Please reload.'); + }), + pretifyError('Failed to load schema. Please reload.')); } public postSchema(appName: string, dto: CreateSchemaDto, user: string, now: DateTime): Observable { const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas`); - return HTTP.postVersioned(this.http, url, dto) - .map(response => { + return HTTP.postVersioned(this.http, url, dto).pipe( + map(response => { const body = response.payload.body; now = now || DateTime.now(); @@ -742,10 +329,8 @@ export class SchemasService { '', dto.properties || new SchemaPropertiesDto(), false, - user, - user, - now, - now, + now, user, + now, user, response.version, dto.fields || [], body.scriptQuery, @@ -753,174 +338,182 @@ export class SchemasService { body.scriptUpdate, body.scriptDelete, body.scriptChange); - }) - .do(schema => { + }), + tap(schema => { this.analytics.trackEvent('Schema', 'Created', appName); - }) - .pretifyError('Failed to create schema. Please reload.'); - } - - public postField(appName: string, schemaName: string, dto: AddFieldDto, version: Version): Observable> { - const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/fields`); - - return HTTP.postVersioned(this.http, url, dto, version) - .map(response => { - const body = response.payload.body; - - const field = new FieldDto( - body.id, - dto.name, - false, - false, - false, - dto.partitioning, - dto.properties); - - return new Versioned(response.version, field); - }) - .do(() => { - this.analytics.trackEvent('Schema', 'FieldCreated', appName); - }) - .pretifyError('Failed to add field. Please reload.'); + }), + pretifyError('Failed to create schema. Please reload.')); } public deleteSchema(appName: string, schemaName: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}`); - return HTTP.deleteVersioned(this.http, url, version) - .do(() => { + return HTTP.deleteVersioned(this.http, url, version).pipe( + tap(() => { this.analytics.trackEvent('Schema', 'Deleted', appName); - }) - .pretifyError('Failed to delete schema. Please reload.'); + }), + pretifyError('Failed to delete schema. Please reload.')); } public putScripts(appName: string, schemaName: string, dto: UpdateSchemaScriptsDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/scripts`); - return HTTP.putVersioned(this.http, url, dto, version) - .do(() => { + return HTTP.putVersioned(this.http, url, dto, version).pipe( + tap(() => { this.analytics.trackEvent('Schema', 'ScriptsConfigured', appName); - }) - .pretifyError('Failed to update schema scripts. Please reload.'); + }), + pretifyError('Failed to update schema scripts. Please reload.')); } public putSchema(appName: string, schemaName: string, dto: UpdateSchemaDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}`); - return HTTP.putVersioned(this.http, url, dto, version) - .do(() => { + return HTTP.putVersioned(this.http, url, dto, version).pipe( + tap(() => { this.analytics.trackEvent('Schema', 'Updated', appName); - }) - .pretifyError('Failed to update schema. Please reload.'); - } - - public putFieldOrdering(appName: string, schemaName: string, dto: number[], version: Version): Observable> { - const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/fields/ordering`); - - return HTTP.putVersioned(this.http, url, { fieldIds: dto }, version) - .do(() => { - this.analytics.trackEvent('Schema', 'FieldsReordered', appName); - }) - .pretifyError('Failed to reorder fields. Please reload.'); + }), + pretifyError('Failed to update schema. Please reload.')); } public publishSchema(appName: string, schemaName: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/publish`); - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { + return HTTP.putVersioned(this.http, url, {}, version).pipe( + tap(() => { this.analytics.trackEvent('Schema', 'Published', appName); - }) - .pretifyError('Failed to publish schema. Please reload.'); + }), + pretifyError('Failed to publish schema. Please reload.')); } public unpublishSchema(appName: string, schemaName: string, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/unpublish`); - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { + return HTTP.putVersioned(this.http, url, {}, version).pipe( + tap(() => { this.analytics.trackEvent('Schema', 'Unpublished', appName); - }) - .pretifyError('Failed to unpublish schema. Please reload.'); + }), + pretifyError('Failed to unpublish schema. Please reload.')); } public putCategory(appName: string, schemaName: string, dto: UpdateSchemaCategoryDto, version: Version): Observable> { const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/category`); - return HTTP.putVersioned(this.http, url, dto, version) - .do(() => { + return HTTP.putVersioned(this.http, url, dto, version).pipe( + tap(() => { this.analytics.trackEvent('Schema', 'CategoryChanged', appName); - }) - .pretifyError('Failed to change category. Please reload.'); + }), + pretifyError('Failed to change category. Please reload.')); } - public putField(appName: string, schemaName: string, fieldId: number, dto: UpdateFieldDto, version: Version): Observable> { - const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/fields/${fieldId}`); + public postField(appName: string, schemaName: string, dto: AddFieldDto, parentId: number | undefined, version: Version): Observable> { + const url = this.buildUrl(appName, schemaName, parentId, ''); - return HTTP.putVersioned(this.http, url, dto, version) - .do(() => { - this.analytics.trackEvent('Schema', 'FieldUpdated', appName); - }) - .pretifyError('Failed to update field. Please reload.'); + return HTTP.postVersioned(this.http, url, dto, version).pipe( + map(response => { + const body = response.payload.body; + + if (parentId) { + const field = new NestedFieldDto(body.id, dto.name, dto.properties, parentId); + + return new Versioned(response.version, field); + } else { + const field = new RootFieldDto(body.id, dto.name, dto.properties, dto.partitioning); + + return new Versioned(response.version, field); + } + }), + tap(() => { + this.analytics.trackEvent('Schema', 'FieldCreated', appName); + }), + pretifyError('Failed to add field. Please reload.')); } - public enableField(appName: string, schemaName: string, fieldId: number, version: Version): Observable> { - const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/fields/${fieldId}/enable`); + public putFieldOrdering(appName: string, schemaName: string, dto: number[], parentId: number | undefined, version: Version): Observable> { + const url = this.buildUrl(appName, schemaName, parentId, '/ordering'); - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { - this.analytics.trackEvent('Schema', 'FieldEnabled', appName); - }) - .pretifyError('Failed to enable field. Please reload.'); + return HTTP.putVersioned(this.http, url, { fieldIds: dto }, version).pipe( + tap(() => { + this.analytics.trackEvent('Schema', 'FieldsReordered', appName); + }), + pretifyError('Failed to reorder fields. Please reload.')); } - public disableField(appName: string, schemaName: string, fieldId: number, version: Version): Observable> { - const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/fields/${fieldId}/disable`); + public putField(appName: string, schemaName: string, fieldId: number, dto: UpdateFieldDto, parentId: number | undefined, version: Version): Observable> { + const url = this.buildUrl(appName, schemaName, parentId, `/${fieldId}`); - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { - this.analytics.trackEvent('Schema', 'FieldDisabled', appName); - }) - .pretifyError('Failed to disable field. Please reload.'); + return HTTP.putVersioned(this.http, url, dto, version).pipe( + tap(() => { + this.analytics.trackEvent('Schema', 'FieldUpdated', appName); + }), + pretifyError('Failed to update field. Please reload.')); } - public lockField(appName: string, schemaName: string, fieldId: number, version: Version): Observable> { - const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/fields/${fieldId}/lock`); + public lockField(appName: string, schemaName: string, fieldId: number, parentId: number | undefined, version: Version): Observable> { + const url = this.buildUrl(appName, schemaName, parentId, `/${fieldId}/lock`); - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { + return HTTP.putVersioned(this.http, url, {}, version).pipe( + tap(() => { this.analytics.trackEvent('Schema', 'FieldLocked', appName); - }) - .pretifyError('Failed to lock field. Please reload.'); + }), + pretifyError('Failed to lock field. Please reload.')); + } + + public enableField(appName: string, schemaName: string, fieldId: number, parentId: number | undefined, version: Version): Observable> { + const url = this.buildUrl(appName, schemaName, parentId, `/${fieldId}/enable`); + + return HTTP.putVersioned(this.http, url, {}, version).pipe( + tap(() => { + this.analytics.trackEvent('Schema', 'FieldEnabled', appName); + }), + pretifyError('Failed to enable field. Please reload.')); } - public showField(appName: string, schemaName: string, fieldId: number, version: Version): Observable> { - const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/fields/${fieldId}/show`); + public disableField(appName: string, schemaName: string, fieldId: number, parentId: number | undefined, version: Version): Observable> { + const url = this.buildUrl(appName, schemaName, parentId, `/${fieldId}/disable`); - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { + return HTTP.putVersioned(this.http, url, {}, version).pipe( + tap(() => { + this.analytics.trackEvent('Schema', 'FieldDisabled', appName); + }), + pretifyError('Failed to disable field. Please reload.')); + } + + public showField(appName: string, schemaName: string, fieldId: number, parentId: number | undefined, version: Version): Observable> { + const url = this.buildUrl(appName, schemaName, parentId, `/${fieldId}/show`); + + return HTTP.putVersioned(this.http, url, {}, version).pipe( + tap(() => { this.analytics.trackEvent('Schema', 'FieldShown', appName); - }) - .pretifyError('Failed to show field. Please reload.'); + }), + pretifyError('Failed to show field. Please reload.')); } - public hideField(appName: string, schemaName: string, fieldId: number, version: Version): Observable> { - const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/fields/${fieldId}/hide`); + public hideField(appName: string, schemaName: string, fieldId: number, parentId: number | undefined, version: Version): Observable> { + const url = this.buildUrl(appName, schemaName, parentId, `/${fieldId}/hide`); - return HTTP.putVersioned(this.http, url, {}, version) - .do(() => { + return HTTP.putVersioned(this.http, url, {}, version).pipe( + tap(() => { this.analytics.trackEvent('Schema', 'FieldHidden', appName); - }) - .pretifyError('Failed to hide field. Please reload.'); + }), + pretifyError('Failed to hide field. Please reload.')); } - public deleteField(appName: string, schemaName: string, fieldId: number, version: Version): Observable> { - const url = this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/fields/${fieldId}`); + public deleteField(appName: string, schemaName: string, fieldId: number, parentId: number | undefined, version: Version): Observable> { + const url = this.buildUrl(appName, schemaName, parentId, `/${fieldId}`); - return HTTP.deleteVersioned(this.http, url, version) - .do(() => { + return HTTP.deleteVersioned(this.http, url, version).pipe( + tap(() => { this.analytics.trackEvent('Schema', 'FieldDeleted', appName); - }) - .pretifyError('Failed to delete field. Please reload.'); + }), + pretifyError('Failed to delete field. Please reload.')); + } + + private buildUrl(appName: string, schemaName: string, parentId: number | undefined, suffix: string) { + const url = + parentId ? + this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/fields/${parentId}/nested${suffix}`) : + this.apiUrl.buildUrl(`api/apps/${appName}/schemas/${schemaName}/fields${suffix}`); + + return url; } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/schemas.types.ts b/src/Squidex/app/shared/services/schemas.types.ts new file mode 100644 index 000000000..080ac7d97 --- /dev/null +++ b/src/Squidex/app/shared/services/schemas.types.ts @@ -0,0 +1,315 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +export const fieldTypes = [ + { + type: 'String', + description: 'Titles, names, paragraphs.' + }, { + type: 'Assets', + description: 'Images, videos, documents.' + }, { + type: 'Boolean', + description: 'Yes or no, true or false.' + }, { + type: 'DateTime', + description: 'Events date, opening hours.' + }, { + type: 'Geolocation', + description: 'Coordinates: latitude and longitude.' + }, { + type: 'Json', + description: 'Data in JSON format, for developers.' + }, { + type: 'Number', + description: 'ID, order number, rating, quantity.' + }, { + type: 'References', + description: 'Links to other content items.' + }, { + type: 'Tags', + description: 'Special format for tags.' + }, { + type: 'Array', + description: 'List of embedded objects.' + } +]; + +export const fieldInvariant = 'iv'; + +export function createProperties(fieldType: string, values: Object | null = null): FieldPropertiesDto { + let properties: FieldPropertiesDto; + + switch (fieldType) { + case 'Array': + properties = new ArrayFieldPropertiesDto(); + break; + case 'Assets': + properties = new AssetsFieldPropertiesDto(); + break; + case 'Boolean': + properties = new BooleanFieldPropertiesDto('Checkbox'); + break; + case 'DateTime': + properties = new DateTimeFieldPropertiesDto('DateTime'); + break; + case 'Geolocation': + properties = new GeolocationFieldPropertiesDto(); + break; + case 'Json': + properties = new JsonFieldPropertiesDto(); + break; + case 'Number': + properties = new NumberFieldPropertiesDto('Input'); + break; + case 'References': + properties = new ReferencesFieldPropertiesDto(); + break; + case 'String': + properties = new StringFieldPropertiesDto('Input'); + break; + case 'Tags': + properties = new TagsFieldPropertiesDto(); + break; + default: + throw 'Invalid properties type'; + } + + if (values) { + Object.assign(properties, values); + } + + return properties; +} + +export interface FieldPropertiesVisitor { + visitArray(properties: ArrayFieldPropertiesDto): T; + + visitAssets(properties: AssetsFieldPropertiesDto): T; + + visitBoolean(properties: BooleanFieldPropertiesDto): T; + + visitDateTime(properties: DateTimeFieldPropertiesDto): T; + + visitGeolocation(properties: GeolocationFieldPropertiesDto): T; + + visitJson(properties: JsonFieldPropertiesDto): T; + + visitNumber(properties: NumberFieldPropertiesDto): T; + + visitReferences(properties: ReferencesFieldPropertiesDto): T; + + visitString(properties: StringFieldPropertiesDto): T; + + visitTags(properties: TagsFieldPropertiesDto): T; +} + +export abstract class FieldPropertiesDto { + public abstract fieldType: string; + + public readonly editorUrl?: string; + public readonly label?: string; + public readonly hints?: string; + public readonly placeholder?: string; + public readonly isRequired: boolean = false; + public readonly isListField: boolean = false; + + constructor(public readonly editor: string, + props?: Partial + ) { + if (props) { + Object.assign(this, props); + } + } + + public abstract accept(visitor: FieldPropertiesVisitor): T; +} + +export class ArrayFieldPropertiesDto extends FieldPropertiesDto { + public readonly fieldType = 'Array'; + + public readonly minItems?: number; + public readonly maxItems?: number; + + constructor( + props?: Partial + ) { + super('Default', props); + } + + public accept(visitor: FieldPropertiesVisitor): T { + return visitor.visitArray(this); + } +} + +export class AssetsFieldPropertiesDto extends FieldPropertiesDto { + public readonly fieldType = 'Assets'; + + public readonly minItems?: number; + public readonly maxItems?: number; + public readonly minSize?: number; + public readonly maxSize?: number; + public readonly allowedExtensions?: string[]; + public readonly mustBeImage?: boolean; + public readonly minWidth?: number; + public readonly maxWidth?: number; + public readonly minHeight?: number; + public readonly maxHeight?: number; + public readonly aspectWidth?: number; + public readonly aspectHeight?: number; + + constructor( + props?: Partial + ) { + super('Default', props); + } + + public accept(visitor: FieldPropertiesVisitor): T { + return visitor.visitAssets(this); + } +} + +export class BooleanFieldPropertiesDto extends FieldPropertiesDto { + public readonly fieldType = 'Boolean'; + + public readonly inlineEditable: boolean = false; + public readonly defaultValue?: boolean; + + constructor(editor: string, + props?: Partial + ) { + super(editor, props); + } + + public accept(visitor: FieldPropertiesVisitor): T { + return visitor.visitBoolean(this); + } +} + +export class DateTimeFieldPropertiesDto extends FieldPropertiesDto { + public readonly fieldType = 'DateTime'; + + public readonly defaultValue?: string; + public readonly maxValue?: string; + public readonly minValue?: string; + public readonly calculatedDefaultValue?: string; + + constructor(editor: string, + props?: Partial + ) { + super(editor, props); + } + + public accept(visitor: FieldPropertiesVisitor): T { + return visitor.visitDateTime(this); + } +} + +export class GeolocationFieldPropertiesDto extends FieldPropertiesDto { + public readonly fieldType = 'Geolocation'; + + constructor( + props?: Partial + ) { + super('Default', props); + } + + public accept(visitor: FieldPropertiesVisitor): T { + return visitor.visitGeolocation(this); + } +} + +export class JsonFieldPropertiesDto extends FieldPropertiesDto { + public readonly fieldType = 'Json'; + + constructor( + props?: Partial + ) { + super('Default', props); + } + + public accept(visitor: FieldPropertiesVisitor): T { + return visitor.visitJson(this); + } +} + +export class NumberFieldPropertiesDto extends FieldPropertiesDto { + public readonly fieldType = 'Number'; + + public readonly inlineEditable: boolean = false; + public readonly defaultValue?: number; + public readonly maxValue?: number; + public readonly minValue?: number; + public readonly allowedValues?: number[]; + + constructor(editor: string, + props?: Partial + ) { + super(editor, props); + } + + public accept(visitor: FieldPropertiesVisitor): T { + return visitor.visitNumber(this); + } +} + +export class ReferencesFieldPropertiesDto extends FieldPropertiesDto { + public readonly fieldType = 'References'; + + public readonly minItems?: number; + public readonly maxItems?: number; + public readonly schemaId?: string; + + constructor( + props?: Partial + ) { + super('Default', props); + } + + public accept(visitor: FieldPropertiesVisitor): T { + return visitor.visitReferences(this); + } +} + +export class StringFieldPropertiesDto extends FieldPropertiesDto { + public readonly fieldType = 'String'; + + public readonly inlineEditable = false; + public readonly defaultValue?: string; + public readonly pattern?: string; + public readonly patternMessage?: string; + public readonly minLength?: number; + public readonly maxLength?: number; + public readonly allowedValues?: string[]; + + constructor(editor: string, + props?: Partial + ) { + super(editor, props); + } + + public accept(visitor: FieldPropertiesVisitor): T { + return visitor.visitString(this); + } +} + +export class TagsFieldPropertiesDto extends FieldPropertiesDto { + public readonly fieldType = 'Tags'; + + public readonly minItems?: number; + public readonly maxItems?: number; + + constructor( + props?: Partial + ) { + super('Default', props); + } + + public accept(visitor: FieldPropertiesVisitor): T { + return visitor.visitTags(this); + } +} \ No newline at end of file diff --git a/src/Squidex/app/shared/services/ui.service.spec.ts b/src/Squidex/app/shared/services/ui.service.spec.ts index 5d88f63bd..2e27ece4d 100644 --- a/src/Squidex/app/shared/services/ui.service.spec.ts +++ b/src/Squidex/app/shared/services/ui.service.spec.ts @@ -34,8 +34,8 @@ describe('UIService', () => { it('should make get request to get settings', inject([UIService, HttpTestingController], (uiService: UIService, httpMock: HttpTestingController) => { - let settings1: UISettingsDto | null = null; - let settings2: UISettingsDto | null = null; + let settings1: UISettingsDto; + let settings2: UISettingsDto; uiService.getSettings().subscribe(result => { settings1 = result; @@ -54,14 +54,14 @@ describe('UIService', () => { settings2 = result; }); - expect(settings1).toEqual(response); - expect(settings2).toEqual(response); + expect(settings1!).toEqual(response); + expect(settings2!).toEqual(response); })); it('should return default settings when error occurs', inject([UIService, HttpTestingController], (uiService: UIService, httpMock: HttpTestingController) => { - let settings: UISettingsDto | null = null; + let settings: UISettingsDto; uiService.getSettings().subscribe(result => { settings = result; @@ -74,6 +74,6 @@ describe('UIService', () => { req.error(new ErrorEvent('500')); - expect(settings).toBeDefined(); + expect(settings!).toBeDefined(); })); }); \ No newline at end of file diff --git a/src/Squidex/app/shared/services/ui.service.ts b/src/Squidex/app/shared/services/ui.service.ts index 87a9fd638..605b73747 100644 --- a/src/Squidex/app/shared/services/ui.service.ts +++ b/src/Squidex/app/shared/services/ui.service.ts @@ -7,9 +7,8 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { Observable, of } from 'rxjs'; +import { catchError, tap } from 'rxjs/operators'; import { ApiUrlConfig } from '@app/framework'; @@ -30,17 +29,17 @@ export class UIService { public getSettings(): Observable { if (this.settings) { - return Observable.of(this.settings); + return of(this.settings); } else { const url = this.apiUrl.buildUrl(`api/ui/settings`); - return this.http.get(url) - .catch(error => { - return Observable.of({ regexSuggestions: [], mapType: 'OSM', mapKey: '' }); - }) - .do(settings => { + return this.http.get(url).pipe( + catchError(error => { + return of({ regexSuggestions: [], mapType: 'OSM', mapKey: '' }); + }), + tap(settings => { this.settings = settings; - }); + })); } } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/usages.service.spec.ts b/src/Squidex/app/shared/services/usages.service.spec.ts index f0fbb8c67..66f4f8aca 100644 --- a/src/Squidex/app/shared/services/usages.service.spec.ts +++ b/src/Squidex/app/shared/services/usages.service.spec.ts @@ -38,7 +38,7 @@ describe('UsagesService', () => { it('should make get request to get calls usages', inject([UsagesService, HttpTestingController], (usagesService: UsagesService, httpMock: HttpTestingController) => { - let usages: CallsUsageDto[] | null = null; + let usages: CallsUsageDto[]; usagesService.getCallsUsages('my-app', DateTime.parseISO_UTC('2017-10-12'), DateTime.parseISO_UTC('2017-10-13')).subscribe(result => { usages = result; @@ -62,7 +62,7 @@ describe('UsagesService', () => { } ]); - expect(usages).toEqual( + expect(usages!).toEqual( [ new CallsUsageDto(DateTime.parseISO_UTC('2017-10-12'), 10, 130), new CallsUsageDto(DateTime.parseISO_UTC('2017-10-13'), 13, 170) @@ -72,7 +72,7 @@ describe('UsagesService', () => { it('should make get request to get month calls', inject([UsagesService, HttpTestingController], (usagesService: UsagesService, httpMock: HttpTestingController) => { - let usages: CurrentCallsDto | null = null; + let usages: CurrentCallsDto; usagesService.getMonthCalls('my-app').subscribe(result => { usages = result; @@ -85,13 +85,13 @@ describe('UsagesService', () => { req.flush({ count: 130, maxAllowed: 150 }); - expect(usages).toEqual(new CurrentCallsDto(130, 150)); + expect(usages!).toEqual(new CurrentCallsDto(130, 150)); })); it('should make get request to get storage usages', inject([UsagesService, HttpTestingController], (usagesService: UsagesService, httpMock: HttpTestingController) => { - let usages: StorageUsageDto[] | null = null; + let usages: StorageUsageDto[]; usagesService.getStorageUsages('my-app', DateTime.parseISO_UTC('2017-10-12'), DateTime.parseISO_UTC('2017-10-13')).subscribe(result => { usages = result; @@ -115,7 +115,7 @@ describe('UsagesService', () => { } ]); - expect(usages).toEqual( + expect(usages!).toEqual( [ new StorageUsageDto(DateTime.parseISO_UTC('2017-10-12'), 10, 130), new StorageUsageDto(DateTime.parseISO_UTC('2017-10-13'), 13, 170) @@ -125,7 +125,7 @@ describe('UsagesService', () => { it('should make get request to get today storage', inject([UsagesService, HttpTestingController], (usagesService: UsagesService, httpMock: HttpTestingController) => { - let usages: CurrentStorageDto | null = null; + let usages: CurrentStorageDto; usagesService.getTodayStorage('my-app').subscribe(result => { usages = result; @@ -138,6 +138,6 @@ describe('UsagesService', () => { req.flush({ size: 130, maxAllowed: 150 }); - expect(usages).toEqual(new CurrentStorageDto(130, 150)); + expect(usages!).toEqual(new CurrentStorageDto(130, 150)); })); }); \ No newline at end of file diff --git a/src/Squidex/app/shared/services/usages.service.ts b/src/Squidex/app/shared/services/usages.service.ts index c9cbc23cb..f8fbe07f8 100644 --- a/src/Squidex/app/shared/services/usages.service.ts +++ b/src/Squidex/app/shared/services/usages.service.ts @@ -8,13 +8,13 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/angular/http/http-extensions'; +import { map } from 'rxjs/operators'; import { ApiUrlConfig, DateTime, - HTTP + HTTP, + pretifyError } from '@app/framework'; export class CallsUsageDto { @@ -62,32 +62,32 @@ export class UsagesService { public getMonthCalls(app: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${app}/usages/calls/month`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; return new CurrentCallsDto(body.count, body.maxAllowed); - }) - .pretifyError('Failed to load monthly api calls. Please reload.'); + }), + pretifyError('Failed to load monthly api calls. Please reload.')); } public getTodayStorage(app: string): Observable { const url = this.apiUrl.buildUrl(`api/apps/${app}/usages/storage/today`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; return new CurrentStorageDto(body.size, body.maxAllowed); - }) - .pretifyError('Failed to load todays storage size. Please reload.'); + }), + pretifyError('Failed to load todays storage size. Please reload.')); } public getCallsUsages(app: string, fromDate: DateTime, toDate: DateTime): Observable { const url = this.apiUrl.buildUrl(`api/apps/${app}/usages/calls/${fromDate.toUTCStringFormat('YYYY-MM-DD')}/${toDate.toUTCStringFormat('YYYY-MM-DD')}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body; @@ -98,15 +98,15 @@ export class UsagesService { item.count, item.averageMs); }); - }) - .pretifyError('Failed to load calls usage. Please reload.'); + }), + pretifyError('Failed to load calls usage. Please reload.')); } public getStorageUsages(app: string, fromDate: DateTime, toDate: DateTime): Observable { const url = this.apiUrl.buildUrl(`api/apps/${app}/usages/storage/${fromDate.toUTCStringFormat('YYYY-MM-DD')}/${toDate.toUTCStringFormat('YYYY-MM-DD')}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body; @@ -117,7 +117,7 @@ export class UsagesService { item.count, item.size); }); - }) - .pretifyError('Failed to load storage usage. Please reload.'); + }), + pretifyError('Failed to load storage usage. Please reload.')); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/users-provider.service.spec.ts b/src/Squidex/app/shared/services/users-provider.service.spec.ts index 5e0adc69e..81a87740b 100644 --- a/src/Squidex/app/shared/services/users-provider.service.spec.ts +++ b/src/Squidex/app/shared/services/users-provider.service.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of, throwError } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { @@ -31,15 +31,15 @@ describe('UsersProviderService', () => { const user = new UserDto('123', 'User1'); usersService.setup(x => x.getUser('123')) - .returns(() => Observable.of(user)).verifiable(Times.once()); + .returns(() => of(user)).verifiable(Times.once()); - let resultingUser: UserDto | null = null; + let resultingUser: UserDto; usersProviderService.getUser('123').subscribe(result => { resultingUser = result; }).unsubscribe(); - expect(resultingUser).toBe(user); + expect(resultingUser!).toBe(user); usersService.verifyAll(); }); @@ -48,17 +48,17 @@ describe('UsersProviderService', () => { const user = new UserDto('123', 'User1'); usersService.setup(x => x.getUser('123')) - .returns(() => Observable.of(user)).verifiable(Times.once()); + .returns(() => of(user)).verifiable(Times.once()); usersProviderService.getUser('123'); - let resultingUser: UserDto | null = null; + let resultingUser: UserDto; usersProviderService.getUser('123').subscribe(result => { resultingUser = result; }).unsubscribe(); - expect(resultingUser).toBe(user); + expect(resultingUser!).toBe(user); usersService.verifyAll(); }); @@ -70,15 +70,15 @@ describe('UsersProviderService', () => { .returns(() => new Profile({ profile: { sub: '123'}})); usersService.setup(x => x.getUser('123')) - .returns(() => Observable.of(user)).verifiable(Times.once()); + .returns(() => of(user)).verifiable(Times.once()); - let resultingUser: UserDto | null = null; + let resultingUser: UserDto; usersProviderService.getUser('123').subscribe(result => { resultingUser = result; }).unsubscribe(); - expect(resultingUser).toEqual(new UserDto('123', 'Me')); + expect(resultingUser!).toEqual(new UserDto('123', 'Me')); usersService.verifyAll(); }); @@ -88,15 +88,15 @@ describe('UsersProviderService', () => { .returns(() => new Profile({ profile: { sub: '123'}})); usersService.setup(x => x.getUser('123')) - .returns(() => Observable.throw('NOT FOUND')).verifiable(Times.once()); + .returns(() => throwError('NOT FOUND')).verifiable(Times.once()); - let resultingUser: UserDto | null = null; + let resultingUser: UserDto; usersProviderService.getUser('123').subscribe(result => { resultingUser = result; }).unsubscribe(); - expect(resultingUser).toEqual(new UserDto('Unknown', 'Unknown')); + expect(resultingUser!).toEqual(new UserDto('Unknown', 'Unknown')); usersService.verifyAll(); }); diff --git a/src/Squidex/app/shared/services/users-provider.service.ts b/src/Squidex/app/shared/services/users-provider.service.ts index 88a0473cb..e5534fc5a 100644 --- a/src/Squidex/app/shared/services/users-provider.service.ts +++ b/src/Squidex/app/shared/services/users-provider.service.ts @@ -6,7 +6,8 @@ */ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; +import { ConnectableObservable, Observable, of } from 'rxjs'; +import { catchError, map, publishLast, share } from 'rxjs/operators'; import { UserDto, UsersService } from './users.service'; @@ -27,23 +28,24 @@ export class UsersProviderService { if (!result) { const request = - this.usersService.getUser(id) - .catch(error => { - return Observable.of(new UserDto('Unknown', 'Unknown')); - }) - .publishLast(); + this.usersService.getUser(id).pipe( + catchError(error => { + return of(new UserDto('Unknown', 'Unknown')); + }), + publishLast()); - request.connect(); + (>request).connect(); result = this.caches[id] = request; } - return result - .map(dto => { + return result.pipe( + map(dto => { if (me && this.authService.user && dto.id === this.authService.user.id) { dto = new UserDto(dto.id, me); } return dto; - }).share(); + }), + share()); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/services/users.service.spec.ts b/src/Squidex/app/shared/services/users.service.spec.ts index e7ad55c7a..8f454b8f0 100644 --- a/src/Squidex/app/shared/services/users.service.spec.ts +++ b/src/Squidex/app/shared/services/users.service.spec.ts @@ -34,7 +34,7 @@ describe('UsersService', () => { it('should make get request to get many users', inject([UsersService, HttpTestingController], (usersService: UsersService, httpMock: HttpTestingController) => { - let users: UserDto[] | null = null; + let users: UserDto[]; usersService.getUsers().subscribe(result => { users = result; @@ -56,7 +56,7 @@ describe('UsersService', () => { } ]); - expect(users).toEqual( + expect(users!).toEqual( [ new UserDto('123', 'User1'), new UserDto('456', 'User2') @@ -66,7 +66,7 @@ describe('UsersService', () => { it('should make get request with query to get many users', inject([UsersService, HttpTestingController], (usersService: UsersService, httpMock: HttpTestingController) => { - let users: UserDto[] | null = null; + let users: UserDto[]; usersService.getUsers('my-query').subscribe(result => { users = result; @@ -88,7 +88,7 @@ describe('UsersService', () => { } ]); - expect(users).toEqual( + expect(users!).toEqual( [ new UserDto('123', 'User1'), new UserDto('456', 'User2') @@ -98,7 +98,7 @@ describe('UsersService', () => { it('should make get request to get single user', inject([UsersService, HttpTestingController], (usersService: UsersService, httpMock: HttpTestingController) => { - let user: UserDto | null = null; + let user: UserDto; usersService.getUser('123').subscribe(result => { user = result; @@ -111,6 +111,6 @@ describe('UsersService', () => { req.flush({ id: '123', displayName: 'User1' }); - expect(user).toEqual(new UserDto('123', 'User1')); + expect(user!).toEqual(new UserDto('123', 'User1')); })); }); \ No newline at end of file diff --git a/src/Squidex/app/shared/services/users.service.ts b/src/Squidex/app/shared/services/users.service.ts index 855968f7b..4a513099d 100644 --- a/src/Squidex/app/shared/services/users.service.ts +++ b/src/Squidex/app/shared/services/users.service.ts @@ -8,10 +8,13 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; -import '@app/framework/angular/http/http-extensions'; - -import { ApiUrlConfig, HTTP } from '@app/framework'; +import { + ApiUrlConfig, + HTTP, + pretifyError +} from '@app/framework'; export class UserDto { constructor( @@ -32,8 +35,8 @@ export class UsersService { public getUsers(query?: string): Observable { const url = this.apiUrl.buildUrl(`api/users?query=${query || ''}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; const items: any[] = body; @@ -43,21 +46,21 @@ export class UsersService { item.id, item.displayName); }); - }) - .pretifyError('Failed to load users. Please reload.'); + }), + pretifyError('Failed to load users. Please reload.')); } public getUser(id: string): Observable { const url = this.apiUrl.buildUrl(`api/users/${id}`); - return HTTP.getVersioned(this.http, url) - .map(response => { + return HTTP.getVersioned(this.http, url).pipe( + map(response => { const body = response.payload.body; return new UserDto( body.id, body.displayName); - }) - .pretifyError('Failed to load user. Please reload.'); + }), + pretifyError('Failed to load user. Please reload.')); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/state/apps.forms.ts b/src/Squidex/app/shared/state/apps.forms.ts new file mode 100644 index 000000000..57fb0995b --- /dev/null +++ b/src/Squidex/app/shared/state/apps.forms.ts @@ -0,0 +1,30 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { map, startWith } from 'rxjs/operators'; + +import { Form, ValidatorsEx } from '@app/framework'; + +const FALLBACK_NAME = 'my-app'; + +export class CreateAppForm extends Form { + public appName = + this.form.controls['name'].valueChanges.pipe(map(n => n || FALLBACK_NAME), startWith(FALLBACK_NAME)); + + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + name: ['', + [ + Validators.required, + Validators.maxLength(40), + ValidatorsEx.pattern('[a-z0-9]+(\-[a-z0-9]+)*', 'Name can contain lower case letters (a-z), numbers and dashes (not at the end).') + ] + ] + })); + } +} \ No newline at end of file diff --git a/src/Squidex/app/shared/state/apps.state.spec.ts b/src/Squidex/app/shared/state/apps.state.spec.ts index 70ed96dd4..c3f3ad902 100644 --- a/src/Squidex/app/shared/state/apps.state.spec.ts +++ b/src/Squidex/app/shared/state/apps.state.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, Mock, Times } from 'typemoq'; import { @@ -37,7 +37,7 @@ describe('AppsState', () => { appsService = Mock.ofType(); appsService.setup(x => x.getApps()) - .returns(() => Observable.of(oldApps)) + .returns(() => of(oldApps)) .verifiable(Times.once()); appsState = new AppsState(appsService.object, dialogs.object); @@ -85,7 +85,7 @@ describe('AppsState', () => { const request = new CreateAppDto(newApp.name); appsService.setup(x => x.postApp(request)) - .returns(() => Observable.of(newApp)); + .returns(() => of(newApp)); appsState.create(request, now).subscribe(); @@ -96,10 +96,10 @@ describe('AppsState', () => { const request = new CreateAppDto(newApp.name); appsService.setup(x => x.postApp(request)) - .returns(() => Observable.of(newApp)); + .returns(() => of(newApp)); appsService.setup(x => x.deleteApp(newApp.name)) - .returns(() => Observable.of({})); + .returns(() => of({})); appsState.create(request, now).subscribe(); diff --git a/src/Squidex/app/shared/state/apps.state.ts b/src/Squidex/app/shared/state/apps.state.ts index d76ca0b8c..861bf3160 100644 --- a/src/Squidex/app/shared/state/apps.state.ts +++ b/src/Squidex/app/shared/state/apps.state.ts @@ -1,4 +1,3 @@ - /* * Squidex Headless CMS * @@ -7,18 +6,15 @@ */ import { Injectable } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { Observable, of } from 'rxjs'; +import { distinctUntilChanged, map, tap } from 'rxjs/operators'; import { DateTime, DialogService, - Form, ImmutableArray, - State, - ValidatorsEx + notify, + State } from '@app/framework'; import { @@ -27,26 +23,6 @@ import { CreateAppDto } from './../services/apps.service'; -const FALLBACK_NAME = 'my-app'; - -export class CreateAppForm extends Form { - public appName = - this.form.controls['name'].valueChanges.map(n => n || FALLBACK_NAME) - .startWith(FALLBACK_NAME); - - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - name: ['', - [ - Validators.required, - Validators.maxLength(40), - ValidatorsEx.pattern('[a-z0-9]+(\-[a-z0-9]+)*', 'Name can contain lower case letters (a-z), numbers and dashes (not at the end).') - ] - ] - })); - } -} - interface Snapshot { apps: ImmutableArray; @@ -60,12 +36,12 @@ export class AppsState extends State { } public selectedApp = - this.changes.map(s => s.selectedApp) - .distinctUntilChanged(); + this.changes.pipe(map(s => s.selectedApp), + distinctUntilChanged()); public apps = - this.changes.map(s => s.apps) - .distinctUntilChanged(); + this.changes.pipe(map(s => s.apps), + distinctUntilChanged()); constructor( private readonly appsService: AppsService, @@ -77,40 +53,40 @@ export class AppsState extends State { public select(name: string | null): Observable { const observable = !name ? - Observable.of(null) : - Observable.of(this.snapshot.apps.find(x => x.name === name) || null); + of(null) : + of(this.snapshot.apps.find(x => x.name === name) || null); - return observable - .do(selectedApp => { + return observable.pipe( + tap(selectedApp => { this.next(s => ({ ...s, selectedApp })); - }); + })); } public load(): Observable { - return this.appsService.getApps() - .do(dtos => { + return this.appsService.getApps().pipe( + tap(dtos => { this.next(s => { const apps = ImmutableArray.of(dtos); return { ...s, apps }; }); - }); + })); } public create(request: CreateAppDto, now?: DateTime): Observable { - return this.appsService.postApp(request) - .do(dto => { + return this.appsService.postApp(request).pipe( + tap(dto => { this.next(s => { const apps = s.apps.push(dto).sortByStringAsc(x => x.name); return { ...s, apps }; }); - }); + })); } public delete(name: string): Observable { - return this.appsService.deleteApp(name) - .do(app => { + return this.appsService.deleteApp(name).pipe( + tap(app => { this.next(s => { const apps = s.apps.filter(x => x.name !== name); @@ -118,7 +94,7 @@ export class AppsState extends State { return { ...s, apps, selectedApp }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/state/assets.forms.ts b/src/Squidex/app/shared/state/assets.forms.ts new file mode 100644 index 000000000..b6a23c236 --- /dev/null +++ b/src/Squidex/app/shared/state/assets.forms.ts @@ -0,0 +1,22 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; + +import { Form } from '@app/framework'; + +export class RenameAssetForm extends Form { + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + name: ['', + [ + Validators.required + ] + ] + })); + } +} \ No newline at end of file diff --git a/src/Squidex/app/shared/state/assets.state.spec.ts b/src/Squidex/app/shared/state/assets.state.spec.ts index c6def135f..08fc6fea5 100644 --- a/src/Squidex/app/shared/state/assets.state.spec.ts +++ b/src/Squidex/app/shared/state/assets.state.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -50,7 +50,7 @@ describe('AssetsState', () => { assetsService = Mock.ofType(); assetsService.setup(x => x.getAssets(app, 30, 0, undefined)) - .returns(() => Observable.of(new AssetsDto(200, oldAssets))); + .returns(() => of(new AssetsDto(200, oldAssets))); assetsState = new AssetsState(appsState.object, assetsService.object, dialogs.object); assetsState.load().subscribe(); @@ -71,6 +71,8 @@ describe('AssetsState', () => { it('should show notification on load when reload is true', () => { assetsState.load(true).subscribe(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); @@ -95,7 +97,7 @@ describe('AssetsState', () => { it('should remove asset from snapshot when deleted', () => { assetsService.setup(x => x.deleteAsset(app, oldAssets[0].id, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); assetsState.delete(oldAssets[0]).subscribe(); @@ -105,18 +107,20 @@ describe('AssetsState', () => { it('should load next page and prev page when paging', () => { assetsService.setup(x => x.getAssets(app, 30, 30, undefined)) - .returns(() => Observable.of(new AssetsDto(200, []))); + .returns(() => of(new AssetsDto(200, []))); assetsState.goNext().subscribe(); assetsState.goPrev().subscribe(); + expect().nothing(); + assetsService.verify(x => x.getAssets(app, 30, 30, undefined), Times.once()); assetsService.verify(x => x.getAssets(app, 30, 0, undefined), Times.exactly(2)); }); it('should load with query when searching', () => { assetsService.setup(x => x.getAssets(app, 30, 0, 'my-query')) - .returns(() => Observable.of(new AssetsDto(0, []))); + .returns(() => of(new AssetsDto(0, []))); assetsState.search('my-query').subscribe(); diff --git a/src/Squidex/app/shared/state/assets.state.ts b/src/Squidex/app/shared/state/assets.state.ts index 45e936b3f..f931f944f 100644 --- a/src/Squidex/app/shared/state/assets.state.ts +++ b/src/Squidex/app/shared/state/assets.state.ts @@ -6,15 +6,13 @@ */ import { Injectable } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { distinctUntilChanged, map, tap } from 'rxjs/operators'; import { DialogService, - Form, ImmutableArray, + notify, Pager, State } from '@app/framework'; @@ -22,18 +20,6 @@ import { import { AssetDto, AssetsService} from './../services/assets.service'; import { AppsState } from './apps.state'; -export class RenameAssetForm extends Form { - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - name: ['', - [ - Validators.required - ] - ] - })); - } -} - interface Snapshot { assets: ImmutableArray; assetsPager: Pager; @@ -45,16 +31,16 @@ interface Snapshot { @Injectable() export class AssetsState extends State { public assets = - this.changes.map(x => x.assets) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.assets), + distinctUntilChanged()); public assetsPager = - this.changes.map(x => x.assetsPager) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.assetsPager), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); constructor( private readonly appsState: AppsState, @@ -73,8 +59,8 @@ export class AssetsState extends State { } private loadInternal(isReload = false): Observable { - return this.assetsService.getAssets(this.appName, this.snapshot.assetsPager.pageSize, this.snapshot.assetsPager.skip, this.snapshot.assetsQuery) - .do(dtos => { + return this.assetsService.getAssets(this.appName, this.snapshot.assetsPager.pageSize, this.snapshot.assetsPager.skip, this.snapshot.assetsQuery).pipe( + tap(dtos => { if (isReload) { this.dialogs.notifyInfo('Assets reloaded.'); } @@ -85,8 +71,8 @@ export class AssetsState extends State { return { ...s, assets, assetsPager, isLoaded: true }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public add(asset: AssetDto) { @@ -99,16 +85,16 @@ export class AssetsState extends State { } public delete(asset: AssetDto): Observable { - return this.assetsService.deleteAsset(this.appName, asset.id, asset.version) - .do(dto => { + return this.assetsService.deleteAsset(this.appName, asset.id, asset.version).pipe( + tap(dto => { return this.next(s => { const assets = s.assets.filter(x => x.id !== asset.id); const assetsPager = s.assetsPager.decrementCount(); return { ...s, assets, assetsPager }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public update(asset: AssetDto) { diff --git a/src/Squidex/app/shared/state/backups.state.spec.ts b/src/Squidex/app/shared/state/backups.state.spec.ts index c3c884e6b..d46cea933 100644 --- a/src/Squidex/app/shared/state/backups.state.spec.ts +++ b/src/Squidex/app/shared/state/backups.state.spec.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of, throwError } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -41,7 +42,7 @@ describe('BackupsState', () => { backupsService = Mock.ofType(); backupsService.setup(x => x.getBackups(app)) - .returns(() => Observable.of(oldBackups)); + .returns(() => of(oldBackups)); backupsState = new BackupsState(appsState.object, backupsService.object, dialogs.object); backupsState.load().subscribe(); @@ -57,30 +58,36 @@ describe('BackupsState', () => { it('should show notification on load when reload is true', () => { backupsState.load(true, false).subscribe(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); it('should show notification on load error when silent is true', () => { backupsService.setup(x => x.getBackups(app)) - .returns(() => Observable.throw({})); + .returns(() => throwError({})); + + backupsState.load(true, true).pipe(onErrorResumeNext()).subscribe(); - backupsState.load(true, true).onErrorResumeNext().subscribe(); + expect().nothing(); dialogs.verify(x => x.notifyError(It.isAny()), Times.once()); }); it('should not show notification on load error when flag is false', () => { backupsService.setup(x => x.getBackups(app)) - .returns(() => Observable.throw({})); + .returns(() => throwError({})); + + backupsState.load().pipe(onErrorResumeNext()).subscribe(); - backupsState.load().onErrorResumeNext().subscribe(); + expect().nothing(); dialogs.verify(x => x.notifyError(It.isAny()), Times.never()); }); it('should not add backup to snapshot', () => { backupsService.setup(x => x.postBackup(app)) - .returns(() => Observable.of({})); + .returns(() => of({})); backupsState.start().subscribe(); @@ -91,7 +98,7 @@ describe('BackupsState', () => { it('should not remove backup from snapshot', () => { backupsService.setup(x => x.deleteBackup(app, oldBackups[0].id)) - .returns(() => Observable.of({})); + .returns(() => of({})); backupsState.delete(oldBackups[0]).subscribe(); diff --git a/src/Squidex/app/shared/state/backups.state.ts b/src/Squidex/app/shared/state/backups.state.ts index 834acdf9c..8501f635c 100644 --- a/src/Squidex/app/shared/state/backups.state.ts +++ b/src/Squidex/app/shared/state/backups.state.ts @@ -6,13 +6,13 @@ */ import { Injectable } from '@angular/core'; -import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { Observable, throwError } from 'rxjs'; +import { catchError, distinctUntilChanged, map, tap } from 'rxjs/operators'; import { DialogService, ImmutableArray, + notify, State } from '@app/framework'; @@ -29,16 +29,16 @@ interface Snapshot { @Injectable() export class BackupsState extends State { public backups = - this.changes.map(x => x.backups) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.backups), + distinctUntilChanged()); public maxBackupsReached = - this.changes.map(x => x.backups.length >= 10) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.backups.length >= 10), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); constructor( private readonly appsState: AppsState, @@ -53,8 +53,8 @@ export class BackupsState extends State { this.resetState(); } - return this.backupsService.getBackups(this.appName) - .do(dtos => { + return this.backupsService.getBackups(this.appName).pipe( + tap(dtos => { if (isReload && !silent) { this.dialogs.notifyInfo('Backups reloaded.'); } @@ -64,30 +64,30 @@ export class BackupsState extends State { return { ...s, backups, isLoaded: true }; }); - }) - .catch(error => { + }), + catchError(error => { if (silent) { this.dialogs.notifyError(error); } - return Observable.throw(error); - }); + return throwError(error); + })); } public start(): Observable { - return this.backupsService.postBackup(this.appsState.appName) - .do(() => { + return this.backupsService.postBackup(this.appsState.appName).pipe( + tap(() => { this.dialogs.notifyInfo('Backup started, it can take several minutes to complete.'); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public delete(backup: BackupDto): Observable { - return this.backupsService.deleteBackup(this.appsState.appName, backup.id) - .do(() => { + return this.backupsService.deleteBackup(this.appsState.appName, backup.id).pipe( + tap(() => { this.dialogs.notifyInfo('Backup is about to be deleted.'); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } private get appName() { diff --git a/src/Squidex/app/shared/state/clients.forms.ts b/src/Squidex/app/shared/state/clients.forms.ts new file mode 100644 index 000000000..5c155f673 --- /dev/null +++ b/src/Squidex/app/shared/state/clients.forms.ts @@ -0,0 +1,39 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { map, startWith } from 'rxjs/operators'; + +import { Form, ValidatorsEx } from '@app/framework'; + +export class RenameClientForm extends Form { + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + name: ['', + [ + Validators.required + ] + ] + })); + } +} + +export class AttachClientForm extends Form { + public hasNoName = + this.form.controls['name'].valueChanges.pipe(startWith(''), map(x => !x || x.length === 0)); + + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + name: ['', + [ + Validators.maxLength(40), + ValidatorsEx.pattern('[a-z0-9]+(\-[a-z0-9]+)*', 'Name can contain lower case letters (a-z), numbers and dashes (not at the end).') + ] + ] + })); + } +} \ No newline at end of file diff --git a/src/Squidex/app/shared/state/clients.state.spec.ts b/src/Squidex/app/shared/state/clients.state.spec.ts index e8fd8431a..265361c86 100644 --- a/src/Squidex/app/shared/state/clients.state.spec.ts +++ b/src/Squidex/app/shared/state/clients.state.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -47,7 +47,7 @@ describe('ClientsState', () => { clientsService = Mock.ofType(); clientsService.setup(x => x.getClients(app)) - .returns(() => Observable.of(new AppClientsDto(oldClients, version))); + .returns(() => of(new AppClientsDto(oldClients, version))); clientsState = new ClientsState(clientsService.object, appsState.object, dialogs.object); clientsState.load().subscribe(); @@ -64,6 +64,8 @@ describe('ClientsState', () => { it('should show notification on load when reload is true', () => { clientsState.load(true).subscribe(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); @@ -73,7 +75,7 @@ describe('ClientsState', () => { const request = new CreateAppClientDto('id3'); clientsService.setup(x => x.postClient(app, request, version)) - .returns(() => Observable.of(new Versioned(newVersion, newClient))); + .returns(() => of(new Versioned(newVersion, newClient))); clientsState.attach(request).subscribe(); @@ -85,7 +87,7 @@ describe('ClientsState', () => { const request = new UpdateAppClientDto('NewName', 'NewPermission'); clientsService.setup(x => x.putClient(app, oldClients[0].id, request, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); clientsState.update(oldClients[0], request).subscribe(); @@ -98,7 +100,7 @@ describe('ClientsState', () => { it('should remove client from snapshot when revoked', () => { clientsService.setup(x => x.deleteClient(app, oldClients[0].id, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); clientsState.revoke(oldClients[0]).subscribe(); diff --git a/src/Squidex/app/shared/state/clients.state.ts b/src/Squidex/app/shared/state/clients.state.ts index 067f7e7ea..29a99f990 100644 --- a/src/Squidex/app/shared/state/clients.state.ts +++ b/src/Squidex/app/shared/state/clients.state.ts @@ -6,17 +6,14 @@ */ import { Injectable } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { distinctUntilChanged, map, tap } from 'rxjs/operators'; import { DialogService, - Form, ImmutableArray, + notify, State, - ValidatorsEx, Version } from '@app/framework'; @@ -29,34 +26,6 @@ import { UpdateAppClientDto } from './../services/app-clients.service'; -export class RenameClientForm extends Form { - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - name: ['', - [ - Validators.required - ] - ] - })); - } -} - -export class AttachClientForm extends Form { - public hasNoName = - this.form.controls['name'].valueChanges.startWith('').map(x => !x || x.length === 0); - - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - name: ['', - [ - Validators.maxLength(40), - ValidatorsEx.pattern('[a-z0-9]+(\-[a-z0-9]+)*', 'Name can contain lower case letters (a-z), numbers and dashes (not at the end).') - ] - ] - })); - } -} - interface Snapshot { clients: ImmutableArray; @@ -68,12 +37,12 @@ interface Snapshot { @Injectable() export class ClientsState extends State { public clients = - this.changes.map(x => x.clients) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.clients), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); constructor( private readonly appClientsService: AppClientsService, @@ -88,8 +57,8 @@ export class ClientsState extends State { this.resetState(); } - return this.appClientsService.getClients(this.appName) - .do(dtos => { + return this.appClientsService.getClients(this.appName).pipe( + tap(dtos => { if (isReload) { this.dialogs.notifyInfo('Clients reloaded.'); } @@ -99,44 +68,44 @@ export class ClientsState extends State { return { ...s, clients, isLoaded: true, version: dtos.version }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public attach(request: CreateAppClientDto): Observable { - return this.appClientsService.postClient(this.appName, request, this.version) - .do(dto => { + return this.appClientsService.postClient(this.appName, request, this.version).pipe( + tap(dto => { this.next(s => { const clients = s.clients.push(dto.payload); return { ...s, clients, version: dto.version }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public revoke(client: AppClientDto): Observable { - return this.appClientsService.deleteClient(this.appName, client.id, this.version) - .do(dto => { + return this.appClientsService.deleteClient(this.appName, client.id, this.version).pipe( + tap(dto => { this.next(s => { const clients = s.clients.filter(c => c.id !== client.id); return { ...s, clients, version: dto.version }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public update(client: AppClientDto, request: UpdateAppClientDto): Observable { - return this.appClientsService.putClient(this.appName, client.id, request, this.version) - .do(dto => { + return this.appClientsService.putClient(this.appName, client.id, request, this.version).pipe( + tap(dto => { this.next(s => { const clients = s.clients.replaceBy('id', update(client, request)); return { ...s, clients, version: dto.version }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } private get appName() { @@ -149,4 +118,4 @@ export class ClientsState extends State { } const update = (client: AppClientDto, request: UpdateAppClientDto) => - new AppClientDto(client.id, request.name || client.name, client.secret, request.permission || client.permission); \ No newline at end of file + client.with({ name: request.name || client.name, permission: request.permission || client.permission }); \ No newline at end of file diff --git a/src/Squidex/app/shared/state/contents.forms.spec.ts b/src/Squidex/app/shared/state/contents.forms.spec.ts new file mode 100644 index 000000000..fbf86b36a --- /dev/null +++ b/src/Squidex/app/shared/state/contents.forms.spec.ts @@ -0,0 +1,379 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { DateTime } from '@app/framework'; + +import { + ArrayFieldPropertiesDto, + AssetsFieldPropertiesDto, + BooleanFieldPropertiesDto, + DateTimeFieldPropertiesDto, + FieldDefaultValue, + FieldFormatter, + FieldPropertiesDto, + FieldValidatorsFactory, + GeolocationFieldPropertiesDto, + JsonFieldPropertiesDto, + NumberFieldPropertiesDto, + ReferencesFieldPropertiesDto, + RootFieldDto, + SchemaDetailsDto, + SchemaPropertiesDto, + StringFieldPropertiesDto, + TagsFieldPropertiesDto +} from './../'; + +describe('SchemaDetailsDto', () => { + it('should return label as display name', () => { + const schema = createSchema(new SchemaPropertiesDto('Label'), 1, []); + + expect(schema.displayName).toBe('Label'); + }); + + it('should return name as display name if label is undefined', () => { + const schema = createSchema(new SchemaPropertiesDto(undefined), 1, []); + + expect(schema.displayName).toBe('schema1'); + }); + + it('should return name as display name label is empty', () => { + const schema = createSchema(new SchemaPropertiesDto(''), 1, []); + + expect(schema.displayName).toBe('schema1'); + }); + + it('should return configured fields as list fields if no schema field are declared', () => { + const field1 = createField(new ArrayFieldPropertiesDto({ isListField: true }), 1); + const field2 = createField(new ArrayFieldPropertiesDto({ isListField: false }), 2); + const field3 = createField(new ArrayFieldPropertiesDto({ isListField: true }), 3); + + const schema = createSchema(new SchemaPropertiesDto(''), 1, [field1, field2, field3]); + + expect(schema.listFields).toEqual([field1, field3]); + }); + + it('should return first fields as list fields if no schema field is declared', () => { + const field1 = createField(new ArrayFieldPropertiesDto(), 1); + const field2 = createField(new ArrayFieldPropertiesDto(), 2); + const field3 = createField(new ArrayFieldPropertiesDto(), 3); + + const schema = createSchema(new SchemaPropertiesDto(''), 1, [field1, field2, field3]); + + expect(schema.listFields).toEqual([field1]); + }); + + it('should return empty list fields if fields is empty', () => { + const schema = createSchema(new SchemaPropertiesDto(), 1, []); + + expect(schema.listFields).toEqual([{ properties: {} }]); + }); +}); + +describe('FieldDto', () => { + it('should return label as display name', () => { + const field = createField(new AssetsFieldPropertiesDto({ label: 'Label' }), 1); + + expect(field.displayName).toBe('Label'); + }); + + it('should return name as display name if label is null', () => { + const field = createField(new AssetsFieldPropertiesDto(), 1); + + expect(field.displayName).toBe('field1'); + }); + + it('should return name as display name label is empty', () => { + const field = createField(new AssetsFieldPropertiesDto({ label: '' }), 1); + + expect(field.displayName).toBe('field1'); + }); + + it('should return placeholder as display placeholder', () => { + const field = createField(new AssetsFieldPropertiesDto({ placeholder: 'Placeholder' }), 1); + + expect(field.displayPlaceholder).toBe('Placeholder'); + }); + + it('should return empty as display placeholder if placeholder is null', () => { + const field = createField(new AssetsFieldPropertiesDto()); + + expect(field.displayPlaceholder).toBe(''); + }); + + it('should return localizable if partitioning is language', () => { + const field = createField(new AssetsFieldPropertiesDto(), 1, 'language'); + + expect(field.isLocalizable).toBeTruthy(); + }); + + it('should not return localizable if partitioning is invarient', () => { + const field = createField(new AssetsFieldPropertiesDto(), 1, 'invariant'); + + expect(field.isLocalizable).toBeFalsy(); + }); +}); + +describe('ArrayField', () => { + const field = createField(new ArrayFieldPropertiesDto({ isRequired: true, minItems: 1, maxItems: 5 })); + + it('should create validators', () => { + expect(FieldValidatorsFactory.createValidators(field, false).length).toBe(3); + }); + + it('should format to empty string if null', () => { + expect(FieldFormatter.format(field, null)).toBe(''); + }); + + it('should format to asset count', () => { + expect(FieldFormatter.format(field, [1, 2, 3])).toBe('3 Item(s)'); + }); + + it('should return zero formatting if other type', () => { + expect(FieldFormatter.format(field, 1)).toBe('0 Items'); + }); + + it('should return null for default properties', () => { + expect(FieldDefaultValue.get(field)).toBeNull(); + }); +}); + +describe('AssetsField', () => { + const field = createField(new AssetsFieldPropertiesDto({ isRequired: true, minItems: 1, maxItems: 5 })); + + it('should create validators', () => { + expect(FieldValidatorsFactory.createValidators(field, false).length).toBe(3); + }); + + it('should format to empty string if null', () => { + expect(FieldFormatter.format(field, null)).toBe(''); + }); + + it('should format to asset count', () => { + expect(FieldFormatter.format(field, [1, 2, 3])).toBe('3 Asset(s)'); + }); + + it('should return zero formatting if other type', () => { + expect(FieldFormatter.format(field, 1)).toBe('0 Assets'); + }); + + it('should return null for default properties', () => { + expect(FieldDefaultValue.get(field)).toBeNull(); + }); +}); + +describe('TagsField', () => { + const field = createField(new TagsFieldPropertiesDto({ isRequired: true, minItems: 1, maxItems: 5 })); + + it('should create validators', () => { + expect(FieldValidatorsFactory.createValidators(field, false).length).toBe(3); + }); + + it('should format to empty string if null', () => { + expect(FieldFormatter.format(field, null)).toBe(''); + }); + + it('should format to asset count', () => { + expect(FieldFormatter.format(field, ['hello', 'squidex', 'cms'])).toBe('hello, squidex, cms'); + }); + + it('should return zero formatting if other type', () => { + expect(FieldFormatter.format(field, 1)).toBe(''); + }); + + it('should return null for default properties', () => { + expect(FieldDefaultValue.get(field)).toBeNull(); + }); +}); + +describe('BooleanField', () => { + const field = createField(new BooleanFieldPropertiesDto('Checkbox', { isRequired: true })); + + it('should create validators', () => { + expect(FieldValidatorsFactory.createValidators(field, false).length).toBe(1); + }); + + it('should format to empty string if null', () => { + expect(FieldFormatter.format(field, null)).toBe(''); + }); + + it('should format to Yes if true', () => { + expect(FieldFormatter.format(field, true)).toBe('Yes'); + }); + + it('should format to No if false', () => { + expect(FieldFormatter.format(field, false)).toBe('No'); + }); + + it('should return default value for default properties', () => { + const field2 = createField(new BooleanFieldPropertiesDto('Checkbox', { defaultValue: true })); + + expect(FieldDefaultValue.get(field2)).toBeTruthy(); + }); +}); + +describe('DateTimeField', () => { + const now = DateTime.parseISO_UTC('2017-10-12T16:30:10Z'); + const field = createField(new DateTimeFieldPropertiesDto('DateTime', { isRequired: true })); + + it('should create validators', () => { + expect(FieldValidatorsFactory.createValidators(field, false).length).toBe(1); + }); + + it('should format to empty string if null', () => { + expect(FieldFormatter.format(field, null)).toBe(''); + }); + + it('should format to input if parsing failed', () => { + expect(FieldFormatter.format(field, true)).toBe(true); + }); + + it('should format to date', () => { + const dateField = createField(new DateTimeFieldPropertiesDto('Date')); + + expect(FieldFormatter.format(dateField, '2017-12-12T16:00:00Z')).toBe('2017-12-12'); + }); + + it('should format to date time', () => { + const field2 = createField(new DateTimeFieldPropertiesDto('DateTime')); + + expect(FieldFormatter.format(field2, '2017-12-12T16:00:00Z')).toBe('2017-12-12 16:00:00'); + }); + + it('should return default for DateFieldProperties', () => { + const field2 = createField(new DateTimeFieldPropertiesDto('DateTime', { defaultValue: '2017-10-12T16:00:00Z' })); + + expect(FieldDefaultValue.get(field2)).toEqual('2017-10-12T16:00:00Z'); + }); + + it('should return calculated date when Today for DateFieldProperties', () => { + const field2 = createField(new DateTimeFieldPropertiesDto('DateTime', { calculatedDefaultValue: 'Today' })); + + expect(FieldDefaultValue.get(field2, now)).toEqual('2017-10-12'); + }); + + it('should return calculated date when Now for DateFieldProperties', () => { + const field2 = createField(new DateTimeFieldPropertiesDto('DateTime', { calculatedDefaultValue: 'Now' })); + + expect(FieldDefaultValue.get(field2, now)).toEqual('2017-10-12T16:30:10Z'); + }); +}); + +describe('GeolocationField', () => { + const field = createField(new GeolocationFieldPropertiesDto({ isRequired: true })); + + it('should create validators', () => { + expect(FieldValidatorsFactory.createValidators(field, false).length).toBe(1); + }); + + it('should format to empty string if null', () => { + expect(FieldFormatter.format(field, null)).toBe(''); + }); + + it('should format to latitude and longitude', () => { + expect(FieldFormatter.format(field, { latitude: 42, longitude: 3.14 })).toBe('3.14, 42'); + }); + + it('should return null for default properties', () => { + expect(FieldDefaultValue.get(field)).toBeNull(); + }); +}); + +describe('JsonField', () => { + const field = createField(new JsonFieldPropertiesDto({ isRequired: true })); + + it('should create validators', () => { + expect(FieldValidatorsFactory.createValidators(field, false).length).toBe(1); + }); + + it('should format to empty string if null', () => { + expect(FieldFormatter.format(field, null)).toBe(''); + }); + + it('should format to constant', () => { + expect(FieldFormatter.format(field, {})).toBe(''); + }); + + it('should return null for default properties', () => { + expect(FieldDefaultValue.get(field)).toBeNull(); + }); +}); + +describe('NumberField', () => { + const field = createField(new NumberFieldPropertiesDto('Input', { isRequired: true, minValue: 1, maxValue: 6, allowedValues: [1, 3] })); + + it('should create validators', () => { + expect(FieldValidatorsFactory.createValidators(field, false).length).toBe(4); + }); + + it('should format to empty string if null', () => { + expect(FieldFormatter.format(field, null)).toBe(''); + }); + + it('should format to number', () => { + expect(FieldFormatter.format(field, 42)).toEqual(42); + }); + + it('should return default value for default properties', () => { + const field2 = createField(new NumberFieldPropertiesDto('Input', { defaultValue: 13 })); + + expect(FieldDefaultValue.get(field2)).toEqual(13); + }); +}); + +describe('ReferencesField', () => { + const field = createField(new ReferencesFieldPropertiesDto({ isRequired: true, minItems: 1, maxItems: 5 })); + + it('should create validators', () => { + expect(FieldValidatorsFactory.createValidators(field, false).length).toBe(3); + }); + + it('should format to empty string if null', () => { + expect(FieldFormatter.format(field, null)).toBe(''); + }); + + it('should format to asset count', () => { + expect(FieldFormatter.format(field, [1, 2, 3])).toBe('3 Reference(s)'); + }); + + it('should return zero formatting if other type', () => { + expect(FieldFormatter.format(field, 1)).toBe('0 References'); + }); + + it('should return null for default properties', () => { + expect(FieldDefaultValue.get(field)).toBeNull(); + }); +}); + +describe('StringField', () => { + const field = createField(new StringFieldPropertiesDto('Input', { isRequired: true, pattern: 'pattern', minLength: 1, maxLength: 5, allowedValues: ['a', 'b'] })); + + it('should create validators', () => { + expect(FieldValidatorsFactory.createValidators(field, false).length).toBe(5); + }); + + it('should format to empty string if null', () => { + expect(FieldFormatter.format(field, null)).toBe(''); + }); + + it('should format to string', () => { + expect(FieldFormatter.format(field, 'hello')).toBe('hello'); + }); + + it('should return default value for default properties', () => { + const field2 = createField(new StringFieldPropertiesDto('Input', { defaultValue: 'MyDefault' })); + + expect(FieldDefaultValue.get(field2)).toEqual('MyDefault'); + }); +}); + +function createSchema(properties: SchemaPropertiesDto, index = 1, fields: RootFieldDto[]) { + return new SchemaDetailsDto('id' + index, 'schema' + index, '', properties, true, null!, null!, null!, null!, null!, fields); +} + +function createField(properties: FieldPropertiesDto, index = 1, partitioning = 'languages') { + return new RootFieldDto(index, 'field' + index, properties, partitioning); +} \ No newline at end of file diff --git a/src/Squidex/app/shared/state/contents.forms.ts b/src/Squidex/app/shared/state/contents.forms.ts new file mode 100644 index 000000000..cad79f703 --- /dev/null +++ b/src/Squidex/app/shared/state/contents.forms.ts @@ -0,0 +1,518 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + + +// tslint:disable:prefer-for-of + +import { FormArray, FormControl, FormGroup, ValidatorFn, Validators } from '@angular/forms'; + +import { + DateTime, + Form, + formControls, + ImmutableArray, + Types, + ValidatorsEx +} from '@app/framework'; + +import { AppLanguageDto } from './../services/app-languages.service'; +import { FieldDto, RootFieldDto, SchemaDetailsDto } from './../services/schemas.service'; +import { + ArrayFieldPropertiesDto, + AssetsFieldPropertiesDto, + BooleanFieldPropertiesDto, + DateTimeFieldPropertiesDto, + fieldInvariant, + FieldPropertiesVisitor, + GeolocationFieldPropertiesDto, + JsonFieldPropertiesDto, + NumberFieldPropertiesDto, + ReferencesFieldPropertiesDto, + StringFieldPropertiesDto, + TagsFieldPropertiesDto +} from './../services/schemas.types'; + +export class FieldFormatter implements FieldPropertiesVisitor { + constructor( + private readonly value: any + ) { + } + + public static format(field: FieldDto, value: any) { + if (value === null || value === undefined) { + return ''; + } + + return field.properties.accept(new FieldFormatter(value)); + } + + public visitDateTime(properties: DateTimeFieldPropertiesDto): string { + try { + const parsed = DateTime.parseISO_UTC(this.value); + + if (properties.editor === 'Date') { + return parsed.toUTCStringFormat('YYYY-MM-DD'); + } else { + return parsed.toUTCStringFormat('YYYY-MM-DD HH:mm:ss'); + } + } catch (ex) { + return this.value; + } + } + + public visitArray(properties: ArrayFieldPropertiesDto): string { + if (this.value.length) { + return `${this.value.length} Item(s)`; + } else { + return '0 Items'; + } + } + + public visitAssets(properties: AssetsFieldPropertiesDto): string { + if (this.value.length) { + return `${this.value.length} Asset(s)`; + } else { + return '0 Assets'; + } + } + + public visitReferences(properties: ReferencesFieldPropertiesDto): string { + if (this.value.length) { + return `${this.value.length} Reference(s)`; + } else { + return '0 References'; + } + } + + public visitTags(properties: TagsFieldPropertiesDto): string { + if (this.value.length) { + return this.value.join(', '); + } else { + return ''; + } + } + + public visitBoolean(properties: BooleanFieldPropertiesDto): string { + return this.value ? 'Yes' : 'No'; + } + + public visitGeolocation(properties: GeolocationFieldPropertiesDto): string { + return `${this.value.longitude}, ${this.value.latitude}`; + } + + public visitJson(properties: JsonFieldPropertiesDto): string { + return ''; + } + + public visitNumber(properties: NumberFieldPropertiesDto): string { + return this.value; + } + + public visitString(properties: StringFieldPropertiesDto): string { + return this.value; + } +} + +export class FieldValidatorsFactory implements FieldPropertiesVisitor { + constructor( + private readonly isOptional: boolean + ) { + } + + public static createValidators(field: FieldDto, isOptional: boolean) { + const validators = field.properties.accept(new FieldValidatorsFactory(isOptional)); + + if (field.properties.isRequired && !isOptional) { + validators.push(Validators.required); + } + + return validators; + } + + public visitNumber(properties: NumberFieldPropertiesDto): ValidatorFn[] { + const validators: ValidatorFn[] = []; + + if (properties.minValue) { + validators.push(Validators.min(properties.minValue)); + } + + if (properties.maxValue) { + validators.push(Validators.max(properties.maxValue)); + } + + if (properties.allowedValues && properties.allowedValues.length > 0) { + const values: (number | null)[] = properties.allowedValues; + + if (properties.isRequired && !this.isOptional) { + validators.push(ValidatorsEx.validValues(values)); + } else { + validators.push(ValidatorsEx.validValues(values.concat([null]))); + } + } + + return validators; + } + + public visitString(properties: StringFieldPropertiesDto): ValidatorFn[] { + const validators: ValidatorFn[] = []; + + if (properties.minLength) { + validators.push(Validators.minLength(properties.minLength)); + } + + if (properties.maxLength) { + validators.push(Validators.maxLength(properties.maxLength)); + } + + if (properties.pattern && properties.pattern.length > 0) { + validators.push(ValidatorsEx.pattern(properties.pattern, properties.patternMessage)); + } + + if (properties.allowedValues && properties.allowedValues.length > 0) { + const values: (string | null)[] = properties.allowedValues; + + if (properties.isRequired && !this.isOptional) { + validators.push(ValidatorsEx.validValues(values)); + } else { + validators.push(ValidatorsEx.validValues(values.concat([null]))); + } + } + + return validators; + } + + public visitArray(properties: ArrayFieldPropertiesDto): ValidatorFn[] { + const validators: ValidatorFn[] = []; + + if (properties.minItems) { + validators.push(Validators.minLength(properties.minItems)); + } + + if (properties.maxItems) { + validators.push(Validators.maxLength(properties.maxItems)); + } + + return validators; + } + + public visitAssets(properties: AssetsFieldPropertiesDto): ValidatorFn[] { + const validators: ValidatorFn[] = []; + + if (properties.minItems) { + validators.push(Validators.minLength(properties.minItems)); + } + + if (properties.maxItems) { + validators.push(Validators.maxLength(properties.maxItems)); + } + + return validators; + } + + public visitReferences(properties: ReferencesFieldPropertiesDto): ValidatorFn[] { + const validators: ValidatorFn[] = []; + + if (properties.minItems) { + validators.push(Validators.minLength(properties.minItems)); + } + + if (properties.maxItems) { + validators.push(Validators.maxLength(properties.maxItems)); + } + + return validators; + } + + public visitTags(properties: TagsFieldPropertiesDto): ValidatorFn[] { + const validators: ValidatorFn[] = []; + + if (properties.minItems) { + validators.push(Validators.minLength(properties.minItems)); + } + + if (properties.maxItems) { + validators.push(Validators.maxLength(properties.maxItems)); + } + + return validators; + } + + public visitBoolean(properties: BooleanFieldPropertiesDto): ValidatorFn[] { + return []; + } + + public visitDateTime(properties: DateTimeFieldPropertiesDto): ValidatorFn[] { + return []; + } + + public visitGeolocation(properties: GeolocationFieldPropertiesDto): ValidatorFn[] { + return []; + } + + public visitJson(properties: JsonFieldPropertiesDto): ValidatorFn[] { + return []; + } +} + +export class FieldDefaultValue implements FieldPropertiesVisitor { + constructor( + private readonly now?: DateTime + ) { + } + + public visitDateTime(properties: DateTimeFieldPropertiesDto): any { + const now = this.now || DateTime.now(); + + if (properties.calculatedDefaultValue === 'Now') { + return now.toUTCStringFormat('YYYY-MM-DDTHH:mm:ss') + 'Z'; + } else if (properties.calculatedDefaultValue === 'Today') { + return now.toUTCStringFormat('YYYY-MM-DD'); + } else { + return properties.defaultValue; + } + } + + public static get(field: FieldDto, now?: DateTime) { + return field.properties.accept(new FieldDefaultValue(now)); + } + + public visitArray(properties: ArrayFieldPropertiesDto): any { + return null; + } + + public visitAssets(properties: AssetsFieldPropertiesDto): any { + return null; + } + + public visitBoolean(properties: BooleanFieldPropertiesDto): any { + return properties.defaultValue; + } + + public visitGeolocation(properties: GeolocationFieldPropertiesDto): any { + return null; + } + + public visitJson(properties: JsonFieldPropertiesDto): any { + return null; + } + + public visitNumber(properties: NumberFieldPropertiesDto): any { + return properties.defaultValue; + } + + public visitReferences(properties: ReferencesFieldPropertiesDto): any { + return null; + } + + public visitString(properties: StringFieldPropertiesDto): any { + return properties.defaultValue; + } + + public visitTags(properties: TagsFieldPropertiesDto): any { + return null; + } +} + +export class EditContentForm extends Form { + constructor( + private readonly schema: SchemaDetailsDto, + private readonly languages: ImmutableArray + ) { + super(new FormGroup({})); + + for (const field of schema.fields) { + const fieldForm = new FormGroup({}); + const fieldDefault = FieldDefaultValue.get(field); + + const createControl = (isOptional: boolean) => { + const validators = FieldValidatorsFactory.createValidators(field, isOptional); + + if (field.isArray) { + return new FormArray([], validators); + } else { + return new FormControl(fieldDefault, validators); + } + }; + + if (field.isLocalizable) { + for (let language of this.languages.values) { + fieldForm.setControl(language.iso2Code, createControl(language.isOptional)); + } + } else { + fieldForm.setControl(fieldInvariant, createControl(false)); + } + + this.form.setControl(field.name, fieldForm); + } + + this.enable(); + } + + public removeArrayItem(field: RootFieldDto, language: AppLanguageDto, index: number) { + this.findArrayItemForm(field, language).removeAt(index); + } + + public insertArrayItem(field: RootFieldDto, language: AppLanguageDto) { + if (field.nested.length > 0) { + const formControl = this.findArrayItemForm(field, language); + + this.addArrayItem(field, language, formControl); + } + } + + private addArrayItem(field: RootFieldDto, language: AppLanguageDto | null, partitionForm: FormArray) { + const itemForm = new FormGroup({}); + + let isOptional = field.isLocalizable && language !== null && language.isOptional; + + for (let nested of field.nested) { + const nestedValidators = FieldValidatorsFactory.createValidators(nested, isOptional); + const nestedDefault = FieldDefaultValue.get(nested); + + itemForm.setControl(nested.name, new FormControl(nestedDefault, nestedValidators)); + } + + partitionForm.push(itemForm); + } + + private findArrayItemForm(field: RootFieldDto, language: AppLanguageDto): FormArray { + const fieldForm = this.form.get(field.name)!; + + if (field.isLocalizable) { + return fieldForm.get(language.iso2Code)!; + } else { + return fieldForm.get(fieldInvariant); + } + } + + public loadContent(value: any, isArchive: boolean) { + for (let field of this.schema.fields) { + if (field.isArray && field.nested.length > 0) { + const fieldForm = this.form.get(field.name); + + if (!fieldForm) { + continue; + } + + const fieldValue = value ? value[field.name] || {} : {}; + + const addControls = (key: string, language: AppLanguageDto | null) => { + const partitionValue = fieldValue[key]; + + let partitionForm = fieldForm.controls[key]; + + if (!partitionForm) { + partitionForm = new FormArray([]); + + fieldForm.setControl(key, partitionForm); + } + + const length = Types.isArray(partitionValue) ? partitionValue.length : 0; + + while (partitionForm.controls.length < length) { + this.addArrayItem(field, language, partitionForm); + } + while (partitionForm.controls.length > length) { + partitionForm.removeAt(partitionForm.length - 1); + } + }; + + if (field.isLocalizable) { + for (let language of this.languages.values) { + addControls(language.iso2Code, language); + } + } else { + addControls(fieldInvariant, null); + } + } + } + + super.load(value); + + if (isArchive) { + this.disable(); + } else { + this.enable(); + } + } + + protected enable() { + if (this.schema.fields.length === 0) { + this.form.enable(); + return; + } + + for (const field of this.schema.fields) { + const fieldForm = this.form.get(field.name); + + if (!fieldForm) { + continue; + } + + if (field.isArray) { + fieldForm.enable(); + + for (let partitionForm of formControls(fieldForm)) { + for (let itemForm of formControls(partitionForm)) { + for (let nested of field.nested) { + const nestedForm = itemForm.get(nested.name); + + if (!nestedForm) { + continue; + } + + if (nested.isDisabled) { + nestedForm.disable({ onlySelf: true }); + } + } + } + } + } else if (field.isDisabled) { + fieldForm.disable(); + } else { + fieldForm.enable(); + } + } + } +} + +export class PatchContentForm extends Form { + constructor( + private readonly schema: SchemaDetailsDto, + private readonly language: AppLanguageDto + ) { + super(new FormGroup({})); + + for (let field of this.schema.listFieldsEditable) { + const validators = FieldValidatorsFactory.createValidators(field, this.language.isOptional); + + this.form.setControl(field.name, new FormControl(undefined, validators)); + } + } + + public submit() { + const result = super.submit(); + + if (result) { + const request = {}; + + for (let field of this.schema.listFieldsEditable) { + const value = result[field.name]; + + if (field.isLocalizable) { + request[field.name] = { [this.language.iso2Code]: value }; + } else { + request[field.name] = { iv: value }; + } + } + + return request; + } + + return result; + } +} \ No newline at end of file diff --git a/src/Squidex/app/shared/state/contents.state.ts b/src/Squidex/app/shared/state/contents.state.ts index 12e28c6cf..fb4300868 100644 --- a/src/Squidex/app/shared/state/contents.state.ts +++ b/src/Squidex/app/shared/state/contents.state.ts @@ -6,135 +6,27 @@ */ import { Injectable } from '@angular/core'; -import { FormControl, FormGroup } from '@angular/forms'; -import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { forkJoin, Observable, of } from 'rxjs'; +import { catchError, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators'; import { DateTime, DialogService, - ErrorDto, - Form, ImmutableArray, + notify, Pager, State, Version, Versioned } from '@app/framework'; -import { AppLanguageDto } from './../services/app-languages.service'; import { AuthService } from './../services/auth.service'; -import { fieldInvariant, SchemaDetailsDto, SchemaDto } from './../services/schemas.service'; +import { SchemaDto } from './../services/schemas.service'; import { AppsState } from './apps.state'; import { SchemasState } from './schemas.state'; import { ContentDto, ContentsService, ScheduleDto } from './../services/contents.service'; -export class EditContentForm extends Form { - constructor( - private readonly schema: SchemaDetailsDto, - private readonly languages: ImmutableArray - ) { - super(new FormGroup({})); - - for (const field of schema.fields) { - const fieldForm = new FormGroup({}); - - const defaultValue = field.defaultValue(); - - if (field.isLocalizable) { - for (let language of this.languages.values) { - fieldForm.setControl(language.iso2Code, new FormControl(defaultValue, field.createValidators(language.isOptional))); - } - } else { - fieldForm.setControl(fieldInvariant, new FormControl(defaultValue, field.createValidators(false))); - } - - this.form.setControl(field.name, fieldForm); - } - - this.enableContentForm(); - } - - public submitCompleted(newValue?: any) { - super.submitCompleted(newValue); - - this.enableContentForm(); - } - - public submitFailed(error?: string | ErrorDto) { - super.submitFailed(error); - - this.enableContentForm(); - } - - public loadData(value: any, isArchive: boolean) { - super.load(value); - - if (isArchive) { - this.form.disable(); - } else { - this.enableContentForm(); - } - } - - private enableContentForm() { - if (this.schema.fields.length === 0) { - this.form.enable(); - } else { - for (const field of this.schema.fields) { - const fieldForm = this.form.controls[field.name]; - - if (field.isDisabled) { - fieldForm.disable(); - } else { - fieldForm.enable(); - } - } - } - } -} - -export class PatchContentForm extends Form { - constructor( - private readonly schema: SchemaDetailsDto, - private readonly language: AppLanguageDto - ) { - super(new FormGroup({})); - - for (let field of this.schema.listFields) { - if (field.properties && field.properties['inlineEditable']) { - this.form.setControl(field.name, new FormControl(undefined, field.createValidators(this.language.isOptional))); - } - } - } - - public submit() { - const result = super.submit(); - - if (result) { - const request = {}; - - for (let field of this.schema.listFields) { - if (field.properties['inlineEditable']) { - const value = result[field.name]; - - if (field.isLocalizable) { - request[field.name] = { [this.language.iso2Code]: value }; - } else { - request[field.name] = { iv: value }; - } - } - } - - return request; - } - - return result; - } -} - interface Snapshot { contents: ImmutableArray; contentsPager: Pager; @@ -148,28 +40,28 @@ interface Snapshot { export abstract class ContentsStateBase extends State { public selectedContent = - this.changes.map(x => x.selectedContent) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.selectedContent), + distinctUntilChanged()); public contents = - this.changes.map(x => x.contents) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.contents), + distinctUntilChanged()); public contentsPager = - this.changes.map(x => x.contentsPager) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.contentsPager), + distinctUntilChanged()); public contentsQuery = - this.changes.map(x => x.contentsQuery) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.contentsQuery), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); public isArchive = - this.changes.map(x => !!x.isArchive) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isArchive), + distinctUntilChanged()); constructor( private readonly appsState: AppsState, @@ -181,27 +73,27 @@ export abstract class ContentsStateBase extends State { } public select(id: string | null): Observable { - return this.loadContent(id) - .do(content => { + return this.loadContent(id).pipe( + tap(content => { this.next(s => { const contents = content ? s.contents.replaceBy('id', content) : s.contents; return { ...s, selectedContent: content, contents }; }); - }); + })); } private loadContent(id: string | null) { return !id ? - Observable.of(null) : - Observable.of(this.snapshot.contents.find(x => x.id === id)) - .switchMap(content => { + of(null) : + of(this.snapshot.contents.find(x => x.id === id)).pipe( + switchMap(content => { if (!content) { - return this.contentsService.getContent(this.appName, this.schemaName, id).catch(() => Observable.of(null)); + return this.contentsService.getContent(this.appName, this.schemaName, id).pipe(catchError(() => of(null))); } else { - return Observable.of(content); + return of(content); } - }); + })); } public load(isReload = false): Observable { @@ -217,8 +109,8 @@ export abstract class ContentsStateBase extends State { this.snapshot.contentsPager.pageSize, this.snapshot.contentsPager.skip, this.snapshot.contentsQuery, undefined, - this.snapshot.isArchive) - .do(dtos => { + this.snapshot.isArchive).pipe( + tap(dtos => { if (isReload) { this.dialogs.notifyInfo('Contents reloaded.'); } @@ -235,13 +127,13 @@ export abstract class ContentsStateBase extends State { return { ...s, contents, contentsPager, selectedContent, isLoaded: true }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public create(request: any, publish: boolean, now?: DateTime) { - return this.contentsService.postContent(this.appName, this.schemaName, request, publish) - .do(dto => { + return this.contentsService.postContent(this.appName, this.schemaName, request, publish).pipe( + tap(dto => { this.dialogs.notifyInfo('Contents created successfully.'); return this.next(s => { @@ -250,47 +142,47 @@ export abstract class ContentsStateBase extends State { return { ...s, contents, contentsPager }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public changeManyStatus(contents: ContentDto[], action: string, dueTime: string | null): Observable { - return Observable.forkJoin( + return forkJoin( contents.map(c => - this.contentsService.changeContentStatus(this.appName, this.schemaName, c.id, action, dueTime, c.version) - .catch(error => Observable.of(error)))) - .do(results => { + this.contentsService.changeContentStatus(this.appName, this.schemaName, c.id, action, dueTime, c.version).pipe( + catchError(error => of(error))))).pipe( + tap(results => { const error = results.find(x => !!x.error); if (error) { this.dialogs.notifyError(error); } - return Observable.of(error); - }) - .switchMap(() => this.loadInternal()); + return of(error); + }), + switchMap(() => this.loadInternal())); } public deleteMany(contents: ContentDto[]): Observable { - return Observable.forkJoin( - contents.map(c => - this.contentsService.deleteContent(this.appName, this.schemaName, c.id, c.version) - .catch(error => Observable.of(error)))) - .do(results => { + return forkJoin( + contents.map(c => + this.contentsService.deleteContent(this.appName, this.schemaName, c.id, c.version).pipe( + catchError(error => of(error))))).pipe( + tap(results => { const error = results.find(x => !!x.error); if (error) { this.dialogs.notifyError(error); } - return Observable.of(error); - }) - .switchMap(() => this.loadInternal()); + return of(error); + }), + switchMap(() => this.loadInternal())); } public publishChanges(content: ContentDto, dueTime: string | null, now?: DateTime): Observable { - return this.contentsService.changeContentStatus(this.appName, this.schemaName, content.id, 'Publish', dueTime, content.version) - .do(dto => { + return this.contentsService.changeContentStatus(this.appName, this.schemaName, content.id, 'Publish', dueTime, content.version).pipe( + tap(dto => { this.dialogs.notifyInfo('Content updated successfully.'); if (dueTime) { @@ -298,13 +190,13 @@ export abstract class ContentsStateBase extends State { } else { this.replaceContent(confirmChanges(content, this.user, dto.version, now)); } - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public changeStatus(content: ContentDto, action: string, status: string, dueTime: string | null, now?: DateTime): Observable { - return this.contentsService.changeContentStatus(this.appName, this.schemaName, content.id, action, dueTime, content.version) - .do(dto => { + return this.contentsService.changeContentStatus(this.appName, this.schemaName, content.id, action, dueTime, content.version).pipe( + tap(dto => { this.dialogs.notifyInfo('Content updated successfully.'); if (dueTime) { @@ -312,48 +204,48 @@ export abstract class ContentsStateBase extends State { } else { this.replaceContent(changeStatus(content, status, this.user, dto.version, now)); } - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public update(content: ContentDto, request: any, now?: DateTime): Observable { - return this.contentsService.putContent(this.appName, this.schemaName, content.id, request, false, content.version) - .do(dto => { + return this.contentsService.putContent(this.appName, this.schemaName, content.id, request, false, content.version).pipe( + tap(dto => { this.dialogs.notifyInfo('Content updated successfully.'); this.replaceContent(updateData(content, dto.payload, this.user, dto.version, now)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public proposeUpdate(content: ContentDto, request: any, now?: DateTime): Observable { - return this.contentsService.putContent(this.appName, this.schemaName, content.id, request, true, content.version) - .do(dto => { + return this.contentsService.putContent(this.appName, this.schemaName, content.id, request, true, content.version).pipe( + tap(dto => { this.dialogs.notifyInfo('Content updated successfully.'); this.replaceContent(updateDataDraft(content, dto.payload, this.user, dto.version, now)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public discardChanges(content: ContentDto, now?: DateTime): Observable { - return this.contentsService.discardChanges(this.appName, this.schemaName, content.id, content.version) - .do(dto => { + return this.contentsService.discardChanges(this.appName, this.schemaName, content.id, content.version).pipe( + tap(dto => { this.dialogs.notifyInfo('Content updated successfully.'); this.replaceContent(discardChanges(content, this.user, dto.version, now)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public patch(content: ContentDto, request: any, now?: DateTime): Observable { - return this.contentsService.patchContent(this.appName, this.schemaName, content.id, request, content.version) - .do(dto => { + return this.contentsService.patchContent(this.appName, this.schemaName, content.id, request, content.version).pipe( + tap(dto => { this.dialogs.notifyInfo('Content updated successfully.'); this.replaceContent(updateData(content, dto.payload, this.user, dto.version, now)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } private replaceContent(content: ContentDto) { @@ -396,8 +288,7 @@ export abstract class ContentsStateBase extends State { } public loadVersion(content: ContentDto, version: Version): Observable> { - return this.contentsService.getVersionData(this.appName, this.schemaName, content.id, version) - .notify(this.dialogs); + return this.contentsService.getVersionData(this.appName, this.schemaName, content.id, version).pipe(notify(this.dialogs)); } private get appName() { @@ -439,74 +330,55 @@ export class ManualContentsState extends ContentsStateBase { } } +const changeScheduleStatus = (content: ContentDto, status: string, dueTime: string, user: string, version: Version, now?: DateTime) => + content.with({ + scheduleJob: new ScheduleDto(status, user, DateTime.parseISO_UTC(dueTime)), + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); + const changeStatus = (content: ContentDto, status: string, user: string, version: Version, now?: DateTime) => - new ContentDto( - content.id, + content.with({ status, - content.createdBy, user, - content.created, now || DateTime.now(), - null, - content.isPending, - content.data, - content.dataDraft, - version); - -const changeScheduleStatus = (content: ContentDto, status: string, dueTime: string, user: string, version: Version, now?: DateTime) => - new ContentDto( - content.id, - content.status, - content.createdBy, user, - content.created, now || DateTime.now(), - new ScheduleDto(status, user, DateTime.parseISO_UTC(dueTime)), - content.isPending, - content.data, - content.dataDraft, - version); + scheduleJob: null, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); const updateData = (content: ContentDto, data: any, user: string, version: Version, now?: DateTime) => - new ContentDto( - content.id, - content.status, - content.createdBy, user, - content.created, now || DateTime.now(), - content.scheduleJob, - content.isPending, - data, + content.with({ data, - version); + dataDraft: data, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); const updateDataDraft = (content: ContentDto, data: any, user: string, version: Version, now?: DateTime) => - new ContentDto( - content.id, - content.status, - content.createdBy, user, - content.created, now || DateTime.now(), - content.scheduleJob, - true, - content.data, - data, - version); + content.with({ + isPending: true, + dataDraft: data, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); const confirmChanges = (content: ContentDto, user: string, version: Version, now?: DateTime) => - new ContentDto( - content.id, - content.status, - content.createdBy, user, - content.created, now || DateTime.now(), - null, - false, - content.dataDraft, - content.dataDraft, - version); + content.with({ + isPending: false, + data: content.dataDraft, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); const discardChanges = (content: ContentDto, user: string, version: Version, now?: DateTime) => - new ContentDto( - content.id, - content.status, - content.createdBy, user, - content.created, now || DateTime.now(), - content.scheduleJob, - false, - content.data, - content.data, - version); \ No newline at end of file + content.with({ + isPending: false, + dataDraft: content.data, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); \ No newline at end of file diff --git a/src/Squidex/app/shared/state/contributors.forms.ts b/src/Squidex/app/shared/state/contributors.forms.ts new file mode 100644 index 000000000..3680fa2e6 --- /dev/null +++ b/src/Squidex/app/shared/state/contributors.forms.ts @@ -0,0 +1,26 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { map, startWith } from 'rxjs/operators'; + +import { Form } from '@app/framework'; + +export class AssignContributorForm extends Form { + public hasNoUser = + this.form.controls['user'].valueChanges.pipe(startWith(null), map(x => !x)); + + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + user: [null, + [ + Validators.required + ] + ] + })); + } +} \ No newline at end of file diff --git a/src/Squidex/app/shared/state/contributors.state.spec.ts b/src/Squidex/app/shared/state/contributors.state.spec.ts index 7408ea9f0..ad6145a09 100644 --- a/src/Squidex/app/shared/state/contributors.state.spec.ts +++ b/src/Squidex/app/shared/state/contributors.state.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -52,7 +52,7 @@ describe('ContributorsState', () => { contributorsService = Mock.ofType(); contributorsService.setup(x => x.getContributors(app)) - .returns(() => Observable.of(new AppContributorsDto(oldContributors, 3, version))); + .returns(() => of(new AppContributorsDto(oldContributors, 3, version))); contributorsState = new ContributorsState(contributorsService.object, appsState.object, authService.object, dialogs.object); contributorsState.load().subscribe(); @@ -74,6 +74,8 @@ describe('ContributorsState', () => { it('should show notification on load when reload is true', () => { contributorsState.load(true).subscribe(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); @@ -83,7 +85,7 @@ describe('ContributorsState', () => { const request = new AppContributorDto('mail2stehle@gmail.com', 'Developer'); contributorsService.setup(x => x.postContributor(app, request, version)) - .returns(() => Observable.of(new Versioned(newVersion, newContributor))); + .returns(() => of(new Versioned(newVersion, newContributor))); contributorsState.assign(request).subscribe(); @@ -103,7 +105,7 @@ describe('ContributorsState', () => { const request = new AppContributorDto('mail2stehle@gmail.com', 'Owner'); contributorsService.setup(x => x.postContributor(app, request, version)) - .returns(() => Observable.of(new Versioned(newVersion, newContributor))); + .returns(() => of(new Versioned(newVersion, newContributor))); contributorsState.assign(request).subscribe(); @@ -118,7 +120,7 @@ describe('ContributorsState', () => { it('should remove contributor from snapshot when revoked', () => { contributorsService.setup(x => x.deleteContributor(app, oldContributors[0].contributorId, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); contributorsState.revoke(oldContributors[0]).subscribe(); diff --git a/src/Squidex/app/shared/state/contributors.state.ts b/src/Squidex/app/shared/state/contributors.state.ts index 71986f287..2b218bcd8 100644 --- a/src/Squidex/app/shared/state/contributors.state.ts +++ b/src/Squidex/app/shared/state/contributors.state.ts @@ -6,15 +6,13 @@ */ import { Injectable } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { distinctUntilChanged, map, tap } from 'rxjs/operators'; import { DialogService, - Form, ImmutableArray, + notify, State, Version } from '@app/framework'; @@ -23,21 +21,6 @@ import { AppContributorDto, AppContributorsService } from './../services/app-con import { AuthService } from './../services/auth.service'; import { AppsState } from './apps.state'; -export class AssignContributorForm extends Form { - public hasNoUser = - this.form.controls['user'].valueChanges.startWith(null).map(x => !x); - - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - user: [null, - [ - Validators.required - ] - ] - })); - } -} - interface SnapshotContributor { contributor: AppContributorDto; @@ -58,20 +41,20 @@ interface Snapshot { @Injectable() export class ContributorsState extends State { public contributors = - this.changes.map(x => x.contributors) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.contributors), + distinctUntilChanged()); public isMaxReached = - this.changes.map(x => x.isMaxReached) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.isMaxReached), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); public maxContributors = - this.changes.map(x => x.maxContributors) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.maxContributors), + distinctUntilChanged()); constructor( private readonly appContributorsService: AppContributorsService, @@ -87,8 +70,8 @@ export class ContributorsState extends State { this.resetState(); } - return this.appContributorsService.getContributors(this.appName) - .do(dtos => { + return this.appContributorsService.getContributors(this.appName).pipe( + tap(dtos => { if (isReload) { this.dialogs.notifyInfo('Contributors reloaded.'); } @@ -96,28 +79,28 @@ export class ContributorsState extends State { const contributors = ImmutableArray.of(dtos.contributors.map(x => this.createContributor(x))); this.replaceContributors(contributors, dtos.version, dtos.maxContributors); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public revoke(contributor: AppContributorDto): Observable { - return this.appContributorsService.deleteContributor(this.appName, contributor.contributorId, this.version) - .do(dto => { + return this.appContributorsService.deleteContributor(this.appName, contributor.contributorId, this.version).pipe( + tap(dto => { const contributors = this.snapshot.contributors.filter(x => x.contributor.contributorId !== contributor.contributorId); this.replaceContributors(contributors, dto.version); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public assign(request: AppContributorDto): Observable { - return this.appContributorsService.postContributor(this.appName, request, this.version) - .do(dto => { + return this.appContributorsService.postContributor(this.appName, request, this.version).pipe( + tap(dto => { const contributors = this.updateContributors(dto.payload.contributorId, request.permission, dto.version); this.replaceContributors(contributors, dto.version); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } private updateContributors(id: string, permission: string, version: Version) { diff --git a/src/Squidex/app/shared/state/languages.forms.ts b/src/Squidex/app/shared/state/languages.forms.ts new file mode 100644 index 000000000..bc2e57568 --- /dev/null +++ b/src/Squidex/app/shared/state/languages.forms.ts @@ -0,0 +1,45 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; + +import { Form } from '@app/framework'; + +export class EditLanguageForm extends Form { + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + isMaster: false, + isOptional: false + })); + + this.form.controls['isMaster'].valueChanges + .subscribe(value => { + if (value) { + this.form.controls['isOptional'].setValue(false); + } + }); + + this.form.controls['isOptional'].valueChanges + .subscribe(value => { + if (value) { + this.form.controls['isMaster'].setValue(false); + } + }); + } +} + +export class AddLanguageForm extends Form { + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + language: [null, + [ + Validators.required + ] + ] + })); + } +} \ No newline at end of file diff --git a/src/Squidex/app/shared/state/languages.state.spec.ts b/src/Squidex/app/shared/state/languages.state.spec.ts index 5a51cfe3f..57ebc7be0 100644 --- a/src/Squidex/app/shared/state/languages.state.spec.ts +++ b/src/Squidex/app/shared/state/languages.state.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -55,12 +55,12 @@ describe('LanguagesState', () => { allLanguagesService = Mock.ofType(); allLanguagesService.setup(x => x.getLanguages()) - .returns(() => Observable.of([languageDE, languageEN, languageIT, languageES])); + .returns(() => of([languageDE, languageEN, languageIT, languageES])); languagesService = Mock.ofType(); languagesService.setup(x => x.getLanguages(app)) - .returns(() => Observable.of(new AppLanguagesDto(oldLanguages, version))); + .returns(() => of(new AppLanguagesDto(oldLanguages, version))); languagesState = new LanguagesState(languagesService.object, appsState.object, dialogs.object, allLanguagesService.object); languagesState.load().subscribe(); @@ -88,6 +88,8 @@ describe('LanguagesState', () => { it('should show notification on load when reload is true', () => { languagesState.load(true).subscribe(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); @@ -95,7 +97,7 @@ describe('LanguagesState', () => { const newLanguage = new AppLanguageDto(languageIT.iso2Code, languageIT.englishName, false, false, []); languagesService.setup(x => x.postLanguage(app, It.isAny(), version)) - .returns(() => Observable.of(new Versioned(newVersion, newLanguage))); + .returns(() => of(new Versioned(newVersion, newLanguage))); languagesState.add(languageIT).subscribe(); @@ -122,7 +124,7 @@ describe('LanguagesState', () => { const request = new UpdateAppLanguageDto(true, false, []); languagesService.setup(x => x.putLanguage(app, oldLanguages[1].iso2Code, request, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); languagesState.update(oldLanguages[1], request).subscribe(); @@ -146,7 +148,7 @@ describe('LanguagesState', () => { it('should remove language from snapshot when deleted', () => { languagesService.setup(x => x.deleteLanguage(app, oldLanguages[1].iso2Code, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); languagesState.remove(oldLanguages[1]).subscribe(); diff --git a/src/Squidex/app/shared/state/languages.state.ts b/src/Squidex/app/shared/state/languages.state.ts index 64c53da5d..c0c61e9a1 100644 --- a/src/Squidex/app/shared/state/languages.state.ts +++ b/src/Squidex/app/shared/state/languages.state.ts @@ -6,15 +6,13 @@ */ import { Injectable } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { forkJoin, Observable } from 'rxjs'; +import { distinctUntilChanged, map, tap } from 'rxjs/operators'; import { DialogService, - Form, ImmutableArray, + notify, State, Version } from '@app/framework'; @@ -23,42 +21,6 @@ import { AddAppLanguageDto, AppLanguageDto, AppLanguagesService, UpdateAppLangua import { LanguageDto, LanguagesService } from './../services/languages.service'; import { AppsState } from './apps.state'; - -export class EditLanguageForm extends Form { - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - isMaster: false, - isOptional: false - })); - - this.form.controls['isMaster'].valueChanges - .subscribe(value => { - if (value) { - this.form.controls['isOptional'].setValue(false); - } - }); - - this.form.controls['isOptional'].valueChanges - .subscribe(value => { - if (value) { - this.form.controls['isMaster'].setValue(false); - } - }); - } -} - -export class AddLanguageForm extends Form { - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - language: [null, - [ - Validators.required - ] - ] - })); - } -} - interface SnapshotLanguage { language: AppLanguageDto; @@ -82,16 +44,16 @@ interface Snapshot { @Injectable() export class LanguagesState extends State { public languages = - this.changes.map(x => x.languages) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.languages), + distinctUntilChanged()); public newLanguages = - this.changes.map(x => x.allLanguagesNew) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.allLanguagesNew), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); constructor( private readonly appLanguagesService: AppLanguagesService, @@ -113,12 +75,13 @@ export class LanguagesState extends State { this.resetState(); } - return Observable.forkJoin( + return forkJoin( this.languagesService.getLanguages(), - this.appLanguagesService.getLanguages(this.appName), - (allLanguages, languages) => ({ allLanguages, languages }) - ) - .do(dtos => { + this.appLanguagesService.getLanguages(this.appName)).pipe( + map(args => { + return { allLanguages: args[0], languages: args[1] }; + }), + tap(dtos => { if (isReload) { this.dialogs.notifyInfo('Languages reloaded.'); } @@ -126,33 +89,33 @@ export class LanguagesState extends State { const sorted = ImmutableArray.of(dtos.allLanguages).sortByStringAsc(x => x.englishName); this.replaceLanguages(ImmutableArray.of(dtos.languages.languages), dtos.languages.version, sorted); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public add(language: LanguageDto): Observable { - return this.appLanguagesService.postLanguage(this.appName, new AddAppLanguageDto(language.iso2Code), this.version) - .do(dto => { + return this.appLanguagesService.postLanguage(this.appName, new AddAppLanguageDto(language.iso2Code), this.version).pipe( + tap(dto => { const languages = this.snapshot.plainLanguages.push(dto.payload).sortByStringAsc(x => x.englishName); this.replaceLanguages(languages, dto.version); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public remove(language: AppLanguageDto): Observable { - return this.appLanguagesService.deleteLanguage(this.appName, language.iso2Code, this.version) - .do(dto => { + return this.appLanguagesService.deleteLanguage(this.appName, language.iso2Code, this.version).pipe( + tap(dto => { const languages = this.snapshot.plainLanguages.filter(x => x.iso2Code !== language.iso2Code); this.replaceLanguages(languages, dto.version); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public update(language: AppLanguageDto, request: UpdateAppLanguageDto): Observable { - return this.appLanguagesService.putLanguage(this.appName, language.iso2Code, request, this.version) - .do(dto => { + return this.appLanguagesService.putLanguage(this.appName, language.iso2Code, request, this.version).pipe( + tap(dto => { const languages = this.snapshot.plainLanguages.map(l => { if (l.iso2Code === language.iso2Code) { return update(l, request.isMaster, request.isOptional, request.fallback); @@ -164,8 +127,8 @@ export class LanguagesState extends State { }); this.replaceLanguages(languages, dto.version); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } private replaceLanguages(languages: ImmutableArray, version: Version, allLanguages?: ImmutableArray) { @@ -216,8 +179,6 @@ export class LanguagesState extends State { } } - - const update = (language: AppLanguageDto, isMaster: boolean, isOptional: boolean, fallback: string[]) => new AppLanguageDto( language.iso2Code, diff --git a/src/Squidex/app/shared/state/patterns.forms.ts b/src/Squidex/app/shared/state/patterns.forms.ts new file mode 100644 index 000000000..4267d5da2 --- /dev/null +++ b/src/Squidex/app/shared/state/patterns.forms.ts @@ -0,0 +1,34 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; + +import { Form, ValidatorsEx } from '@app/framework'; + +export class EditPatternForm extends Form { + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + name: ['', + [ + Validators.required, + Validators.maxLength(100), + ValidatorsEx.pattern('[A-z0-9]+[A-z0-9\- ]*[A-z0-9]', 'Name can only contain letters, numbers, dashes and spaces.') + ] + ], + pattern: ['', + [ + Validators.required + ] + ], + message: ['', + [ + Validators.maxLength(1000) + ] + ] + })); + } +} \ No newline at end of file diff --git a/src/Squidex/app/shared/state/patterns.state.spec.ts b/src/Squidex/app/shared/state/patterns.state.spec.ts index 705f2814d..fcb4fe6b7 100644 --- a/src/Squidex/app/shared/state/patterns.state.spec.ts +++ b/src/Squidex/app/shared/state/patterns.state.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -46,7 +46,7 @@ describe('PatternsState', () => { patternsService = Mock.ofType(); patternsService.setup(x => x.getPatterns(app)) - .returns(() => Observable.of(new AppPatternsDto(oldPatterns, version))); + .returns(() => of(new AppPatternsDto(oldPatterns, version))); patternsState = new PatternsState(patternsService.object, appsState.object, dialogs.object); patternsState.load().subscribe(); @@ -62,6 +62,8 @@ describe('PatternsState', () => { it('should show notification on load when reload is true', () => { patternsState.load(true).subscribe(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); @@ -71,7 +73,7 @@ describe('PatternsState', () => { const request = new EditAppPatternDto('name3', 'pattern3', ''); patternsService.setup(x => x.postPattern(app, request, version)) - .returns(() => Observable.of(new Versioned(newVersion, newPattern))); + .returns(() => of(new Versioned(newVersion, newPattern))); patternsState.create(request).subscribe(); @@ -83,7 +85,7 @@ describe('PatternsState', () => { const request = new EditAppPatternDto('a_name2', 'a_pattern2', 'a_message2'); patternsService.setup(x => x.putPattern(app, oldPatterns[1].id, request, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); patternsState.update(oldPatterns[1], request).subscribe(); @@ -97,7 +99,7 @@ describe('PatternsState', () => { it('should remove pattern from snapshot when deleted', () => { patternsService.setup(x => x.deletePattern(app, oldPatterns[0].id, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); patternsState.delete(oldPatterns[0]).subscribe(); diff --git a/src/Squidex/app/shared/state/patterns.state.ts b/src/Squidex/app/shared/state/patterns.state.ts index 1a1153764..ad038005b 100644 --- a/src/Squidex/app/shared/state/patterns.state.ts +++ b/src/Squidex/app/shared/state/patterns.state.ts @@ -6,17 +6,14 @@ */ import { Injectable } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { distinctUntilChanged, map, tap } from 'rxjs/operators'; import { DialogService, - Form, ImmutableArray, + notify, State, - ValidatorsEx, Version } from '@app/framework'; @@ -28,30 +25,6 @@ import { EditAppPatternDto } from './../services/app-patterns.service'; -export class EditPatternForm extends Form { - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - name: ['', - [ - Validators.required, - Validators.maxLength(100), - ValidatorsEx.pattern('[A-z0-9]+[A-z0-9\- ]*[A-z0-9]', 'Name can only contain letters, numbers, dashes and spaces.') - ] - ], - pattern: ['', - [ - Validators.required - ] - ], - message: ['', - [ - Validators.maxLength(1000) - ] - ] - })); - } -} - interface Snapshot { patterns: ImmutableArray; @@ -63,12 +36,12 @@ interface Snapshot { @Injectable() export class PatternsState extends State { public patterns = - this.changes.map(x => x.patterns) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.patterns), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); constructor( private readonly appPatternsService: AppPatternsService, @@ -83,8 +56,8 @@ export class PatternsState extends State { this.resetState(); } - return this.appPatternsService.getPatterns(this.appName) - .do(dtos => { + return this.appPatternsService.getPatterns(this.appName).pipe( + tap(dtos => { if (isReload) { this.dialogs.notifyInfo('Patterns reloaded.'); } @@ -94,44 +67,44 @@ export class PatternsState extends State { return { ...s, patterns, isLoaded: true, version: dtos.version }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public create(request: EditAppPatternDto): Observable { - return this.appPatternsService.postPattern(this.appName, request, this.version) - .do(dto => { + return this.appPatternsService.postPattern(this.appName, request, this.version).pipe( + tap(dto => { this.next(s => { const patterns = s.patterns.push(dto.payload).sortByStringAsc(x => x.name); return { ...s, patterns, version: dto.version }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public update(pattern: AppPatternDto, request: EditAppPatternDto): Observable { - return this.appPatternsService.putPattern(this.appName, pattern.id, request, this.version) - .do(dto => { + return this.appPatternsService.putPattern(this.appName, pattern.id, request, this.version).pipe( + tap(dto => { this.next(s => { const patterns = s.patterns.replaceBy('id', update(pattern, request)).sortByStringAsc(x => x.name); return { ...s, patterns, version: dto.version }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public delete(pattern: AppPatternDto): Observable { - return this.appPatternsService.deletePattern(this.appName, pattern.id, this.version) - .do(dto => { + return this.appPatternsService.deletePattern(this.appName, pattern.id, this.version).pipe( + tap(dto => { this.next(s => { const patterns = s.patterns.filter(c => c.id !== pattern.id); return { ...s, patterns, version: dto.version }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } private get appName() { diff --git a/src/Squidex/app/shared/state/plans.state.spec.ts b/src/Squidex/app/shared/state/plans.state.spec.ts index 627259a61..acf86b7e0 100644 --- a/src/Squidex/app/shared/state/plans.state.spec.ts +++ b/src/Squidex/app/shared/state/plans.state.spec.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -55,13 +56,13 @@ describe('PlansState', () => { plansService = Mock.ofType(); plansService.setup(x => x.getPlans(app)) - .returns(() => Observable.of(oldPlans)); + .returns(() => of(oldPlans)); plansState = new PlansState(appsState.object, authService.object, dialogs.object, plansService.object); }); it('should load plans', () => { - plansState.load().onErrorResumeNext().subscribe(); + plansState.load().pipe(onErrorResumeNext()).subscribe(); expect(plansState.snapshot.plans.values).toEqual([ { isSelected: true, isYearlySelected: false, plan: oldPlans.plans[0] }, @@ -76,7 +77,7 @@ describe('PlansState', () => { }); it('should load plans with overriden id', () => { - plansState.load(false, 'id2_yearly').onErrorResumeNext().subscribe(); + plansState.load(false, 'id2_yearly').pipe(onErrorResumeNext()).subscribe(); expect(plansState.snapshot.plans.values).toEqual([ { isSelected: false, isYearlySelected: false, plan: oldPlans.plans[0] }, @@ -93,6 +94,8 @@ describe('PlansState', () => { it('should show notification on load when reload is true', () => { plansState.load(true).subscribe(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); @@ -100,10 +103,10 @@ describe('PlansState', () => { plansState.window = { location: {} }; plansService.setup(x => x.putPlan(app, It.isAny(), version)) - .returns(() => Observable.of(new Versioned(newVersion, new PlanChangedDto('URI')))); + .returns(() => of(new Versioned(newVersion, new PlanChangedDto('URI')))); plansState.load().subscribe(); - plansState.change('free').onErrorResumeNext().subscribe(); + plansState.change('free').pipe(onErrorResumeNext()).subscribe(); expect(plansState.snapshot.plans.values).toEqual([ { isSelected: true, isYearlySelected: false, plan: oldPlans.plans[0] }, @@ -117,10 +120,10 @@ describe('PlansState', () => { plansState.window = { location: {} }; plansService.setup(x => x.putPlan(app, It.isAny(), version)) - .returns(() => Observable.of(new Versioned(newVersion, new PlanChangedDto('')))); + .returns(() => of(new Versioned(newVersion, new PlanChangedDto('')))); plansState.load().subscribe(); - plansState.change('id2_yearly').onErrorResumeNext().subscribe(); + plansState.change('id2_yearly').pipe(onErrorResumeNext()).subscribe(); expect(plansState.snapshot.plans.values).toEqual([ { isSelected: false, isYearlySelected: false, plan: oldPlans.plans[0] }, diff --git a/src/Squidex/app/shared/state/plans.state.ts b/src/Squidex/app/shared/state/plans.state.ts index b4bebb278..4687f0fbd 100644 --- a/src/Squidex/app/shared/state/plans.state.ts +++ b/src/Squidex/app/shared/state/plans.state.ts @@ -7,12 +7,12 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { distinctUntilChanged, map, tap } from 'rxjs/operators'; import { DialogService, ImmutableArray, + notify, State, Version } from '@app/framework'; @@ -47,24 +47,24 @@ interface Snapshot { @Injectable() export class PlansState extends State { public plans = - this.changes.map(x => x.plans) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.plans), + distinctUntilChanged()); public isOwner = - this.changes.map(x => !!x.isOwner) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isOwner), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); public isDisabled = - this.changes.map(x => !x.isOwner) - .distinctUntilChanged(); + this.changes.pipe(map(x => !x.isOwner), + distinctUntilChanged()); public hasPortal = - this.changes.map(x => x.hasPortal) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.hasPortal), + distinctUntilChanged()); public window = window; @@ -82,8 +82,8 @@ export class PlansState extends State { this.resetState(); } - return this.plansService.getPlans(this.appName) - .do(dto => { + return this.plansService.getPlans(this.appName).pipe( + tap(dto => { if (isReload) { this.dialogs.notifyInfo('Plans reloaded.'); } @@ -101,13 +101,13 @@ export class PlansState extends State { hasPortal: dto.hasPortal }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public change(planId: string): Observable { - return this.plansService.putPlan(this.appName, new ChangePlanDto(planId), this.version) - .do(dto => { + return this.plansService.putPlan(this.appName, new ChangePlanDto(planId), this.version).pipe( + tap(dto => { if (dto.payload.redirectUri && dto.payload.redirectUri.length > 0) { this.window.location.href = dto.payload.redirectUri; } else { @@ -117,8 +117,8 @@ export class PlansState extends State { return { ...s, plans, isOwner: true, version: dto.version }; }); } - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } private createPlan(plan: PlanDto, id: string) { diff --git a/src/Squidex/app/shared/state/rule-events.state.spec.ts b/src/Squidex/app/shared/state/rule-events.state.spec.ts index 4430cc44e..f2ce20829 100644 --- a/src/Squidex/app/shared/state/rule-events.state.spec.ts +++ b/src/Squidex/app/shared/state/rule-events.state.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -46,7 +46,7 @@ describe('RuleEventsState', () => { rulesService = Mock.ofType(); rulesService.setup(x => x.getEvents(app, 10, 0)) - .returns(() => Observable.of(new RuleEventsDto(200, oldRuleEvents))); + .returns(() => of(new RuleEventsDto(200, oldRuleEvents))); ruleEventsState = new RuleEventsState(appsState.object, dialogs.object, rulesService.object); ruleEventsState.load().subscribe(); @@ -63,26 +63,32 @@ describe('RuleEventsState', () => { it('should show notification on load when reload is true', () => { ruleEventsState.load(true).subscribe(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); it('should load next page and prev page when paging', () => { rulesService.setup(x => x.getEvents(app, 10, 10)) - .returns(() => Observable.of(new RuleEventsDto(200, []))); + .returns(() => of(new RuleEventsDto(200, []))); ruleEventsState.goNext().subscribe(); ruleEventsState.goPrev().subscribe(); + expect().nothing(); + rulesService.verify(x => x.getEvents(app, 10, 10), Times.once()); rulesService.verify(x => x.getEvents(app, 10, 0), Times.exactly(2)); }); it('should call service when enqueuing event', () => { rulesService.setup(x => x.enqueueEvent(app, oldRuleEvents[0].id)) - .returns(() => Observable.of({})); + .returns(() => of({})); ruleEventsState.enqueue(oldRuleEvents[0]).subscribe(); + expect().nothing(); + rulesService.verify(x => x.enqueueEvent(app, oldRuleEvents[0].id), Times.once()); }); }); \ No newline at end of file diff --git a/src/Squidex/app/shared/state/rule-events.state.ts b/src/Squidex/app/shared/state/rule-events.state.ts index 643a29eaa..03593ca98 100644 --- a/src/Squidex/app/shared/state/rule-events.state.ts +++ b/src/Squidex/app/shared/state/rule-events.state.ts @@ -7,12 +7,12 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { distinctUntilChanged, map, tap } from 'rxjs/operators'; import { DialogService, ImmutableArray, + notify, Pager, State } from '@app/framework'; @@ -31,16 +31,16 @@ interface Snapshot { @Injectable() export class RuleEventsState extends State { public ruleEvents = - this.changes.map(x => x.ruleEvents) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.ruleEvents), + distinctUntilChanged()); public ruleEventsPager = - this.changes.map(x => x.ruleEventsPager) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.ruleEventsPager), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); constructor( private readonly appsState: AppsState, @@ -61,8 +61,8 @@ export class RuleEventsState extends State { private loadInternal(isReload = false): Observable { return this.rulesService.getEvents(this.appName, this.snapshot.ruleEventsPager.pageSize, - this.snapshot.ruleEventsPager.skip) - .do(dtos => { + this.snapshot.ruleEventsPager.skip).pipe( + tap(dtos => { if (isReload) { this.dialogs.notifyInfo('RuleEvents reloaded.'); } @@ -73,16 +73,16 @@ export class RuleEventsState extends State { return { ...s, ruleEvents, ruleEventsPager, isLoaded: true }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public enqueue(event: RuleEventDto): Observable { - return this.rulesService.enqueueEvent(this.appsState.appName, event.id) - .do(() => { + return this.rulesService.enqueueEvent(this.appsState.appName, event.id).pipe( + tap(() => { this.dialogs.notifyInfo('Events enqueued. Will be resend in a few seconds.'); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public goNext(): Observable { diff --git a/src/Squidex/app/shared/state/rules.state.spec.ts b/src/Squidex/app/shared/state/rules.state.spec.ts index 74ea383d7..7f5c565c5 100644 --- a/src/Squidex/app/shared/state/rules.state.spec.ts +++ b/src/Squidex/app/shared/state/rules.state.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of } from 'rxjs'; import { IMock, It, Mock, Times } from 'typemoq'; import { RulesState } from './rules.state'; @@ -59,7 +59,7 @@ describe('RulesState', () => { rulesService = Mock.ofType(); rulesService.setup(x => x.getRules(app)) - .returns(() => Observable.of(oldRules)); + .returns(() => of(oldRules)); rulesState = new RulesState(appsState.object, authService.object, dialogs.object, rulesService.object); rulesState.load().subscribe(); @@ -75,6 +75,8 @@ describe('RulesState', () => { it('should show notification on load when reload is true', () => { rulesState.load(true).subscribe(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); @@ -84,7 +86,7 @@ describe('RulesState', () => { const request = new CreateRuleDto({}, {}); rulesService.setup(x => x.postRule(app, request, modifier, creation)) - .returns(() => Observable.of(newRule)); + .returns(() => of(newRule)); rulesState.create(request, creation).subscribe(); @@ -95,7 +97,7 @@ describe('RulesState', () => { const newAction = {}; rulesService.setup(x => x.putRule(app, oldRules[0].id, It.is(i => true), version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); rulesState.updateAction(oldRules[0], newAction, modified).subscribe(); @@ -109,7 +111,7 @@ describe('RulesState', () => { const newTrigger = {}; rulesService.setup(x => x.putRule(app, oldRules[0].id, It.is(i => true), version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); rulesState.updateTrigger(oldRules[0], newTrigger, modified).subscribe(); @@ -121,7 +123,7 @@ describe('RulesState', () => { it('should mark as enabled and update and user info when enabled', () => { rulesService.setup(x => x.enableRule(app, oldRules[0].id, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); rulesState.enable(oldRules[0], modified).subscribe(); @@ -133,7 +135,7 @@ describe('RulesState', () => { it('should mark as disabled and update and user info when disabled', () => { rulesService.setup(x => x.disableRule(app, oldRules[1].id, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); rulesState.disable(oldRules[1], modified).subscribe(); @@ -145,7 +147,7 @@ describe('RulesState', () => { it('should remove rule from snapshot when deleted', () => { rulesService.setup(x => x.deleteRule(app, oldRules[0].id, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); rulesState.delete(oldRules[0]).subscribe(); diff --git a/src/Squidex/app/shared/state/rules.state.ts b/src/Squidex/app/shared/state/rules.state.ts index 566dc229d..6434b209f 100644 --- a/src/Squidex/app/shared/state/rules.state.ts +++ b/src/Squidex/app/shared/state/rules.state.ts @@ -7,13 +7,13 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { distinctUntilChanged, map, tap } from 'rxjs/operators'; import { DateTime, DialogService, ImmutableArray, + notify, State, Version } from '@app/framework'; @@ -37,12 +37,12 @@ interface Snapshot { @Injectable() export class RulesState extends State { public rules = - this.changes.map(x => x.rules) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.rules), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); constructor( private readonly appsState: AppsState, @@ -58,8 +58,8 @@ export class RulesState extends State { this.resetState(); } - return this.rulesService.getRules(this.appName) - .do(dtos => { + return this.rulesService.getRules(this.appName).pipe( + tap(dtos => { if (isReload) { this.dialogs.notifyInfo('Rules reloaded.'); } @@ -69,64 +69,64 @@ export class RulesState extends State { return { ...s, rules, isLoaded: true }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public create(request: CreateRuleDto, now?: DateTime): Observable { - return this.rulesService.postRule(this.appName, request, this.user, now || DateTime.now()) - .do(dto => { + return this.rulesService.postRule(this.appName, request, this.user, now || DateTime.now()).pipe( + tap(dto => { this.next(s => { const rules = s.rules.push(dto); return { ...s, rules }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public delete(rule: RuleDto): Observable { - return this.rulesService.deleteRule(this.appName, rule.id, rule.version) - .do(dto => { + return this.rulesService.deleteRule(this.appName, rule.id, rule.version).pipe( + tap(dto => { this.next(s => { const rules = s.rules.removeAll(x => x.id === rule.id); return { ...s, rules }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public updateAction(rule: RuleDto, action: any, now?: DateTime): Observable { - return this.rulesService.putRule(this.appName, rule.id, new UpdateRuleDto(null, action), rule.version) - .do(dto => { + return this.rulesService.putRule(this.appName, rule.id, new UpdateRuleDto(null, action), rule.version).pipe( + tap(dto => { this.replaceRule(updateAction(rule, action, this.user, dto.version, now)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public updateTrigger(rule: RuleDto, trigger: any, now?: DateTime): Observable { - return this.rulesService.putRule(this.appName, rule.id, new UpdateRuleDto(trigger, null), rule.version) - .do(dto => { + return this.rulesService.putRule(this.appName, rule.id, new UpdateRuleDto(trigger, null), rule.version).pipe( + tap(dto => { this.replaceRule(updateTrigger(rule, trigger, this.user, dto.version, now)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public enable(rule: RuleDto, now?: DateTime): Observable { - return this.rulesService.enableRule(this.appName, rule.id, rule.version) - .do(dto => { + return this.rulesService.enableRule(this.appName, rule.id, rule.version).pipe( + tap(dto => { this.replaceRule(setEnabled(rule, true, this.user, dto.version, now)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public disable(rule: RuleDto, now?: DateTime): Observable { - return this.rulesService.disableRule(this.appName, rule.id, rule.version) - .do(dto => { + return this.rulesService.disableRule(this.appName, rule.id, rule.version).pipe( + tap(dto => { this.replaceRule(setEnabled(rule, false, this.user, dto.version, now)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } private replaceRule(rule: RuleDto) { @@ -147,37 +147,27 @@ export class RulesState extends State { } const updateTrigger = (rule: RuleDto, trigger: any, user: string, version: Version, now?: DateTime) => - new RuleDto( - rule.id, - rule.createdBy, user, - rule.created, now || DateTime.now(), - version, - rule.isEnabled, + rule.with({ trigger, - trigger.triggerType, - rule.action, - rule.action.actionType); + triggerType: trigger.triggerType, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); const updateAction = (rule: RuleDto, action: any, user: string, version: Version, now?: DateTime) => - new RuleDto( - rule.id, - rule.createdBy, user, - rule.created, now || DateTime.now(), - version, - rule.isEnabled, - rule.trigger, - rule.trigger.triggerType, + rule.with({ action, - action.actionType); + actionType: action.triggerType, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); const setEnabled = (rule: RuleDto, isEnabled: boolean, user: string, version: Version, now?: DateTime) => - new RuleDto( - rule.id, - rule.createdBy, user, - rule.created, now || DateTime.now(), - version, + rule.with({ isEnabled, - rule.trigger, - rule.triggerType, - rule.action, - rule.actionType); + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); diff --git a/src/Squidex/app/shared/state/schemas.forms.ts b/src/Squidex/app/shared/state/schemas.forms.ts new file mode 100644 index 000000000..75930b75a --- /dev/null +++ b/src/Squidex/app/shared/state/schemas.forms.ts @@ -0,0 +1,129 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { map, startWith } from 'rxjs/operators'; + +import { Form, ValidatorsEx } from '@app/framework'; + +import { createProperties } from './../services/schemas.types'; + +const FALLBACK_NAME = 'my-schema'; + +export class CreateCategoryForm extends Form { + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + name: [''] + })); + } +} + +export class CreateSchemaForm extends Form { + public schemaName = + this.form.controls['name'].valueChanges.pipe( + map(n => n || FALLBACK_NAME), startWith(FALLBACK_NAME)); + + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + name: ['', + [ + Validators.required, + Validators.maxLength(40), + ValidatorsEx.pattern('[a-z0-9]+(\-[a-z0-9]+)*', 'Name can contain lower case letters (a-z), numbers and dashes only (not at the end).') + ] + ], + import: {} + })); + } +} + +export class EditScriptsForm extends Form { + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + scriptQuery: '', + scriptCreate: '', + scriptUpdate: '', + scriptDelete: '', + scriptChange: '' + })); + } +} + +export class EditFieldForm extends Form { + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + label: ['', + [ + Validators.maxLength(100) + ] + ], + hints: ['', + [ + Validators.maxLength(1000) + ] + ], + placeholder: ['', + [ + Validators.maxLength(1000) + ] + ], + editorUrl: null, + isRequired: false, + isListField: false + })); + } +} + +export class EditSchemaForm extends Form { + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + label: ['', + [ + Validators.maxLength(100) + ] + ], + hints: ['', + [ + Validators.maxLength(1000) + ] + ] + })); + } +} + +export class AddFieldForm extends Form { + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + type: ['String', + [ + Validators.required + ] + ], + name: ['', + [ + Validators.required, + Validators.maxLength(40), + ValidatorsEx.pattern('[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*', 'Name must be a valid javascript name in camel case.') + ] + ], + isLocalizable: false + })); + } + + public submit() { + const value = super.submit(); + + if (value) { + const properties = createProperties(value.type); + const partitioning = value.isLocalizable ? 'language' : 'invariant'; + + return { name: value.name, partitioning, properties }; + } + + return null; + } +} \ No newline at end of file diff --git a/src/Squidex/app/shared/state/schemas.state.spec.ts b/src/Squidex/app/shared/state/schemas.state.spec.ts index 05abe8a8f..b25f318b6 100644 --- a/src/Squidex/app/shared/state/schemas.state.spec.ts +++ b/src/Squidex/app/shared/state/schemas.state.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Observable } from 'rxjs'; +import { of, throwError } from 'rxjs'; import { IMock, It, Mock, Times } from 'typemoq'; import { SchemasState } from './schemas.state'; @@ -18,7 +18,8 @@ import { CreateSchemaDto, DateTime, DialogService, - FieldDto, + NestedFieldDto, + RootFieldDto, SchemaDetailsDto, SchemaDto, SchemasService, @@ -40,17 +41,20 @@ describe('SchemasState', () => { const newVersion = new Version('2'); const oldSchemas = [ - new SchemaDto('id1', 'name1', 'category1', {}, false, creator, creator, creation, creation, version), - new SchemaDto('id2', 'name2', 'category2', {}, true , creator, creator, creation, creation, version) + new SchemaDto('id1', 'name1', 'category1', {}, false, creation, creator, creation, creator, version), + new SchemaDto('id2', 'name2', 'category2', {}, true , creation, creator, creation, creator, version) ]; - const field1 = new FieldDto(1, '1', false, false, false, 'l', createProperties('String')); - const field2 = new FieldDto(2, '2', true, true, true, 'l', createProperties('Number')); + const nested1 = new NestedFieldDto(3, '3', createProperties('Number'), 2); + const nested2 = new NestedFieldDto(4, '4', createProperties('String'), 2, true, true); + + const field1 = new RootFieldDto(1, '1', createProperties('String'), 'invariant'); + const field2 = new RootFieldDto(2, '2', createProperties('Array'), 'invariant', true, true, true, [nested1, nested2]); const schema = new SchemaDetailsDto('id2', 'name2', 'category2', {}, true, - creator, creator, - creation, creation, + creation, creator, + creation, creator, version, [field1, field2]); @@ -76,13 +80,13 @@ describe('SchemasState', () => { schemasService = Mock.ofType(); schemasService.setup(x => x.getSchemas(app)) - .returns(() => Observable.of(oldSchemas)); + .returns(() => of(oldSchemas)); schemasService.setup(x => x.getSchema(app, schema.name)) - .returns(() => Observable.of(schema)); + .returns(() => of(schema)); schemasService.setup(x => x.getSchema(app, schema.name)) - .returns(() => Observable.of(schema)); + .returns(() => of(schema)); schemasState = new SchemasState(appsState.object, authService.object, dialogs.object, schemasService.object); schemasState.load().subscribe(); @@ -110,6 +114,8 @@ describe('SchemasState', () => { it('should show notification on load when reload is true', () => { schemasState.load(true).subscribe(); + expect().nothing(); + dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); @@ -130,6 +136,8 @@ describe('SchemasState', () => { schemasState.select('name2').subscribe(); schemasService.verify(x => x.getSchema(app, 'name2'), Times.exactly(2)); + + expect().nothing(); }); it('should return schema on select and load when not loaded', () => { @@ -141,12 +149,12 @@ describe('SchemasState', () => { expect(selectedSchema!).toBe(schema); expect(schemasState.snapshot.selectedSchema).toBe(schema); - expect(schemasState.snapshot.selectedSchema).toBe(schemasState.snapshot.schemas.at(1)); + expect(schemasState.snapshot.selectedSchema).toBe(schemasState.snapshot.schemas.at(1)); }); it('should return null on select when loading failed', () => { schemasService.setup(x => x.getSchema(app, 'failed')) - .returns(() => Observable.throw({})); + .returns(() => throwError({})); let selectedSchema: SchemaDetailsDto; @@ -173,7 +181,7 @@ describe('SchemasState', () => { it('should mark published and update user info when published', () => { schemasService.setup(x => x.publishSchema(app, oldSchemas[0].name, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); schemasState.publish(oldSchemas[0], modified).subscribe(); @@ -185,7 +193,7 @@ describe('SchemasState', () => { it('should unmark published and update user info when unpublished', () => { schemasService.setup(x => x.unpublishSchema(app, oldSchemas[1].name, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); schemasState.unpublish(oldSchemas[1], modified).subscribe(); @@ -199,7 +207,7 @@ describe('SchemasState', () => { const category = 'my-new-category'; schemasService.setup(x => x.putCategory(app, oldSchemas[0].name, It.is(i => i.name === category), version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); schemasState.changeCategory(oldSchemas[0], category, modified).subscribe(); @@ -216,7 +224,7 @@ describe('SchemasState', () => { it('should nmark published and update user info when published selected schema', () => { schemasService.setup(x => x.publishSchema(app, schema.name, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); schemasState.publish(schema, modified).subscribe(); @@ -226,12 +234,11 @@ describe('SchemasState', () => { expectToBeModified(schema_1); }); - it('should change category and update user info when category of selected schema changed', () => { const category = 'my-new-category'; schemasService.setup(x => x.putCategory(app, oldSchemas[0].name, It.is(i => i.name === category), version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); schemasState.changeCategory(oldSchemas[0], category, modified).subscribe(); @@ -245,7 +252,7 @@ describe('SchemasState', () => { const request = new UpdateSchemaDto('name2_label', 'name2_hints'); schemasService.setup(x => x.putSchema(app, schema.name, It.isAny(), version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); schemasState.update(schema, request, modified).subscribe(); @@ -260,7 +267,7 @@ describe('SchemasState', () => { const request = new UpdateSchemaScriptsDto('query', 'create', 'update', 'delete', 'change'); schemasService.setup(x => x.putScripts(app, schema.name, It.isAny(), version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); schemasState.configureScripts(schema, request, modified).subscribe(); @@ -277,10 +284,10 @@ describe('SchemasState', () => { it('should add schema to snapshot when created', () => { const request = new CreateSchemaDto('newName'); - const result = new SchemaDetailsDto('id4', 'newName', '', {}, false, modifier, modifier, modified, modified, version, []); + const result = new SchemaDetailsDto('id4', 'newName', '', {}, false, modified, modifier, modified, modifier, version, []); schemasService.setup(x => x.postSchema(app, request, modifier, modified)) - .returns(() => Observable.of(result)); + .returns(() => of(result)); schemasState.create(request, modified).subscribe(); @@ -290,7 +297,7 @@ describe('SchemasState', () => { it('should remove schema from snapshot when deleted', () => { schemasService.setup(x => x.deleteSchema(app, schema.name, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + .returns(() => of(new Versioned(newVersion, {}))); schemasState.delete(schema).subscribe(); @@ -301,12 +308,12 @@ describe('SchemasState', () => { it('should add field and update user info when field added', () => { const request = new AddFieldDto(field1.name, field1.partitioning, field1.properties); - const newField = new FieldDto(3, '3', false, false, false, 'l', createProperties('String')); + const newField = new RootFieldDto(3, '3', createProperties('String'), 'invariant'); - schemasService.setup(x => x.postField(app, schema.name, It.isAny(), version)) - .returns(() => Observable.of(new Versioned(newVersion, newField))); + schemasService.setup(x => x.postField(app, schema.name, It.isAny(), undefined, version)) + .returns(() => of(new Versioned(newVersion, newField))); - schemasState.addField(schema, request, modified).subscribe(); + schemasState.addField(schema, request, undefined, modified).subscribe(); const schema_1 = schemasState.snapshot.schemas.at(1); @@ -314,9 +321,25 @@ describe('SchemasState', () => { expectToBeModified(schema_1); }); + it('should add field and update user info when nested field added', () => { + const request = new AddFieldDto(field1.name, field1.partitioning, field1.properties); + + const newField = new NestedFieldDto(3, '3', createProperties('String'), 2); + + schemasService.setup(x => x.postField(app, schema.name, It.isAny(), 2, version)) + .returns(() => of(new Versioned(newVersion, newField))); + + schemasState.addField(schema, request, field2, modified).subscribe(); + + const schema_1 = schemasState.snapshot.schemas.at(1); + + expect(schema_1.fields[1].nested).toEqual([nested1, nested2, newField]); + expectToBeModified(schema_1); + }); + it('should remove field and update user info when field removed', () => { - schemasService.setup(x => x.deleteField(app, schema.name, field1.fieldId, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + schemasService.setup(x => x.deleteField(app, schema.name, field1.fieldId, undefined, version)) + .returns(() => of(new Versioned(newVersion, {}))); schemasState.deleteField(schema, field1, modified).subscribe(); @@ -326,11 +349,23 @@ describe('SchemasState', () => { expectToBeModified(schema_1); }); + it('should remove field and update user info when nested field removed', () => { + schemasService.setup(x => x.deleteField(app, schema.name, nested1.fieldId, 2, version)) + .returns(() => of(new Versioned(newVersion, {}))); + + schemasState.deleteField(schema, nested1, modified).subscribe(); + + const schema_1 = schemasState.snapshot.schemas.at(1); + + expect(schema_1.fields[1].nested).toEqual([nested2]); + expectToBeModified(schema_1); + }); + it('should sort fields and update user info when fields sorted', () => { - schemasService.setup(x => x.putFieldOrdering(app, schema.name, [field2.fieldId, field1.fieldId], version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + schemasService.setup(x => x.putFieldOrdering(app, schema.name, [field2.fieldId, field1.fieldId], undefined, version)) + .returns(() => of(new Versioned(newVersion, {}))); - schemasState.sortFields(schema, [field2, field1], modified).subscribe(); + schemasState.sortFields(schema, [field2, field1], undefined, modified).subscribe(); const schema_1 = schemasState.snapshot.schemas.at(1); @@ -338,11 +373,23 @@ describe('SchemasState', () => { expectToBeModified(schema_1); }); + it('should sort fields and update user info when nested fields sorted', () => { + schemasService.setup(x => x.putFieldOrdering(app, schema.name, [nested2.fieldId, nested1.fieldId], 2, version)) + .returns(() => of(new Versioned(newVersion, {}))); + + schemasState.sortFields(schema, [nested2, nested1], field2, modified).subscribe(); + + const schema_1 = schemasState.snapshot.schemas.at(1); + + expect(schema_1.fields[1].nested).toEqual([nested2, nested1]); + expectToBeModified(schema_1); + }); + it('should update field properties and update user info when field updated', () => { const request = new UpdateFieldDto(createProperties('String')); - schemasService.setup(x => x.putField(app, schema.name, field1.fieldId, request, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + schemasService.setup(x => x.putField(app, schema.name, field1.fieldId, request, undefined, version)) + .returns(() => of(new Versioned(newVersion, {}))); schemasState.updateField(schema, field1, request, modified).subscribe(); @@ -352,9 +399,23 @@ describe('SchemasState', () => { expectToBeModified(schema_1); }); + it('should update field properties and update user info when nested field updated', () => { + const request = new UpdateFieldDto(createProperties('String')); + + schemasService.setup(x => x.putField(app, schema.name, nested1.fieldId, request, 2, version)) + .returns(() => of(new Versioned(newVersion, {}))); + + schemasState.updateField(schema, nested1, request, modified).subscribe(); + + const schema_1 = schemasState.snapshot.schemas.at(1); + + expect(schema_1.fields[1].nested[0].properties).toBe(request.properties); + expectToBeModified(schema_1); + }); + it('should mark field hidden and update user info when field hidden', () => { - schemasService.setup(x => x.hideField(app, schema.name, field1.fieldId, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + schemasService.setup(x => x.hideField(app, schema.name, field1.fieldId, undefined, version)) + .returns(() => of(new Versioned(newVersion, {}))); schemasState.hideField(schema, field1, modified).subscribe(); @@ -364,9 +425,21 @@ describe('SchemasState', () => { expectToBeModified(schema_1); }); + it('should mark field hidden and update user info when nested field hidden', () => { + schemasService.setup(x => x.hideField(app, schema.name, nested1.fieldId, 2, version)) + .returns(() => of(new Versioned(newVersion, {}))); + + schemasState.hideField(schema, nested1, modified).subscribe(); + + const schema_1 = schemasState.snapshot.schemas.at(1); + + expect(schema_1.fields[1].nested[0].isHidden).toBeTruthy(); + expectToBeModified(schema_1); + }); + it('should mark field disabled and update user info when field disabled', () => { - schemasService.setup(x => x.disableField(app, schema.name, field1.fieldId, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + schemasService.setup(x => x.disableField(app, schema.name, field1.fieldId, undefined, version)) + .returns(() => of(new Versioned(newVersion, {}))); schemasState.disableField(schema, field1, modified).subscribe(); @@ -376,9 +449,21 @@ describe('SchemasState', () => { expectToBeModified(schema_1); }); + it('should mark field disabled and update user info when nested disabled', () => { + schemasService.setup(x => x.disableField(app, schema.name, nested1.fieldId, 2, version)) + .returns(() => of(new Versioned(newVersion, {}))); + + schemasState.disableField(schema, nested1, modified).subscribe(); + + const schema_1 = schemasState.snapshot.schemas.at(1); + + expect(schema_1.fields[1].nested[0].isDisabled).toBeTruthy(); + expectToBeModified(schema_1); + }); + it('should mark field locked and update user info when field locked', () => { - schemasService.setup(x => x.lockField(app, schema.name, field1.fieldId, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + schemasService.setup(x => x.lockField(app, schema.name, field1.fieldId, undefined, version)) + .returns(() => of(new Versioned(newVersion, {}))); schemasState.lockField(schema, field1, modified).subscribe(); @@ -388,9 +473,21 @@ describe('SchemasState', () => { expectToBeModified(schema_1); }); + it('should mark field locked and update user info when nested field locked', () => { + schemasService.setup(x => x.lockField(app, schema.name, nested1.fieldId, 2, version)) + .returns(() => of(new Versioned(newVersion, {}))); + + schemasState.lockField(schema, nested1, modified).subscribe(); + + const schema_1 = schemasState.snapshot.schemas.at(1); + + expect(schema_1.fields[1].nested[0].isLocked).toBeTruthy(); + expectToBeModified(schema_1); + }); + it('should unmark field hidden and update user info when field shown', () => { - schemasService.setup(x => x.showField(app, schema.name, field2.fieldId, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + schemasService.setup(x => x.showField(app, schema.name, field2.fieldId, undefined, version)) + .returns(() => of(new Versioned(newVersion, {}))); schemasState.showField(schema, field2, modified).subscribe(); @@ -400,9 +497,21 @@ describe('SchemasState', () => { expectToBeModified(schema_1); }); + it('should unmark field hidden and update user info when nested field shown', () => { + schemasService.setup(x => x.showField(app, schema.name, nested2.fieldId, 2, version)) + .returns(() => of(new Versioned(newVersion, {}))); + + schemasState.showField(schema, nested2, modified).subscribe(); + + const schema_1 = schemasState.snapshot.schemas.at(1); + + expect(schema_1.fields[1].nested[1].isHidden).toBeFalsy(); + expectToBeModified(schema_1); + }); + it('should unmark field disabled and update user info when field enabled', () => { - schemasService.setup(x => x.enableField(app, schema.name, field2.fieldId, version)) - .returns(() => Observable.of(new Versioned(newVersion, {}))); + schemasService.setup(x => x.enableField(app, schema.name, field2.fieldId, undefined, version)) + .returns(() => of(new Versioned(newVersion, {}))); schemasState.enableField(schema, field2, modified).subscribe(); @@ -411,6 +520,18 @@ describe('SchemasState', () => { expect(schema_1.fields[1].isDisabled).toBeFalsy(); expectToBeModified(schema_1); }); + + it('should unmark field disabled and update user info when nested field enabled', () => { + schemasService.setup(x => x.enableField(app, schema.name, nested2.fieldId, 2, version)) + .returns(() => of(new Versioned(newVersion, {}))); + + schemasState.enableField(schema, nested2, modified).subscribe(); + + const schema_1 = schemasState.snapshot.schemas.at(1); + + expect(schema_1.fields[1].nested[1].isDisabled).toBeFalsy(); + expectToBeModified(schema_1); + }); }); function expectToBeModified(schema_1: SchemaDto) { diff --git a/src/Squidex/app/shared/state/schemas.state.ts b/src/Squidex/app/shared/state/schemas.state.ts index 3d4375596..cd2adc36e 100644 --- a/src/Squidex/app/shared/state/schemas.state.ts +++ b/src/Squidex/app/shared/state/schemas.state.ts @@ -6,19 +6,16 @@ */ import { Injectable } from '@angular/core'; -import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { Observable } from 'rxjs'; - -import '@app/framework/utils/rxjs-extensions'; +import { Observable, of } from 'rxjs'; +import { catchError, distinctUntilChanged, map, tap } from 'rxjs/operators'; import { DateTime, DialogService, - Form, ImmutableArray, + notify, State, Types, - ValidatorsEx, Version } from '@app/framework'; @@ -27,10 +24,10 @@ import { AppsState } from './apps.state'; import { AddFieldDto, - createProperties, CreateSchemaDto, FieldDto, - FieldPropertiesDto, + NestedFieldDto, + RootFieldDto, SchemaDetailsDto, SchemaDto, SchemaPropertiesDto, @@ -41,121 +38,9 @@ import { UpdateSchemaScriptsDto } from './../services/schemas.service'; -const FALLBACK_NAME = 'my-schema'; +import { FieldPropertiesDto } from './../services/schemas.types'; -export class CreateCategoryForm extends Form { - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - name: [''] - })); - } -} - -export class CreateSchemaForm extends Form { - public schemaName = - this.form.controls['name'].valueChanges.map(n => n || FALLBACK_NAME) - .startWith(FALLBACK_NAME); - - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - name: ['', - [ - Validators.required, - Validators.maxLength(40), - ValidatorsEx.pattern('[a-z0-9]+(\-[a-z0-9]+)*', 'Name can contain lower case letters (a-z), numbers and dashes only (not at the end).') - ] - ], - import: {} - })); - } -} - -export class EditScriptsForm extends Form { - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - scriptQuery: '', - scriptCreate: '', - scriptUpdate: '', - scriptDelete: '', - scriptChange: '' - })); - } -} - -export class EditFieldForm extends Form { - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - label: ['', - [ - Validators.maxLength(100) - ] - ], - hints: ['', - [ - Validators.maxLength(1000) - ] - ], - placeholder: ['', - [ - Validators.maxLength(1000) - ] - ], - editorUrl: null, - isRequired: false, - isListField: false - })); - } -} - -export class EditSchemaForm extends Form { - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - label: ['', - [ - Validators.maxLength(100) - ] - ], - hints: ['', - [ - Validators.maxLength(1000) - ] - ] - })); - } -} - -export class AddFieldForm extends Form { - constructor(formBuilder: FormBuilder) { - super(formBuilder.group({ - type: ['String', - [ - Validators.required - ] - ], - name: ['', - [ - Validators.required, - Validators.maxLength(40), - ValidatorsEx.pattern('[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*', 'Name must be a valid javascript name in camel case.') - ] - ], - isLocalizable: false - })); - } - - public submit() { - const value = super.submit(); - - if (value) { - const properties = createProperties(value.type); - const partitioning = value.isLocalizable ? 'language' : 'invariant'; - - return { name: value.name, partitioning, properties }; - } - - return null; - } -} +type AnyFieldDto = NestedFieldDto | RootFieldDto; interface Snapshot { categories: { [name: string]: boolean }; @@ -171,24 +56,24 @@ interface Snapshot { @Injectable() export class SchemasState extends State { public selectedSchema = - this.changes.map(x => x.selectedSchema) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.selectedSchema), + distinctUntilChanged()); public categories = - this.changes.map(x => ImmutableArray.of(Object.keys(x.categories)).sortByStringAsc(s => s)) - .distinctUntilChanged(); + this.changes.pipe(map(x => ImmutableArray.of(Object.keys(x.categories)).sortByStringAsc(s => s)), + distinctUntilChanged()); public schemas = - this.changes.map(x => x.schemas) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.schemas), + distinctUntilChanged()); public publishedSchemas = - this.changes.map(x => x.schemas.filter(s => s.isPublished)) - .distinctUntilChanged(); + this.changes.pipe(map(x => x.schemas.filter(s => s.isPublished)), + distinctUntilChanged()); public isLoaded = - this.changes.map(x => !!x.isLoaded) - .distinctUntilChanged(); + this.changes.pipe(map(x => !!x.isLoaded), + distinctUntilChanged()); public get schemaName() { return this.snapshot.selectedSchema!.name; @@ -204,20 +89,20 @@ export class SchemasState extends State { } public select(idOrName: string | null): Observable { - return this.loadSchema(idOrName) - .do(schema => { + return this.loadSchema(idOrName).pipe( + tap(schema => { this.next(s => { const schemas = schema ? s.schemas.replaceBy('id', schema) : s.schemas; return { ...s, selectedSchema: schema, schemas }; }); - }); + })); } private loadSchema(idOrName: string | null) { - return !idOrName ? Observable.of(null) : - this.schemasService.getSchema(this.appName, idOrName) - .catch(() => Observable.of(null)); + return !idOrName ? of(null) : + this.schemasService.getSchema(this.appName, idOrName).pipe( + catchError(() => of(null))); } public load(isReload = false): Observable { @@ -225,8 +110,8 @@ export class SchemasState extends State { this.resetState(); } - return this.schemasService.getSchemas(this.appName) - .do(dtos => { + return this.schemasService.getSchemas(this.appName).pipe( + tap(dtos => { if (isReload) { this.dialogs.notifyInfo('Schemas reloaded.'); } @@ -238,32 +123,32 @@ export class SchemasState extends State { return { ...s, schemas, schemasApp: this.appName, isLoaded: true, categories }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public create(request: CreateSchemaDto, now?: DateTime) { - return this.schemasService.postSchema(this.appName, request, this.user, now || DateTime.now()) - .do(dto => { + return this.schemasService.postSchema(this.appName, request, this.user, now || DateTime.now()).pipe( + tap(dto => { return this.next(s => { const schemas = s.schemas.push(dto).sortByStringAsc(x => x.displayName); return { ...s, schemas }; }); - }); + })); } public delete(schema: SchemaDto): Observable { - return this.schemasService.deleteSchema(this.appName, schema.name, schema.version) - .do(dto => { + return this.schemasService.deleteSchema(this.appName, schema.name, schema.version).pipe( + tap(dto => { return this.next(s => { const schemas = s.schemas.filter(x => x.id !== schema.id); const selectedSchema = s.selectedSchema && s.selectedSchema.id === schema.id ? null : s.selectedSchema; return { ...s, schemas, selectedSchema }; }); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public addCategory(name: string) { @@ -282,115 +167,148 @@ export class SchemasState extends State { }); } - public addField(schema: SchemaDetailsDto, request: AddFieldDto, now?: DateTime): Observable { - return this.schemasService.postField(this.appName, schema.name, request, schema.version) - .do(dto => { - this.replaceSchema(addField(schema, dto.payload, this.user, dto.version, now)); - }).map(d => d.payload); - } - public publish(schema: SchemaDto, now?: DateTime): Observable { - return this.schemasService.publishSchema(this.appName, schema.name, schema.version) - .do(dto => { + return this.schemasService.publishSchema(this.appName, schema.name, schema.version).pipe( + tap(dto => { this.replaceSchema(setPublished(schema, true, this.user, dto.version, now)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public unpublish(schema: SchemaDto, now?: DateTime): Observable { - return this.schemasService.unpublishSchema(this.appName, schema.name, schema.version) - .do(dto => { + return this.schemasService.unpublishSchema(this.appName, schema.name, schema.version).pipe( + tap(dto => { this.replaceSchema(setPublished(schema, false, this.user, dto.version, now)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } public changeCategory(schema: SchemaDto, name: string, now?: DateTime): Observable { - return this.schemasService.putCategory(this.appName, schema.name, new UpdateSchemaCategoryDto(name), schema.version) - .do(dto => { + return this.schemasService.putCategory(this.appName, schema.name, new UpdateSchemaCategoryDto(name), schema.version).pipe( + tap(dto => { this.replaceSchema(changeCategory(schema, name, this.user, dto.version, now)); - }) - .notify(this.dialogs); + }), + notify(this.dialogs)); } - public enableField(schema: SchemaDetailsDto, field: FieldDto, now?: DateTime): Observable { - return this.schemasService.enableField(this.appName, schema.name, field.fieldId, schema.version) - .do(dto => { - this.replaceSchema(updateField(schema, setDisabled(field, false), this.user, dto.version, now)); - }) - .notify(this.dialogs); + public configureScripts(schema: SchemaDetailsDto, request: UpdateSchemaScriptsDto, now?: DateTime): Observable { + return this.schemasService.putScripts(this.appName, schema.name, request, schema.version).pipe( + tap(dto => { + this.replaceSchema(configureScripts(schema, request, this.user, dto.version, now)); + }), + notify(this.dialogs)); } - public disableField(schema: SchemaDetailsDto, field: FieldDto, now?: DateTime): Observable { - return this.schemasService.disableField(this.appName, schema.name, field.fieldId, schema.version) - .do(dto => { - this.replaceSchema(updateField(schema, setDisabled(field, true), this.user, dto.version, now)); - }) - .notify(this.dialogs); + public update(schema: SchemaDetailsDto, request: UpdateSchemaDto, now?: DateTime): Observable { + return this.schemasService.putSchema(this.appName, schema.name, request, schema.version).pipe( + tap(dto => { + this.replaceSchema(updateProperties(schema, request, this.user, dto.version, now)); + }), + notify(this.dialogs)); } - public lockField(schema: SchemaDetailsDto, field: FieldDto, now?: DateTime): Observable { - return this.schemasService.lockField(this.appName, schema.name, field.fieldId, schema.version) - .do(dto => { - this.replaceSchema(updateField(schema, setLocked(field, true), this.user, dto.version, now)); - }) - .notify(this.dialogs); + public addField(schema: SchemaDetailsDto, request: AddFieldDto, parent?: RootFieldDto, now?: DateTime): Observable { + return this.schemasService.postField(this.appName, schema.name, request, pid(parent), schema.version).pipe( + tap(dto => { + if (Types.is(dto.payload, NestedFieldDto)) { + this.replaceSchema(updateField(schema, addNested(parent!, dto.payload), this.user, dto.version, now)); + } else { + this.replaceSchema(addField(schema, dto.payload, this.user, dto.version, now)); + } + }), + map(d => d.payload)); } - public showField(schema: SchemaDetailsDto, field: FieldDto, now?: DateTime): Observable { - return this.schemasService.showField(this.appName, schema.name, field.fieldId, schema.version) - .do(dto => { - this.replaceSchema(updateField(schema, setHidden(field, false), this.user, dto.version, now)); - }) - .notify(this.dialogs); + public sortFields(schema: SchemaDetailsDto, fields: any[], parent?: RootFieldDto, now?: DateTime): Observable { + return this.schemasService.putFieldOrdering(this.appName, schema.name, fields.map(t => t.fieldId), pid(parent), schema.version).pipe( + tap(dto => { + if (!parent) { + this.replaceSchema(replaceFields(schema, fields, this.user, dto.version, now)); + } else { + this.replaceSchema(updateField(schema, replaceNested(parent, fields), this.user, dto.version, now)); + } + }), + notify(this.dialogs)); } - public hideField(schema: SchemaDetailsDto, field: FieldDto, now?: DateTime): Observable { - return this.schemasService.hideField(this.appName, schema.name, field.fieldId, schema.version) - .do(dto => { - this.replaceSchema(updateField(schema, setHidden(field, true), this.user, dto.version, now)); - }) - .notify(this.dialogs); + public lockField(schema: SchemaDetailsDto, field: AnyFieldDto, now?: DateTime): Observable { + return this.schemasService.lockField(this.appName, schema.name, field.fieldId, pidof(field), schema.version).pipe( + tap(dto => { + this.replaceField(schema, setLocked(field, true), dto.version, now); + }), + notify(this.dialogs)); } - public deleteField(schema: SchemaDetailsDto, field: FieldDto, now?: DateTime): Observable { - return this.schemasService.deleteField(this.appName, schema.name, field.fieldId, schema.version) - .do(dto => { - this.replaceSchema(removeField(schema, field, this.user, dto.version, now)); - }) - .notify(this.dialogs); + public enableField(schema: SchemaDetailsDto, field: AnyFieldDto, now?: DateTime): Observable { + return this.schemasService.enableField(this.appName, schema.name, field.fieldId, pidof(field), schema.version).pipe( + tap(dto => { + this.replaceField(schema, setDisabled(field, false), dto.version, now); + }), + notify(this.dialogs)); } - public sortFields(schema: SchemaDetailsDto, fields: FieldDto[], now?: DateTime): Observable { - return this.schemasService.putFieldOrdering(this.appName, schema.name, fields.map(t => t.fieldId), schema.version) - .do(dto => { - this.replaceSchema(replaceFields(schema, fields, this.user, dto.version, now)); - }) - .notify(this.dialogs); + public disableField(schema: SchemaDetailsDto, field: AnyFieldDto, now?: DateTime): Observable { + return this.schemasService.disableField(this.appName, schema.name, field.fieldId, pidof(field), schema.version).pipe( + tap(dto => { + this.replaceField(schema, setDisabled(field, true), dto.version, now); + }), + notify(this.dialogs)); } - public updateField(schema: SchemaDetailsDto, field: FieldDto, request: UpdateFieldDto, now?: DateTime): Observable { - return this.schemasService.putField(this.appName, schema.name, field.fieldId, request, schema.version) - .do(dto => { - this.replaceSchema(updateField(schema, update(field, request.properties), this.user, dto.version, now)); - }) - .notify(this.dialogs); + public showField(schema: SchemaDetailsDto, field: AnyFieldDto, now?: DateTime): Observable { + return this.schemasService.showField(this.appName, schema.name, field.fieldId, pidof(field), schema.version).pipe( + tap(dto => { + this.replaceField(schema, setHidden(field, false), dto.version, now); + }), + notify(this.dialogs)); } - public configureScripts(schema: SchemaDetailsDto, request: UpdateSchemaScriptsDto, now?: DateTime): Observable { - return this.schemasService.putScripts(this.appName, schema.name, request, schema.version) - .do(dto => { - this.replaceSchema(configureScripts(schema, request, this.user, dto.version, now)); - }) - .notify(this.dialogs); + public hideField(schema: SchemaDetailsDto, field: AnyFieldDto, now?: DateTime): Observable { + return this.schemasService.hideField(this.appName, schema.name, field.fieldId, pidof(field), schema.version).pipe( + tap(dto => { + this.replaceField(schema, setHidden(field, true), dto.version, now); + }), + notify(this.dialogs)); } - public update(schema: SchemaDetailsDto, request: UpdateSchemaDto, now?: DateTime): Observable { - return this.schemasService.putSchema(this.appName, schema.name, request, schema.version) - .do(dto => { - this.replaceSchema(updateProperties(schema, request, this.user, dto.version, now)); - }) - .notify(this.dialogs); + public updateField(schema: SchemaDetailsDto, field: AnyFieldDto, request: UpdateFieldDto, now?: DateTime): Observable { + return this.schemasService.putField(this.appName, schema.name, field.fieldId, request, pidof(field), schema.version).pipe( + tap(dto => { + this.replaceField(schema, update(field, request.properties), dto.version, now); + }), + notify(this.dialogs)); + } + + public deleteField(schema: SchemaDetailsDto, field: AnyFieldDto, now?: DateTime): Observable { + return this.schemasService.deleteField(this.appName, schema.name, field.fieldId, pidof(field), schema.version).pipe( + tap(dto => { + this.removeField(schema, field, dto.version, now); + }), + notify(this.dialogs)); + } + + private replaceField(schema: SchemaDetailsDto, field: AnyFieldDto, version: Version, now?: DateTime) { + if (Types.is(field, RootFieldDto)) { + this.replaceSchema(updateField(schema, field, this.user, version, now)); + } else { + const parent = schema.fields.find(x => x.fieldId === field.parentId); + + if (parent) { + this.replaceSchema(updateField(schema, updatedNested(parent, field), this.user, version, now)); + } + } + } + + private removeField(schema: SchemaDetailsDto, field: AnyFieldDto, version: Version, now?: DateTime) { + if (Types.is(field, RootFieldDto)) { + this.replaceSchema(removeField(schema, field, this.user, version, now)); + } else { + const parent = schema.fields.find(x => x.fieldId === field.parentId); + + if (parent) { + this.replaceSchema(updateField(schema, removeNested(parent, field), this.user, version, now)); + } + } } private replaceSchema(schema: SchemaDto) { @@ -444,204 +362,97 @@ function removeCategory(categories: { [name: string]: boolean }, category: strin return categories; } -const setPublished = (schema: SchemaDto | SchemaDetailsDto, publish: boolean, user: string, version: Version, now?: DateTime) => { - if (Types.is(schema, SchemaDetailsDto)) { - return new SchemaDetailsDto( - schema.id, - schema.name, - schema.category, - schema.properties, - publish, - schema.createdBy, user, - schema.created, now || DateTime.now(), - version, - schema.fields, - schema.scriptQuery, - schema.scriptCreate, - schema.scriptUpdate, - schema.scriptDelete, - schema.scriptChange); - } else { - return new SchemaDto( - schema.id, - schema.name, - schema.category, - schema.properties, - publish, - schema.createdBy, user, - schema.created, now || DateTime.now(), - version); - } -}; - -const changeCategory = (schema: SchemaDto | SchemaDetailsDto, category: string, user: string, version: Version, now?: DateTime) => { - if (Types.is(schema, SchemaDetailsDto)) { - return new SchemaDetailsDto( - schema.id, - schema.name, - category, - schema.properties, - schema.isPublished, - schema.createdBy, user, - schema.created, now || DateTime.now(), - version, - schema.fields, - schema.scriptQuery, - schema.scriptCreate, - schema.scriptUpdate, - schema.scriptDelete, - schema.scriptChange); - } else { - return new SchemaDto( - schema.id, - schema.name, - category, - schema.properties, - schema.isPublished, - schema.createdBy, user, - schema.created, now || DateTime.now(), - version); - } -}; +const setPublished = (schema: T, isPublished: boolean, user: string, version: Version, now?: DateTime) => + schema.with({ + isPublished, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); + + +const changeCategory = (schema: T, category: string, user: string, version: Version, now?: DateTime) => + schema.with({ + category, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); const configureScripts = (schema: SchemaDetailsDto, scripts: UpdateSchemaScriptsDto, user: string, version: Version, now?: DateTime) => - new SchemaDetailsDto( - schema.id, - schema.name, - schema.category, - schema.properties, - schema.isPublished, - schema.createdBy, user, - schema.created, now || DateTime.now(), - version, - schema.fields, - scripts.scriptQuery, - scripts.scriptCreate, - scripts.scriptUpdate, - scripts.scriptDelete, - scripts.scriptChange); + schema.with({ + ...scripts, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); const updateProperties = (schema: SchemaDetailsDto, properties: SchemaPropertiesDto, user: string, version: Version, now?: DateTime) => - new SchemaDetailsDto( - schema.id, - schema.name, - schema.category, + schema.with({ properties, - schema.isPublished, - schema.createdBy, user, - schema.created, now || DateTime.now(), - version, - schema.fields, - schema.scriptQuery, - schema.scriptCreate, - schema.scriptUpdate, - schema.scriptDelete, - schema.scriptChange); - -const addField = (schema: SchemaDetailsDto, field: FieldDto, user: string, version: Version, now?: DateTime) => - new SchemaDetailsDto( - schema.id, - schema.name, - schema.category, - schema.properties, - schema.isPublished, - schema.createdBy, user, - schema.created, now || DateTime.now(), - version, - [...schema.fields, field], - schema.scriptQuery, - schema.scriptCreate, - schema.scriptUpdate, - schema.scriptDelete, - schema.scriptChange); - -const updateField = (schema: SchemaDetailsDto, field: FieldDto, user: string, version: Version, now?: DateTime) => - new SchemaDetailsDto( - schema.id, - schema.name, - schema.category, - schema.properties, - schema.isPublished, - schema.createdBy, user, - schema.created, now || DateTime.now(), - version, - schema.fields.map(f => f.fieldId === field.fieldId ? field : f), - schema.scriptQuery, - schema.scriptCreate, - schema.scriptUpdate, - schema.scriptDelete, - schema.scriptChange); - -const replaceFields = (schema: SchemaDetailsDto, fields: FieldDto[], user: string, version: Version, now?: DateTime) => - new SchemaDetailsDto( - schema.id, - schema.name, - schema.category, - schema.properties, - schema.isPublished, - schema.createdBy, user, - schema.created, now || DateTime.now(), - version, + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); + +const addField = (schema: SchemaDetailsDto, field: RootFieldDto, user: string, version: Version, now?: DateTime) => + schema.with({ + fields: [...schema.fields, field], + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); + +const updateField = (schema: SchemaDetailsDto, field: RootFieldDto, user: string, version: Version, now?: DateTime) => + schema.with({ + fields: schema.fields.map(f => f.fieldId === field.fieldId ? field : f), + lastModified: now || DateTime.now(), + lastModifiedBy: user, + version + }); + +const replaceFields = (schema: SchemaDetailsDto, fields: RootFieldDto[], user: string, version: Version, now?: DateTime) => + schema.with({ fields, - schema.scriptQuery, - schema.scriptCreate, - schema.scriptUpdate, - schema.scriptDelete, - schema.scriptChange); + version, + lastModified: now || DateTime.now(), + lastModifiedBy: user + }); const removeField = (schema: SchemaDetailsDto, field: FieldDto, user: string, version: Version, now?: DateTime) => - new SchemaDetailsDto( - schema.id, - schema.name, - schema.category, - schema.properties, - schema.isPublished, - schema.createdBy, user, - schema.created, now || DateTime.now(), + schema.with({ + fields: schema.fields.filter(f => f.fieldId !== field.fieldId), version, - schema.fields.filter(f => f.fieldId !== field.fieldId), - schema.scriptQuery, - schema.scriptCreate, - schema.scriptUpdate, - schema.scriptDelete, - schema.scriptChange); - -const setLocked = (field: FieldDto, isLocked: boolean) => - new FieldDto( - field.fieldId, - field.name, - isLocked, - field.isHidden, - field.isDisabled, - field.partitioning, - field.properties); - -const setHidden = (field: FieldDto, isHidden: boolean) => - new FieldDto( - field.fieldId, - field.name, - field.isLocked, - isHidden, - field.isDisabled, - field.partitioning, - field.properties); - -const setDisabled = (field: FieldDto, isDisabled: boolean) => - new FieldDto( - field.fieldId, - field.name, - field.isLocked, - field.isDisabled, - isDisabled, - field.partitioning, - field.properties); - -const update = (field: FieldDto, properties: FieldPropertiesDto) => - new FieldDto( - field.fieldId, - field.name, - field.isLocked, - field.isHidden, - field.isDisabled, - field.partitioning, - properties); \ No newline at end of file + lastModified: now || DateTime.now(), + lastModifiedBy: user + }); + +const addNested = (parent: RootFieldDto, nested: NestedFieldDto) => + parent.with({ nested: [...parent.nested, nested] }); + +const updatedNested = (parent: RootFieldDto, nested: NestedFieldDto) => + parent.with({ nested: parent.nested.map(f => f.fieldId === nested.fieldId ? nested : f) }); + +const replaceNested = (parent: RootFieldDto, nested: NestedFieldDto[]) => + parent.with({ nested }); + +const removeNested = (parent: RootFieldDto, nested: NestedFieldDto) => + parent.with({ nested: parent.nested.filter(f => f.fieldId !== nested.fieldId) }); + +const setLocked = (field: T, isLocked: boolean) => + field.with({ isLocked }); + +const setHidden = (field: T, isHidden: boolean) => + field.with({ isHidden }); + +const setDisabled = (field: T, isDisabled: boolean) => + field.with({ isDisabled }); + +const update = (field: T, properties: FieldPropertiesDto) => + field.with({ properties }); + +const pid = (field?: RootFieldDto) => + field ? field.fieldId : undefined; + +const pidof = (field: FieldDto) => + Types.is(field, NestedFieldDto) ? field.parentId : undefined; \ No newline at end of file diff --git a/src/Squidex/app/shell/pages/internal/profile-menu.component.ts b/src/Squidex/app/shell/pages/internal/profile-menu.component.ts index 970b846e2..672a298f4 100644 --- a/src/Squidex/app/shell/pages/internal/profile-menu.component.ts +++ b/src/Squidex/app/shell/pages/internal/profile-menu.component.ts @@ -7,6 +7,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Subscription } from 'rxjs'; +import { filter } from 'rxjs/operators'; import { ApiUrlConfig, @@ -47,7 +48,7 @@ export class ProfileMenuComponent implements OnDestroy, OnInit { public ngOnInit() { this.authenticationSubscription = - this.authService.userChanges.filter(user => !!user) + this.authService.userChanges.pipe(filter(user => !!user)) .subscribe(user => { this.profileId = user!.id; this.profileDisplayName = user!.displayName; diff --git a/src/Squidex/app/theme/_common.scss b/src/Squidex/app/theme/_common.scss index a271702fb..185624ead 100644 --- a/src/Squidex/app/theme/_common.scss +++ b/src/Squidex/app/theme/_common.scss @@ -113,7 +113,9 @@ body { // Drop area for drag and drop features. // .drop-container { - position: relative; + & { + position: relative; + } .drop-area { & { @@ -147,6 +149,13 @@ body { } } +.sorting { + &, + & > * { + @include opacity(.5); + } +} + // // Animations // diff --git a/src/Squidex/app/theme/icomoon/demo.html b/src/Squidex/app/theme/icomoon/demo.html index 1a52b9660..aefcf21b8 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: 89)

+

Font Name: icomoon (Glyphs: 90)

Grid Size: 14

+
+
+ + + + icon-type-Array +
+
+ + +
+
+ liga: + +
+
diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot index 3a771e107..b1f623178 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 f8e87e599..094cf6b9e 100644 --- a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg +++ b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg @@ -93,6 +93,7 @@ + diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf index 29c1ec161..4b50ee30b 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 844257073..a77abf513 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/icons/type-Array.svg b/src/Squidex/app/theme/icomoon/icons/type-Array.svg new file mode 100644 index 000000000..aaf0cb10e --- /dev/null +++ b/src/Squidex/app/theme/icomoon/icons/type-Array.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/Squidex/app/theme/icomoon/selection.json b/src/Squidex/app/theme/icomoon/selection.json index 266f325f0..4787eaf86 100644 --- a/src/Squidex/app/theme/icomoon/selection.json +++ b/src/Squidex/app/theme/icomoon/selection.json @@ -1,6 +1,44 @@ { "IcoMoonType": "selection", "icons": [ + { + "icon": { + "paths": [ + "M832 268.8h-657.92c-15.36 0-25.6-10.24-25.6-25.6s10.24-25.6 25.6-25.6h657.92c15.36 0 25.6 10.24 25.6 25.6s-10.24 25.6-25.6 25.6z", + "M832 453.12h-409.6c-15.36 0-25.6-10.24-25.6-25.6s10.24-25.6 25.6-25.6h409.6c15.36 0 25.6 10.24 25.6 25.6s-10.24 25.6-25.6 25.6z", + "M832 642.56h-409.6c-15.36 0-25.6-10.24-25.6-25.6s10.24-25.6 25.6-25.6h409.6c15.36 0 25.6 10.24 25.6 25.6s-10.24 25.6-25.6 25.6z", + "M832 832h-409.6c-15.36 0-25.6-10.24-25.6-25.6s10.24-25.6 25.6-25.6h409.6c15.36 0 25.6 10.24 25.6 25.6s-10.24 25.6-25.6 25.6z" + ], + "attrs": [ + {}, + {}, + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 14, + "tags": [ + "type-Array" + ] + }, + "attrs": [ + {}, + {}, + {}, + {} + ], + "properties": { + "order": 108, + "id": 211, + "name": "type-Array", + "prevSize": 28, + "code": 59734 + }, + "setIdx": 0, + "setId": 1, + "iconIdx": 0 + }, { "icon": { "paths": [ @@ -28,8 +66,8 @@ "name": "exclamation" }, "setIdx": 0, - "setId": 3, - "iconIdx": 0 + "setId": 1, + "iconIdx": 1 }, { "icon": { @@ -57,9 +95,9 @@ "prevSize": 28, "code": 59730 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 0 + "iconIdx": 2 }, { "icon": { @@ -87,9 +125,9 @@ "code": 59725, "name": "action-Slack" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 1 + "iconIdx": 3 }, { "icon": { @@ -116,9 +154,9 @@ "prevSize": 28, "code": 59723 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 2 + "iconIdx": 4 }, { "icon": { @@ -148,9 +186,9 @@ "prevSize": 28, "code": 59721 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 3 + "iconIdx": 5 }, { "icon": { @@ -180,9 +218,9 @@ "prevSize": 28, "code": 59711 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 4 + "iconIdx": 6 }, { "icon": { @@ -210,9 +248,9 @@ "code": 59648, "name": "angle-down" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 5 + "iconIdx": 7 }, { "icon": { @@ -240,9 +278,9 @@ "code": 59649, "name": "angle-left" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 6 + "iconIdx": 8 }, { "icon": { @@ -270,9 +308,9 @@ "code": 59697, "name": "angle-right" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 7 + "iconIdx": 9 }, { "icon": { @@ -300,9 +338,9 @@ "code": 59651, "name": "angle-up" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 8 + "iconIdx": 10 }, { "icon": { @@ -341,9 +379,9 @@ "prevSize": 28, "code": 59717 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 9 + "iconIdx": 11 }, { "icon": { @@ -376,9 +414,9 @@ "prevSize": 28, "code": 59720 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 10 + "iconIdx": 12 }, { "icon": { @@ -406,9 +444,9 @@ "code": 59709, "name": "bug" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 11 + "iconIdx": 13 }, { "icon": { @@ -436,9 +474,9 @@ "code": 59692, "name": "caret-down" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 12 + "iconIdx": 14 }, { "icon": { @@ -466,9 +504,9 @@ "code": 59690, "name": "caret-left" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 13 + "iconIdx": 15 }, { "icon": { @@ -496,9 +534,9 @@ "code": 59689, "name": "caret-right" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 14 + "iconIdx": 16 }, { "icon": { @@ -526,9 +564,9 @@ "code": 59691, "name": "caret-up" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 15 + "iconIdx": 17 }, { "icon": { @@ -564,9 +602,9 @@ "prevSize": 28, "code": 59718 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 16 + "iconIdx": 18 }, { "icon": { @@ -593,9 +631,9 @@ "prevSize": 28, "code": 59702 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 17 + "iconIdx": 19 }, { "icon": { @@ -622,9 +660,9 @@ "prevSize": 28, "code": 59703 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 18 + "iconIdx": 20 }, { "icon": { @@ -651,9 +689,9 @@ "prevSize": 28, "code": 59704 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 19 + "iconIdx": 21 }, { "icon": { @@ -678,9 +716,9 @@ "prevSize": 28, "code": 61450 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 20 + "iconIdx": 22 }, { "icon": { @@ -707,9 +745,9 @@ "prevSize": 28, "code": 61641 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 21 + "iconIdx": 23 }, { "icon": { @@ -736,9 +774,9 @@ "prevSize": 28, "code": 59698 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 22 + "iconIdx": 24 }, { "icon": { @@ -786,9 +824,9 @@ "prevSize": 28, "code": 59719 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 23 + "iconIdx": 25 }, { "icon": { @@ -818,9 +856,9 @@ "code": 59732, "name": "hour-glass" }, - "setIdx": 1, - "setId": 2, - "iconIdx": 0 + "setIdx": 0, + "setId": 1, + "iconIdx": 26 }, { "icon": { @@ -851,9 +889,9 @@ "code": 59731, "name": "spinner" }, - "setIdx": 1, - "setId": 2, - "iconIdx": 1 + "setIdx": 0, + "setId": 1, + "iconIdx": 27 }, { "icon": { @@ -882,9 +920,9 @@ "code": 59728, "name": "clock" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 67 + "iconIdx": 28 }, { "icon": { @@ -919,9 +957,9 @@ "prevSize": 32, "code": 59650 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 68 + "iconIdx": 29 }, { "icon": { @@ -952,9 +990,9 @@ "prevSize": 32, "code": 59850 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 69 + "iconIdx": 30 }, { "icon": { @@ -985,9 +1023,9 @@ "code": 59715, "name": "elapsed" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 70 + "iconIdx": 31 }, { "icon": { @@ -1015,9 +1053,9 @@ "code": 59707, "name": "google" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 71 + "iconIdx": 32 }, { "icon": { @@ -1047,9 +1085,9 @@ "code": 59700, "name": "lock" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 72 + "iconIdx": 33 }, { "icon": { @@ -1078,9 +1116,9 @@ "code": 59712, "name": "microsoft, action-AzureQueue" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 73 + "iconIdx": 34 }, { "icon": { @@ -1108,9 +1146,9 @@ "code": 59695, "name": "pause" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 74 + "iconIdx": 35 }, { "icon": { @@ -1138,9 +1176,9 @@ "code": 59696, "name": "play" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 75 + "iconIdx": 36 }, { "icon": { @@ -1177,9 +1215,9 @@ "code": 59694, "name": "reset" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 76 + "iconIdx": 37 }, { "icon": { @@ -1212,9 +1250,9 @@ "code": 59693, "name": "settings2" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 77 + "iconIdx": 38 }, { "icon": { @@ -1246,9 +1284,9 @@ "code": 59716, "name": "timeout" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 78 + "iconIdx": 39 }, { "icon": { @@ -1276,9 +1314,9 @@ "code": 59699, "name": "unlocked" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 79 + "iconIdx": 40 }, { "icon": { @@ -1305,9 +1343,9 @@ "prevSize": 32, "code": 59729 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 24 + "iconIdx": 41 }, { "icon": { @@ -1335,9 +1373,9 @@ "prevSize": 32, "code": 59726 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 25 + "iconIdx": 42 }, { "icon": { @@ -1367,9 +1405,9 @@ "prevSize": 32, "code": 59727 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 26 + "iconIdx": 43 }, { "icon": { @@ -1396,9 +1434,9 @@ "prevSize": 32, "code": 59724 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 27 + "iconIdx": 44 }, { "icon": { @@ -1434,9 +1472,9 @@ "prevSize": 32, "code": 59722 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 28 + "iconIdx": 45 }, { "icon": { @@ -1463,9 +1501,9 @@ "prevSize": 32, "code": 59652 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 29 + "iconIdx": 46 }, { "icon": { @@ -1492,9 +1530,9 @@ "prevSize": 32, "code": 59653 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 30 + "iconIdx": 47 }, { "icon": { @@ -1521,9 +1559,9 @@ "prevSize": 32, "code": 59654 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 31 + "iconIdx": 48 }, { "icon": { @@ -1550,9 +1588,9 @@ "prevSize": 32, "code": 59655 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 32 + "iconIdx": 49 }, { "icon": { @@ -1579,9 +1617,9 @@ "prevSize": 32, "code": 59656 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 33 + "iconIdx": 50 }, { "icon": { @@ -1608,9 +1646,9 @@ "prevSize": 32, "code": 59657 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 34 + "iconIdx": 51 }, { "icon": { @@ -1637,9 +1675,9 @@ "prevSize": 32, "code": 59658 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 35 + "iconIdx": 52 }, { "icon": { @@ -1666,9 +1704,9 @@ "prevSize": 32, "code": 59659 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 36 + "iconIdx": 53 }, { "icon": { @@ -1695,9 +1733,9 @@ "prevSize": 32, "code": 59660 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 37 + "iconIdx": 54 }, { "icon": { @@ -1724,9 +1762,9 @@ "prevSize": 32, "code": 59661 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 38 + "iconIdx": 55 }, { "icon": { @@ -1753,9 +1791,9 @@ "prevSize": 32, "code": 59662 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 39 + "iconIdx": 56 }, { "icon": { @@ -1782,9 +1820,9 @@ "prevSize": 32, "code": 59663 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 40 + "iconIdx": 57 }, { "icon": { @@ -1811,9 +1849,9 @@ "prevSize": 32, "code": 59664 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 41 + "iconIdx": 58 }, { "icon": { @@ -1846,9 +1884,9 @@ "prevSize": 32, "code": 59665 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 42 + "iconIdx": 59 }, { "icon": { @@ -1875,9 +1913,9 @@ "prevSize": 32, "code": 59666 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 43 + "iconIdx": 60 }, { "icon": { @@ -1904,9 +1942,9 @@ "prevSize": 32, "code": 59667 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 44 + "iconIdx": 61 }, { "icon": { @@ -1933,9 +1971,9 @@ "prevSize": 32, "code": 59668 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 45 + "iconIdx": 62 }, { "icon": { @@ -1962,9 +2000,9 @@ "prevSize": 32, "code": 59669 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 46 + "iconIdx": 63 }, { "icon": { @@ -1991,9 +2029,9 @@ "prevSize": 32, "code": 59670 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 47 + "iconIdx": 64 }, { "icon": { @@ -2020,9 +2058,9 @@ "prevSize": 32, "code": 59671 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 48 + "iconIdx": 65 }, { "icon": { @@ -2049,9 +2087,9 @@ "prevSize": 32, "code": 59672 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 49 + "iconIdx": 66 }, { "icon": { @@ -2079,9 +2117,9 @@ "prevSize": 32, "code": 59713 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 50 + "iconIdx": 67 }, { "icon": { @@ -2108,9 +2146,9 @@ "prevSize": 32, "code": 59673 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 51 + "iconIdx": 68 }, { "icon": { @@ -2137,9 +2175,9 @@ "prevSize": 32, "code": 59675 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 52 + "iconIdx": 69 }, { "icon": { @@ -2166,9 +2204,9 @@ "prevSize": 32, "code": 59676 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 53 + "iconIdx": 70 }, { "icon": { @@ -2195,9 +2233,9 @@ "prevSize": 32, "code": 59677 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 54 + "iconIdx": 71 }, { "icon": { @@ -2224,9 +2262,9 @@ "prevSize": 32, "code": 59678 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 55 + "iconIdx": 72 }, { "icon": { @@ -2253,9 +2291,9 @@ "prevSize": 32, "code": 59679 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 56 + "iconIdx": 73 }, { "icon": { @@ -2282,9 +2320,9 @@ "prevSize": 32, "code": 59680 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 57 + "iconIdx": 74 }, { "icon": { @@ -2320,9 +2358,9 @@ "prevSize": 32, "code": 59681 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 58 + "iconIdx": 75 }, { "icon": { @@ -2349,9 +2387,9 @@ "prevSize": 32, "code": 59682 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 59 + "iconIdx": 76 }, { "icon": { @@ -2378,9 +2416,9 @@ "prevSize": 32, "code": 59683 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 60 + "iconIdx": 77 }, { "icon": { @@ -2407,9 +2445,9 @@ "prevSize": 32, "code": 59684 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 61 + "iconIdx": 78 }, { "icon": { @@ -2436,9 +2474,9 @@ "prevSize": 32, "code": 59685 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 62 + "iconIdx": 79 }, { "icon": { @@ -2465,9 +2503,9 @@ "prevSize": 32, "code": 59674 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 63 + "iconIdx": 80 }, { "icon": { @@ -2494,9 +2532,9 @@ "prevSize": 32, "code": 59686 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 64 + "iconIdx": 81 }, { "icon": { @@ -2523,9 +2561,9 @@ "prevSize": 32, "code": 59687 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 65 + "iconIdx": 82 }, { "icon": { @@ -2552,9 +2590,9 @@ "prevSize": 32, "code": 59688 }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 66 + "iconIdx": 83 }, { "icon": { @@ -2585,9 +2623,9 @@ "code": 59701, "name": "browser" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 80 + "iconIdx": 84 }, { "icon": { @@ -2617,9 +2655,9 @@ "code": 59714, "name": "checkmark" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 81 + "iconIdx": 85 }, { "icon": { @@ -2647,9 +2685,9 @@ "code": 59706, "name": "control-Stars" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 82 + "iconIdx": 86 }, { "icon": { @@ -2676,9 +2714,9 @@ "code": 59705, "name": "control-RichText" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 83 + "iconIdx": 87 }, { "icon": { @@ -2705,9 +2743,9 @@ "code": 59710, "name": "download" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 84 + "iconIdx": 88 }, { "icon": { @@ -2734,9 +2772,9 @@ "code": 59708, "name": "info" }, - "setIdx": 2, + "setIdx": 0, "setId": 1, - "iconIdx": 85 + "iconIdx": 89 } ], "height": 1024, diff --git a/src/Squidex/app/theme/icomoon/style.css b/src/Squidex/app/theme/icomoon/style.css index 525937dbb..2d0eae8ba 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?ajcf5j'); - src: url('fonts/icomoon.eot?ajcf5j#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?ajcf5j') format('truetype'), - url('fonts/icomoon.woff?ajcf5j') format('woff'), - url('fonts/icomoon.svg?ajcf5j#icomoon') format('svg'); + src: url('fonts/icomoon.eot?ebsjd4'); + src: url('fonts/icomoon.eot?ebsjd4#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?ebsjd4') format('truetype'), + url('fonts/icomoon.woff?ebsjd4') format('woff'), + url('fonts/icomoon.svg?ebsjd4#icomoon') format('svg'); font-weight: normal; font-style: normal; } @@ -24,6 +24,9 @@ -moz-osx-font-smoothing: grayscale; } +.icon-type-Array:before { + content: "\e956"; +} .icon-exclamation:before { content: "\e955"; } diff --git a/src/Squidex/app/theme/theme.scss b/src/Squidex/app/theme/theme.scss index c91f6a74d..3dca4d75d 100644 --- a/src/Squidex/app/theme/theme.scss +++ b/src/Squidex/app/theme/theme.scss @@ -6,8 +6,8 @@ // Pikaday @import '~pikaday/css/pikaday.css'; -// Drag and Drop -@import '~ng2-dnd/bundles/style.css'; +// Dragula +@import '~dragula/dist/dragula.css'; // Bootstrap Overrides @import '_bootstrap.scss'; diff --git a/src/Squidex/appsettings.json b/src/Squidex/appsettings.json index b72f5ec5c..b23f0e36c 100644 --- a/src/Squidex/appsettings.json +++ b/src/Squidex/appsettings.json @@ -53,7 +53,11 @@ /* * Setting the flag to true, enables well formatteds json logs. */ - "human": true + "human": true, + /* + * Set to true, to use colors. + */ + "colors": true }, "assetStore": { diff --git a/src/Squidex/package.json b/src/Squidex/package.json index 7a53c688d..333ef68f3 100644 --- a/src/Squidex/package.json +++ b/src/Squidex/package.json @@ -9,89 +9,94 @@ "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 --display-optimization-bailout", - "build:nobail": "webpack --config app-config/webpack.run.prod.js --display-error-details", + "start": "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", "build:copy": "cpx node_modules/oidc-client/dist/oidc-client.min.js wwwroot/scripts/", "build:clean": "rimraf wwwroot/build", - "tslint": "tslint app/**/*.ts" + "tslint": "tslint -c tslint.json -p tsconfig.json app/**/*.ts" }, "dependencies": { - "@angular/animations": "5.2.1", - "@angular/common": "5.2.1", - "@angular/core": "5.2.1", - "@angular/forms": "5.2.1", - "@angular/http": "5.2.1", - "@angular/platform-browser": "5.2.1", - "@angular/platform-browser-dynamic": "5.2.1", - "@angular/platform-server": "5.2.1", - "@angular/router": "5.2.1", - "angular2-chartjs": "0.4.1", + "@angular/animations": "6.0.3", + "@angular/common": "6.0.3", + "@angular/core": "6.0.3", + "@angular/forms": "6.0.3", + "@angular/http": "6.0.3", + "@angular/platform-browser": "6.0.3", + "@angular/platform-browser-dynamic": "6.0.3", + "@angular/platform-server": "6.0.3", + "@angular/router": "6.0.3", + "angular2-chartjs": "0.5.1", "babel-polyfill": "6.26.0", - "bootstrap": "4.0.0", - "core-js": "2.5.3", + "bootstrap": "4.1.1", + "codemirror": "5.38.0", + "core-js": "2.5.7", + "dragula": "3.7.2", "graphiql": "0.11.11", - "moment": "2.20.1", + "moment": "2.22.2", "mousetrap": "1.6.1", "ng2-dnd": "5.0.2", - "oidc-client": "1.4.1", + "oidc-client": "1.5.0", "pikaday": "1.7.0", "progressbar.js": "1.0.1", - "react": "16.2.0", - "react-dom": "16.2.0", - "rxjs": "5.5.6", - "slugify": "1.2.9", - "zone.js": "0.8.20" + "react": "16.4.0", + "react-dom": "16.4.0", + "rxjs": "6.2.0", + "slugify": "1.3.0", + "zone.js": "0.8.26" }, "devDependencies": { - "@angular/compiler": "5.2.1", - "@angular/compiler-cli": "5.2.1", - "@ngtools/webpack": "1.9.5", - "@types/core-js": "0.9.45", - "@types/jasmine": "2.5.45", + "@angular/compiler": "6.0.3", + "@angular/compiler-cli": "6.0.3", + "@ngtools/webpack": "6.0.3", + "@types/core-js": "2.5.0", + "@types/dragula": "2.1.33", + "@types/jasmine": "2.8.8", "@types/mousetrap": "1.6", - "@types/node": "8.5.2", - "@types/react": "16.0.34", - "@types/react-dom": "16.0.3", + "@types/node": "10.1.2", + "@types/react": "16.3.16", + "@types/react-dom": "16.0.5", "angular2-router-loader": "0.3.5", "angular2-template-loader": "0.6.2", - "awesome-typescript-loader": "3.4.1", - "codelyzer": "4.1.0", + "awesome-typescript-loader": "5.0.0", + "codelyzer": "4.3.0", "cpx": "1.5.0", - "css-loader": "0.28.9", - "exports-loader": "0.6.4", - "extract-text-webpack-plugin": "3.0.2", - "file-loader": "1.1.6", + "css-loader": "0.28.11", + "exports-loader": "0.7.0", + "file-loader": "1.1.11", "html-loader": "0.5.5", - "html-webpack-plugin": "2.30.1", + "html-webpack-plugin": "3.2.0", "ignore-loader": "0.1.2", - "istanbul-instrumenter-loader": "0.2.0", - "jasmine-core": "2.9.1", - "karma": "2.0.0", + "istanbul-instrumenter-loader": "3.0.1", + "jasmine-core": "3.1.0", + "karma": "2.0.2", "karma-chrome-launcher": "2.2.0", "karma-cli": "1.0.1", - "karma-coverage": "1.1.1", + "karma-coverage": "1.1.2", "karma-htmlfile-reporter": "0.3.5", - "karma-jasmine": "1.1.1", - "karma-jasmine-html-reporter": "0.2.2", + "karma-jasmine": "1.1.2", + "karma-jasmine-html-reporter": "1.1.0", "karma-mocha-reporter": "2.2.5", "karma-sourcemap-loader": "0.3.7", - "karma-webpack": "2.0.9", - "node-sass": "4.7.2", + "karma-webpack": "3.0.0", + "mini-css-extract-plugin": "0.4.0", + "node-sass": "4.9.0", "noop-loader": "1.0.0", "null-loader": "0.1.1", "raw-loader": "0.5.1", "rimraf": "2.6.2", + "rxjs-tslint": "0.1.4", "sass-lint": "1.12.1", - "sass-loader": "6.0.6", - "style-loader": "0.19.1", - "tsconfig-paths-webpack-plugin": "3.0.2", - "tslint": "5.9.1", - "tslint-loader": "3.5.3", + "sass-loader": "7.0.1", + "style-loader": "0.21.0", + "tsconfig-paths-webpack-plugin": "3.1.3", + "tslint": "5.10.0", + "tslint-loader": "3.6.0", "typemoq": "2.1.0", - "typescript": "2.5.3", - "underscore": "1.8.3", - "webpack": "3.10.0", - "webpack-dev-server": "2.11.1", - "webpack-merge": "4.1.1" + "typescript": "2.7.2", + "underscore": "1.9.1", + "webpack": "4.10.2", + "webpack-cli": "2.1.5", + "webpack-dev-server": "3.1.4", + "webpack-merge": "4.1.2" } } diff --git a/src/Squidex/tsconfig.json b/src/Squidex/tsconfig.json index 76e9a508a..af90295f4 100644 --- a/src/Squidex/tsconfig.json +++ b/src/Squidex/tsconfig.json @@ -18,5 +18,8 @@ "app/*" ] } + }, + "angularCompilerOptions": { + "preserveWhitespaces": true } } \ No newline at end of file diff --git a/src/Squidex/tslint.json b/src/Squidex/tslint.json index 1dff2ae30..95dd43adb 100644 --- a/src/Squidex/tslint.json +++ b/src/Squidex/tslint.json @@ -1,6 +1,7 @@ { "rulesDirectory": [ - "node_modules/codelyzer" + "node_modules/codelyzer", + "node_modules/rxjs-tslint" ], "rules": { "angular-whitespace": false, @@ -69,7 +70,7 @@ "no-switch-case-fall-through": true, "no-trailing-whitespace": true, "no-unused-expression": true, - "no-use-before-declare": true, + "no-use-before-declare": false, "no-var-keyword": true, "object-literal-sort-keys": false, "one-line": [ @@ -97,6 +98,10 @@ "single" ], "radix": true, + "rxjs-collapse-imports": true, + "rxjs-pipeable-operators-only": true, + "rxjs-no-static-observable-methods": true, + "rxjs-proper-imports": true, "semicolon": [ true, "always" diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/ArrayFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/ArrayFieldTests.cs new file mode 100644 index 000000000..b8c910077 --- /dev/null +++ b/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/ArrayFieldTests.cs @@ -0,0 +1,222 @@ +// ========================================================================== +// 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.Linq; +using Newtonsoft.Json; +using Squidex.Domain.Apps.Core.Schemas; +using Xunit; + +#pragma warning disable SA1310 // Field names must not contain underscore + +namespace Squidex.Domain.Apps.Core.Model.Schemas +{ + public class ArrayfieldTests + { + private readonly JsonSerializer serializer = TestData.DefaultSerializer(); + private readonly ArrayField parent_0 = Fields.Array(100, "root", Partitioning.Invariant); + + [Fact] + public void Should_add_field() + { + var field = CreateField(1); + + var parent_1 = parent_0.AddField(field); + + Assert.Empty(parent_0.Fields); + Assert.Equal(field, parent_1.FieldsById[1]); + } + + [Fact] + public void Should_throw_exception_if_adding_field_with_name_that_already_exists() + { + var parent_1 = parent_0.AddField(CreateField(1)); + + Assert.Throws(() => parent_1.AddNumber(2, "my-field-1")); + } + + [Fact] + public void Should_throw_exception_if_adding_field_with_id_that_already_exists() + { + var parent_1 = parent_0.AddField(CreateField(1)); + + Assert.Throws(() => parent_1.AddNumber(1, "my-field-2")); + } + + [Fact] + public void Should_hide_field() + { + var parent_1 = parent_0.AddField(CreateField(1)); + + var parent_2 = parent_1.UpdateField(1, f => f.Hide()); + var parent_3 = parent_2.UpdateField(1, f => f.Hide()); + + Assert.False(parent_1.FieldsById[1].IsHidden); + Assert.True(parent_3.FieldsById[1].IsHidden); + } + + [Fact] + public void Should_return_same_parent_if_field_to_hide_does_not_exist() + { + var parent_1 = parent_0.UpdateField(1, f => f.Hide()); + + Assert.Same(parent_0, parent_1); + } + + [Fact] + public void Should_show_field() + { + var parent_1 = parent_0.AddField(CreateField(1)); + + var parent_2 = parent_1.UpdateField(1, f => f.Hide()); + var parent_3 = parent_2.UpdateField(1, f => f.Show()); + var parent_4 = parent_3.UpdateField(1, f => f.Show()); + + Assert.True(parent_2.FieldsById[1].IsHidden); + Assert.False(parent_4.FieldsById[1].IsHidden); + } + + [Fact] + public void Should_return_same_parent_if_field_to_show_does_not_exist() + { + var parent_1 = parent_0.UpdateField(1, f => f.Show()); + + Assert.Same(parent_0, parent_1); + } + + [Fact] + public void Should_disable_field() + { + var parent_1 = parent_0.AddField(CreateField(1)); + + var parent_2 = parent_1.UpdateField(1, f => f.Disable()); + var parent_3 = parent_2.UpdateField(1, f => f.Disable()); + + Assert.False(parent_1.FieldsById[1].IsDisabled); + Assert.True(parent_3.FieldsById[1].IsDisabled); + } + + [Fact] + public void Should_return_same_parent_if_field_to_disable_does_not_exist() + { + var parent_1 = parent_0.UpdateField(1, f => f.Disable()); + + Assert.Same(parent_0, parent_1); + } + + [Fact] + public void Should_enable_field() + { + var parent_1 = parent_0.AddField(CreateField(1)); + + var parent_2 = parent_1.UpdateField(1, f => f.Disable()); + var parent_3 = parent_2.UpdateField(1, f => f.Enable()); + var parent_4 = parent_3.UpdateField(1, f => f.Enable()); + + Assert.True(parent_2.FieldsById[1].IsDisabled); + Assert.False(parent_4.FieldsById[1].IsDisabled); + } + + [Fact] + public void Should_return_same_parent_if_field_to_enable_does_not_exist() + { + var parent_1 = parent_0.UpdateField(1, f => f.Enable()); + + Assert.Same(parent_0, parent_1); + } + + [Fact] + public void Should_update_field() + { + var properties = new NumberFieldProperties(); + + var parent_1 = parent_0.AddField(CreateField(1)); + var parent_2 = parent_1.UpdateField(1, f => f.Update(properties)); + + Assert.NotSame(properties, parent_1.FieldsById[1].RawProperties); + Assert.Same(properties, parent_2.FieldsById[1].RawProperties); + } + + [Fact] + public void Should_throw_exception_if_updating_with_invalid_properties_type() + { + var parent_1 = parent_0.AddField(CreateField(1)); + + Assert.Throws(() => parent_1.UpdateField(1, f => f.Update(new StringFieldProperties()))); + } + + [Fact] + public void Should_return_same_parent_if_field_to_update_does_not_exist() + { + var parent_1 = parent_0.UpdateField(1, f => f.Update(new StringFieldProperties())); + + Assert.Same(parent_0, parent_1); + } + + [Fact] + public void Should_delete_field() + { + var parent_1 = parent_0.AddField(CreateField(1)); + var parent_2 = parent_1.DeleteField(1); + + Assert.Empty(parent_2.FieldsById); + } + + [Fact] + public void Should_return_same_parent_if_field_to_delete_does_not_exist() + { + var parent_1 = parent_0.DeleteField(1); + + Assert.Same(parent_0, parent_1); + } + + [Fact] + public void Should_reorder_fields() + { + var field1 = CreateField(1); + var field2 = CreateField(2); + var field3 = CreateField(3); + + var parent_1 = parent_0.AddField(field1); + var parent_2 = parent_1.AddField(field2); + var parent_3 = parent_2.AddField(field3); + var parent_4 = parent_3.ReorderFields(new List { 3, 2, 1 }); + + Assert.Equal(new List { field3, field2, field1 }, parent_4.Fields.ToList()); + } + + [Fact] + public void Should_throw_exception_if_not_all_fields_are_covered_for_reordering() + { + var field1 = CreateField(1); + var field2 = CreateField(2); + + var parent_1 = parent_0.AddField(field1); + var parent_2 = parent_1.AddField(field2); + + Assert.Throws(() => parent_2.ReorderFields(new List { 1 })); + } + + [Fact] + public void Should_throw_exception_if_field_to_reorder_does_not_exist() + { + var field1 = CreateField(1); + var field2 = CreateField(2); + + var parent_1 = parent_0.AddField(field1); + var parent_2 = parent_1.AddField(field2); + + Assert.Throws(() => parent_2.ReorderFields(new List { 1, 4 })); + } + + private static NestedField CreateField(int id) + { + return Fields.Number(id, $"my-field-{id}"); + } + } +} diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/FieldRegistryTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/FieldRegistryTests.cs index 95a56d739..597b54f8d 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/FieldRegistryTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/FieldRegistryTests.cs @@ -28,7 +28,12 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas return default(T); } - public override Field CreateField(long id, string name, Partitioning partitioning) + public override RootField CreateRootField(long id, string name, Partitioning partitioning) + { + return null; + } + + public override NestedField CreateNestedField(long id, string name) { return null; } @@ -37,7 +42,7 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas [Fact] public void Should_throw_exception_if_creating_field_and_field_is_not_registered() { - Assert.Throws(() => sut.CreateField(1, "name", Partitioning.Invariant, new InvalidProperties())); + Assert.Throws(() => sut.CreateRootField(1, "name", Partitioning.Invariant, new InvalidProperties())); } [Theory] @@ -54,7 +59,7 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas { var properties = (FieldProperties)Activator.CreateInstance(propertyType); - var field = sut.CreateField(1, "name", Partitioning.Invariant, properties); + var field = sut.CreateRootField(1, "name", Partitioning.Invariant, properties); Assert.Equal(properties, field.RawProperties); } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/SchemaFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/SchemaFieldTests.cs index 2878a87e0..b27784278 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/SchemaFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/SchemaFieldTests.cs @@ -24,7 +24,7 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas .Select(x => new object[] { x }) .ToList(); - private readonly Field field_0 = Fields.Number(1, "my-field", Partitioning.Invariant); + private readonly RootField field_0 = Fields.Number(1, "my-field", Partitioning.Invariant); [Fact] public void Should_instantiate_field() diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/SchemaTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/SchemaTests.cs index cd267b57e..8b9dfcc3b 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/SchemaTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Model/Schemas/SchemaTests.cs @@ -78,8 +78,8 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas { var schema_1 = schema_0.AddField(CreateField(1)); - var schema_2 = schema_1.HideField(1); - var schema_3 = schema_2.HideField(1); + var schema_2 = schema_1.UpdateField(1, f => f.Hide()); + var schema_3 = schema_2.UpdateField(1, f => f.Hide()); Assert.False(schema_1.FieldsById[1].IsHidden); Assert.True(schema_3.FieldsById[1].IsHidden); @@ -88,7 +88,7 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas [Fact] public void Should_return_same_schema_if_field_to_hide_does_not_exist() { - var schema_1 = schema_0.HideField(1); + var schema_1 = schema_0.UpdateField(1, f => f.Hide()); Assert.Same(schema_0, schema_1); } @@ -98,9 +98,9 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas { var schema_1 = schema_0.AddField(CreateField(1)); - var schema_2 = schema_1.HideField(1); - var schema_3 = schema_2.ShowField(1); - var schema_4 = schema_3.ShowField(1); + var schema_2 = schema_1.UpdateField(1, f => f.Hide()); + var schema_3 = schema_2.UpdateField(1, f => f.Show()); + var schema_4 = schema_3.UpdateField(1, f => f.Show()); Assert.True(schema_2.FieldsById[1].IsHidden); Assert.False(schema_4.FieldsById[1].IsHidden); @@ -109,7 +109,7 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas [Fact] public void Should_return_same_schema_if_field_to_show_does_not_exist() { - var schema_1 = schema_0.ShowField(1); + var schema_1 = schema_0.UpdateField(1, f => f.Show()); Assert.Same(schema_0, schema_1); } @@ -119,8 +119,8 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas { var schema_1 = schema_0.AddField(CreateField(1)); - var schema_2 = schema_1.DisableField(1); - var schema_3 = schema_2.DisableField(1); + var schema_2 = schema_1.UpdateField(1, f => f.Disable()); + var schema_3 = schema_2.UpdateField(1, f => f.Disable()); Assert.False(schema_1.FieldsById[1].IsDisabled); Assert.True(schema_3.FieldsById[1].IsDisabled); @@ -129,7 +129,7 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas [Fact] public void Should_return_same_schema_if_field_to_disable_does_not_exist() { - var schema_1 = schema_0.DisableField(1); + var schema_1 = schema_0.UpdateField(1, f => f.Disable()); Assert.Same(schema_0, schema_1); } @@ -139,9 +139,9 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas { var schema_1 = schema_0.AddField(CreateField(1)); - var schema_2 = schema_1.DisableField(1); - var schema_3 = schema_2.EnableField(1); - var schema_4 = schema_3.EnableField(1); + var schema_2 = schema_1.UpdateField(1, f => f.Disable()); + var schema_3 = schema_2.UpdateField(1, f => f.Enable()); + var schema_4 = schema_3.UpdateField(1, f => f.Enable()); Assert.True(schema_2.FieldsById[1].IsDisabled); Assert.False(schema_4.FieldsById[1].IsDisabled); @@ -150,7 +150,7 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas [Fact] public void Should_return_same_schema_if_field_to_enable_does_not_exist() { - var schema_1 = schema_0.EnableField(1); + var schema_1 = schema_0.UpdateField(1, f => f.Enable()); Assert.Same(schema_0, schema_1); } @@ -160,8 +160,8 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas { var schema_1 = schema_0.AddField(CreateField(1)); - var schema_2 = schema_1.LockField(1); - var schema_3 = schema_2.LockField(1); + var schema_2 = schema_1.UpdateField(1, f => f.Lock()); + var schema_3 = schema_2.UpdateField(1, f => f.Lock()); Assert.False(schema_1.FieldsById[1].IsLocked); Assert.True(schema_3.FieldsById[1].IsLocked); @@ -170,7 +170,7 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas [Fact] public void Should_return_same_schema_if_field_to_lock_does_not_exist() { - var schema_1 = schema_0.LockField(1); + var schema_1 = schema_0.UpdateField(1, f => f.Lock()); Assert.Same(schema_0, schema_1); } @@ -181,7 +181,7 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas var properties = new NumberFieldProperties(); var schema_1 = schema_0.AddField(CreateField(1)); - var schema_2 = schema_1.UpdateField(1, properties); + var schema_2 = schema_1.UpdateField(1, f => f.Update(properties)); Assert.NotSame(properties, schema_1.FieldsById[1].RawProperties); Assert.Same(properties, schema_2.FieldsById[1].RawProperties); @@ -192,13 +192,13 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas { var schema_1 = schema_0.AddField(CreateField(1)); - Assert.Throws(() => schema_1.UpdateField(1, new StringFieldProperties())); + Assert.Throws(() => schema_1.UpdateField(1, f => f.Update(new StringFieldProperties()))); } [Fact] public void Should_return_same_schema_if_field_to_update_does_not_exist() { - var schema_1 = schema_0.UpdateField(1, new StringFieldProperties()); + var schema_1 = schema_0.UpdateField(1, f => f.Update(new StringFieldProperties())); Assert.Same(schema_0, schema_1); } @@ -251,7 +251,7 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas var schema_3 = schema_2.AddField(field3); var schema_4 = schema_3.ReorderFields(new List { 3, 2, 1 }); - Assert.Equal(new List { field3, field2, field1 }, schema_4.Fields.ToList()); + Assert.Equal(new List { field3, field2, field1 }, schema_4.Fields.ToList()); } [Fact] @@ -287,7 +287,7 @@ namespace Squidex.Domain.Apps.Core.Model.Schemas schemaTarget.ShouldBeEquivalentTo(schemaSource); } - private static Field CreateField(int id) + private static RootField CreateField(int id) { return Fields.Number(id, $"my-field-{id}", Partitioning.Invariant); } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionFlatTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionFlatTests.cs index ecd72adef..6b12ded85 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionFlatTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionFlatTests.cs @@ -33,7 +33,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent .AddAssets(5, "assets1", Partitioning.Invariant) .AddAssets(6, "assets2", Partitioning.Invariant) .AddJson(4, "json", Partitioning.Language) - .HideField(3); + .UpdateField(3, f => f.Hide()); } [Fact] diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionTests.cs index c6631888c..7081b61bc 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionTests.cs @@ -26,14 +26,14 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent .AddAssets(5, "assets1", Partitioning.Invariant) .AddAssets(6, "assets2", Partitioning.Invariant) .AddJson(4, "json", Partitioning.Language) - .HideField(3); + .UpdateField(3, f => f.Hide()); } [Fact] - public void Should_convert_to_id_model() + public void Should_convert_name_to_id() { var input = - new NamedContentData() + new NamedContentData() .AddField("field1", new ContentFieldData() .AddValue("en", "EN")) @@ -44,7 +44,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent new ContentFieldData() .AddValue("iv", 2)); - var actual = input.ToIdModel(schema, (data, field) => field.Name == "field2" ? null : data); + var actual = input.ConvertName2Id(schema, (data, field) => field.Name == "field2" ? null : data); var expected = new IdContentData() @@ -56,25 +56,25 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent } [Fact] - public void Should_convert_id_model() + public void Should_convert_name_to_name() { var input = - new IdContentData() - .AddField(1, + new NamedContentData() + .AddField("field1", new ContentFieldData() .AddValue("en", "EN")) - .AddField(2, + .AddField("field2", new ContentFieldData() .AddValue("iv", 1)) - .AddField(99, + .AddField("invalid", new ContentFieldData() .AddValue("iv", 2)); - var actual = input.Convert(schema, (data, field) => field.Name == "field2" ? null : data); + var actual = input.ConvertName2Name(schema, (data, field) => field.Name == "field2" ? null : data); var expected = - new IdContentData() - .AddField(1, + new NamedContentData() + .AddField("field1", new ContentFieldData() .AddValue("en", "EN")); @@ -82,10 +82,10 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent } [Fact] - public void Should_convert_to_name_model() + public void Should_convert_id_to_id() { var input = - new IdContentData() + new IdContentData() .AddField(1, new ContentFieldData() .AddValue("en", "EN")) @@ -96,11 +96,11 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent new ContentFieldData() .AddValue("iv", 2)); - var actual = input.ToNameModel(schema, (data, field) => field.Name == "field2" ? null : data); + var actual = input.ConvertId2Id(schema, (data, field) => field.Name == "field2" ? null : data); var expected = - new NamedContentData() - .AddField("field1", + new IdContentData() + .AddField(1, new ContentFieldData() .AddValue("en", "EN")); @@ -108,21 +108,21 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent } [Fact] - public void Should_convert_name_model() + public void Should_convert_id_to_name() { var input = - new NamedContentData() - .AddField("field1", + new IdContentData() + .AddField(1, new ContentFieldData() .AddValue("en", "EN")) - .AddField("field2", + .AddField(2, new ContentFieldData() .AddValue("iv", 1)) - .AddField("invalid", + .AddField(99, new ContentFieldData() .AddValue("iv", 2)); - var actual = input.Convert(schema, (data, field) => field.Name == "field2" ? null : data); + var actual = input.ConvertId2Name(schema, (data, field) => field.Name == "field2" ? null : data); var expected = new NamedContentData() diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/FieldConvertersTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/FieldConvertersTests.cs index 75413bf6a..65a638810 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/FieldConvertersTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/FieldConvertersTests.cs @@ -19,48 +19,138 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent public class FieldConvertersTests { private readonly LanguagesConfig languagesConfig = LanguagesConfig.Build(Language.EN, Language.DE); - private readonly Field stringLanguageField = Fields.String(1, "1", Partitioning.Language); - private readonly Field stringInvariantField = Fields.String(1, "1", Partitioning.Invariant); - private readonly Field numberField = Fields.Number(1, "1", Partitioning.Invariant); + private readonly RootField numberField = Fields.Number(1, "1", Partitioning.Invariant); + private readonly RootField stringLanguageField = Fields.String(1, "1", Partitioning.Language); + private readonly RootField stringInvariantField = Fields.String(1, "1", Partitioning.Invariant); + private readonly RootField jsonField = Fields.Json(1, "1", Partitioning.Invariant); + private readonly RootField arrayField = Fields.Array(1, "1", Partitioning.Invariant, + Fields.Number(1, "field1"), + Fields.Number(2, "field2").Hide()); [Fact] - public void Should_encode_json_values() + public void Should_filter_for_value_conversion() { - var source = + var input = new ContentFieldData() - .AddValue("en", null) - .AddValue("de", JToken.FromObject(new { Value = 1 })); + .AddValue("iv", new JObject()); + + var actual = FieldConverters.ForValues((f, i) => Value.Unset)(input, stringInvariantField); - var result = FieldConverters.EncodeJson()(source, Fields.Json(1, "1", Partitioning.Invariant)); + var expected = new ContentFieldData(); - Assert.Null(result["en"]); - Assert.True(result["de"].Type == JTokenType.String); + Assert.Equal(expected, actual); } [Fact] - public void Should_return_same_values_if_encoding_non_json_field() + public void Should_convert_for_value_conversion() { - var source = + var input = new ContentFieldData() - .AddValue("en", null); + .AddValue("iv", new JObject()); - var result = FieldConverters.EncodeJson()(source, stringLanguageField); + var actual = FieldConverters.ForValues(ValueConverters.EncodeJson())(input, jsonField); - Assert.Same(source, result); + var expected = + new ContentFieldData() + .AddValue("iv", "e30="); + + Assert.Equal(expected, actual); } [Fact] - public void Should_decode_json_values() + public void Should_convert_name_to_id() { - var source = + var input = new ContentFieldData() - .AddValue("en", null) - .AddValue("de", "e30="); + .AddValue("iv", + new JArray( + new JObject( + new JProperty("field1", 100), + new JProperty("field2", 200), + new JProperty("invalid", 300)))); + + var actual = FieldConverters.ForNestedName2Id(ValueConverters.ExcludeHidden())(input, arrayField); + + var expected = + new ContentFieldData() + .AddValue("iv", + new JArray( + new JObject( + new JProperty("1", 100)))); + + Assert.Equal(expected, actual); + } + + [Fact] + public void Should_convert_name_to_name() + { + var input = + new ContentFieldData() + .AddValue("iv", + new JArray( + new JObject( + new JProperty("field1", 100), + new JProperty("field2", 200), + new JProperty("invalid", 300)))); + + var actual = FieldConverters.ForNestedName2Name(ValueConverters.ExcludeHidden())(input, arrayField); - var result = FieldConverters.DecodeJson()(source, Fields.Json(1, "1", Partitioning.Invariant)); + var expected = + new ContentFieldData() + .AddValue("iv", + new JArray( + new JObject( + new JProperty("field1", 100)))); - Assert.Null(result["en"]); - Assert.True(result["de"] is JObject); + Assert.Equal(expected, actual); + } + + [Fact] + public void Should_convert_id_to_id() + { + var input = + new ContentFieldData() + .AddValue("iv", + new JArray( + new JObject( + new JProperty("1", 100), + new JProperty("2", 200), + new JProperty("99", 300)))); + + var actual = FieldConverters.ForNestedId2Id(ValueConverters.ExcludeHidden())(input, arrayField); + + var expected = + new ContentFieldData() + .AddValue("iv", + new JArray( + new JObject( + new JProperty("1", 100)))); + + Assert.Equal(expected, actual); + } + + [Fact] + public void Should_convert_id_to_name() + { + var input = + new ContentFieldData() + .AddValue("iv", + new JArray( + new JObject( + new JProperty("1", 100), + new JProperty("2", 200), + new JProperty("99", 300)))); + + var actual = FieldConverters.ForNestedId2Name(ValueConverters.ExcludeHidden())(input, arrayField); + + var expected = + new ContentFieldData() + .AddValue("iv", + new JArray( + new JObject( + new JProperty("field1", 100)))); + + Assert.Equal(expected, actual); } [Fact] @@ -77,7 +167,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent } [Fact] - public void Should_return_null_values_if_all_value_is_invalid() + public void Should_return_null_values_any_value_is_invalid() { var source = new ContentFieldData() @@ -89,18 +179,6 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent Assert.Null(result); } - [Fact] - public void Should_return_same_values_if_decoding_non_json_field() - { - var source = - new ContentFieldData() - .AddValue("en", null); - - var result = FieldConverters.DecodeJson()(source, stringLanguageField); - - Assert.Same(source, result); - } - [Fact] public void Should_return_same_values_if_field_not_hidden() { diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ValueConvertersTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ValueConvertersTests.cs new file mode 100644 index 000000000..9f4cab614 --- /dev/null +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ValueConvertersTests.cs @@ -0,0 +1,104 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Newtonsoft.Json.Linq; +using Squidex.Domain.Apps.Core.Apps; +using Squidex.Domain.Apps.Core.ConvertContent; +using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Infrastructure; +using Xunit; + +namespace Squidex.Domain.Apps.Core.Operations.ConvertContent +{ + public class ValueConvertersTests + { + private readonly LanguagesConfig languagesConfig = LanguagesConfig.Build(Language.EN, Language.DE); + private readonly RootField stringField = Fields.String(1, "1", Partitioning.Invariant); + private readonly RootField jsonField = Fields.Json(1, "1", Partitioning.Invariant); + private readonly RootField numberField = Fields.Number(1, "1", Partitioning.Invariant); + + [Fact] + public void Should_encode_json_value() + { + var source = new JObject(); + + var result = ValueConverters.EncodeJson()(source, jsonField); + + Assert.Equal("e30=", result); + } + + [Fact] + public void Should_return_same_value_if_encoding_null_value() + { + var source = JValue.CreateNull(); + + var result = ValueConverters.EncodeJson()(source, jsonField); + + Assert.Same(source, result); + } + + [Fact] + public void Should_return_same_value_if_encoding_non_json_field() + { + var source = (JToken)"NO-JSON"; + + var result = ValueConverters.EncodeJson()(source, stringField); + + Assert.Same(source, result); + } + + [Fact] + public void Should_decode_json_values() + { + var source = "e30="; + + var result = ValueConverters.DecodeJson()(source, jsonField); + + Assert.Equal(new JObject(), result); + } + + [Fact] + public void Should_return_same_value_if_decoding_null_value() + { + var source = JValue.CreateNull(); + + var result = ValueConverters.DecodeJson()(source, jsonField); + + Assert.Same(source, result); + } + + [Fact] + public void Should_return_same_value_if_decoding_non_json_field() + { + var source = JValue.CreateNull(); + + var result = ValueConverters.EncodeJson()(source, stringField); + + Assert.Same(source, result); + } + + [Fact] + public void Should_return_unset_if_field_hidden() + { + var source = 123; + + var result = ValueConverters.ExcludeHidden()(source, stringField.Hide()); + + Assert.Same(Value.Unset, result); + } + + [Fact] + public void Should_return_unset_if_field_has_wrong_type() + { + var source = "invalid"; + + var result = ValueConverters.ExcludeChangedTypes()(source, numberField); + + Assert.Same(Value.Unset, result); + } + } +} diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ExtractReferenceIds/ReferenceExtractionTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ExtractReferenceIds/ReferenceExtractionTests.cs index 43d2c5522..99dbc94dc 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ExtractReferenceIds/ReferenceExtractionTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ExtractReferenceIds/ReferenceExtractionTests.cs @@ -37,7 +37,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ExtractReferenceIds .AddAssets(5, "assets1", Partitioning.Invariant) .AddAssets(6, "assets2", Partitioning.Invariant) .AddJson(4, "json", Partitioning.Language) - .HideField(3); + .UpdateField(3, f => f.Hide()); } [Fact] @@ -69,7 +69,9 @@ namespace Squidex.Domain.Apps.Core.Operations.ExtractReferenceIds new ContentFieldData() .AddValue("iv", new JArray(id1.ToString(), id2.ToString()))); - var actual = input.Convert(schema, FieldReferencesConverter.CleanReferences(new[] { id2 })); + var converter = FieldConverters.ForValues(ValueReferencesConverter.CleanReferences(new[] { id2 })); + + var actual = input.ConvertId2Id(schema, converter); var cleanedValue = (JArray)actual[5]["iv"]; @@ -91,7 +93,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ExtractReferenceIds } [Fact] - public void Should_empty_list_from_assets_field_for_referenced_ids_when_null() + public void Should_return_empty_list_from_assets_field_for_referenced_ids_when_null() { var sut = Fields.Assets(1, "my-asset", Partitioning.Invariant); @@ -101,7 +103,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ExtractReferenceIds } [Fact] - public void Should_empty_list_from_assets_field_for_referenced_ids_when_other_type() + public void Should_return_empty_list_from_assets_field_for_referenced_ids_when_other_type() { var sut = Fields.Assets(1, "my-asset", Partitioning.Invariant); @@ -111,7 +113,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ExtractReferenceIds } [Fact] - public void Should_empty_list_from_non_references_field() + public void Should_return_empty_list_from_non_references_field() { var sut = Fields.String(1, "my-string", Partitioning.Invariant); diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs index 4dd9c0b59..7112afd42 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs @@ -34,8 +34,8 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules private readonly IUserResolver userResolver = A.Fake(); private readonly IUser user = A.Fake(); private readonly IRuleUrlGenerator urlGenerator = A.Fake(); - private readonly NamedId appId = new NamedId(Guid.NewGuid(), "my-app"); - private readonly NamedId schemaId = new NamedId(Guid.NewGuid(), "my-schema"); + private readonly NamedId appId = NamedId.Of(Guid.NewGuid(), "my-app"); + private readonly NamedId schemaId = NamedId.Of(Guid.NewGuid(), "my-schema"); private readonly Guid contentId = Guid.NewGuid(); private readonly RuleEventFormatter sut; diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs index 8fecceb38..f0bbc9d29 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs @@ -116,7 +116,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules [Fact] public async Task Should_not_create_job_if_too_old() { - var e = new ContentCreated { SchemaId = new NamedId(Guid.NewGuid(), "my-schema"), AppId = new NamedId(Guid.NewGuid(), "my-event") }; + var e = new ContentCreated { SchemaId = NamedId.Of(Guid.NewGuid(), "my-schema"), AppId = NamedId.Of(Guid.NewGuid(), "my-event") }; var now = SystemClock.Instance.GetCurrentInstant(); @@ -147,7 +147,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules [Fact] public async Task Should_create_job_if_triggered() { - var e = new ContentCreated { SchemaId = new NamedId(Guid.NewGuid(), "my-schema"), AppId = new NamedId(Guid.NewGuid(), "my-event") }; + var e = new ContentCreated { SchemaId = NamedId.Of(Guid.NewGuid(), "my-schema"), AppId = NamedId.Of(Guid.NewGuid(), "my-event") }; var now = SystemClock.Instance.GetCurrentInstant(); diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/Triggers/ContentChangedTriggerTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/Triggers/ContentChangedTriggerTests.cs index 6b31152bb..719c2bd45 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/Triggers/ContentChangedTriggerTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/Triggers/ContentChangedTriggerTests.cs @@ -27,8 +27,8 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules.Triggers public class ContentChangedTriggerTests { private readonly IRuleTriggerHandler sut = new ContentChangedTriggerHandler(); - private static readonly NamedId SchemaMatch = new NamedId(Guid.NewGuid(), "my-schema1"); - private static readonly NamedId SchemaNonMatch = new NamedId(Guid.NewGuid(), "my-schema2"); + private static readonly NamedId SchemaMatch = NamedId.Of(Guid.NewGuid(), "my-schema1"); + private static readonly NamedId SchemaNonMatch = NamedId.Of(Guid.NewGuid(), "my-schema2"); public static IEnumerable TestData = new[] { diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ArrayFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ArrayFieldTests.cs new file mode 100644 index 000000000..4c6030662 --- /dev/null +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ArrayFieldTests.cs @@ -0,0 +1,115 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using FluentAssertions; +using Newtonsoft.Json.Linq; +using Squidex.Domain.Apps.Core.Schemas; +using Xunit; + +namespace Squidex.Domain.Apps.Core.Operations.ValidateContent +{ + public class ArrayFieldTests + { + private readonly List errors = new List(); + + [Fact] + public void Should_instantiate_field() + { + var sut = Field(new ArrayFieldProperties()); + + Assert.Equal("my-array", sut.Name); + } + + [Fact] + public async Task Should_not_add_error_if_tags_are_valid() + { + var sut = Field(new ArrayFieldProperties()); + + await sut.ValidateAsync(CreateValue(new JObject()), errors, ValidationTestExtensions.ValidContext); + + Assert.Empty(errors); + } + + [Fact] + public async Task Should_not_add_error_if_tags_are_null_and_valid() + { + var sut = Field(new ArrayFieldProperties()); + + await sut.ValidateAsync(CreateValue(null), errors); + + Assert.Empty(errors); + } + + [Fact] + public async Task Should_add_errors_if_tags_are_required_and_null() + { + var sut = Field(new ArrayFieldProperties { IsRequired = true }); + + await sut.ValidateAsync(CreateValue(null), errors); + + errors.ShouldBeEquivalentTo( + new[] { "Field is required." }); + } + + [Fact] + public async Task Should_add_errors_if_tags_are_required_and_empty() + { + var sut = Field(new ArrayFieldProperties { IsRequired = true }); + + await sut.ValidateAsync(CreateValue(), errors); + + errors.ShouldBeEquivalentTo( + new[] { "Field is required." }); + } + + [Fact] + public async Task Should_add_errors_if_value_is_not_valid() + { + var sut = Field(new ArrayFieldProperties()); + + await sut.ValidateAsync("invalid", errors); + + errors.ShouldBeEquivalentTo( + new[] { "Not a valid value." }); + } + + [Fact] + public async Task Should_add_errors_if_value_has_not_enough_items() + { + var sut = Field(new ArrayFieldProperties { MinItems = 3 }); + + await sut.ValidateAsync(CreateValue(new JObject(), new JObject()), errors); + + errors.ShouldBeEquivalentTo( + new[] { "Must have at least 3 item(s)." }); + } + + [Fact] + public async Task Should_add_errors_if_value_has_too_much_items() + { + var sut = Field(new ArrayFieldProperties { MaxItems = 1 }); + + await sut.ValidateAsync(CreateValue(new JObject(), new JObject()), errors); + + errors.ShouldBeEquivalentTo( + new[] { "Must have not more than 1 item(s)." }); + } + + private static JToken CreateValue(params JObject[] ids) + { + return ids == null ? JValue.CreateNull() : (JToken)new JArray(ids.OfType().ToArray()); + } + + private static RootField Field(ArrayFieldProperties properties) + { + return Fields.Array(1, "my-array", Partitioning.Invariant, properties); + } + } +} diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/AssetsFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/AssetsFieldTests.cs index 2e3794ac8..bea569525 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/AssetsFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/AssetsFieldTests.cs @@ -100,7 +100,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(null), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } [Fact] @@ -111,7 +111,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } [Fact] @@ -122,7 +122,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync("invalid", errors); errors.ShouldBeEquivalentTo( - new[] { " is not a valid value." }); + new[] { "Not a valid value." }); } [Fact] @@ -133,7 +133,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(document.AssetId, document.AssetId), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { " must have at least 3 item(s)." }); + new[] { "Must have at least 3 item(s)." }); } [Fact] @@ -144,7 +144,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(document.AssetId, document.AssetId), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { " must have not more than 1 item(s)." }); + new[] { "Must have not more than 1 item(s)." }); } [Fact] @@ -157,7 +157,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(assetId), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { $" has invalid asset #1: Id '{assetId}' not found." }); + new[] { $"[1]: Id '{assetId}' not found." }); } [Fact] @@ -168,7 +168,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(document.AssetId, image.AssetId), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { $" has invalid asset #1: '4 kB' less than minimum of '5 kB'." }); + new[] { $"[1]: '4 kB' less than minimum of '5 kB'." }); } [Fact] @@ -179,7 +179,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(document.AssetId, image.AssetId), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { $" has invalid asset #2: '8 kB' greater than maximum of '5 kB'." }); + new[] { $"[2]: '8 kB' greater than maximum of '5 kB'." }); } [Fact] @@ -190,7 +190,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(document.AssetId, image.AssetId), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { $" has invalid asset #1: Not an image." }); + new[] { $"[1]: Not an image." }); } [Fact] @@ -201,7 +201,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(document.AssetId, image.AssetId), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { $" has invalid asset #2: Width '800px' less than minimum of '1000px'." }); + new[] { $"[2]: Width '800px' less than minimum of '1000px'." }); } [Fact] @@ -212,7 +212,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(document.AssetId, image.AssetId), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { $" has invalid asset #2: Width '800px' greater than maximum of '700px'." }); + new[] { $"[2]: Width '800px' greater than maximum of '700px'." }); } [Fact] @@ -223,7 +223,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(document.AssetId, image.AssetId), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { $" has invalid asset #2: Height '600px' less than minimum of '800px'." }); + new[] { $"[2]: Height '600px' less than minimum of '800px'." }); } [Fact] @@ -234,7 +234,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(document.AssetId, image.AssetId), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { $" has invalid asset #2: Height '600px' greater than maximum of '500px'." }); + new[] { $"[2]: Height '600px' greater than maximum of '500px'." }); } [Fact] @@ -245,7 +245,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(document.AssetId, image.AssetId), errors, ctx); errors.ShouldBeEquivalentTo( - new[] { " has invalid asset #2: Aspect ratio not '1:1'." }); + new[] { "[2]: Aspect ratio not '1:1'." }); } [Fact] @@ -258,8 +258,8 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new[] { - $" has invalid asset #1: Invalid file extension.", - $" has invalid asset #2: Invalid file extension." + $"[1]: Invalid file extension.", + $"[2]: Invalid file extension." }); } @@ -268,7 +268,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent return ids == null ? JValue.CreateNull() : (JToken)new JArray(ids.OfType().ToArray()); } - private static Field Field(AssetsFieldProperties properties) + private static RootField Field(AssetsFieldProperties properties) { return Fields.Assets(1, "my-assets", Partitioning.Invariant, properties); } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/BooleanFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/BooleanFieldTests.cs index 918e10f93..2c63b643b 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/BooleanFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/BooleanFieldTests.cs @@ -54,7 +54,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(null), errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } [Fact] @@ -65,7 +65,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue("Invalid"), errors); errors.ShouldBeEquivalentTo( - new[] { " is not a valid value." }); + new[] { "Not a valid value." }); } private static JValue CreateValue(object v) @@ -73,7 +73,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent return new JValue(v); } - private static Field Field(BooleanFieldProperties properties) + private static RootField Field(BooleanFieldProperties properties) { return Fields.Boolean(1, "my-boolean", Partitioning.Invariant, properties); } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ContentValidationTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ContentValidationTests.cs index 29d809c2b..299609881 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ContentValidationTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ContentValidationTests.cs @@ -8,6 +8,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using FluentAssertions; +using Newtonsoft.Json.Linq; using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Core.Schemas; @@ -37,7 +38,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new List { - new ValidationError("unknown is not a known field.", "unknown") + new ValidationError("unknown: Not a known field.", "unknown") }); } @@ -58,7 +59,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new List { - new ValidationError("my-field must be less or equals than '100'.", "my-field") + new ValidationError("my-field: Must be less or equals than '100'.", "my-field") }); } @@ -79,8 +80,8 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new List { - new ValidationError("my-field has an unsupported invariant value 'es'.", "my-field"), - new ValidationError("my-field has an unsupported invariant value 'it'.", "my-field") + new ValidationError("my-field(es): Not a known invariant value.", "my-field(es)"), + new ValidationError("my-field(it): Not a known invariant value.", "my-field(it)") }); } @@ -98,8 +99,8 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new List { - new ValidationError("my-field (de) is required.", "my-field"), - new ValidationError("my-field (en) is required.", "my-field") + new ValidationError("my-field(de): Field is required.", "my-field(de)"), + new ValidationError("my-field(en): Field is required.", "my-field(en)") }); } @@ -117,7 +118,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new List { - new ValidationError("my-field is required.", "my-field") + new ValidationError("my-field: Field is required.", "my-field") }); } @@ -138,7 +139,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new List { - new ValidationError("my-field has an unsupported language value 'xx'.", "my-field") + new ValidationError("my-field(xx): Not a known language.", "my-field(xx)") }); } @@ -181,8 +182,8 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new List { - new ValidationError("my-field has an unsupported language value 'es'.", "my-field"), - new ValidationError("my-field has an unsupported language value 'it'.", "my-field") + new ValidationError("my-field(es): Not a known language.", "my-field(es)"), + new ValidationError("my-field(it): Not a known language.", "my-field(it)") }); } @@ -199,7 +200,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new List { - new ValidationError("unknown is not a known field.", "unknown") + new ValidationError("unknown: Not a known field.", "unknown") }); } @@ -220,7 +221,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new List { - new ValidationError("my-field must be less or equals than '100'.", "my-field") + new ValidationError("my-field: Must be less or equals than '100'.", "my-field") }); } @@ -241,8 +242,8 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new List { - new ValidationError("my-field has an unsupported invariant value 'es'.", "my-field"), - new ValidationError("my-field has an unsupported invariant value 'it'.", "my-field") + new ValidationError("my-field(es): Not a known invariant value.", "my-field(es)"), + new ValidationError("my-field(it): Not a known invariant value.", "my-field(it)") }); } @@ -291,7 +292,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new List { - new ValidationError("my-field has an unsupported language value 'xx'.", "my-field") + new ValidationError("my-field(xx): Not a known language.", "my-field(xx)") }); } @@ -312,8 +313,34 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent errors.ShouldBeEquivalentTo( new List { - new ValidationError("my-field has an unsupported language value 'es'.", "my-field"), - new ValidationError("my-field has an unsupported language value 'it'.", "my-field") + new ValidationError("my-field(es): Not a known language.", "my-field(es)"), + new ValidationError("my-field(it): Not a known language.", "my-field(it)") + }); + } + + [Fact] + public async Task Should_add_error_if_array_field_has_required_nested_field() + { + schema = + schema.AddArray(1, "my-field", Partitioning.Invariant, f => f. + AddNumber(1, "my-nested", new NumberFieldProperties { IsRequired = true })); + + var data = + new NamedContentData() + .AddField("my-field", + new ContentFieldData() + .AddValue("iv", new JArray( + new JObject(), + new JObject(new JProperty("my-nested", 1)), + new JObject()))); + + await data.ValidatePartialAsync(context, schema, languagesConfig.ToResolver(), errors); + + errors.ShouldBeEquivalentTo( + new List + { + new ValidationError("my-field[1].my-nested: Field is required.", "my-field[1].my-nested"), + new ValidationError("my-field[3].my-nested: Field is required.", "my-field[3].my-nested"), }); } } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/DateTimeFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/DateTimeFieldTests.cs index bb2c88f3b..7950209ea 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/DateTimeFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/DateTimeFieldTests.cs @@ -46,7 +46,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(null), errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } [Fact] @@ -57,7 +57,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(FutureDays(0)), errors); errors.ShouldBeEquivalentTo( - new[] { $" must be greater or equals than '{FutureDays(10)}'." }); + new[] { $"Must be greater or equals than '{FutureDays(10)}'." }); } [Fact] @@ -68,7 +68,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(FutureDays(20)), errors); errors.ShouldBeEquivalentTo( - new[] { $" must be less or equals than '{FutureDays(10)}'." }); + new[] { $"Must be less or equals than '{FutureDays(10)}'." }); } [Fact] @@ -79,7 +79,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue("Invalid"), errors); errors.ShouldBeEquivalentTo( - new[] { " is not a valid value." }); + new[] { "Not a valid value." }); } [Fact] @@ -90,7 +90,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(123), errors); errors.ShouldBeEquivalentTo( - new[] { " is not a valid value." }); + new[] { "Not a valid value." }); } private static Instant FutureDays(int days) @@ -103,7 +103,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent return v is Instant ? new JValue(v.ToString()) : new JValue(v); } - private static Field Field(DateTimeFieldProperties properties) + private static RootField Field(DateTimeFieldProperties properties) { return Fields.DateTime(1, "my-datetime", Partitioning.Invariant, properties); } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/GeolocationFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/GeolocationFieldTests.cs index 2e38c8dc2..65ad9140b 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/GeolocationFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/GeolocationFieldTests.cs @@ -62,7 +62,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(geolocation), errors); errors.ShouldBeEquivalentTo( - new[] { " is not a valid value." }); + new[] { "Not a valid value." }); } [Fact] @@ -77,7 +77,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(geolocation), errors); errors.ShouldBeEquivalentTo( - new[] { " is not a valid value." }); + new[] { "Not a valid value." }); } [Fact] @@ -93,7 +93,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(geolocation), errors); errors.ShouldBeEquivalentTo( - new[] { " is not a valid value." }); + new[] { "Not a valid value." }); } [Fact] @@ -104,7 +104,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(JValue.CreateNull()), errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } private static JToken CreateValue(JToken v) @@ -112,7 +112,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent return v; } - private static Field Field(GeolocationFieldProperties properties) + private static RootField Field(GeolocationFieldProperties properties) { return Fields.Geolocation(1, "my-geolocation", Partitioning.Invariant, properties); } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/JsonFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/JsonFieldTests.cs index 35f6d9e68..7e2844cb2 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/JsonFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/JsonFieldTests.cs @@ -44,7 +44,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(JValue.CreateNull()), errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } private static JValue CreateValue(JValue v) @@ -52,7 +52,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent return v; } - private static Field Field(JsonFieldProperties properties) + private static RootField Field(JsonFieldProperties properties) { return Fields.Json(1, "my-json", Partitioning.Invariant, properties); } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/NumberFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/NumberFieldTests.cs index 009f1c266..d62b93f05 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/NumberFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/NumberFieldTests.cs @@ -45,7 +45,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(null), errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } [Fact] @@ -56,7 +56,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(5), errors); errors.ShouldBeEquivalentTo( - new[] { " must be greater or equals than '10'." }); + new[] { "Must be greater or equals than '10'." }); } [Fact] @@ -67,7 +67,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(20), errors); errors.ShouldBeEquivalentTo( - new[] { " must be less or equals than '10'." }); + new[] { "Must be less or equals than '10'." }); } [Fact] @@ -78,7 +78,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(20), errors); errors.ShouldBeEquivalentTo( - new[] { " is not an allowed value." }); + new[] { "Not an allowed value." }); } [Fact] @@ -89,7 +89,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue("Invalid"), errors); errors.ShouldBeEquivalentTo( - new[] { " is not a valid value." }); + new[] { "Not a valid value." }); } private static JValue CreateValue(object v) @@ -97,7 +97,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent return new JValue(v); } - private static Field Field(NumberFieldProperties properties) + private static RootField Field(NumberFieldProperties properties) { return Fields.Number(1, "my-number", Partitioning.Invariant, properties); } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ReferencesFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ReferencesFieldTests.cs index ba6936e56..7d2781f5c 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ReferencesFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ReferencesFieldTests.cs @@ -32,11 +32,9 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent [Fact] public async Task Should_not_add_error_if_references_are_valid() { - var referenceId = Guid.NewGuid(); - var sut = Field(new ReferencesFieldProperties()); - await sut.ValidateAsync(CreateValue(referenceId), errors, ValidationTestExtensions.ValidContext); + await sut.ValidateAsync(CreateValue(Guid.NewGuid()), errors, ValidationTestExtensions.ValidContext); Assert.Empty(errors); } @@ -59,7 +57,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(null), errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } [Fact] @@ -70,7 +68,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(), errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } [Fact] @@ -81,7 +79,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync("invalid", errors); errors.ShouldBeEquivalentTo( - new[] { " is not a valid value." }); + new[] { "Not a valid value." }); } [Fact] @@ -92,7 +90,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(Guid.NewGuid(), Guid.NewGuid()), errors); errors.ShouldBeEquivalentTo( - new[] { " must have at least 3 item(s)." }); + new[] { "Must have at least 3 item(s)." }); } [Fact] @@ -103,7 +101,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(Guid.NewGuid(), Guid.NewGuid()), errors); errors.ShouldBeEquivalentTo( - new[] { " must have not more than 1 item(s)." }); + new[] { "Must have not more than 1 item(s)." }); } [Fact] @@ -116,7 +114,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(referenceId), errors, ValidationTestExtensions.InvalidReferences(referenceId)); errors.ShouldBeEquivalentTo( - new[] { $" contains invalid reference '{referenceId}'." }); + new[] { $"Contains invalid reference '{referenceId}'." }); } private static JToken CreateValue(params Guid[] ids) @@ -124,7 +122,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent return ids == null ? JValue.CreateNull() : (JToken)new JArray(ids.OfType().ToArray()); } - private static Field Field(ReferencesFieldProperties properties) + private static RootField Field(ReferencesFieldProperties properties) { return Fields.References(1, "my-refs", Partitioning.Invariant, properties); } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/StringFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/StringFieldTests.cs index 0e4a41e4a..0f4329e43 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/StringFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/StringFieldTests.cs @@ -45,7 +45,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(null), errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } [Fact] @@ -56,7 +56,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue("123"), errors); errors.ShouldBeEquivalentTo( - new[] { " must have more than '10' characters." }); + new[] { "Must have more than '10' characters." }); } [Fact] @@ -67,7 +67,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue("12345678"), errors); errors.ShouldBeEquivalentTo( - new[] { " must have less than '5' characters." }); + new[] { "Must have less than '5' characters." }); } [Fact] @@ -78,7 +78,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue("Bar"), errors); errors.ShouldBeEquivalentTo( - new[] { " is not an allowed value." }); + new[] { "Not an allowed value." }); } [Fact] @@ -89,7 +89,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue("abc"), errors); errors.ShouldBeEquivalentTo( - new[] { " is not valid." }); + new[] { "Not valid." }); } [Fact] @@ -108,7 +108,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent return new JValue(v); } - private static Field Field(StringFieldProperties properties) + private static RootField Field(StringFieldProperties properties) { return Fields.String(1, "my-string", Partitioning.Invariant, properties); } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/TagsFieldTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/TagsFieldTests.cs index 18aaebc1b..6b96f8df2 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/TagsFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/TagsFieldTests.cs @@ -5,7 +5,6 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -31,11 +30,9 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent [Fact] public async Task Should_not_add_error_if_tags_are_valid() { - var referenceId = Guid.NewGuid(); - var sut = Field(new TagsFieldProperties()); - await sut.ValidateAsync(CreateValue(referenceId), errors, ValidationTestExtensions.ValidContext); + await sut.ValidateAsync(CreateValue("tag"), errors, ValidationTestExtensions.ValidContext); Assert.Empty(errors); } @@ -58,7 +55,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(null), errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } [Fact] @@ -69,7 +66,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync(CreateValue(), errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } [Fact] @@ -80,7 +77,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent await sut.ValidateAsync("invalid", errors); errors.ShouldBeEquivalentTo( - new[] { " is not a valid value." }); + new[] { "Not a valid value." }); } [Fact] @@ -88,10 +85,10 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent { var sut = Field(new TagsFieldProperties { MinItems = 3 }); - await sut.ValidateAsync(CreateValue(Guid.NewGuid(), Guid.NewGuid()), errors); + await sut.ValidateAsync(CreateValue("tag-1", "tag-2"), errors); errors.ShouldBeEquivalentTo( - new[] { " must have at least 3 item(s)." }); + new[] { "Must have at least 3 item(s)." }); } [Fact] @@ -99,18 +96,18 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent { var sut = Field(new TagsFieldProperties { MaxItems = 1 }); - await sut.ValidateAsync(CreateValue(Guid.NewGuid(), Guid.NewGuid()), errors); + await sut.ValidateAsync(CreateValue("tag-1", "tag-2"), errors); errors.ShouldBeEquivalentTo( - new[] { " must have not more than 1 item(s)." }); + new[] { "Must have not more than 1 item(s)." }); } - private static JToken CreateValue(params Guid[] ids) + private static JToken CreateValue(params string[] ids) { return ids == null ? JValue.CreateNull() : (JToken)new JArray(ids.OfType().ToArray()); } - private static Field Field(TagsFieldProperties properties) + private static RootField Field(TagsFieldProperties properties) { return Fields.Tags(1, "my-tags", Partitioning.Invariant, properties); } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ValidationTestExtensions.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ValidationTestExtensions.cs index acbd2c373..3b1e1c454 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ValidationTestExtensions.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/ValidationTestExtensions.cs @@ -25,22 +25,50 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent public static Task ValidateAsync(this IValidator validator, object value, IList errors, ValidationContext context = null) { - return validator.ValidateAsync(value, context ?? ValidContext, errors.Add); + return validator.ValidateAsync(value, + CreateContext(context), + CreateFormatter(errors)); } public static Task ValidateOptionalAsync(this IValidator validator, object value, IList errors, ValidationContext context = null) { - return validator.ValidateAsync(value, (context ?? ValidContext).Optional(true), errors.Add); + return validator.ValidateAsync(value, + CreateContext(context).Optional(true), + CreateFormatter(errors)); } public static Task ValidateAsync(this IField field, JToken value, IList errors, ValidationContext context = null) { - return field.ValidateAsync(value, context ?? ValidContext, errors.Add); + return new FieldValidator(ValidatorsFactory.CreateValidators(field).ToArray(), field).ValidateAsync(value, + CreateContext(context), + CreateFormatter(errors)); } public static Task ValidateOptionalAsync(this IField field, JToken value, IList errors, ValidationContext context = null) { - return field.ValidateAsync(value, (context ?? ValidContext).Optional(true), errors.Add); + return new FieldValidator(ValidatorsFactory.CreateValidators(field).ToArray(), field).ValidateAsync(value, + CreateContext(context).Optional(true), + CreateFormatter(errors)); + } + + private static AddError CreateFormatter(IList errors) + { + return (field, message) => + { + if (field == null || !field.Any()) + { + errors.Add(message); + } + else + { + errors.Add($"{field.ToPathString()}: {message}"); + } + }; + } + + private static ValidationContext CreateContext(ValidationContext context) + { + return context ?? ValidContext; } public static ValidationContext Assets(params IAssetInfo[] assets) diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/AllowedValuesValidatorTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/AllowedValuesValidatorTests.cs index dfa62d5a5..e9165a47c 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/AllowedValuesValidatorTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/AllowedValuesValidatorTests.cs @@ -45,7 +45,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators await sut.ValidateAsync(50, errors); errors.ShouldBeEquivalentTo( - new[] { " is not an allowed value." }); + new[] { "Not an allowed value." }); } } } \ No newline at end of file diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/CollectionItemValidatorTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/CollectionItemValidatorTests.cs index 19e42b907..800ddc0c7 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/CollectionItemValidatorTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/CollectionItemValidatorTests.cs @@ -20,7 +20,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators [Fact] public async Task Should_not_add_error_if_value_is_wrong_type() { - var sut = new CollectionItemValidator(new RangeValidator(2, 4)); + var sut = new CollectionItemValidator(new RangeValidator(2, 4)); await sut.ValidateAsync(true, errors); @@ -30,7 +30,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators [Fact] public async Task Should_not_add_error_if_all_values_are_valid() { - var sut = new CollectionItemValidator(new RangeValidator(2, 4)); + var sut = new CollectionItemValidator(new RangeValidator(2, 4)); await sut.ValidateAsync(new List { 2, 3, 4 }, errors); @@ -40,15 +40,15 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators [Fact] public async Task Should_add_error_if_at_least_one_item_is_not_valid() { - var sut = new CollectionItemValidator(new RangeValidator(2, 4)); + var sut = new CollectionItemValidator(new RangeValidator(2, 4)); await sut.ValidateAsync(new List { 2, 1, 4, 5 }, errors); errors.ShouldBeEquivalentTo( new[] { - " item #2 must be greater or equals than '2'.", - " item #4 must be less or equals than '4'." + "[2]: Must be greater or equals than '2'.", + "[4]: Must be less or equals than '4'." }); } } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/CollectionValidatorTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/CollectionValidatorTests.cs index cdb24dd14..4d31d0972 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/CollectionValidatorTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/CollectionValidatorTests.cs @@ -20,7 +20,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators [Fact] public async Task Should_not_add_error_if_value_is_valid() { - var sut = new CollectionValidator(true, 1, 3); + var sut = new CollectionValidator(true, 1, 3); await sut.ValidateAsync(new List { 1, 2 }, errors); @@ -30,7 +30,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators [Fact] public async Task Should_not_add_error_if_optional() { - var sut = new CollectionValidator(true, 1, 3); + var sut = new CollectionValidator(true, 1, 3); await sut.ValidateOptionalAsync(null, errors); @@ -40,34 +40,34 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators [Fact] public async Task Should_add_error_if_value_is_null() { - var sut = new CollectionValidator(true, 1, 3); + var sut = new CollectionValidator(true, 1, 3); await sut.ValidateAsync(null, errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } [Fact] public async Task Should_add_error_if_collection_has_too_few_items() { - var sut = new CollectionValidator(true, 2, 3); + var sut = new CollectionValidator(true, 2, 3); await sut.ValidateAsync(new List { 1 }, errors); errors.ShouldBeEquivalentTo( - new[] { " must have at least 2 item(s)." }); + new[] { "Must have at least 2 item(s)." }); } [Fact] public async Task Should_add_error_if_collection_has_too_many_items() { - var sut = new CollectionValidator(true, 2, 3); + var sut = new CollectionValidator(true, 2, 3); await sut.ValidateAsync(new List { 1, 2, 3, 4 }, errors); errors.ShouldBeEquivalentTo( - new[] { " must have not more than 3 item(s)." }); + new[] { "Must have not more than 3 item(s)." }); } } } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/PatternValidatorTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/PatternValidatorTests.cs index 3b35d115d..a15f390e0 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/PatternValidatorTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/PatternValidatorTests.cs @@ -55,7 +55,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators await sut.ValidateAsync("foo", errors); errors.ShouldBeEquivalentTo( - new[] { " is not valid." }); + new[] { "Not valid." }); } [Fact] @@ -77,7 +77,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators await sut.ValidateAsync("https://archiverbx.blob.core.windows.net/static/C:/Users/USR/Documents/Projects/PROJ/static/images/full/1234567890.jpg", errors); errors.ShouldBeEquivalentTo( - new[] { " has a regex that is too slow." }); + new[] { "Regex is too slow." }); } } } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/RangeValidatorTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/RangeValidatorTests.cs index 952dae61c..4d232d10d 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/RangeValidatorTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/RangeValidatorTests.cs @@ -58,7 +58,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators await sut.ValidateAsync(1500, errors); errors.ShouldBeEquivalentTo( - new[] { " must be greater or equals than '2000'." }); + new[] { "Must be greater or equals than '2000'." }); } [Fact] @@ -69,7 +69,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators await sut.ValidateAsync(1500, errors); errors.ShouldBeEquivalentTo( - new[] { " must be less or equals than '1000'." }); + new[] { "Must be less or equals than '1000'." }); } } } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/RequiredStringValidatorTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/RequiredStringValidatorTests.cs index d0b81afec..63b065d59 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/RequiredStringValidatorTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/RequiredStringValidatorTests.cs @@ -59,7 +59,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators await sut.ValidateAsync(string.Empty, errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } [Fact] @@ -70,7 +70,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators await sut.ValidateAsync(null, errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } } } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/RequiredValidatorTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/RequiredValidatorTests.cs index 42c10195c..e2a13ce67 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/RequiredValidatorTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/RequiredValidatorTests.cs @@ -55,7 +55,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators await sut.ValidateAsync(null, errors); errors.ShouldBeEquivalentTo( - new[] { " is required." }); + new[] { "Field is required." }); } } } diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/StringLengthValidatorTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/StringLengthValidatorTests.cs index 8bbb88844..5e08b43a6 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/StringLengthValidatorTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ValidateContent/Validators/StringLengthValidatorTests.cs @@ -69,7 +69,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators await sut.ValidateAsync(CreateString(1500), errors); errors.ShouldBeEquivalentTo( - new[] { " must have more than '2000' characters." }); + new[] { "Must have more than '2000' characters." }); } [Fact] @@ -80,7 +80,7 @@ namespace Squidex.Domain.Apps.Core.Operations.ValidateContent.Validators await sut.ValidateAsync(CreateString(1500), errors); errors.ShouldBeEquivalentTo( - new[] { " must have less than '1000' characters." }); + new[] { "Must have less than '1000' characters." }); } private static string CreateString(int size) diff --git a/tests/Squidex.Domain.Apps.Core.Tests/TestData.cs b/tests/Squidex.Domain.Apps.Core.Tests/TestData.cs index 3fc8ed13c..6434b9bee 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/TestData.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/TestData.cs @@ -54,49 +54,47 @@ namespace Squidex.Domain.Apps.Core public static Schema MixedSchema() { - var inv = Partitioning.Invariant; - - var schema = new Schema("user"); - - schema = schema.Publish(); - schema = schema.Update(new SchemaProperties { Hints = "The User" }); - - schema = schema.AddJson(1, "my-json", inv, - new JsonFieldProperties()); - - schema = schema.AddAssets(2, "my-assets", inv, - new AssetsFieldProperties()); - - schema = schema.AddString(3, "my-string1", inv, - new StringFieldProperties { Label = "My String1", IsRequired = true, AllowedValues = ImmutableList.Create("a", "b") }); - - schema = schema.AddString(4, "my-string2", inv, - new StringFieldProperties { Hints = "My String1" }); - - schema = schema.AddNumber(5, "my-number", inv, - new NumberFieldProperties { MinValue = 1, MaxValue = 10 }); - - schema = schema.AddBoolean(6, "my-boolean", inv, - new BooleanFieldProperties()); - - schema = schema.AddDateTime(7, "my-datetime", inv, - new DateTimeFieldProperties { Editor = DateTimeFieldEditor.DateTime }); - - schema = schema.AddDateTime(8, "my-date", inv, - new DateTimeFieldProperties { Editor = DateTimeFieldEditor.Date }); - - schema = schema.AddGeolocation(9, "my-geolocation", inv, - new GeolocationFieldProperties()); - - schema = schema.AddReferences(10, "my-references", inv, - new ReferencesFieldProperties()); - - schema = schema.AddTags(11, "my-tags", Partitioning.Language, - new TagsFieldProperties()); - - schema = schema.HideField(7); - schema = schema.LockField(8); - schema = schema.DisableField(9); + var schema = new Schema("user") + .Publish() + .AddArray(101, "root-array", Partitioning.Language, f => f + .AddAssets(201, "nested-assets") + .AddBoolean(202, "nested-boolean") + .AddDateTime(203, "nested-datetime") + .AddGeolocation(204, "nested-geolocation") + .AddJson(205, "nested-json") + .AddJson(211, "nested-json2") + .AddNumber(206, "nested-number") + .AddReferences(207, "nested-references") + .AddString(208, "nested-string") + .AddTags(209, "nested-tags")) + .AddAssets(102, "root-assets", Partitioning.Invariant, + new AssetsFieldProperties()) + .AddBoolean(103, "root-boolean", Partitioning.Invariant, + new BooleanFieldProperties()) + .AddDateTime(104, "root-datetime", Partitioning.Invariant, + new DateTimeFieldProperties { Editor = DateTimeFieldEditor.DateTime }) + .AddDateTime(105, "root-date", Partitioning.Invariant, + new DateTimeFieldProperties { Editor = DateTimeFieldEditor.Date }) + .AddGeolocation(106, "root-geolocation", Partitioning.Invariant, + new GeolocationFieldProperties()) + .AddJson(107, "root-json", Partitioning.Invariant, + new JsonFieldProperties()) + .AddNumber(108, "root-number", Partitioning.Invariant, + new NumberFieldProperties { MinValue = 1, MaxValue = 10 }) + .AddReferences(109, "root-references", Partitioning.Invariant, + new ReferencesFieldProperties()) + .AddString(110, "root-string1", Partitioning.Invariant, + new StringFieldProperties { Label = "My String1", IsRequired = true, AllowedValues = ImmutableList.Create("a", "b") }) + .AddString(111, "root-string2", Partitioning.Invariant, + new StringFieldProperties { Hints = "My String1" }) + .AddTags(112, "root-tags", Partitioning.Language, + new TagsFieldProperties()) + .Update(new SchemaProperties { Hints = "The User" }) + .HideField(104) + .HideField(211, 101) + .DisableField(109) + .DisableField(212, 101) + .LockField(105); return schema; } diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs deleted file mode 100644 index e0866ee5e..000000000 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLMutationTests.cs +++ /dev/null @@ -1,487 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using System.Threading.Tasks; -using FakeItEasy; -using Newtonsoft.Json.Linq; -using Squidex.Domain.Apps.Core.Contents; -using Squidex.Domain.Apps.Entities.Contents.Commands; -using Squidex.Infrastructure; -using Squidex.Infrastructure.Commands; -using Xunit; - -namespace Squidex.Domain.Apps.Entities.Contents.GraphQL -{ - public class GraphQLMutationTests : GraphQLTestBase - { - private readonly Guid contentId = Guid.NewGuid(); - private readonly IContentEntity content; - private readonly CommandContext commandContext = new CommandContext(new PatchContent(), A.Dummy()); - - public GraphQLMutationTests() - { - content = CreateContent(contentId, Guid.Empty, Guid.Empty, null, true); - - A.CallTo(() => commandBus.PublishAsync(A.Ignored)) - .Returns(commandContext); - } - - [Fact] - public async Task Should_return_single_content_when_creating_content() - { - var query = $@" - mutation OP($data: MySchemaInputDto!) {{ - createMySchemaContent(data: $data, expectedVersion: 10) {{ - version - data {{ - myString {{ - de - }} - myNumber {{ - iv - }} - myBoolean {{ - iv - }} - myDatetime {{ - iv - }} - myGeolocation {{ - iv - }} - myTags {{ - iv - }} - }} - }} - }}"; - - commandContext.Complete(new EntityCreatedResult(content.Data, 13)); - - var inputContent = GetInputContent(content); - - var variables = - new JObject( - new JProperty("data", inputContent)); - - var result = await sut.QueryAsync(context, new GraphQLQuery { Query = query, Variables = variables }); - - var expected = new - { - data = new - { - createMySchemaContent = new - { - version = 13, - data = new - { - myString = new - { - de = "value" - }, - myNumber = new - { - iv = 1 - }, - myBoolean = new - { - iv = true - }, - myDatetime = new - { - iv = content.LastModified.ToDateTimeUtc() - }, - myGeolocation = new - { - iv = new - { - latitude = 10, - longitude = 20 - } - }, - myTags = new - { - iv = new[] - { - "tag1", - "tag2" - } - } - } - } - } - }; - - AssertResult(expected, result); - } - - [Fact] - public async Task Should_return_single_content_when_updating_content() - { - var query = $@" - mutation OP($data: MySchemaInputDto!) {{ - updateMySchemaContent(id: ""{contentId}"", data: $data, expectedVersion: 10) {{ - version - data {{ - myString {{ - de - }} - myNumber {{ - iv - }} - myBoolean {{ - iv - }} - myDatetime {{ - iv - }} - myGeolocation {{ - iv - }} - myTags {{ - iv - }} - }} - }} - }}"; - - commandContext.Complete(new ContentDataChangedResult(content.Data, 13)); - - var inputContent = GetInputContent(content); - - var variables = - new JObject( - new JProperty("data", inputContent)); - - var result = await sut.QueryAsync(context, new GraphQLQuery { Query = query, Variables = variables }); - - var expected = new - { - data = new - { - updateMySchemaContent = new - { - version = 13, - data = new - { - myString = new - { - de = "value" - }, - myNumber = new - { - iv = 1 - }, - myBoolean = new - { - iv = true - }, - myDatetime = new - { - iv = content.LastModified.ToDateTimeUtc() - }, - myGeolocation = new - { - iv = new - { - latitude = 10, - longitude = 20 - } - }, - myTags = new - { - iv = new[] - { - "tag1", - "tag2" - } - } - } - } - } - }; - - AssertResult(expected, result); - } - - [Fact] - public async Task Should_return_single_content_when_patching_content() - { - var query = $@" - mutation OP($data: MySchemaInputDto!) {{ - patchMySchemaContent(id: ""{contentId}"", data: $data, expectedVersion: 10) {{ - version - data {{ - myString {{ - de - }} - myNumber {{ - iv - }} - myBoolean {{ - iv - }} - myDatetime {{ - iv - }} - myGeolocation {{ - iv - }} - myTags {{ - iv - }} - }} - }} - }}"; - - commandContext.Complete(new ContentDataChangedResult(content.Data, 13)); - - var inputContent = GetInputContent(content); - - var variables = - new JObject( - new JProperty("data", inputContent)); - - var result = await sut.QueryAsync(context, new GraphQLQuery { Query = query, Variables = variables }); - - var expected = new - { - data = new - { - patchMySchemaContent = new - { - version = 13, - data = new - { - myString = new - { - de = "value" - }, - myNumber = new - { - iv = 1 - }, - myBoolean = new - { - iv = true - }, - myDatetime = new - { - iv = content.LastModified.ToDateTimeUtc() - }, - myGeolocation = new - { - iv = new - { - latitude = 10, - longitude = 20 - } - }, - myTags = new - { - iv = new[] - { - "tag1", - "tag2" - } - } - } - } - } - }; - - AssertResult(expected, result); - } - - [Fact] - public async Task Should_publish_command_for_publish() - { - var query = $@" - mutation {{ - publishMySchemaContent(id: ""{contentId}"", expectedVersion: 10) {{ - version - }} - }}"; - - commandContext.Complete(new EntitySavedResult(13)); - - var result = await sut.QueryAsync(context, new GraphQLQuery { Query = query }); - - var expected = new - { - data = new - { - publishMySchemaContent = new - { - version = 13 - } - } - }; - - AssertResult(expected, result); - - A.CallTo(() => commandBus.PublishAsync( - A.That.Matches(x => - x.ContentId == contentId && - x.Status == Status.Published && - x.ExpectedVersion == 10))) - .MustHaveHappened(); - } - - [Fact] - public async Task Should_publish_command_for_unpublish() - { - var query = $@" - mutation {{ - unpublishMySchemaContent(id: ""{contentId}"", expectedVersion: 10) {{ - version - }} - }}"; - - commandContext.Complete(new EntitySavedResult(13)); - - var result = await sut.QueryAsync(context, new GraphQLQuery { Query = query }); - - var expected = new - { - data = new - { - unpublishMySchemaContent = new - { - version = 13 - } - } - }; - - AssertResult(expected, result); - - A.CallTo(() => commandBus.PublishAsync( - A.That.Matches(x => - x.ContentId == contentId && - x.Status == Status.Draft && - x.ExpectedVersion == 10))) - .MustHaveHappened(); - } - - [Fact] - public async Task Should_publish_command_for_archive() - { - var query = $@" - mutation {{ - archiveMySchemaContent(id: ""{contentId}"", expectedVersion: 10) {{ - version - }} - }}"; - - commandContext.Complete(new EntitySavedResult(13)); - - var result = await sut.QueryAsync(context, new GraphQLQuery { Query = query }); - - var expected = new - { - data = new - { - archiveMySchemaContent = new - { - version = 13 - } - } - }; - - AssertResult(expected, result); - - A.CallTo(() => commandBus.PublishAsync( - A.That.Matches(x => - x.ContentId == contentId && - x.Status == Status.Archived && - x.ExpectedVersion == 10))) - .MustHaveHappened(); - } - - [Fact] - public async Task Should_publish_command_for_restore() - { - var query = $@" - mutation {{ - restoreMySchemaContent(id: ""{contentId}"", expectedVersion: 10) {{ - version - }} - }}"; - - commandContext.Complete(new EntitySavedResult(13)); - - var result = await sut.QueryAsync(context, new GraphQLQuery { Query = query }); - - var expected = new - { - data = new - { - restoreMySchemaContent = new - { - version = 13 - } - } - }; - - AssertResult(expected, result); - - A.CallTo(() => commandBus.PublishAsync( - A.That.Matches(x => - x.ContentId == contentId && - x.Status == Status.Draft && - x.ExpectedVersion == 10))) - .MustHaveHappened(); - } - - [Fact] - public async Task Should_publish_command_for_delete() - { - var query = $@" - mutation {{ - deleteMySchemaContent(id: ""{contentId}"", expectedVersion: 10) {{ - version - }} - }}"; - - commandContext.Complete(new EntitySavedResult(13)); - - var result = await sut.QueryAsync(context, new GraphQLQuery { Query = query }); - - var expected = new - { - data = new - { - deleteMySchemaContent = new - { - version = 13 - } - } - }; - - AssertResult(expected, result); - - A.CallTo(() => commandBus.PublishAsync( - A.That.Matches(x => - x.ContentId == contentId && - x.ExpectedVersion == 10))) - .MustHaveHappened(); - } - - private static JObject GetInputContent(IContentEntity content) - { - var camelContent = new NamedContentData(); - - foreach (var kvp in content.Data) - { - camelContent[kvp.Key.ToCamelCase()] = kvp.Value; - } - - return JObject.FromObject(camelContent); - } - } -} diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs index 8b75b5cf5..03d7d7fac 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs @@ -273,6 +273,12 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL myTags { iv } + myArray { + iv { + nestedNumber + nestedBoolean + } + } } } }"; @@ -342,6 +348,22 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL "tag1", "tag2" } + }, + myArray = new + { + iv = new[] + { + new + { + nestedNumber = 1, + nestedBoolean = true + }, + new + { + nestedNumber = 2, + nestedBoolean = false + } + } } } } diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs index 652e23f6e..174f1f477 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLTestBase.cs @@ -24,7 +24,6 @@ using Squidex.Domain.Apps.Entities.Assets.Repositories; using Squidex.Domain.Apps.Entities.Contents.TestData; using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; -using Squidex.Infrastructure.Commands; using Xunit; #pragma warning disable SA1311 // Static readonly fields must begin with upper-case letter @@ -39,7 +38,6 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL protected static readonly string appName = "my-app"; protected readonly Schema schemaDef; protected readonly IContentQueryService contentQuery = A.Fake(); - protected readonly ICommandBus commandBus = A.Fake(); protected readonly IAssetRepository assetRepository = A.Fake(); protected readonly ISchemaEntity schema = A.Fake(); protected readonly IMemoryCache cache = new MemoryCache(Options.Create(new MemoryCacheOptions())); @@ -72,7 +70,10 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL .AddGeolocation(10, "my-geolocation", Partitioning.Invariant, new GeolocationFieldProperties()) .AddTags(11, "my-tags", Partitioning.Invariant, - new TagsFieldProperties()); + new TagsFieldProperties()) + .AddArray(12, "my-array", Partitioning.Invariant, f => f + .AddBoolean(121, "nested-boolean") + .AddNumber(122, "nested-number")); A.CallTo(() => app.Id).Returns(appId); A.CallTo(() => app.Name).Returns(appName); @@ -90,10 +91,10 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL A.CallTo(() => appProvider.GetSchemasAsync(appId)).Returns(allSchemas); - sut = new CachingGraphQLService(cache, appProvider, assetRepository, commandBus, contentQuery, new FakeUrlGenerator()); + sut = new CachingGraphQLService(cache, appProvider, assetRepository, contentQuery, new FakeUrlGenerator()); } - protected static IContentEntity CreateContent(Guid id, Guid refId, Guid assetId, NamedContentData data = null, bool noJson = false) + protected static IContentEntity CreateContent(Guid id, Guid refId, Guid assetId, NamedContentData data = null) { var now = DateTime.UtcNow.ToInstant(); @@ -122,14 +123,19 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL .AddValue("iv", JToken.FromObject(new[] { refId }))) .AddField("my-geolocation", new ContentFieldData() - .AddValue("iv", JToken.FromObject(new { latitude = 10, longitude = 20 }))); - - if (!noJson) - { - data.AddField("my-json", - new ContentFieldData() - .AddValue("iv", JToken.FromObject(new { value = 1 }))); - } + .AddValue("iv", JToken.FromObject(new { latitude = 10, longitude = 20 }))) + .AddField("my-json", + new ContentFieldData() + .AddValue("iv", JToken.FromObject(new { value = 1 }))) + .AddField("my-array", + new ContentFieldData() + .AddValue("iv", new JArray( + new JObject( + new JProperty("nested-boolean", true), + new JProperty("nested-number", 1)), + new JObject( + new JProperty("nested-boolean", false), + new JProperty("nested-number", 2))))); var content = new ContentEntity { 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 4934a4a33..e225709e2 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Guards/GuardRuleTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Guards/GuardRuleTests.cs @@ -25,7 +25,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Guards { private readonly Uri validUrl = new Uri("https://squidex.io"); private readonly Rule rule_0 = new Rule(new ContentChangedTrigger(), new WebhookAction()); - private readonly NamedId appId = new NamedId(Guid.NewGuid(), "my-app"); + private readonly NamedId appId = NamedId.Of(Guid.NewGuid(), "my-app"); private readonly IAppProvider appProvider = A.Fake(); public GuardRuleTests() diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Indexes/RulesByAppIndexCommandMiddlewareTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Indexes/RulesByAppIndexCommandMiddlewareTests.cs index 30fada75b..cb4fd2a23 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Indexes/RulesByAppIndexCommandMiddlewareTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/Indexes/RulesByAppIndexCommandMiddlewareTests.cs @@ -38,7 +38,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Indexes public async Task Should_add_rule_to_index_on_create() { var context = - new CommandContext(new CreateRule { RuleId = appId, AppId = new NamedId(appId, "my-app") }, commandBus) + new CommandContext(new CreateRule { RuleId = appId, AppId = NamedId.Of(appId, "my-app") }, commandBus) .Complete(); await sut.HandleAsync(context); @@ -60,7 +60,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.Indexes .Returns(J.AsTask(ruleState)); A.CallTo(() => ruleState.AppId) - .Returns(new NamedId(appId, "my-app")); + .Returns(NamedId.Of(appId, "my-app")); var context = new CommandContext(new DeleteRule { RuleId = appId }, commandBus) diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleEnqueuerTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleEnqueuerTests.cs index de5eed0bb..e27cceb12 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleEnqueuerTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleEnqueuerTests.cs @@ -28,7 +28,7 @@ namespace Squidex.Domain.Apps.Entities.Rules private readonly IRuleEventRepository ruleEventRepository = A.Fake(); private readonly RuleService ruleService = A.Fake(); private readonly Instant now = SystemClock.Instance.GetCurrentInstant(); - private readonly NamedId appId = new NamedId(Guid.NewGuid(), "my-app"); + private readonly NamedId appId = NamedId.Of(Guid.NewGuid(), "my-app"); private readonly RuleEnqueuer sut; public RuleEnqueuerTests() diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/FieldProperties/ArrayFieldPropertiesTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/FieldProperties/ArrayFieldPropertiesTests.cs new file mode 100644 index 000000000..74a2ca646 --- /dev/null +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/FieldProperties/ArrayFieldPropertiesTests.cs @@ -0,0 +1,33 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using System.Linq; +using FluentAssertions; +using Squidex.Domain.Apps.Core.Schemas; +using Squidex.Infrastructure; +using Xunit; + +namespace Squidex.Domain.Apps.Entities.Schemas.Guards.FieldProperties +{ + public class ArrayFieldPropertiesTests + { + [Fact] + public void Should_add_error_if_min_items_greater_than_max_items() + { + var sut = new ArrayFieldProperties { MinItems = 10, MaxItems = 5 }; + + var errors = FieldPropertiesValidator.Validate(sut).ToList(); + + errors.ShouldBeEquivalentTo( + new List + { + new ValidationError("Max items must be greater than min items.", "MinItems", "MaxItems") + }); + } + } +} \ No newline at end of file diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/GuardSchemaFieldTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/GuardSchemaFieldTests.cs index 2b2511a54..8d03c3259 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/GuardSchemaFieldTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/GuardSchemaFieldTests.cs @@ -5,6 +5,8 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; +using System.Collections.Generic; using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Entities.Schemas.Commands; @@ -12,6 +14,7 @@ using Squidex.Infrastructure; using Xunit; #pragma warning disable SA1310 // Field names must not contain underscore +#pragma warning disable SA1401 // Fields must be private namespace Squidex.Domain.Apps.Entities.Schemas.Guards { @@ -26,155 +29,147 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards schema_0 = new Schema("my-schema") .AddString(1, "field1", Partitioning.Invariant) - .AddString(2, "field2", Partitioning.Invariant); + .AddString(2, "field2", Partitioning.Invariant) + .AddArray(3, "field3", Partitioning.Invariant, f => f + .AddNumber(301, "field301")); } - [Fact] - public void CanHide_should_throw_exception_if_already_hidden() + private static Action A(Action method) where T : FieldCommand { - var command = new HideField { FieldId = 1 }; - - var schema_1 = schema_0.HideField(1); - - Assert.Throws(() => GuardSchemaField.CanHide(schema_1, command)); + return new Action(method); } - [Fact] - public void CanHide_should_throw_exception_if_not_found() + private static Func S(Func method) { - var command = new HideField { FieldId = 3 }; - - Assert.Throws(() => GuardSchemaField.CanHide(schema_0, command)); + return new Func(method); } - [Fact] - public void CanHide_hould_not_throw_exception_if_visible() + public static IEnumerable FieldCommandData = new[] { - var command = new HideField { FieldId = 1 }; - - GuardSchemaField.CanHide(schema_0, command); - } - - [Fact] - public void CanDisable_should_throw_exception_if_already_disabled() + new object[] { A(GuardSchemaField.CanEnable) }, + new object[] { A(GuardSchemaField.CanDelete) }, + new object[] { A(GuardSchemaField.CanDisable) }, + new object[] { A(GuardSchemaField.CanHide) }, + new object[] { A(GuardSchemaField.CanLock) }, + new object[] { A(GuardSchemaField.CanShow) }, + new object[] { A(GuardSchemaField.CanUpdate) } + }; + + public static IEnumerable InvalidStates = new[] { - var command = new DisableField { FieldId = 1 }; - - var schema_1 = schema_0.DisableField(1); - - Assert.Throws(() => GuardSchemaField.CanDisable(schema_1, command)); - } - - [Fact] - public void CanDisable_should_throw_exception_if_not_found() + new object[] { A(GuardSchemaField.CanDisable), S(s => s.DisableField(1)) }, + new object[] { A(GuardSchemaField.CanEnable), S(s => s) }, + new object[] { A(GuardSchemaField.CanHide), S(s => s.HideField(1)) }, + new object[] { A(GuardSchemaField.CanShow), S(s => s.LockField(1)) }, + new object[] { A(GuardSchemaField.CanLock), S(s => s.LockField(1)) } + }; + + public static IEnumerable InvalidNestedStates = new[] { - var command = new DisableField { FieldId = 3 }; - - Assert.Throws(() => GuardSchemaField.CanDisable(schema_0, command)); - } - - [Fact] - public void CanDisable_Should_not_throw_exception_if_enabled() + new object[] { A(GuardSchemaField.CanDisable), S(s => s.DisableField(301, 3)) }, + new object[] { A(GuardSchemaField.CanEnable), S(s => s) }, + new object[] { A(GuardSchemaField.CanHide), S(s => s.HideField(301, 3)) }, + new object[] { A(GuardSchemaField.CanShow), S(s => s) }, + new object[] { A(GuardSchemaField.CanLock), S(s => s.LockField(301, 3)) } + }; + + public static IEnumerable ValidStates = new[] { - var command = new DisableField { FieldId = 1 }; + new object[] { A(GuardSchemaField.CanDisable), S(s => s) }, + new object[] { A(GuardSchemaField.CanEnable), S(s => s.DisableField(1)) }, + new object[] { A(GuardSchemaField.CanHide), S(s => s) }, + new object[] { A(GuardSchemaField.CanShow), S(s => s.HideField(1)) } + }; - GuardSchemaField.CanDisable(schema_0, command); - } - - [Fact] - public void CanShow_should_throw_exception_if_already_shown() + public static IEnumerable ValidNestedStates = new[] { - var command = new ShowField { FieldId = 1 }; - - Assert.Throws(() => GuardSchemaField.CanShow(schema_0, command)); - } - - [Fact] - public void CanShow_should_throw_exception_if_not_found() + new object[] { A(GuardSchemaField.CanEnable), S(s => s.DisableField(301, 3)) }, + new object[] { A(GuardSchemaField.CanDisable), S(s => s) }, + new object[] { A(GuardSchemaField.CanHide), S(s => s) }, + new object[] { A(GuardSchemaField.CanShow), S(s => s.HideField(301, 3)) } + }; + + [Theory] + [MemberData(nameof(FieldCommandData))] + public void Commands_should_throw_exception_if_field_not_found(Action action) where T : FieldCommand, new() { - var command = new ShowField { FieldId = 3 }; + var command = new T { FieldId = 4 }; - Assert.Throws(() => GuardSchemaField.CanShow(schema_0, command)); + Assert.Throws(() => action(schema_0, command)); } - [Fact] - public void CanShow_should_not_throw_exception_if_hidden() + [Theory] + [MemberData(nameof(FieldCommandData))] + public void Commands_should_throw_exception_if_parent_field_not_found(Action action) where T : FieldCommand, new() { - var command = new ShowField { FieldId = 1 }; + var command = new T { ParentFieldId = 4, FieldId = 401 }; - var schema_1 = schema_0.HideField(1); - - GuardSchemaField.CanShow(schema_1, command); + Assert.Throws(() => action(schema_0, command)); } - [Fact] - public void CanEnable_should_throw_exception_if_already_enabled() + [Theory] + [MemberData(nameof(FieldCommandData))] + public void Commands_should_throw_exception_if_child_field_not_found(Action action) where T : FieldCommand, new() { - var command = new EnableField { FieldId = 1 }; + var command = new T { ParentFieldId = 3, FieldId = 302 }; - Assert.Throws(() => GuardSchemaField.CanEnable(schema_0, command)); + Assert.Throws(() => action(schema_0, command)); } - [Fact] - public void CanEnable_should_throw_exception_if_not_found() + [Theory] + [MemberData(nameof(InvalidStates))] + public void Commands_should_throw_exception_if_state_not_valid(Action action, Func updater) where T : FieldCommand, new() { - var command = new EnableField { FieldId = 3 }; + var command = new T { FieldId = 1 }; - Assert.Throws(() => GuardSchemaField.CanEnable(schema_0, command)); + Assert.Throws(() => action(updater(schema_0), command)); } - [Fact] - public void CanEnable_should_not_throw_exception_if_disabled() + [Theory] + [MemberData(nameof(InvalidNestedStates))] + public void Commands_should_throw_exception_if_nested_state_not_valid(Action action, Func updater) where T : FieldCommand, new() { - var command = new EnableField { FieldId = 1 }; + var command = new T { ParentFieldId = 3, FieldId = 301 }; - var schema_1 = schema_0.DisableField(1); - - GuardSchemaField.CanEnable(schema_1, command); + Assert.Throws(() => action(updater(schema_0), command)); } - [Fact] - public void CanLock_should_throw_exception_if_already_locked() + [Theory] + [MemberData(nameof(ValidStates))] + public void Commands_should_not_throw_exception_if_state_valid(Action action, Func updater) where T : FieldCommand, new() { - var command = new LockField { FieldId = 1 }; - - var schema_1 = schema_0.LockField(1); + var command = new T { FieldId = 1 }; - Assert.Throws(() => GuardSchemaField.CanLock(schema_1, command)); + action(updater(schema_0), command); } - [Fact] - public void LockField_should_throw_exception_if_not_found() + [Theory] + [MemberData(nameof(ValidNestedStates))] + public void Commands_should_not_throw_exception_if_nested_state_valid(Action action, Func updater) where T : FieldCommand, new() { - var command = new LockField { FieldId = 3 }; + var command = new T { ParentFieldId = 3, FieldId = 301 }; - Assert.Throws(() => GuardSchemaField.CanLock(schema_0, command)); + action(updater(schema_0), command); } [Fact] - public void CanLock_should_not_throw_exception_if_not_locked() + public void CanDelete_should_throw_exception_if_locked() { - var command = new LockField { FieldId = 1 }; + var command = new DeleteField { FieldId = 1 }; - GuardSchemaField.CanLock(schema_0, command); - } + var schema_1 = schema_0.UpdateField(1, f => f.Lock()); - [Fact] - public void CanDelete_should_throw_exception_if_not_found() - { - var command = new DeleteField { FieldId = 3 }; - - Assert.Throws(() => GuardSchemaField.CanDelete(schema_0, command)); + Assert.Throws(() => GuardSchemaField.CanDelete(schema_1, command)); } [Fact] - public void CanDelete_should_throw_exception_if_locked() + public void CanHide_should_throw_exception_if_locked() { - var command = new DeleteField { FieldId = 1 }; + var command = new HideField { FieldId = 1 }; - var schema_1 = schema_0.LockField(1); + var schema_1 = schema_0.UpdateField(1, f => f.Lock()); - Assert.Throws(() => GuardSchemaField.CanDelete(schema_1, command)); + Assert.Throws(() => GuardSchemaField.CanHide(schema_1, command)); } [Fact] @@ -188,9 +183,9 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards [Fact] public void CanUpdate_should_throw_exception_if_locked() { - var command = new UpdateField { FieldId = 1, Properties = new StringFieldProperties() }; + var command = new UpdateField { FieldId = 1, Properties = validProperties }; - var schema_1 = schema_0.LockField(1); + var schema_1 = schema_0.UpdateField(1, f => f.Lock()); Assert.Throws(() => GuardSchemaField.CanUpdate(schema_1, command)); } @@ -198,7 +193,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards [Fact] public void CanUpdate_should_not_throw_exception_if_not_locked() { - var command = new UpdateField { FieldId = 1, Properties = new StringFieldProperties() }; + var command = new UpdateField { FieldId = 1, Properties = validProperties }; GuardSchemaField.CanUpdate(schema_0, command); } @@ -222,7 +217,15 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards [Fact] public void CanAdd_should_throw_exception_if_field_already_exists() { - var command = new AddField { Name = "field1", Properties = new StringFieldProperties() }; + var command = new AddField { Name = "field1", Properties = validProperties }; + + Assert.Throws(() => GuardSchemaField.CanAdd(schema_0, command)); + } + + [Fact] + public void CanAdd_should_throw_exception_if_nested_field_already_exists() + { + var command = new AddField { Name = "field301", Properties = validProperties, ParentFieldId = 3 }; Assert.Throws(() => GuardSchemaField.CanAdd(schema_0, command)); } @@ -259,10 +262,26 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards Assert.Throws(() => GuardSchemaField.CanAdd(schema_0, command)); } + [Fact] + public void CanAdd_should_throw_exception_if_parent_not_exists() + { + var command = new AddField { Name = "field302", Properties = validProperties, ParentFieldId = 99 }; + + Assert.Throws(() => GuardSchemaField.CanAdd(schema_0, command)); + } + [Fact] public void CanAdd_should_not_throw_exception_if_field_not_exists() { - var command = new AddField { Name = "field3", Properties = new StringFieldProperties() }; + var command = new AddField { Name = "field4", Properties = validProperties }; + + GuardSchemaField.CanAdd(schema_0, command); + } + + [Fact] + public void CanAdd_should_not_throw_exception_if_field_exists_in_root() + { + var command = new AddField { Name = "field1", Properties = validProperties, ParentFieldId = 3 }; GuardSchemaField.CanAdd(schema_0, command); } diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/GuardSchemaTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/GuardSchemaTests.cs index 3f9ad2cfd..3c8732370 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/GuardSchemaTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Guards/GuardSchemaTests.cs @@ -23,7 +23,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards { private readonly IAppProvider appProvider = A.Fake(); private readonly Schema schema_0; - private readonly NamedId appId = new NamedId(Guid.NewGuid(), "my-app"); + private readonly NamedId appId = NamedId.Of(Guid.NewGuid(), "my-app"); public GuardSchemaTests() { @@ -74,6 +74,44 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards Name = null, Properties = InvalidProperties(), Partitioning = "invalid" + }, + new CreateSchemaField + { + Name = null, + Properties = new ArrayFieldProperties(), + Partitioning = "invalid", + Nested = new List + { + new CreateSchemaNestedField + { + Name = null, + Properties = InvalidProperties() + }, + new CreateSchemaNestedField + { + Name = null, + Properties = InvalidProperties() + } + } + }, + new CreateSchemaField + { + Name = null, + Properties = InvalidProperties(), + Partitioning = "invalid", + Nested = new List + { + new CreateSchemaNestedField + { + Name = null, + Properties = InvalidProperties() + }, + new CreateSchemaNestedField + { + Name = null, + Properties = InvalidProperties() + } + } } }, Name = "new-schema" @@ -101,6 +139,25 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards Name = "field1", Properties = ValidProperties(), Partitioning = "invariant" + }, + new CreateSchemaField + { + Name = "field1", + Properties = new ArrayFieldProperties(), + Partitioning = "invariant", + Nested = new List + { + new CreateSchemaNestedField + { + Name = "nested1", + Properties = ValidProperties() + }, + new CreateSchemaNestedField + { + Name = "nested1", + Properties = ValidProperties() + } + } } }, Name = "new-schema" @@ -112,7 +169,45 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards [Fact] public Task CanCreate_should_not_throw_exception_if_command_is_valid() { - var command = new CreateSchema { AppId = appId, Name = "new-schema" }; + var command = new CreateSchema + { + AppId = appId, + Fields = new List + { + new CreateSchemaField + { + Name = "field1", + Properties = ValidProperties(), + Partitioning = "invariant" + }, + new CreateSchemaField + { + Name = "field2", + Properties = ValidProperties(), + Partitioning = "invariant" + }, + new CreateSchemaField + { + Name = "field3", + Properties = new ArrayFieldProperties(), + Partitioning = "invariant", + Nested = new List + { + new CreateSchemaNestedField + { + Name = "nested1", + Properties = ValidProperties() + }, + new CreateSchemaNestedField + { + Name = "nested2", + Properties = ValidProperties() + } + } + } + }, + Name = "new-schema" + }; return GuardSchema.CanCreate(command, appProvider); } @@ -178,7 +273,14 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Guards } [Fact] + public void CanReorder_should_throw_exception_if_parent_field_not_found() + { + var command = new ReorderFields { FieldIds = new List { 1, 2 }, ParentFieldId = 99 }; + Assert.Throws(() => GuardSchema.CanReorder(schema_0, command)); + } + + [Fact] public void CanReorder_should_not_throw_exception_if_field_ids_are_valid() { var command = new ReorderFields { FieldIds = new List { 1, 2 } }; diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Indexes/SchemasByAppIndexCommandMiddlewareTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Indexes/SchemasByAppIndexCommandMiddlewareTests.cs index 32fe82c5c..15091edd8 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Indexes/SchemasByAppIndexCommandMiddlewareTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/Indexes/SchemasByAppIndexCommandMiddlewareTests.cs @@ -38,7 +38,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Indexes public async Task Should_add_schema_to_index_on_create() { var context = - new CommandContext(new CreateSchema { SchemaId = appId, Name = "my-schema", AppId = new NamedId(appId, "my-app") }, commandBus) + new CommandContext(new CreateSchema { SchemaId = appId, Name = "my-schema", AppId = NamedId.Of(appId, "my-app") }, commandBus) .Complete(); await sut.HandleAsync(context); @@ -60,7 +60,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas.Indexes .Returns(J.AsTask(schemaState)); A.CallTo(() => schemaState.AppId) - .Returns(new NamedId(appId, "my-app")); + .Returns(NamedId.Of(appId, "my-app")); var context = new CommandContext(new DeleteSchema { SchemaId = appId }, commandBus) diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaGrainTests.cs index f45e200c1..bf0e83ad7 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Schemas/SchemaGrainTests.cs @@ -10,6 +10,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using FakeItEasy; +using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Entities.Schemas.Commands; using Squidex.Domain.Apps.Entities.Schemas.State; @@ -27,7 +28,10 @@ namespace Squidex.Domain.Apps.Entities.Schemas private readonly IAppProvider appProvider = A.Fake(); private readonly FieldRegistry registry = new FieldRegistry(new TypeNameRegistry()); private readonly string fieldName = "age"; - private readonly NamedId fieldId; + private readonly string arrayName = "array"; + private readonly NamedId fieldId = NamedId.Of(1L, "age"); + private readonly NamedId arrayId = NamedId.Of(1L, "array"); + private readonly NamedId nestedId = NamedId.Of(2L, "age"); private readonly SchemaGrain sut; protected override Guid Id @@ -40,8 +44,6 @@ namespace Squidex.Domain.Apps.Entities.Schemas A.CallTo(() => appProvider.GetSchemaAsync(AppId, SchemaName)) .Returns((ISchemaEntity)null); - fieldId = new NamedId(1, fieldName); - sut = new SchemaGrain(Store, A.Dummy(), appProvider, registry); sut.OnActivateAsync(Id).Wait(); } @@ -85,7 +87,18 @@ namespace Squidex.Domain.Apps.Entities.Schemas var fields = new List { new CreateSchemaField { Name = "field1", Properties = ValidProperties() }, - new CreateSchemaField { Name = "field2", Properties = ValidProperties() } + new CreateSchemaField { Name = "field2", Properties = ValidProperties() }, + new CreateSchemaField + { + Name = "field3", + Partitioning = Partitioning.Language.Key, + Properties = new ArrayFieldProperties(), + Nested = new List + { + new CreateSchemaNestedField { Name = "nested1", Properties = ValidProperties() }, + new CreateSchemaNestedField { Name = "nested2", Properties = ValidProperties() } + } + } }; var command = new CreateSchema { Name = SchemaName, SchemaId = SchemaId, Properties = properties, Fields = fields }; @@ -100,7 +113,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas Assert.Equal(SchemaName, sut.Snapshot.Name); Assert.Equal(SchemaName, sut.Snapshot.SchemaDef.Name); - Assert.Equal(2, @event.Fields.Count); + Assert.Equal(3, @event.Fields.Count); } [Fact] @@ -153,25 +166,6 @@ namespace Squidex.Domain.Apps.Entities.Schemas ); } - [Fact] - public async Task Reorder_should_create_events_and_update_state() - { - var command = new ReorderFields { FieldIds = new List { 1, 2 } }; - - await ExecuteCreateAsync(); - await ExecuteAddFieldAsync("field1"); - await ExecuteAddFieldAsync("field2"); - - var result = await sut.ExecuteAsync(CreateCommand(command)); - - result.ShouldBeEquivalent(new EntitySavedResult(3)); - - LastEvents - .ShouldHaveSameEvents( - CreateEvent(new SchemaFieldsReordered { FieldIds = command.FieldIds }) - ); - } - [Fact] public async Task Publish_should_create_events_and_update_state() { @@ -249,6 +243,45 @@ namespace Squidex.Domain.Apps.Entities.Schemas ); } + [Fact] + public async Task Reorder_should_create_events_and_update_state() + { + var command = new ReorderFields { FieldIds = new List { 1, 2 } }; + + await ExecuteCreateAsync(); + await ExecuteAddFieldAsync("field1"); + await ExecuteAddFieldAsync("field2"); + + var result = await sut.ExecuteAsync(CreateCommand(command)); + + result.ShouldBeEquivalent(new EntitySavedResult(3)); + + LastEvents + .ShouldHaveSameEvents( + CreateEvent(new SchemaFieldsReordered { FieldIds = command.FieldIds }) + ); + } + + [Fact] + public async Task Reorder_should_create_events_and_update_state_for_array() + { + var command = new ReorderFields { ParentFieldId = 1, FieldIds = new List { 2, 3 } }; + + await ExecuteCreateAsync(); + await ExecuteAddArrayFieldAsync(); + await ExecuteAddFieldAsync("field1", 1); + await ExecuteAddFieldAsync("field2", 1); + + var result = await sut.ExecuteAsync(CreateCommand(command)); + + result.ShouldBeEquivalent(new EntitySavedResult(4)); + + LastEvents + .ShouldHaveSameEvents( + CreateEvent(new SchemaFieldsReordered { ParentFieldId = arrayId, FieldIds = command.FieldIds }) + ); + } + [Fact] public async Task Add_should_create_events_and_update_state() { @@ -260,7 +293,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas result.ShouldBeEquivalent(EntityCreatedResult.Create(1, 1)); - Assert.Equal(command.Properties, sut.Snapshot.SchemaDef.FieldsById[1].RawProperties); + Assert.Equal(command.Properties, GetField(1).RawProperties); LastEvents .ShouldHaveSameEvents( @@ -268,6 +301,27 @@ namespace Squidex.Domain.Apps.Entities.Schemas ); } + [Fact] + public async Task Add_should_create_events_and_update_state_for_array() + { + var command = new AddField { ParentFieldId = 1, Name = fieldName, Properties = ValidProperties() }; + + await ExecuteCreateAsync(); + await ExecuteAddArrayFieldAsync(); + + var result = await sut.ExecuteAsync(CreateCommand(command)); + + result.ShouldBeEquivalent(EntityCreatedResult.Create(2, 2)); + + Assert.NotEqual(command.Properties, GetField(1).RawProperties); + Assert.Equal(command.Properties, GetNestedField(1, 2).RawProperties); + + LastEvents + .ShouldHaveSameEvents( + CreateEvent(new FieldAdded { ParentFieldId = arrayId, Name = fieldName, FieldId = nestedId, Properties = command.Properties }) + ); + } + [Fact] public async Task UpdateField_should_create_events_and_update_state() { @@ -280,7 +334,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas result.ShouldBeEquivalent(new EntitySavedResult(2)); - Assert.Equal(command.Properties, sut.Snapshot.SchemaDef.FieldsById[1].RawProperties); + Assert.Equal(command.Properties, GetField(1).RawProperties); LastEvents .ShouldHaveSameEvents( @@ -288,6 +342,28 @@ namespace Squidex.Domain.Apps.Entities.Schemas ); } + [Fact] + public async Task UpdateField_should_create_events_and_update_state_for_array() + { + var command = new UpdateField { ParentFieldId = 1, FieldId = 2, Properties = new StringFieldProperties() }; + + await ExecuteCreateAsync(); + await ExecuteAddArrayFieldAsync(); + await ExecuteAddFieldAsync(fieldName, 1); + + var result = await sut.ExecuteAsync(CreateCommand(command)); + + result.ShouldBeEquivalent(new EntitySavedResult(3)); + + Assert.NotEqual(command.Properties, GetField(1).RawProperties); + Assert.Equal(command.Properties, GetNestedField(1, 2).RawProperties); + + LastEvents + .ShouldHaveSameEvents( + CreateEvent(new FieldUpdated { ParentFieldId = arrayId, FieldId = nestedId, Properties = command.Properties }) + ); + } + [Fact] public async Task LockField_should_create_events_and_update_state() { @@ -300,7 +376,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas result.ShouldBeEquivalent(new EntitySavedResult(2)); - Assert.False(sut.Snapshot.SchemaDef.FieldsById[1].IsDisabled); + Assert.False(GetField(1).IsDisabled); LastEvents .ShouldHaveSameEvents( @@ -308,6 +384,28 @@ namespace Squidex.Domain.Apps.Entities.Schemas ); } + [Fact] + public async Task LockField_should_create_events_and_update_state_for_array() + { + var command = new LockField { ParentFieldId = 1, FieldId = 2 }; + + await ExecuteCreateAsync(); + await ExecuteAddArrayFieldAsync(); + await ExecuteAddFieldAsync(fieldName, 1); + + var result = await sut.ExecuteAsync(CreateCommand(command)); + + result.ShouldBeEquivalent(new EntitySavedResult(3)); + + Assert.False(GetField(1).IsLocked); + Assert.True(GetNestedField(1, 2).IsLocked); + + LastEvents + .ShouldHaveSameEvents( + CreateEvent(new FieldLocked { ParentFieldId = arrayId, FieldId = nestedId }) + ); + } + [Fact] public async Task HideField_should_create_events_and_update_state() { @@ -320,7 +418,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas result.ShouldBeEquivalent(new EntitySavedResult(2)); - Assert.True(sut.Snapshot.SchemaDef.FieldsById[1].IsHidden); + Assert.True(GetField(1).IsHidden); LastEvents .ShouldHaveSameEvents( @@ -328,6 +426,28 @@ namespace Squidex.Domain.Apps.Entities.Schemas ); } + [Fact] + public async Task HideField_should_create_events_and_update_state_for_array() + { + var command = new HideField { ParentFieldId = 1, FieldId = 2 }; + + await ExecuteCreateAsync(); + await ExecuteAddArrayFieldAsync(); + await ExecuteAddFieldAsync(fieldName, 1); + + var result = await sut.ExecuteAsync(CreateCommand(command)); + + result.ShouldBeEquivalent(new EntitySavedResult(3)); + + Assert.False(GetField(1).IsHidden); + Assert.True(GetNestedField(1, 2).IsHidden); + + LastEvents + .ShouldHaveSameEvents( + CreateEvent(new FieldHidden { ParentFieldId = arrayId, FieldId = nestedId }) + ); + } + [Fact] public async Task ShowField_should_create_events_and_update_state() { @@ -341,7 +461,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas result.ShouldBeEquivalent(new EntitySavedResult(3)); - Assert.False(sut.Snapshot.SchemaDef.FieldsById[1].IsHidden); + Assert.False(GetField(1).IsHidden); LastEvents .ShouldHaveSameEvents( @@ -349,6 +469,29 @@ namespace Squidex.Domain.Apps.Entities.Schemas ); } + [Fact] + public async Task ShowField_should_create_events_and_update_state_for_array() + { + var command = new ShowField { ParentFieldId = 1, FieldId = 2 }; + + await ExecuteCreateAsync(); + await ExecuteAddArrayFieldAsync(); + await ExecuteAddFieldAsync(fieldName, 1); + await ExecuteHideFieldAsync(2, 1); + + var result = await sut.ExecuteAsync(CreateCommand(command)); + + result.ShouldBeEquivalent(new EntitySavedResult(4)); + + Assert.False(GetField(1).IsHidden); + Assert.False(GetNestedField(1, 2).IsHidden); + + LastEvents + .ShouldHaveSameEvents( + CreateEvent(new FieldShown { ParentFieldId = arrayId, FieldId = nestedId }) + ); + } + [Fact] public async Task DisableField_should_create_events_and_update_state() { @@ -361,7 +504,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas result.ShouldBeEquivalent(new EntitySavedResult(2)); - Assert.True(sut.Snapshot.SchemaDef.FieldsById[1].IsDisabled); + Assert.True(GetField(1).IsDisabled); LastEvents .ShouldHaveSameEvents( @@ -369,6 +512,28 @@ namespace Squidex.Domain.Apps.Entities.Schemas ); } + [Fact] + public async Task DisableField_should_create_events_and_update_state_for_array() + { + var command = new DisableField { ParentFieldId = 1, FieldId = 2 }; + + await ExecuteCreateAsync(); + await ExecuteAddArrayFieldAsync(); + await ExecuteAddFieldAsync(fieldName, 1); + + var result = await sut.ExecuteAsync(CreateCommand(command)); + + result.ShouldBeEquivalent(new EntitySavedResult(3)); + + Assert.False(GetField(1).IsDisabled); + Assert.True(GetNestedField(1, 2).IsDisabled); + + LastEvents + .ShouldHaveSameEvents( + CreateEvent(new FieldDisabled { ParentFieldId = arrayId, FieldId = nestedId }) + ); + } + [Fact] public async Task EnableField_should_create_events_and_update_state() { @@ -382,7 +547,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas result.ShouldBeEquivalent(new EntitySavedResult(3)); - Assert.False(sut.Snapshot.SchemaDef.FieldsById[1].IsDisabled); + Assert.False(GetField(1).IsDisabled); LastEvents .ShouldHaveSameEvents( @@ -390,6 +555,29 @@ namespace Squidex.Domain.Apps.Entities.Schemas ); } + [Fact] + public async Task EnableField_should_create_events_and_update_state_for_array() + { + var command = new EnableField { ParentFieldId = 1, FieldId = 2 }; + + await ExecuteCreateAsync(); + await ExecuteAddArrayFieldAsync(); + await ExecuteAddFieldAsync(fieldName, 1); + await ExecuteDisableFieldAsync(2, 1); + + var result = await sut.ExecuteAsync(CreateCommand(command)); + + result.ShouldBeEquivalent(new EntitySavedResult(4)); + + Assert.False(GetField(1).IsDisabled); + Assert.False(GetNestedField(1, 2).IsDisabled); + + LastEvents + .ShouldHaveSameEvents( + CreateEvent(new FieldEnabled { ParentFieldId = arrayId, FieldId = nestedId }) + ); + } + [Fact] public async Task DeleteField_should_create_events_and_update_state() { @@ -402,7 +590,7 @@ namespace Squidex.Domain.Apps.Entities.Schemas result.ShouldBeEquivalent(new EntitySavedResult(2)); - Assert.False(sut.Snapshot.SchemaDef.FieldsById.ContainsKey(1)); + Assert.Null(GetField(1)); LastEvents .ShouldHaveSameEvents( @@ -410,24 +598,51 @@ namespace Squidex.Domain.Apps.Entities.Schemas ); } + [Fact] + public async Task DeleteField_should_create_events_and_update_state_for_array() + { + var command = new DeleteField { ParentFieldId = 1, FieldId = 2 }; + + await ExecuteCreateAsync(); + await ExecuteAddArrayFieldAsync(); + await ExecuteAddFieldAsync(fieldName, 1); + + var result = await sut.ExecuteAsync(CreateCommand(command)); + + result.ShouldBeEquivalent(new EntitySavedResult(3)); + + Assert.NotNull(GetField(1)); + Assert.Null(GetNestedField(1, 2)); + + LastEvents + .ShouldHaveSameEvents( + CreateEvent(new FieldDeleted { ParentFieldId = arrayId, FieldId = nestedId }) + ); + } + private Task ExecuteCreateAsync() { return sut.ExecuteAsync(CreateCommand(new CreateSchema { Name = SchemaName })); } - private Task ExecuteAddFieldAsync(string name) + private Task ExecuteAddArrayFieldAsync() + { + return sut.ExecuteAsync(CreateCommand(new AddField { Properties = new ArrayFieldProperties(), Name = arrayName })); + } + + private Task ExecuteAddFieldAsync(string name, long? parentId = null) { - return sut.ExecuteAsync(CreateCommand(new AddField { Properties = ValidProperties(), Name = name })); + return sut.ExecuteAsync(CreateCommand(new AddField { ParentFieldId = parentId, Properties = ValidProperties(), Name = name })); } - private Task ExecuteHideFieldAsync(long id) + private Task ExecuteHideFieldAsync(long id, long? parentId = null) { - return sut.ExecuteAsync(CreateCommand(new HideField { FieldId = id })); + return sut.ExecuteAsync(CreateCommand(new HideField { ParentFieldId = parentId, FieldId = id })); } - private Task ExecuteDisableFieldAsync(long id) + private Task ExecuteDisableFieldAsync(long id, long? parentId = null) { - return sut.ExecuteAsync(CreateCommand(new DisableField { FieldId = id })); + return sut.ExecuteAsync(CreateCommand(new DisableField { ParentFieldId = parentId, FieldId = id })); } private Task ExecutePublishAsync() @@ -440,6 +655,16 @@ namespace Squidex.Domain.Apps.Entities.Schemas return sut.ExecuteAsync(CreateCommand(new DeleteSchema())); } + private IField GetField(int id) + { + return sut.Snapshot.SchemaDef.FieldsById.GetOrDefault(id); + } + + private IField GetNestedField(int parentId, int childId) + { + return ((IArrayField)sut.Snapshot.SchemaDef.FieldsById[parentId]).FieldsById.GetOrDefault(childId); + } + private static StringFieldProperties ValidProperties() { return new StringFieldProperties { MinLength = 10, MaxLength = 20 }; diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj b/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj index 0cdbf976c..6325ad89d 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj @@ -21,6 +21,7 @@ + diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs b/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs index 67377c1bf..c8148df60 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/TestHelpers/HandlerTestBase.cs @@ -38,12 +38,12 @@ namespace Squidex.Domain.Apps.Entities.TestHelpers protected NamedId AppNamedId { - get { return new NamedId(AppId, AppName); } + get { return NamedId.Of(AppId, AppName); } } protected NamedId SchemaNamedId { - get { return new NamedId(SchemaId, SchemaName); } + get { return NamedId.Of(SchemaId, SchemaName); } } protected abstract Guid Id { get; } diff --git a/tests/Squidex.Infrastructure.Tests/NamedIdTests.cs b/tests/Squidex.Infrastructure.Tests/NamedIdTests.cs index 2c06652a1..09a9d1548 100644 --- a/tests/Squidex.Infrastructure.Tests/NamedIdTests.cs +++ b/tests/Squidex.Infrastructure.Tests/NamedIdTests.cs @@ -19,7 +19,7 @@ namespace Squidex.Infrastructure { var id = Guid.NewGuid(); - var namedId = new NamedId(id, "my-name"); + var namedId = NamedId.Of(id, "my-name"); Assert.Equal(id, namedId.Id); Assert.Equal("my-name", namedId.Name); @@ -30,7 +30,7 @@ namespace Squidex.Infrastructure { var id = Guid.NewGuid(); - var namedId = new NamedId(id, "my-name"); + var namedId = NamedId.Of(id, "my-name"); Assert.Equal($"{id},my-name", namedId.ToString()); } @@ -41,10 +41,10 @@ namespace Squidex.Infrastructure var id1 = Guid.NewGuid(); var id2 = Guid.NewGuid(); - var token1a = new NamedId(id1, "my-name1"); - var token1b = new NamedId(id1, "my-name1"); - var token1c = new NamedId(id1, "my-name2"); - var token2a = new NamedId(id2, "my-name1"); + var token1a = NamedId.Of(id1, "my-name1"); + var token1b = NamedId.Of(id1, "my-name1"); + var token1c = NamedId.Of(id1, "my-name2"); + var token2a = NamedId.Of(id2, "my-name1"); Assert.True(token1a.Equals(token1b)); @@ -58,10 +58,10 @@ namespace Squidex.Infrastructure var id1 = Guid.NewGuid(); var id2 = Guid.NewGuid(); - object token1a = new NamedId(id1, "my-name1"); - object token1b = new NamedId(id1, "my-name1"); - object token1c = new NamedId(id1, "my-name2"); - object token2a = new NamedId(id2, "my-name1"); + object token1a = NamedId.Of(id1, "my-name1"); + object token1b = NamedId.Of(id1, "my-name1"); + object token1c = NamedId.Of(id1, "my-name2"); + object token2a = NamedId.Of(id2, "my-name1"); Assert.True(token1a.Equals(token1b)); @@ -75,10 +75,10 @@ namespace Squidex.Infrastructure var id1 = Guid.NewGuid(); var id2 = Guid.NewGuid(); - object token1a = new NamedId(id1, "my-name1"); - object token1b = new NamedId(id1, "my-name1"); - object token1c = new NamedId(id1, "my-name2"); - object token2a = new NamedId(id2, "my-name1"); + object token1a = NamedId.Of(id1, "my-name1"); + object token1b = NamedId.Of(id1, "my-name1"); + object token1c = NamedId.Of(id1, "my-name2"); + object token2a = NamedId.Of(id2, "my-name1"); Assert.Equal(token1a.GetHashCode(), token1b.GetHashCode()); @@ -97,7 +97,7 @@ namespace Squidex.Infrastructure [Fact] public void Should_serialize_and_deserialize_valid_guid_token() { - var value = new NamedId(Guid.NewGuid(), "my-name"); + var value = NamedId.Of(Guid.NewGuid(), "my-name"); value.SerializeAndDeserialize(new NamedGuidIdConverter()); } @@ -113,7 +113,7 @@ namespace Squidex.Infrastructure [Fact] public void Should_serialize_and_deserialize_valid_long_token() { - var value = new NamedId(123, "my-name"); + var value = NamedId.Of(123L, "my-name"); value.SerializeAndDeserialize(new NamedLongIdConverter()); } @@ -129,7 +129,7 @@ namespace Squidex.Infrastructure [Fact] public void Should_serialize_and_deserialize_valid_string_token() { - var value = new NamedId(Guid.NewGuid().ToString(), "my-name"); + var value = NamedId.Of(Guid.NewGuid().ToString(), "my-name"); value.SerializeAndDeserialize(new NamedStringIdConverter()); } diff --git a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs b/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs index 6c5633b24..9f808290d 100644 --- a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs +++ b/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithAppIdCommandMiddlewareTests.cs @@ -66,7 +66,7 @@ namespace Squidex.Pipeline.CommandMiddlewares await sut.HandleAsync(context); - Assert.Equal(new NamedId(appId, appName), command.AppId); + Assert.Equal(NamedId.Of(appId, appName), command.AppId); } [Fact] @@ -100,12 +100,12 @@ namespace Squidex.Pipeline.CommandMiddlewares { SetupApp(out var appId, out var appName); - var command = new CreateContent { AppId = new NamedId(Guid.NewGuid(), "other-app") }; + var command = new CreateContent { AppId = NamedId.Of(Guid.NewGuid(), "other-app") }; var context = new CommandContext(command, commandBus); await sut.HandleAsync(context); - Assert.NotEqual(new NamedId(appId, appName), command.AppId); + Assert.NotEqual(NamedId.Of(appId, appName), command.AppId); } private void SetupApp(out Guid appId, out string appName) diff --git a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs b/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs index d00ae9453..7f962523b 100644 --- a/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs +++ b/tests/Squidex.Tests/Pipeline/CommandMiddlewares/EnrichWithSchemaIdCommandMiddlewareTests.cs @@ -101,7 +101,7 @@ namespace Squidex.Pipeline.CommandMiddlewares await sut.HandleAsync(context); - Assert.Equal(new NamedId(schemaId, schemaName), command.SchemaId); + Assert.Equal(NamedId.Of(schemaId, schemaName), command.SchemaId); } [Fact] @@ -117,7 +117,7 @@ namespace Squidex.Pipeline.CommandMiddlewares await sut.HandleAsync(context); - Assert.Equal(new NamedId(schemaId, schemaName), command.SchemaId); + Assert.Equal(NamedId.Of(schemaId, schemaName), command.SchemaId); } [Fact] @@ -139,7 +139,7 @@ namespace Squidex.Pipeline.CommandMiddlewares [Fact] public async Task Should_use_app_id_from_command() { - var appId = new NamedId(Guid.NewGuid(), "my-app"); + var appId = NamedId.Of(Guid.NewGuid(), "my-app"); SetupSchema(appId.Id, out var schemaId, out var schemaName); @@ -150,7 +150,7 @@ namespace Squidex.Pipeline.CommandMiddlewares await sut.HandleAsync(context); - Assert.Equal(new NamedId(schemaId, schemaName), command.SchemaId); + Assert.Equal(NamedId.Of(schemaId, schemaName), command.SchemaId); } [Fact] @@ -173,12 +173,12 @@ namespace Squidex.Pipeline.CommandMiddlewares SetupApp(out var appId, out var appName); SetupSchema(appId, out var schemaId, out var schemaName); - var command = new CreateContent { SchemaId = new NamedId(Guid.NewGuid(), "other-schema") }; + var command = new CreateContent { SchemaId = NamedId.Of(Guid.NewGuid(), "other-schema") }; var context = new CommandContext(command, commandBus); await sut.HandleAsync(context); - Assert.NotEqual(new NamedId(appId, appName), command.AppId); + Assert.NotEqual(NamedId.Of(appId, appName), command.AppId); } private void SetupSchema(Guid appId, out Guid schemaId, out string schemaName)