diff --git a/extensions/Squidex.Extensions/Squidex.Extensions.csproj b/extensions/Squidex.Extensions/Squidex.Extensions.csproj index 4f8e9fcb0..0ad8a8925 100644 --- a/extensions/Squidex.Extensions/Squidex.Extensions.csproj +++ b/extensions/Squidex.Extensions/Squidex.Extensions.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/ArrayField.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/ArrayField.cs index c58263cb1..99d62bd4e 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/ArrayField.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/ArrayField.cs @@ -37,12 +37,12 @@ namespace Squidex.Domain.Apps.Core.Schemas } public ArrayField(long id, string name, Partitioning partitioning, ArrayFieldProperties properties = null, IFieldSettings settings = null) - : base(id, name, partitioning, properties) + : base(id, name, partitioning, properties, settings) { } public ArrayField(long id, string name, Partitioning partitioning, NestedField[] fields, ArrayFieldProperties properties = null, IFieldSettings settings = null) - : this(id, name, partitioning, properties) + : this(id, name, partitioning, properties, settings) { Guard.NotNull(fields, nameof(fields)); diff --git a/src/Squidex.Domain.Apps.Core.Operations/EventSynchronization/SchemaSynchronizer.cs b/src/Squidex.Domain.Apps.Core.Operations/EventSynchronization/SchemaSynchronizer.cs index cebdfbf99..dc889f26b 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/EventSynchronization/SchemaSynchronizer.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/EventSynchronization/SchemaSynchronizer.cs @@ -95,7 +95,7 @@ namespace Squidex.Domain.Apps.Core.EventSynchronization { foreach (var sourceField in source.Ordered) { - if (!target.ByName.TryGetValue(sourceField.Name, out var targetField)) + if (!target.ByName.TryGetValue(sourceField.Name, out _)) { var id = sourceField.NamedId(); @@ -184,7 +184,7 @@ namespace Squidex.Domain.Apps.Core.EventSynchronization if ((sourceField == null || sourceField is IArrayField) && targetField is IArrayField targetArrayField) { - var fields = (sourceField as IArrayField)?.FieldCollection ?? FieldCollection.Empty; + var fields = ((IArrayField)sourceField)?.FieldCollection ?? FieldCollection.Empty; var events = SyncFields(fields, targetArrayField.FieldCollection, serializer, idGenerator, id, options); diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs index a1f5e3b7b..835e3125a 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleService.cs @@ -65,7 +65,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules return null; } - if (!(@event.Payload is AppEvent appEvent)) + if (!(@event.Payload is AppEvent)) { return null; } diff --git a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleTriggerHandler.cs b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleTriggerHandler.cs index d5f8d47df..c369497ac 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleTriggerHandler.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/HandleRules/RuleTriggerHandler.cs @@ -33,9 +33,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules bool IRuleTriggerHandler.Trigger(EnrichedEvent @event, RuleTrigger trigger) { - var typed = @event as TEnrichedEvent; - - if (typed != null) + if (@event is TEnrichedEvent typed) { return Trigger(typed, (TTrigger)trigger); } @@ -45,9 +43,7 @@ namespace Squidex.Domain.Apps.Core.HandleRules bool IRuleTriggerHandler.Trigger(AppEvent @event, RuleTrigger trigger, Guid ruleId) { - var typed = @event as TEvent; - - if (typed != null) + if (@event is TEvent typed) { return Trigger(typed, (TTrigger)trigger, ruleId); } diff --git a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/JsonMapper.cs b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/JsonMapper.cs index 33e5fd891..4720ddfce 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/JsonMapper.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/JsonMapper.cs @@ -24,7 +24,7 @@ namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper switch (value) { - case JsonNull n: + case JsonNull _: return JsValue.Null; case JsonScalar s: return new JsString(s.Value); diff --git a/src/Squidex.Domain.Apps.Core.Operations/Scripting/DefaultConverter.cs b/src/Squidex.Domain.Apps.Core.Operations/Scripting/DefaultConverter.cs new file mode 100644 index 000000000..5959acc30 --- /dev/null +++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/DefaultConverter.cs @@ -0,0 +1,57 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Security.Claims; +using Jint; +using Jint.Native; +using Jint.Runtime.Interop; +using NodaTime; +using Squidex.Domain.Apps.Core.Contents; +using Squidex.Domain.Apps.Core.Scripting.ContentWrapper; +using Squidex.Shared.Users; + +namespace Squidex.Domain.Apps.Core.Scripting +{ + public sealed class DefaultConverter : IObjectConverter + { + public static readonly DefaultConverter Instance = new DefaultConverter(); + + private DefaultConverter() + { + } + + public bool TryConvert(Engine engine, object value, out JsValue result) + { + result = null; + + if (value is Enum) + { + result = value.ToString(); + return true; + } + + switch (value) + { + case IUser user: + result = JintUser.Create(engine, user); + return true; + case ClaimsPrincipal principal: + result = JintUser.Create(engine, principal); + return true; + case Instant instant: + result = JsValue.FromObject(engine, instant.ToDateTimeUtc()); + return true; + case NamedContentData content: + result = new ContentDataObject(engine, content); + return true; + } + + return false; + } + } +} diff --git a/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs b/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs index 3b3aa4b5b..8512ce30b 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs +++ b/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs @@ -8,18 +8,15 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Security.Claims; using Jint; using Jint.Native; using Jint.Native.Date; using Jint.Native.Object; using Jint.Runtime; using Jint.Runtime.Interop; -using NodaTime; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Core.Scripting.ContentWrapper; using Squidex.Infrastructure; -using Squidex.Shared.Users; namespace Squidex.Domain.Apps.Core.Scripting { @@ -27,40 +24,6 @@ namespace Squidex.Domain.Apps.Core.Scripting { public TimeSpan Timeout { get; set; } = TimeSpan.FromMilliseconds(200); - public sealed class Converter : IObjectConverter - { - public Engine Engine { get; set; } - - public bool TryConvert(object value, out JsValue result) - { - result = null; - - if (value is Enum) - { - result = value.ToString(); - return true; - } - - switch (value) - { - case IUser user: - result = JintUser.Create(Engine, user); - return true; - case ClaimsPrincipal principal: - result = JintUser.Create(Engine, principal); - return true; - case Instant instant: - result = JsValue.FromObject(Engine, instant.ToDateTimeUtc()); - return true; - case NamedContentData content: - result = new ContentDataObject(Engine, content); - return true; - } - - return false; - } - } - public void Execute(ScriptContext context, string script) { Guard.NotNull(context, nameof(context)); @@ -198,8 +161,6 @@ namespace Squidex.Domain.Apps.Core.Scripting private Engine CreateScriptEngine(IReferenceResolver resolver = null, Dictionary> customFormatters = null) { - var converter = new Converter(); - var engine = new Engine(options => { if (resolver != null) @@ -207,7 +168,7 @@ namespace Squidex.Domain.Apps.Core.Scripting options.SetReferencesResolver(resolver); } - options.TimeoutInterval(Timeout).Strict().AddObjectConverter(converter); + options.TimeoutInterval(Timeout).Strict().AddObjectConverter(DefaultConverter.Instance); }); if (customFormatters != null) @@ -218,8 +179,6 @@ namespace Squidex.Domain.Apps.Core.Scripting } } - converter.Engine = engine; - engine.SetValue("slugify", new ClrFunctionInstance(engine, "slugify", Slugify)); engine.SetValue("formatTime", new ClrFunctionInstance(engine, "formatTime", FormatDate)); engine.SetValue("formatDate", new ClrFunctionInstance(engine, "formatDate", FormatDate)); diff --git a/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj b/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj index a2f8491f7..f22143521 100644 --- a/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj +++ b/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/Squidex.Domain.Apps.Entities/Apps/BackupApps.cs b/src/Squidex.Domain.Apps.Entities/Apps/BackupApps.cs index 330014cb8..bf73299e7 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/BackupApps.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/BackupApps.cs @@ -29,8 +29,8 @@ namespace Squidex.Domain.Apps.Entities.Apps private readonly IUserResolver userResolver; private readonly IAppsByNameIndex appsByNameIndex; private readonly HashSet contributors = new HashSet(); + private readonly Dictionary userMapping = new Dictionary(); private Dictionary usersWithEmail = new Dictionary(); - private Dictionary userMapping = new Dictionary(); private bool isReserved; private string appName; diff --git a/src/Squidex.Domain.Apps.Entities/EntityMapper.cs b/src/Squidex.Domain.Apps.Entities/EntityMapper.cs index f990ae781..c5da46700 100644 --- a/src/Squidex.Domain.Apps.Entities/EntityMapper.cs +++ b/src/Squidex.Domain.Apps.Entities/EntityMapper.cs @@ -6,7 +6,6 @@ // ========================================================================== using System; -using NodaTime; using Squidex.Domain.Apps.Events; using Squidex.Infrastructure.EventSourcing; @@ -46,7 +45,7 @@ namespace Squidex.Domain.Apps.Entities private static void SetCreated(IEntity entity, EnvelopeHeaders headers) { - if (entity is IUpdateableEntity updateable && updateable.Created == default(Instant)) + if (entity is IUpdateableEntity updateable && updateable.Created == default) { updateable.Created = headers.Timestamp(); } diff --git a/src/Squidex.Domain.Apps.Entities/Rules/UsageTracking/UsageTrackerGrain.cs b/src/Squidex.Domain.Apps.Entities/Rules/UsageTracking/UsageTrackerGrain.cs index a0cb3b57b..ba7773c68 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/UsageTracking/UsageTrackerGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/UsageTracking/UsageTrackerGrain.cs @@ -79,7 +79,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.UsageTracking { var target = kvp.Value; - var (from, to) = GetDateRange(today, target.NumDays); + var (from, _) = GetDateRange(today, target.NumDays); if (!target.Triggered.HasValue || target.Triggered < from) { @@ -107,7 +107,7 @@ namespace Squidex.Domain.Apps.Entities.Rules.UsageTracking await WriteStateAsync(); } - private (DateTime, DateTime) GetDateRange(DateTime today, int? numDays) + private static (DateTime, DateTime) GetDateRange(DateTime today, int? numDays) { if (numDays.HasValue) { diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs index 70ec38ddc..167971a34 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs @@ -220,9 +220,9 @@ namespace Squidex.Domain.Apps.Entities.Schemas var schemaSource = Snapshot.SchemaDef; var schemaTarget = command.ToSchema(schemaSource.Name, schemaSource.IsSingleton); - var @events = schemaSource.Synchronize(schemaTarget, serializer, () => Snapshot.SchemaFieldsTotal + 1, options); + var events = schemaSource.Synchronize(schemaTarget, serializer, () => Snapshot.SchemaFieldsTotal + 1, options); - foreach (var @event in @events) + foreach (var @event in events) { RaiseEvent(SimpleMapper.Map(command, (SchemaEvent)@event)); } diff --git a/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs b/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs index d4c7a0b8c..3f0a356b1 100644 --- a/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs @@ -43,7 +43,7 @@ namespace Squidex.Infrastructure.States return (existing.Doc, existing.Version); } - return (default(T), EtagVersion.NotFound); + return (default, EtagVersion.NotFound); } } diff --git a/src/Squidex.Infrastructure/EventSourcing/RetrySubscription.cs b/src/Squidex.Infrastructure/EventSourcing/RetrySubscription.cs index 60a9f5679..58bfb6125 100644 --- a/src/Squidex.Infrastructure/EventSourcing/RetrySubscription.cs +++ b/src/Squidex.Infrastructure/EventSourcing/RetrySubscription.cs @@ -82,7 +82,7 @@ namespace Squidex.Infrastructure.EventSourcing { Task.Delay(ReconnectWaitMs, timerCts.Token).ContinueWith(t => { - dispatcher.DispatchAsync(() => Subscribe()); + dispatcher.DispatchAsync(Subscribe); }).Forget(); } else @@ -104,7 +104,7 @@ namespace Squidex.Infrastructure.EventSourcing public async Task StopAsync() { - await dispatcher.DispatchAsync(() => Unsubscribe()); + await dispatcher.DispatchAsync(Unsubscribe); await dispatcher.StopAndWaitAsync(); timerCts.Cancel(); diff --git a/src/Squidex.Infrastructure/Log/LockingLogStore.cs b/src/Squidex.Infrastructure/Log/LockingLogStore.cs index e6b931ebf..bafce0bd2 100644 --- a/src/Squidex.Infrastructure/Log/LockingLogStore.cs +++ b/src/Squidex.Infrastructure/Log/LockingLogStore.cs @@ -52,7 +52,7 @@ namespace Squidex.Infrastructure.Log break; } - await Task.Delay(2000); + await Task.Delay(2000, cts.Token); } if (!cts.IsCancellationRequested) diff --git a/src/Squidex.Infrastructure/States/IStore.cs b/src/Squidex.Infrastructure/States/IStore.cs index e94d94558..390e555de 100644 --- a/src/Squidex.Infrastructure/States/IStore.cs +++ b/src/Squidex.Infrastructure/States/IStore.cs @@ -12,7 +12,7 @@ namespace Squidex.Infrastructure.States { public delegate void HandleEvent(Envelope @event); - public delegate void HandleSnapshot(T state); + public delegate void HandleSnapshot(T state); public interface IStore { diff --git a/src/Squidex/AppServices.cs b/src/Squidex/AppServices.cs deleted file mode 100644 index c880e9e1f..000000000 --- a/src/Squidex/AppServices.cs +++ /dev/null @@ -1,79 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschränkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Squidex.Areas.Api.Config.Swagger; -using Squidex.Areas.Api.Controllers.Contents; -using Squidex.Areas.IdentityServer.Config; -using Squidex.Config; -using Squidex.Config.Authentication; -using Squidex.Config.Domain; -using Squidex.Config.Web; -using Squidex.Domain.Apps.Entities.Assets; -using Squidex.Domain.Apps.Entities.Contents; -using Squidex.Extensions.Actions.Twitter; -using Squidex.Infrastructure.Commands; -using Squidex.Infrastructure.Diagnostics; -using Squidex.Pipeline; -using Squidex.Pipeline.Robots; - -namespace Squidex -{ - public static class AppServices - { - public static void AddAppServices(this IServiceCollection services, IConfiguration config) - { - services.AddHttpClient(); - services.AddLogging(); - services.AddMemoryCache(); - services.AddOptions(); - - services.AddMyAssetServices(config); - services.AddMyAuthentication(config); - services.AddMyEntitiesServices(config); - services.AddMyEventPublishersServices(config); - services.AddMyEventStoreServices(config); - services.AddMyIdentityServer(); - services.AddMyInfrastructureServices(); - services.AddMyLoggingServices(config); - services.AddMyMigrationServices(); - services.AddMyMvc(); - services.AddMyRuleServices(); - services.AddMySerializers(); - services.AddMyStoreServices(config); - services.AddMySwaggerSettings(); - services.AddMySubscriptionServices(config); - - services.Configure( - config.GetSection("contents")); - services.Configure( - config.GetSection("assets")); - services.Configure( - config.GetSection("mode")); - services.Configure( - config.GetSection("twitter")); - services.Configure( - config.GetSection("robots")); - services.Configure( - config.GetSection("healthz:gc")); - services.Configure( - config.GetSection("etags")); - - services.Configure( - config.GetSection("contentsController")); - services.Configure( - config.GetSection("urls")); - services.Configure( - config.GetSection("identity")); - services.Configure( - config.GetSection("ui")); - services.Configure( - config.GetSection("usage")); - } - } -} diff --git a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs index 703e77ce3..6f5812945 100644 --- a/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs +++ b/src/Squidex/Areas/Api/Controllers/Contents/Generator/SchemaSwaggerGenerator.cs @@ -14,7 +14,6 @@ using Squidex.Config; using Squidex.Domain.Apps.Core; using Squidex.Domain.Apps.Core.GenerateJsonSchema; using Squidex.Domain.Apps.Core.Schemas; -using Squidex.Domain.Apps.Entities.Schemas; using Squidex.Infrastructure; using Squidex.Pipeline.Swagger; using Squidex.Shared; diff --git a/src/Squidex/Config/Domain/EventStoreServices.cs b/src/Squidex/Config/Domain/EventStoreServices.cs index e203383e1..defcbc2c7 100644 --- a/src/Squidex/Config/Domain/EventStoreServices.cs +++ b/src/Squidex/Config/Domain/EventStoreServices.cs @@ -37,7 +37,6 @@ namespace Squidex.Config.Domain return new MongoEventStore(mongDatabase, c.GetRequiredService()); }) - .As() .As(); }, ["GetEventStore"] = () => diff --git a/src/Squidex/Config/Domain/LoggingServices.cs b/src/Squidex/Config/Domain/LoggingServices.cs index 36af59330..5e18bd491 100644 --- a/src/Squidex/Config/Domain/LoggingServices.cs +++ b/src/Squidex/Config/Domain/LoggingServices.cs @@ -12,15 +12,10 @@ using Squidex.Domain.Apps.Entities.Apps; using Squidex.Infrastructure.Log; using Squidex.Pipeline; -#pragma warning disable RECS0092 // Convert field to readonly - namespace Squidex.Config.Domain { public static class LoggingServices { - private static ILogChannel console = new ConsoleLogChannel(); - private static ILogChannel file; - public static void AddMyLoggingServices(this IServiceCollection services, IConfiguration config) { if (config.GetValue("logging:human")) @@ -38,18 +33,13 @@ namespace Squidex.Config.Domain if (!string.IsNullOrWhiteSpace(loggingFile)) { - services.AddSingletonAs(file ?? (file = new FileChannel(loggingFile))) + services.AddSingletonAs(new FileChannel(loggingFile)) .As(); } var useColors = config.GetValue("logging:colors"); - if (console == null) - { - console = new ConsoleLogChannel(useColors); - } - - services.AddSingletonAs(console) + services.AddSingletonAs(new ConsoleLogChannel(useColors)) .As(); services.AddSingletonAs(c => new ApplicationInfoLogAppender(typeof(Program).Assembly, Guid.NewGuid())) diff --git a/src/Squidex/Config/Domain/SystemExtensions.cs b/src/Squidex/Config/Domain/SystemExtensions.cs deleted file mode 100644 index c11bd99fd..000000000 --- a/src/Squidex/Config/Domain/SystemExtensions.cs +++ /dev/null @@ -1,87 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschränkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Extensions.Hosting; -using Squidex.Infrastructure; -using Squidex.Infrastructure.Log; -using Squidex.Infrastructure.Migrations; - -namespace Squidex.Config.Domain -{ - public static class SystemExtensions - { - public sealed class InitializeHostedService : IHostedService - { - private readonly IEnumerable targets; - private readonly IApplicationLifetime lifetime; - private readonly ISemanticLog log; - - public InitializeHostedService(IEnumerable targets, IApplicationLifetime lifetime, ISemanticLog log) - { - this.targets = targets; - this.lifetime = lifetime; - this.log = log; - } - - public async Task StartAsync(CancellationToken cancellationToken) - { - try - { - foreach (var target in targets) - { - await target.InitializeAsync(cancellationToken); - - log.LogInformation(w => w.WriteProperty("initializedSystem", target.GetType().Name)); - } - } - catch - { - lifetime.StopApplication(); - throw; - } - } - - public Task StopAsync(CancellationToken cancellationToken) - { - return Task.CompletedTask; - } - } - - public sealed class MigratorHostedService : IHostedService - { - private readonly IApplicationLifetime lifetime; - private readonly Migrator migrator; - - public MigratorHostedService(IApplicationLifetime lifetime, Migrator migrator) - { - this.lifetime = lifetime; - this.migrator = migrator; - } - - public async Task StartAsync(CancellationToken cancellationToken) - { - try - { - await migrator.MigrateAsync(); - } - catch - { - lifetime.StopApplication(); - throw; - } - } - - public Task StopAsync(CancellationToken cancellationToken) - { - return Task.CompletedTask; - } - } - } -} diff --git a/src/Squidex/Config/Orleans/Extensions.cs b/src/Squidex/Config/Orleans/Extensions.cs index 7f9a14a8e..4ecbd022f 100644 --- a/src/Squidex/Config/Orleans/Extensions.cs +++ b/src/Squidex/Config/Orleans/Extensions.cs @@ -5,9 +5,14 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; using Orleans; using Orleans.ApplicationParts; using Orleans.Configuration; +using Orleans.Hosting; +using OrleansDashboard; +using OrleansDashboard.Client; +using OrleansDashboard.Metrics; using Squidex.Domain.Apps.Entities; using Squidex.Infrastructure; @@ -26,5 +31,27 @@ namespace Squidex.Config.Orleans options.ClusterId = Constants.OrleansClusterId; options.ServiceId = Constants.OrleansClusterId; } + + public static ISiloHostBuilder UseDashboardEx(this ISiloHostBuilder builder, Action configurator = null) + { + builder.AddStartupTask(); + + builder.ConfigureApplicationParts(appParts => + appParts + .AddFrameworkPart(typeof(Dashboard).Assembly) + .AddFrameworkPart(typeof(DashboardClient).Assembly)); + + builder.ConfigureServices(services => + { + services.AddDashboard(options => + { + options.HostSelf = false; + }); + }); + + builder.AddIncomingGrainCallFilter(); + + return builder; + } } } diff --git a/src/Squidex/Config/Orleans/OrleansServices.cs b/src/Squidex/Config/Orleans/OrleansServices.cs index cb32bced3..352611909 100644 --- a/src/Squidex/Config/Orleans/OrleansServices.cs +++ b/src/Squidex/Config/Orleans/OrleansServices.cs @@ -1,34 +1,113 @@ // ========================================================================== // 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.Net; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; using Orleans; +using Orleans.Configuration; +using Orleans.Hosting; +using Squidex.Domain.Apps.Entities.Contents; +using Squidex.Domain.Apps.Entities.Rules; +using Squidex.Domain.Apps.Entities.Rules.UsageTracking; +using Squidex.Infrastructure.EventSourcing.Grains; +using Squidex.Infrastructure.Orleans; namespace Squidex.Config.Orleans { public static class OrleansServices { - public static void AddOrleansSilo(this IServiceCollection services) + public static IServiceProvider AddAndBuildOrleans(this IServiceCollection services, IConfiguration config) { - services.AddSingletonAs() - .As() - .AsSelf(); + services.Configure(options => + { + options.Configure(); + }); + + services.Configure(options => + { + options.FastKillOnProcessExit = false; + }); services.AddServicesForSelfHostedDashboard(null, options => { options.HideTrace = true; }); - services.AddSingletonAs(c => c.GetRequiredService()) - .As(); + services.AddHostedService(); + + var hostBuilder = new SiloHostBuilder() + .UseDashboardEx() + .EnableDirectClient() + .AddIncomingGrainCallFilter() + .AddStartupTask>() + .AddStartupTask>() + .AddStartupTask>() + .AddStartupTask>() + .ConfigureApplicationParts(builder => + { + builder.AddMyParts(); + }); + + config.ConfigureByOption("orleans:clustering", new Options + { + ["MongoDB"] = () => + { + hostBuilder.ConfigureEndpoints(Dns.GetHostName(), 11111, 40000, listenOnAnyHostAddress: true); + + var mongoConfiguration = config.GetRequiredValue("store:mongoDb:configuration"); + var mongoDatabaseName = config.GetRequiredValue("store:mongoDb:database"); + + hostBuilder.UseMongoDBClustering(options => + { + options.ConnectionString = mongoConfiguration; + options.CollectionPrefix = "Orleans_"; + options.DatabaseName = mongoDatabaseName; + }); + }, + ["Development"] = () => + { + hostBuilder.UseLocalhostClustering(gatewayPort: 40000, serviceId: Constants.OrleansClusterId, clusterId: Constants.OrleansClusterId); + hostBuilder.Configure(options => options.ExpectedClusterSize = 1); + } + }); + + config.ConfigureByOption("store:type", new Options + { + ["MongoDB"] = () => + { + var mongoConfiguration = config.GetRequiredValue("store:mongoDb:configuration"); + var mongoDatabaseName = config.GetRequiredValue("store:mongoDb:database"); + + hostBuilder.UseMongoDBReminders(options => + { + options.ConnectionString = mongoConfiguration; + options.CollectionPrefix = "Orleans_"; + options.DatabaseName = mongoDatabaseName; + }); + } + }); + + IServiceProvider provider = null; + + hostBuilder.UseServiceProviderFactory((siloServices) => + { + foreach (var descriptor in services) + { + siloServices.Add(descriptor); + } + + provider = siloServices.BuildServiceProvider(); + + return provider; + }).Build(); - services.AddSingletonAs(c => c.GetRequiredService().Client) - .As(); + return provider; } } } diff --git a/src/Squidex/Config/Orleans/SiloHost.cs b/src/Squidex/Config/Orleans/SiloHost.cs new file mode 100644 index 000000000..1817dfa12 --- /dev/null +++ b/src/Squidex/Config/Orleans/SiloHost.cs @@ -0,0 +1,51 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; +using Orleans.Hosting; +using Squidex.Config.Startup; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Log; + +namespace Squidex.Config.Orleans +{ + public sealed class SiloHost : SafeHostedService + { + private readonly ISiloHost silo; + + public SiloHost(ISiloHost silo, ISemanticLog log, IApplicationLifetime lifetime) + : base(lifetime, log) + { + this.silo = silo; + } + + protected override async Task StartAsync(ISemanticLog log, CancellationToken ct) + { + var watch = ValueStopwatch.StartNew(); + try + { + await silo.StartAsync(ct); + } + finally + { + var elapsedMs = watch.Stop(); + + log.LogInformation(w => w + .WriteProperty("message", "Silo started") + .WriteProperty("elapsedMs", elapsedMs)); + } + } + + protected override async Task StopAsync(ISemanticLog log, CancellationToken ct) + { + await silo.StopAsync(); + } + } +} diff --git a/src/Squidex/Config/Orleans/SiloServices.cs b/src/Squidex/Config/Orleans/SiloServices.cs deleted file mode 100644 index 865302883..000000000 --- a/src/Squidex/Config/Orleans/SiloServices.cs +++ /dev/null @@ -1,42 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschränkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Orleans.Hosting; - -namespace Squidex.Config.Orleans -{ - public static class SiloServices - { - public static void AddAppSiloServices(this IServiceCollection services, IConfiguration config) - { - config.ConfigureByOption("store:type", new Options - { - ["MongoDB"] = () => - { - var mongoConfiguration = config.GetRequiredValue("store:mongoDb:configuration"); - var mongoDatabaseName = config.GetRequiredValue("store:mongoDb:database"); - - services.AddMongoDBMembershipTable(options => - { - options.ConnectionString = mongoConfiguration; - options.CollectionPrefix = "Orleans_"; - options.DatabaseName = mongoDatabaseName; - }); - - services.AddMongoDBReminders(options => - { - options.ConnectionString = mongoConfiguration; - options.CollectionPrefix = "Orleans_"; - options.DatabaseName = mongoDatabaseName; - }); - } - }); - } - } -} \ No newline at end of file diff --git a/src/Squidex/Config/Orleans/SiloWrapper.cs b/src/Squidex/Config/Orleans/SiloWrapper.cs deleted file mode 100644 index 55f8b6d11..000000000 --- a/src/Squidex/Config/Orleans/SiloWrapper.cs +++ /dev/null @@ -1,190 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using System.Net; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using Orleans; -using Orleans.Configuration; -using Orleans.Hosting; -using Squidex.Domain.Apps.Entities.Contents; -using Squidex.Domain.Apps.Entities.Rules; -using Squidex.Domain.Apps.Entities.Rules.UsageTracking; -using Squidex.Infrastructure; -using Squidex.Infrastructure.EventSourcing.Grains; -using Squidex.Infrastructure.Log; -using Squidex.Infrastructure.Log.Adapter; -using Squidex.Infrastructure.Orleans; - -namespace Squidex.Config.Orleans -{ - public sealed class SiloWrapper : IHostedService - { - private readonly Lazy lazySilo; - private readonly ISemanticLog log; - private readonly IApplicationLifetime lifetime; - private bool isStopping; - - internal sealed class Source : IConfigurationSource - { - private readonly IConfigurationProvider configurationProvider; - - public Source(IConfigurationProvider configurationProvider) - { - this.configurationProvider = configurationProvider; - } - - public IConfigurationProvider Build(IConfigurationBuilder builder) - { - return configurationProvider; - } - } - - public IClusterClient Client - { - get { return lazySilo.Value.Services.GetRequiredService(); } - } - - public SiloWrapper(IConfiguration config, ISemanticLog log, IApplicationLifetime lifetime) - { - this.lifetime = lifetime; - this.log = log; - - lazySilo = new Lazy(() => - { - var hostBuilder = new SiloHostBuilder() - .UseDashboard(options => options.HostSelf = false) - .EnableDirectClient() - .AddIncomingGrainCallFilter() - .AddStartupTask() - .AddStartupTask>() - .AddStartupTask>() - .AddStartupTask>() - .AddStartupTask>() - .Configure(options => - { - options.Configure(); - }) - .ConfigureApplicationParts(builder => - { - builder.AddMyParts(); - }) - .ConfigureLogging((hostingContext, builder) => - { - builder.AddConfiguration(hostingContext.Configuration.GetSection("logging")); - builder.AddSemanticLog(); - builder.AddFilter(); - }) - .ConfigureServices((context, services) => - { - services.AddAppSiloServices(context.Configuration); - services.AddAppServices(context.Configuration); - - services.Configure(options => options.FastKillOnProcessExit = false); - }) - .ConfigureAppConfiguration((hostContext, builder) => - { - if (config is IConfigurationRoot root) - { - foreach (var provider in root.Providers) - { - builder.Add(new Source(provider)); - } - } - }); - - config.ConfigureByOption("orleans:clustering", new Options - { - ["MongoDB"] = () => - { - hostBuilder.ConfigureEndpoints(Dns.GetHostName(), 11111, 40000, listenOnAnyHostAddress: true); - - var mongoConfiguration = config.GetRequiredValue("store:mongoDb:configuration"); - var mongoDatabaseName = config.GetRequiredValue("store:mongoDb:database"); - - hostBuilder.UseMongoDBClustering(options => - { - options.ConnectionString = mongoConfiguration; - options.CollectionPrefix = "Orleans_"; - options.DatabaseName = mongoDatabaseName; - }); - }, - ["Development"] = () => - { - hostBuilder.UseLocalhostClustering(gatewayPort: 40000, serviceId: Constants.OrleansClusterId, clusterId: Constants.OrleansClusterId); - hostBuilder.Configure(options => options.ExpectedClusterSize = 1); - } - }); - - config.ConfigureByOption("store:type", new Options - { - ["MongoDB"] = () => - { - var mongoConfiguration = config.GetRequiredValue("store:mongoDb:configuration"); - var mongoDatabaseName = config.GetRequiredValue("store:mongoDb:database"); - - hostBuilder.UseMongoDBReminders(options => - { - options.ConnectionString = mongoConfiguration; - options.CollectionPrefix = "Orleans_"; - options.DatabaseName = mongoDatabaseName; - }); - } - }); - - var silo = hostBuilder.Build(); - - silo.Stopped.ContinueWith(x => - { - if (!isStopping) - { - lifetime.StopApplication(); - } - }); - - return silo; - }); - } - - public async Task StartAsync(CancellationToken cancellationToken) - { - var watch = ValueStopwatch.StartNew(); - try - { - await lazySilo.Value.StartAsync(cancellationToken); - } - catch - { - lifetime.StopApplication(); - throw; - } - finally - { - var elapsedMs = watch.Stop(); - - log.LogInformation(w => w - .WriteProperty("message", "Silo started") - .WriteProperty("elapsedMs", elapsedMs)); - } - } - - public async Task StopAsync(CancellationToken cancellationToken) - { - if (lazySilo.IsValueCreated) - { - isStopping = true; - - await lazySilo.Value.StopAsync(cancellationToken); - } - } - } -} diff --git a/src/Squidex/Config/Startup/InitializerHost.cs b/src/Squidex/Config/Startup/InitializerHost.cs new file mode 100644 index 000000000..9d8e2790a --- /dev/null +++ b/src/Squidex/Config/Startup/InitializerHost.cs @@ -0,0 +1,38 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Log; + +namespace Squidex.Config.Startup +{ + public sealed class InitializerHost : SafeHostedService + { + private readonly IEnumerable targets; + + public InitializerHost(IEnumerable targets, IApplicationLifetime lifetime, ISemanticLog log) + : base(lifetime, log) + { + this.targets = targets; + } + + protected override async Task StartAsync(ISemanticLog log, CancellationToken ct) + { + foreach (var target in targets.Distinct()) + { + await target.InitializeAsync(ct); + + log.LogInformation(w => w.WriteProperty("initializedSystem", target.GetType().Name)); + } + } + } +} diff --git a/src/Squidex/Config/Startup/MigratorHost.cs b/src/Squidex/Config/Startup/MigratorHost.cs new file mode 100644 index 000000000..f65867da4 --- /dev/null +++ b/src/Squidex/Config/Startup/MigratorHost.cs @@ -0,0 +1,31 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; +using Squidex.Infrastructure.Log; +using Squidex.Infrastructure.Migrations; + +namespace Squidex.Config.Startup +{ + public sealed class MigratorHost : SafeHostedService + { + private readonly Migrator migrator; + + public MigratorHost(Migrator migrator, IApplicationLifetime lifetime, ISemanticLog log) + : base(lifetime, log) + { + this.migrator = migrator; + } + + protected override Task StartAsync(ISemanticLog log, CancellationToken ct) + { + return migrator.MigrateAsync(); + } + } +} diff --git a/src/Squidex/Config/Startup/SafeHostedService.cs b/src/Squidex/Config/Startup/SafeHostedService.cs new file mode 100644 index 000000000..90f39c691 --- /dev/null +++ b/src/Squidex/Config/Startup/SafeHostedService.cs @@ -0,0 +1,59 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Threading; +using System.Threading.Tasks; +using Microsoft.Extensions.Hosting; +using Squidex.Infrastructure.Log; +using Squidex.Infrastructure.Tasks; + +namespace Squidex.Config.Startup +{ + public abstract class SafeHostedService : IHostedService + { + private readonly IApplicationLifetime lifetime; + private readonly ISemanticLog log; + private bool isStarted; + + protected SafeHostedService(IApplicationLifetime lifetime, ISemanticLog log) + { + this.lifetime = lifetime; + + this.log = log; + } + + public async Task StartAsync(CancellationToken cancellationToken) + { + try + { + await StartAsync(log, cancellationToken); + + isStarted = true; + } + catch + { + lifetime.StopApplication(); + throw; + } + } + + public async Task StopAsync(CancellationToken cancellationToken) + { + if (isStarted) + { + await StopAsync(log, cancellationToken); + } + } + + protected abstract Task StartAsync(ISemanticLog log, CancellationToken ct); + + protected virtual Task StopAsync(ISemanticLog log, CancellationToken ct) + { + return TaskHelper.Done; + } + } +} diff --git a/src/Squidex/Pipeline/Squid/SquidMiddleware.cs b/src/Squidex/Pipeline/Squid/SquidMiddleware.cs index 2a5dd9dae..157c3c381 100644 --- a/src/Squidex/Pipeline/Squid/SquidMiddleware.cs +++ b/src/Squidex/Pipeline/Squid/SquidMiddleware.cs @@ -63,14 +63,9 @@ namespace Squidex.Pipeline.Squid background = backgroundValue; } - var isSmall = false; + var isSmall = request.Query.TryGetValue("small", out _); - if (request.Query.TryGetValue("small", out _)) - { - isSmall = true; - } - - var svg = string.Empty; + string svg; if (isSmall) { diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj index cebe95677..cda49b8ed 100644 --- a/src/Squidex/Squidex.csproj +++ b/src/Squidex/Squidex.csproj @@ -91,7 +91,7 @@ - + diff --git a/src/Squidex/WebStartup.cs b/src/Squidex/WebStartup.cs index ff233f5f7..10b2546e3 100644 --- a/src/Squidex/WebStartup.cs +++ b/src/Squidex/WebStartup.cs @@ -5,17 +5,31 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; using Microsoft.AspNetCore.Builder; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Squidex.Areas.Api; +using Squidex.Areas.Api.Config.Swagger; +using Squidex.Areas.Api.Controllers.Contents; using Squidex.Areas.Frontend; using Squidex.Areas.IdentityServer; +using Squidex.Areas.IdentityServer.Config; using Squidex.Areas.OrleansDashboard; using Squidex.Areas.Portal; +using Squidex.Config; +using Squidex.Config.Authentication; using Squidex.Config.Domain; using Squidex.Config.Orleans; +using Squidex.Config.Startup; using Squidex.Config.Web; +using Squidex.Domain.Apps.Entities.Assets; +using Squidex.Domain.Apps.Entities.Contents; +using Squidex.Extensions.Actions.Twitter; +using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure.Diagnostics; +using Squidex.Pipeline; +using Squidex.Pipeline.Robots; namespace Squidex { @@ -28,13 +42,63 @@ namespace Squidex this.configuration = configuration; } - public void ConfigureServices(IServiceCollection services) + public IServiceProvider ConfigureServices(IServiceCollection services) { - services.AddOrleansSilo(); - services.AddAppServices(configuration); + var config = configuration; - services.AddHostedService(); - services.AddHostedService(); + services.AddHttpClient(); + services.AddLogging(); + services.AddMemoryCache(); + services.AddOptions(); + + services.AddMyAssetServices(config); + services.AddMyAuthentication(config); + services.AddMyEntitiesServices(config); + services.AddMyEventPublishersServices(config); + services.AddMyEventStoreServices(config); + services.AddMyIdentityServer(); + services.AddMyInfrastructureServices(); + services.AddMyLoggingServices(config); + services.AddMyMigrationServices(); + services.AddMyMvc(); + services.AddMyRuleServices(); + services.AddMySerializers(); + services.AddMyStoreServices(config); + services.AddMySwaggerSettings(); + services.AddMySubscriptionServices(config); + + services.Configure( + config.GetSection("contents")); + services.Configure( + config.GetSection("assets")); + services.Configure( + config.GetSection("mode")); + services.Configure( + config.GetSection("twitter")); + services.Configure( + config.GetSection("robots")); + services.Configure( + config.GetSection("healthz:gc")); + services.Configure( + config.GetSection("etags")); + + services.Configure( + config.GetSection("contentsController")); + services.Configure( + config.GetSection("urls")); + services.Configure( + config.GetSection("identity")); + services.Configure( + config.GetSection("ui")); + services.Configure( + config.GetSection("usage")); + + services.AddHostedService(); + services.AddHostedService(); + + var provider = services.AddAndBuildOrleans(configuration); + + return provider; } public void Configure(IApplicationBuilder app) diff --git a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html index ce58ed3e2..59a73c5e1 100644 --- a/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html +++ b/src/Squidex/app/features/administration/pages/event-consumers/event-consumers-page.component.html @@ -6,7 +6,7 @@ - @@ -42,13 +42,13 @@ {{eventConsumer.position}} - - - 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 d7c4b44ce..c73493770 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 @@ -5,11 +5,11 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Subscription, timer } from 'rxjs'; +import { Component, OnInit } from '@angular/core'; +import { timer } from 'rxjs'; import { onErrorResumeNext, switchMap } from 'rxjs/operators'; -import { DialogModel } from '@app/shared'; +import { DialogModel, ResourceOwner } from '@app/shared'; import { EventConsumerDto } from './../../services/event-consumers.service'; import { EventConsumersState } from './../../state/event-consumers.state'; @@ -19,27 +19,20 @@ import { EventConsumersState } from './../../state/event-consumers.state'; styleUrls: ['./event-consumers-page.component.scss'], templateUrl: './event-consumers-page.component.html' }) -export class EventConsumersPageComponent implements OnDestroy, OnInit { - private timerSubscription: Subscription; - +export class EventConsumersPageComponent extends ResourceOwner implements OnInit { public eventConsumerErrorDialog = new DialogModel(); public eventConsumerError = ''; constructor( public readonly eventConsumersState: EventConsumersState ) { - } - - public ngOnDestroy() { - this.timerSubscription.unsubscribe(); + super(); } public ngOnInit() { this.eventConsumersState.load().pipe(onErrorResumeNext()).subscribe(); - this.timerSubscription = - timer(2000, 2000).pipe(switchMap(x => this.eventConsumersState.load(true, true).pipe(onErrorResumeNext()))) - .subscribe(); + this.own(timer(2000, 2000).pipe(switchMap(() => this.eventConsumersState.load(true, true)))); } public reload() { diff --git a/src/Squidex/app/features/administration/pages/restore/restore-page.component.ts b/src/Squidex/app/features/administration/pages/restore/restore-page.component.ts index 026f0becb..c0f6304ab 100644 --- a/src/Squidex/app/features/administration/pages/restore/restore-page.component.ts +++ b/src/Squidex/app/features/administration/pages/restore/restore-page.component.ts @@ -5,15 +5,16 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { FormBuilder } from '@angular/forms'; -import { Subscription, timer } from 'rxjs'; -import { filter, onErrorResumeNext, switchMap } from 'rxjs/operators'; +import { timer } from 'rxjs'; +import { onErrorResumeNext, switchMap } from 'rxjs/operators'; import { AuthService, BackupsService, DialogService, + ResourceOwner, RestoreDto, RestoreForm } from '@app/shared'; @@ -23,9 +24,7 @@ import { styleUrls: ['./restore-page.component.scss'], templateUrl: './restore-page.component.html' }) -export class RestorePageComponent implements OnDestroy, OnInit { - private timerSubscription: Subscription; - +export class RestorePageComponent extends ResourceOwner implements OnInit { public restoreJob: RestoreDto | null; public restoreForm = new RestoreForm(this.formBuilder); @@ -35,18 +34,17 @@ export class RestorePageComponent implements OnDestroy, OnInit { private readonly dialogs: DialogService, private readonly formBuilder: FormBuilder ) { - } - - public ngOnDestroy() { - this.timerSubscription.unsubscribe(); + super(); } public ngOnInit() { - this.timerSubscription = - timer(0, 2000).pipe(switchMap(() => this.backupsService.getRestore().pipe(onErrorResumeNext())), filter(x => !!x)) - .subscribe(dto => { - this.restoreJob = dto!; - }); + this.own( + timer(0, 2000).pipe(switchMap(() => this.backupsService.getRestore().pipe(onErrorResumeNext()))) + .subscribe(job => { + if (job) { + this.restoreJob = job; + } + })); } public restore() { diff --git a/src/Squidex/app/features/administration/pages/users/user-page.component.ts b/src/Squidex/app/features/administration/pages/users/user-page.component.ts index 3be7e69a6..e009b6115 100644 --- a/src/Squidex/app/features/administration/pages/users/user-page.component.ts +++ b/src/Squidex/app/features/administration/pages/users/user-page.component.ts @@ -5,10 +5,11 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { ActivatedRoute, Router } from '@angular/router'; -import { Subscription } from 'rxjs'; + +import { ResourceOwner } from '@app/shared'; import { UserDto } from './../../services/users.service'; import { UserForm, UsersState } from './../../state/users.state'; @@ -18,9 +19,7 @@ import { UserForm, UsersState } from './../../state/users.state'; styleUrls: ['./user-page.component.scss'], templateUrl: './user-page.component.html' }) -export class UserPageComponent implements OnDestroy, OnInit { - private selectedUserSubscription: Subscription; - +export class UserPageComponent extends ResourceOwner implements OnInit { public canUpdate = false; public user?: { user: UserDto, isCurrentUser: boolean }; @@ -32,22 +31,19 @@ export class UserPageComponent implements OnDestroy, OnInit { private readonly route: ActivatedRoute, private readonly router: Router ) { - } - - public ngOnDestroy() { - this.selectedUserSubscription.unsubscribe(); + super(); } public ngOnInit() { - this.selectedUserSubscription = + this.own( this.usersState.selectedUser .subscribe(selectedUser => { - this.user = selectedUser; + this.user = selectedUser!; if (selectedUser) { this.userForm.load(selectedUser.user); } - }); + })); } public save() { diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.html b/src/Squidex/app/features/administration/pages/users/users-page.component.html index 4a8963e8f..0c51c3304 100644 --- a/src/Squidex/app/features/administration/pages/users/users-page.component.html +++ b/src/Squidex/app/features/administration/pages/users/users-page.component.html @@ -6,7 +6,7 @@ - @@ -18,7 +18,7 @@ - @@ -61,10 +61,10 @@ - - @@ -81,7 +81,7 @@
- +
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 e98fd0cf8..ae16e1f21 100644 --- a/src/Squidex/app/features/administration/state/event-consumers.state.ts +++ b/src/Squidex/app/features/administration/state/event-consumers.state.ts @@ -21,7 +21,7 @@ import { EventConsumerDto, EventConsumersService } from './../services/event-con interface Snapshot { eventConsumers: ImmutableArray; - isLoaded?: false; + isLoaded?: boolean; } @Injectable() diff --git a/src/Squidex/app/features/administration/state/users.state.ts b/src/Squidex/app/features/administration/state/users.state.ts index 85266dcb9..05482ff9a 100644 --- a/src/Squidex/app/features/administration/state/users.state.ts +++ b/src/Squidex/app/features/administration/state/users.state.ts @@ -98,7 +98,7 @@ interface Snapshot { isLoaded?: boolean; - selectedUser?: SnapshotUser; + selectedUser?: SnapshotUser | null; } @Injectable() diff --git a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.html b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.html index 74f0d3054..d762911d5 100644 --- a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.html +++ b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.html @@ -1,5 +1,5 @@ - +
\ No newline at end of file diff --git a/src/Squidex/app/features/assets/pages/assets-filters-page.component.html b/src/Squidex/app/features/assets/pages/assets-filters-page.component.html index 9453bc868..0a32d5244 100644 --- a/src/Squidex/app/features/assets/pages/assets-filters-page.component.html +++ b/src/Squidex/app/features/assets/pages/assets-filters-page.component.html @@ -14,7 +14,8 @@ - +
{{tag.name}} @@ -29,7 +30,8 @@

Saved queries

- + diff --git a/src/Squidex/app/features/assets/pages/assets-filters-page.component.ts b/src/Squidex/app/features/assets/pages/assets-filters-page.component.ts index 87cbae194..69c0852de 100644 --- a/src/Squidex/app/features/assets/pages/assets-filters-page.component.ts +++ b/src/Squidex/app/features/assets/pages/assets-filters-page.component.ts @@ -47,4 +47,12 @@ export class AssetsFiltersPageComponent { public isSelectedQuery(query: string) { return query === this.assetsState.snapshot.assetsQuery || (!query && !this.assetsState.assetsQuery); } + + public trackByTag(index: number, tag: { name: string }) { + return tag.name; + } + + public trackByQuery(index: number, query: { name: string }) { + return query.name; + } } \ No newline at end of file diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.html b/src/Squidex/app/features/assets/pages/assets-page.component.html index 36e9e5e3d..8c27b3e4c 100644 --- a/src/Squidex/app/features/assets/pages/assets-page.component.html +++ b/src/Squidex/app/features/assets/pages/assets-page.component.html @@ -1,6 +1,6 @@ - + Assets @@ -10,7 +10,7 @@
-
diff --git a/src/Squidex/app/features/content/declarations.ts b/src/Squidex/app/features/content/declarations.ts index f94dfd517..759513526 100644 --- a/src/Squidex/app/features/content/declarations.ts +++ b/src/Squidex/app/features/content/declarations.ts @@ -9,6 +9,7 @@ export * from './pages/comments/comments-page.component'; export * from './pages/content/content-field.component'; export * from './pages/content/content-history-page.component'; export * from './pages/content/content-page.component'; +export * from './pages/content/field-languages.component'; export * from './pages/contents/contents-filters-page.component'; export * from './pages/contents/contents-page.component'; export * from './pages/schemas/schemas-page.component'; @@ -17,6 +18,7 @@ export * from './shared/array-editor.component'; export * from './shared/assets-editor.component'; export * from './shared/array-item.component'; export * from './shared/content-item.component'; +export * from './shared/content-item-editor.component'; export * from './shared/content-status.component'; export * from './shared/contents-selector.component'; export * from './shared/due-time-selector.component'; diff --git a/src/Squidex/app/features/content/module.ts b/src/Squidex/app/features/content/module.ts index 1f9af170a..d47cb229a 100644 --- a/src/Squidex/app/features/content/module.ts +++ b/src/Squidex/app/features/content/module.ts @@ -29,6 +29,7 @@ import { ContentFieldComponent, ContentHistoryPageComponent, ContentItemComponent, + ContentItemEditorComponent, ContentPageComponent, ContentsFiltersPageComponent, ContentsPageComponent, @@ -36,6 +37,7 @@ import { ContentStatusComponent, DueTimeSelectorComponent, FieldEditorComponent, + FieldLanguagesComponent, PreviewButtonComponent, ReferencesEditorComponent, SchemasPageComponent @@ -112,6 +114,7 @@ const routes: Routes = [ ContentFieldComponent, ContentHistoryPageComponent, ContentItemComponent, + ContentItemEditorComponent, ContentPageComponent, ContentsFiltersPageComponent, ContentStatusComponent, @@ -119,6 +122,7 @@ const routes: Routes = [ ContentsSelectorComponent, DueTimeSelectorComponent, FieldEditorComponent, + FieldLanguagesComponent, PreviewButtonComponent, ReferencesEditorComponent, SchemasPageComponent 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 2dd8dd959..3ea27986d 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,42 +1,83 @@ -
-
- - - - - - - - Please remember to check all languages when you see validation errors. - - +
+
+
+
+ + +
+ + +
+ + +
+ + + + + + +
- -
- - -
- +
+ - - - - +
+
+ + +
+ + +
+ + +
+ + + + + + +
+
diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.scss b/src/Squidex/app/features/content/pages/content/content-field.component.scss index 9c13f51a7..821dd5465 100644 --- a/src/Squidex/app/features/content/pages/content/content-field.component.scss +++ b/src/Squidex/app/features/content/pages/content/content-field.component.scss @@ -11,8 +11,26 @@ @include absolute(.7rem, 1.25rem, auto, auto); } -.invalid { - border-left-color: $color-theme-error; +.row { + margin-left: -1.5rem; + margin-right: -1.5rem; +} + +.col-12 { + padding-left: 1.5rem; + padding-right: 1.5rem; +} + +.col-6 { + & { + padding-left: 1.5rem; + padding-right: .5rem; + } + + &.col-right { + padding-left: .5rem; + padding-right: 1.5rem; + } } .field { @@ -20,9 +38,24 @@ color: $color-theme-error; } + &-invalid { + border-left-color: $color-theme-error; + } + &-disabled { color: $color-border-dark; font-size: .8rem; font-weight: normal; } + + &-copy { + @include absolute(1rem, auto, auto, -1rem); + z-index: 1000; + } +} + +.compare { + padding: .5rem 0; + border: 0; + border-bottom: 1px solid $color-border; } \ No newline at end of file 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 cf176d979..3d5f98d80 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 @@ -5,20 +5,21 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, DoCheck, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; +import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { AbstractControl, FormGroup } from '@angular/forms'; import { Observable } from 'rxjs'; -import { map, startWith } from 'rxjs/operators'; +import { combineLatest } from 'rxjs/operators'; import { AppLanguageDto, EditContentForm, fieldInvariant, - ImmutableArray, + invalid$, LocalStoreService, RootFieldDto, SchemaDto, - Types + Types, + value$ } from '@app/shared'; @Component({ @@ -26,7 +27,7 @@ import { styleUrls: ['./content-field.component.scss'], templateUrl: './content-field.component.html' }) -export class ContentFieldComponent implements DoCheck, OnChanges { +export class ContentFieldComponent implements OnChanges { @Input() public form: EditContentForm; @@ -36,6 +37,9 @@ export class ContentFieldComponent implements DoCheck, OnChanges { @Input() public fieldForm: FormGroup; + @Input() + public fieldFormCompare?: FormGroup; + @Input() public schema: SchemaDto; @@ -43,15 +47,18 @@ export class ContentFieldComponent implements DoCheck, OnChanges { public language: AppLanguageDto; @Input() - public languages: ImmutableArray; + public languages: AppLanguageDto[]; @Output() public languageChange = new EventEmitter(); public selectedFormControl: AbstractControl; + public selectedFormControlCompare?: AbstractControl; + public showAllControls = false; public isInvalid: Observable; + public isDifferent: Observable; constructor( private readonly localStore: LocalStoreService @@ -60,36 +67,73 @@ export class ContentFieldComponent implements DoCheck, OnChanges { public ngOnChanges(changes: SimpleChanges) { if (changes['fieldForm']) { - this.isInvalid = this.fieldForm.statusChanges.pipe(startWith(this.fieldForm.invalid), map(x => this.fieldForm.invalid)); + this.isInvalid = invalid$(this.fieldForm); + } + + if ((changes['fieldForm'] || changes['fieldFormCompare']) && this.fieldFormCompare) { + this.isDifferent = + value$(this.fieldForm).pipe( + combineLatest(value$(this.fieldFormCompare), + (lhs, rhs) => !Types.jsJsonEquals(lhs, rhs))); } if (changes['field']) { this.showAllControls = this.localStore.getBoolean(this.configKey()); } + + const control = this.findControl(this.fieldForm); + + if (this.selectedFormControl !== control) { + if (this.selectedFormControl && Types.isFunction(this.selectedFormControl['_clearChangeFns'])) { + this.selectedFormControl['_clearChangeFns'](); + } + + this.selectedFormControl = control; + } + + if (this.fieldFormCompare) { + const controlCompare = this.findControl(this.fieldFormCompare); + + if (this.selectedFormControlCompare !== controlCompare) { + if (this.selectedFormControlCompare && Types.isFunction(this.selectedFormControlCompare['_clearChangeFns'])) { + this.selectedFormControlCompare['_clearChangeFns'](); + } + + this.selectedFormControlCompare = controlCompare; + } + } } - public toggleShowAll() { - this.showAllControls = !this.showAllControls; + public changeShowAllControls(value: boolean) { + this.showAllControls = value; this.localStore.setBoolean(this.configKey(), this.showAllControls); } - public ngDoCheck() { - let control: AbstractControl; + public copy() { + if (this.selectedFormControlCompare && this.fieldFormCompare) { + if (this.showAllControls) { + this.fieldForm.setValue(this.fieldFormCompare.value); + } else { + this.selectedFormControl.setValue(this.selectedFormControlCompare.value); + } + } + } + private findControl(form: FormGroup) { if (this.field.isLocalizable) { - control = this.fieldForm.controls[this.language.iso2Code]; + return form.controls[this.language.iso2Code]; } else { - control = this.fieldForm.controls[fieldInvariant]; + return form.controls[fieldInvariant]; } + } - if (this.selectedFormControl !== control) { - if (this.selectedFormControl && Types.isFunction(this.selectedFormControl['_clearChangeFns'])) { - this.selectedFormControl['_clearChangeFns'](); - } + public prefix(language: AppLanguageDto) { + return `(${language.iso2Code}`; + } - this.selectedFormControl = control; - } + public trackByLanguage(index: number, language: AppLanguageDto) { + return language.iso2Code; } private configKey() { diff --git a/src/Squidex/app/features/content/pages/content/content-history-page.component.html b/src/Squidex/app/features/content/pages/content/content-history-page.component.html index 3fec6c69d..7ca0c7449 100644 --- a/src/Squidex/app/features/content/pages/content/content-history-page.component.html +++ b/src/Squidex/app/features/content/pages/content/content-history-page.component.html @@ -15,7 +15,7 @@
{{event.created | sqxFromNow}}
- Load this Version + Load · Compare
diff --git a/src/Squidex/app/features/content/pages/content/content-history-page.component.ts b/src/Squidex/app/features/content/pages/content/content-history-page.component.ts index 0c79d722f..96d9fa43d 100644 --- a/src/Squidex/app/features/content/pages/content/content-history-page.component.ts +++ b/src/Squidex/app/features/content/pages/content/content-history-page.component.ts @@ -62,7 +62,11 @@ export class ContentHistoryPageComponent { } public loadVersion(version: number) { - this.messageBus.emit(new ContentVersionSelected(new Version(version.toString()))); + this.messageBus.emit(new ContentVersionSelected(new Version(version.toString()), false)); + } + + public compareVersion(version: number) { + this.messageBus.emit(new ContentVersionSelected(new Version(version.toString()), true)); } public trackByEvent(index: number, event: HistoryEventDto) { 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 bef584f93..a0fb8001b 100644 --- a/src/Squidex/app/features/content/pages/content/content-page.component.html +++ b/src/Squidex/app/features/content/pages/content/content-page.component.html @@ -1,7 +1,7 @@
- + @@ -116,8 +116,9 @@ [form]="contentForm" [field]="field" [fieldForm]="contentForm.form.get(field.name)" + [fieldFormCompare]="contentFormCompare?.form.get(field.name)" [schema]="schema" - [languages]="languages" + [languages]="languages.mutableValues" [(language)]="language">
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 a880fa5c2..610094887 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 @@ -5,10 +5,10 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Observable, of, Subscription } from 'rxjs'; -import { filter, onErrorResumeNext, switchMap } from 'rxjs/operators'; +import { Observable, of } from 'rxjs'; +import { onErrorResumeNext, switchMap } from 'rxjs/operators'; import { ContentVersionSelected } from './../messages'; @@ -25,6 +25,7 @@ import { LanguagesState, MessageBus, ModalModel, + ResourceOwner, SchemaDetailsDto, SchemasState, Version @@ -40,17 +41,13 @@ import { DueTimeSelectorComponent } from './../../shared/due-time-selector.compo fadeAnimation ] }) -export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, OnInit { - private languagesSubscription: Subscription; - private contentSubscription: Subscription; - private contentVersionSelectedSubscription: Subscription; - private selectedSchemaSubscription: Subscription; - +export class ContentPageComponent extends ResourceOwner implements CanComponentDeactivate, OnInit { public schema: SchemaDetailsDto; public content: ContentDto; public contentVersion: Version | null; public contentForm: EditContentForm; + public contentFormCompare: EditContentForm | null = null; public dropdown = new ModalModel(); @@ -70,44 +67,42 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, private readonly router: Router, private readonly schemasState: SchemasState ) { - } - - public ngOnDestroy() { - this.languagesSubscription.unsubscribe(); - this.contentSubscription.unsubscribe(); - this.contentVersionSelectedSubscription.unsubscribe(); - this.selectedSchemaSubscription.unsubscribe(); + super(); } public ngOnInit() { - this.languagesSubscription = + this.own( this.languagesState.languages .subscribe(languages => { this.languages = languages.map(x => x.language); this.language = this.languages.at(0); - }); + })); - this.selectedSchemaSubscription = - this.schemasState.selectedSchema.pipe(filter(s => !!s)) + this.own( + this.schemasState.selectedSchema .subscribe(schema => { - this.schema = schema!; + if (schema) { + this.schema = schema!; - this.contentForm = new EditContentForm(this.schema, this.languages); - }); + this.contentForm = new EditContentForm(this.schema, this.languages); + } + })); - this.contentSubscription = - this.contentsState.selectedContent.pipe(filter(c => !!c)) + this.own( + this.contentsState.selectedContent .subscribe(content => { - this.content = content!; + if (content) { + this.content = content; - this.loadContent(this.content.dataDraft); - }); + this.loadContent(this.content.dataDraft); + } + })); - this.contentVersionSelectedSubscription = + this.own( this.messageBus.of(ContentVersionSelected) .subscribe(message => { - this.loadVersion(message.version); - }); + this.loadVersion(message.version, message.compare); + })); } public canDeactivate(): Observable { @@ -214,26 +209,36 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy, .subscribe(); } - private loadVersion(version: Version) { - if (this.content) { + private loadVersion(version: Version | null, compare: boolean) { + if (!this.content || version === null || version.eq(this.content.version)) { + this.contentFormCompare = null; + this.contentVersion = null; + this.contentForm.load(this.content.dataDraft); + } else { this.contentsState.loadVersion(this.content, version) .subscribe(dto => { - if (this.content.version.value !== version.value) { - this.contentVersion = version; + if (compare) { + if (this.contentFormCompare === null) { + this.contentFormCompare = new EditContentForm(this.schema, this.languages); + this.contentFormCompare.form.disable(); + } + + this.contentFormCompare.load(dto.payload); + this.contentForm.load(this.content.dataDraft); } else { - this.contentVersion = null; + if (this.contentFormCompare) { + this.contentFormCompare = null; + } + + this.contentForm.load(dto.payload); } - this.loadContent(dto); + this.contentVersion = version; }); } } public showLatest() { - if (this.contentVersion) { - this.contentVersion = null; - - this.loadContent(this.content.dataDraft); - } + this.loadVersion(null, false); } } \ No newline at end of file diff --git a/src/Squidex/app/features/content/pages/content/field-languages.component.ts b/src/Squidex/app/features/content/pages/content/field-languages.component.ts new file mode 100644 index 000000000..08d6651d2 --- /dev/null +++ b/src/Squidex/app/features/content/pages/content/field-languages.component.ts @@ -0,0 +1,52 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; + +import { AppLanguageDto, RootFieldDto } from '@app/shared'; + +@Component({ + selector: 'sqx-field-languages', + template: ` + + + + + + + + + Please remember to check all languages when you see validation errors. + + + `, + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class FieldLanguagesComponent { + @Input() + public field: RootFieldDto; + + @Input() + public showAllControls: boolean; + + @Input() + public language: AppLanguageDto; + + @Input() + public languages: AppLanguageDto[]; + + @Output() + public languageChange = new EventEmitter(); + + @Output() + public showAllControlsChange = new EventEmitter(); +} \ No newline at end of file diff --git a/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html index abee1df85..cba1e9f8f 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html +++ b/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html @@ -4,7 +4,8 @@ - + {{query.name}} @@ -13,7 +14,8 @@

Saved queries

- + {{query.name}} diff --git a/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.ts b/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.ts index 9701956cc..6f7bbd691 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.ts +++ b/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.ts @@ -5,13 +5,13 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Subscription } from 'rxjs'; +import { Component, OnInit } from '@angular/core'; import { onErrorResumeNext } from 'rxjs/operators'; import { ContentsState, Queries, + ResourceOwner, SchemasState, UIState } from '@app/shared'; @@ -21,9 +21,7 @@ import { styleUrls: ['./contents-filters-page.component.scss'], templateUrl: './contents-filters-page.component.html' }) -export class ContentsFiltersPageComponent implements OnDestroy, OnInit { - private selectedSchemaSubscription: Subscription; - +export class ContentsFiltersPageComponent extends ResourceOwner implements OnInit { public schemaQueries: Queries; constructor( @@ -31,20 +29,17 @@ export class ContentsFiltersPageComponent implements OnDestroy, OnInit { private readonly schemasState: SchemasState, private readonly uiState: UIState ) { - } - - public ngOnDestroy() { - this.selectedSchemaSubscription.unsubscribe(); + super(); } public ngOnInit() { - this.selectedSchemaSubscription = + this.own( this.schemasState.selectedSchema .subscribe(schema => { if (schema) { this.schemaQueries = new Queries(this.uiState, `schemas.${schema.name}`); } - }); + })); } public search(query: string) { @@ -54,4 +49,12 @@ export class ContentsFiltersPageComponent implements OnDestroy, OnInit { public isSelectedQuery(query: string) { return query === this.contentsState.snapshot.contentsQuery || (!query && !this.contentsState.snapshot.contentsQuery); } + + public trackByTag(index: number, tag: { name: string }) { + return tag.name; + } + + public trackByQuery(index: number, query: { name: string }) { + return query.name; + } } \ No newline at end of file diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-page.component.html index dc771f257..26f70f2c6 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.html +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.html @@ -1,6 +1,6 @@ - + Archive @@ -16,7 +16,7 @@
-
@@ -33,10 +33,10 @@
- +
- @@ -73,23 +73,23 @@
{{selectionCount}} items selected:   - - - - -
- +
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 d0f79bd98..d901cffcd 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 @@ -5,8 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { Subscription } from 'rxjs'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { onErrorResumeNext, switchMap, tap } from 'rxjs/operators'; import { @@ -18,6 +17,7 @@ import { LanguagesState, ModalModel, Queries, + ResourceOwner, SchemaDetailsDto, SchemasState, UIState @@ -30,11 +30,7 @@ import { DueTimeSelectorComponent } from './../../shared/due-time-selector.compo styleUrls: ['./contents-page.component.scss'], templateUrl: './contents-page.component.html' }) -export class ContentsPageComponent implements OnDestroy, OnInit { - private contentsSubscription: Subscription; - private languagesSubscription: Subscription; - private selectedSchemaSubscription: Subscription; - +export class ContentsPageComponent extends ResourceOwner implements OnInit { public schema: SchemaDetailsDto; public schemaQueries: Queries; @@ -61,16 +57,11 @@ export class ContentsPageComponent implements OnDestroy, OnInit { private readonly schemasState: SchemasState, private readonly uiState: UIState ) { - } - - public ngOnDestroy() { - this.contentsSubscription.unsubscribe(); - this.languagesSubscription.unsubscribe(); - this.selectedSchemaSubscription.unsubscribe(); + super(); } public ngOnInit() { - this.selectedSchemaSubscription = + this.own( this.schemasState.selectedSchema .subscribe(schema => { this.resetSelection(); @@ -79,20 +70,20 @@ export class ContentsPageComponent implements OnDestroy, OnInit { this.schemaQueries = new Queries(this.uiState, `schemas.${this.schema.name}`); this.contentsState.init().pipe(onErrorResumeNext()).subscribe(); - }); + })); - this.contentsSubscription = + this.own( this.contentsState.contents .subscribe(() => { this.updateSelectionSummary(); - }); + })); - this.languagesSubscription = + this.own( this.languagesState.languages .subscribe(languages => { this.languages = languages.map(x => x.language); this.language = this.languages.at(0); - }); + })); } public reload() { @@ -209,7 +200,7 @@ export class ContentsPageComponent implements OnDestroy, OnInit { this.updateSelectionSummary(); } - public trackByContent(content: ContentDto): string { + public trackByContent(index: number, content: ContentDto): string { return content.id; } diff --git a/src/Squidex/app/features/content/pages/messages.ts b/src/Squidex/app/features/content/pages/messages.ts index 115c27d43..3eca53b4b 100644 --- a/src/Squidex/app/features/content/pages/messages.ts +++ b/src/Squidex/app/features/content/pages/messages.ts @@ -9,7 +9,8 @@ import { Version } from '@app/shared'; export class ContentVersionSelected { constructor( - public readonly version: Version + public readonly version: Version, + public readonly compare: boolean ) { } } \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/array-editor.component.html b/src/Squidex/app/features/content/shared/array-editor.component.html index 81f476dfc..d4caa05a7 100644 --- a/src/Squidex/app/features/content/shared/array-editor.component.html +++ b/src/Squidex/app/features/content/shared/array-editor.component.html @@ -5,7 +5,7 @@
- diff --git a/src/Squidex/app/features/content/shared/array-editor.component.ts b/src/Squidex/app/features/content/shared/array-editor.component.ts index 64c957e14..b07d56a94 100644 --- a/src/Squidex/app/features/content/shared/array-editor.component.ts +++ b/src/Squidex/app/features/content/shared/array-editor.component.ts @@ -5,23 +5,27 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input } from '@angular/core'; import { AbstractControl, FormArray, FormGroup } from '@angular/forms'; import { AppLanguageDto, EditContentForm, - ImmutableArray, - RootFieldDto + RootFieldDto, + StatefulComponent } from '@app/shared'; +interface State { + isHidden: boolean; +} + @Component({ selector: 'sqx-array-editor', styleUrls: ['./array-editor.component.scss'], templateUrl: './array-editor.component.html', changeDetection: ChangeDetectionStrategy.OnPush }) -export class ArrayEditorComponent { +export class ArrayEditorComponent extends StatefulComponent { @Input() public form: EditContentForm; @@ -32,15 +36,19 @@ export class ArrayEditorComponent { public language: AppLanguageDto; @Input() - public languages: ImmutableArray; + public languages: AppLanguageDto[]; @Input() public arrayControl: FormArray; - public isHidden = false; + constructor(changeDetector: ChangeDetectorRef) { + super(changeDetector, { + isHidden: false + }); + } - public hide(hide: boolean) { - this.isHidden = hide; + public hide(isHidden: boolean) { + this.next(s => ({ ...s, isHidden })); } public removeItem(index: number) { diff --git a/src/Squidex/app/features/content/shared/array-item.component.html b/src/Squidex/app/features/content/shared/array-item.component.html index ad3b3a507..2283e2e54 100644 --- a/src/Squidex/app/features/content/shared/array-item.component.html +++ b/src/Squidex/app/features/content/shared/array-item.component.html @@ -5,32 +5,32 @@ Item #{{index + 1}} - - - - - - - - diff --git a/src/Squidex/app/features/content/shared/array-item.component.ts b/src/Squidex/app/features/content/shared/array-item.component.ts index 16e95b0bc..666e63068 100644 --- a/src/Squidex/app/features/content/shared/array-item.component.ts +++ b/src/Squidex/app/features/content/shared/array-item.component.ts @@ -8,13 +8,12 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { AbstractControl, FormGroup } from '@angular/forms'; import { Observable } from 'rxjs'; -import { map, startWith } from 'rxjs/operators'; import { AppLanguageDto, EditContentForm, FieldDto, - ImmutableArray, + invalid$, RootFieldDto } from '@app/shared'; @@ -62,7 +61,7 @@ export class ArrayItemComponent implements OnChanges { public language: AppLanguageDto; @Input() - public languages: ImmutableArray; + public languages: AppLanguageDto[]; public isInvalid: Observable; @@ -70,7 +69,7 @@ export class ArrayItemComponent implements OnChanges { public ngOnChanges(changes: SimpleChanges) { if (changes['itemForm']) { - this.isInvalid = this.itemForm.statusChanges.pipe(startWith(this.itemForm.invalid), map(x => this.itemForm.invalid)); + this.isInvalid = invalid$(this.itemForm); } if (changes['itemForm'] || changes['field']) { diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.html b/src/Squidex/app/features/content/shared/assets-editor.component.html index eb98de9f4..c6b7f33a1 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.html +++ b/src/Squidex/app/features/content/shared/assets-editor.component.html @@ -1,17 +1,18 @@ -
+ +
- Drop files or click here to add assets. + Drop files or click
- -
@@ -20,12 +21,12 @@
- +
- -
@@ -33,15 +34,17 @@
-
-
- +
diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.scss b/src/Squidex/app/features/content/shared/assets-editor.component.scss index 498a0bcc2..866d10863 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.scss +++ b/src/Squidex/app/features/content/shared/assets-editor.component.scss @@ -44,12 +44,12 @@ & { @include transition(border-color .4s ease); @include border-radius; - @include flex-box; - @include truncate; + @include truncate-nowidth; border: 2px dashed darken($color-border, 10%); + padding: 5px .5rem; font-weight: normal; + font-size: 1rem; text-align: center; - padding: 5px 2rem; color: darken($color-border, 30%); cursor: pointer; } diff --git a/src/Squidex/app/features/content/shared/assets-editor.component.ts b/src/Squidex/app/features/content/shared/assets-editor.component.ts index bf725821b..9dc11ac56 100644 --- a/src/Squidex/app/features/content/shared/assets-editor.component.ts +++ b/src/Squidex/app/features/content/shared/assets-editor.component.ts @@ -5,9 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, OnDestroy, OnInit } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Subscription } from 'rxjs'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnInit } from '@angular/core'; +import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { AppsState, @@ -17,6 +16,7 @@ import { ImmutableArray, LocalStoreService, MessageBus, + StatefulControlComponent, Types } from '@app/shared'; @@ -32,6 +32,14 @@ class AssetUpdated { } } +interface State { + assetFiles: ImmutableArray; + + assets: ImmutableArray; + + isListView: boolean; +} + @Component({ selector: 'sqx-assets-editor', styleUrls: ['./assets-editor.component.scss'], @@ -39,39 +47,35 @@ class AssetUpdated { providers: [SQX_ASSETS_EDITOR_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class AssetsEditorComponent implements ControlValueAccessor, OnInit, OnDestroy { - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; - private subscription: Subscription; - +export class AssetsEditorComponent extends StatefulControlComponent implements OnInit { public assetsDialog = new DialogModel(); - public newAssets = ImmutableArray.empty(); - public oldAssets = ImmutableArray.empty(); - - public isListView = false; - public isDisabled = false; + @Input() + public isCompact = false; - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly appsState: AppsState, private readonly assetsService: AssetsService, - private readonly changeDetector: ChangeDetectorRef, private readonly localStore: LocalStoreService, private readonly messageBus: MessageBus ) { - this.isListView = this.localStore.getBoolean('squidex.assets.list-view'); + super(changeDetector, { + assets: ImmutableArray.empty(), + assetFiles: ImmutableArray.empty(), + isListView: localStore.getBoolean('squidex.assets.list-view') + }); } public writeValue(obj: any) { if (Types.isArrayOfString(obj)) { - if (!Types.isEquals(obj, this.oldAssets.map(x => x.id).values)) { + if (!Types.isEquals(obj, this.snapshot.assets.map(x => x.id).values)) { const assetIds: string[] = obj; this.assetsService.getAssets(this.appsState.appName, 0, 0, undefined, undefined, obj) .subscribe(dtos => { this.setAssets(ImmutableArray.of(assetIds.map(id => dtos.items.find(x => x.id === id)!).filter(a => !!a))); - if (this.oldAssets.length !== assetIds.length) { + if (this.snapshot.assets.length !== assetIds.length) { this.updateValue(); } }, () => { @@ -87,54 +91,28 @@ export class AssetsEditorComponent implements ControlValueAccessor, OnInit, OnDe this.messageBus.emit(new AssetUpdated(asset, this)); } - public ngOnDestroy() { - this.subscription.unsubscribe(); - } - public ngOnInit() { - this.subscription = + this.own( this.messageBus.of(AssetUpdated) .subscribe(event => { if (event.source !== this) { - this.setAssets(this.oldAssets.replaceBy('id', event.asset)); + this.setAssets(this.snapshot.assets.replaceBy('id', event.asset)); } - }); + })); } - public setAssets(asset: ImmutableArray) { - this.oldAssets = asset; - - this.changeDetector.markForCheck(); - } - - public setDisabledState(isDisabled: boolean): void { - this.isDisabled = isDisabled; - - this.changeDetector.markForCheck(); - } - - public noop() { - return; - } - - public registerOnChange(fn: any) { - this.callChange = fn; - } - - public registerOnTouched(fn: any) { - this.callTouched = fn; + public setAssets(assets: ImmutableArray) { + this.next(s => ({ ...s, assets })); } public addFiles(files: File[]) { for (let file of files) { - this.newAssets = this.newAssets.pushFront(file); + this.next(s => ({ ...s, assetFiles: s.assetFiles.pushFront(file) })); } } public selectAssets(assets: AssetDto[]) { - for (let asset of assets) { - this.oldAssets = this.oldAssets.push(asset); - } + this.setAssets(this.snapshot.assets.push(...assets)); if (assets.length > 0) { this.updateValue(); @@ -145,8 +123,11 @@ export class AssetsEditorComponent implements ControlValueAccessor, OnInit, OnDe public addAsset(file: File, asset: AssetDto) { if (asset && file) { - this.newAssets = this.newAssets.remove(file); - this.oldAssets = this.oldAssets.pushFront(asset); + this.next(s => ({ + ...s, + assetFiles: s.assetFiles.remove(file), + assets: s.assets.pushFront(asset) + })); this.updateValue(); } @@ -154,7 +135,7 @@ export class AssetsEditorComponent implements ControlValueAccessor, OnInit, OnDe public sortAssets(assets: AssetDto[]) { if (assets) { - this.oldAssets = ImmutableArray.of(assets); + this.setAssets(ImmutableArray.of(assets)); this.updateValue(); } @@ -162,24 +143,24 @@ export class AssetsEditorComponent implements ControlValueAccessor, OnInit, OnDe public removeLoadedAsset(asset: AssetDto) { if (asset) { - this.oldAssets = this.oldAssets.remove(asset); + this.setAssets(this.snapshot.assets.remove(asset)); this.updateValue(); } } public removeLoadingAsset(file: File) { - this.newAssets = this.newAssets.remove(file); + this.next(s => ({ ...s, assetFiles: s.assetFiles.remove(file) })); } public changeView(isListView: boolean) { - this.isListView = isListView; + this.next(s => ({ ...s, isListView })); this.localStore.setBoolean('squidex.assets.list-view', isListView); } private updateValue() { - let ids: string[] | null = this.oldAssets.values.map(x => x.id); + let ids: string[] | null = this.snapshot.assets.values.map(x => x.id); if (ids.length === 0) { ids = null; @@ -187,8 +168,6 @@ export class AssetsEditorComponent implements ControlValueAccessor, OnInit, OnDe this.callTouched(); this.callChange(ids); - - this.changeDetector.markForCheck(); } public trackByAsset(index: number, asset: AssetDto) { diff --git a/src/Squidex/app/features/content/shared/content-item-editor.component.ts b/src/Squidex/app/features/content/shared/content-item-editor.component.ts new file mode 100644 index 000000000..8e8a95e93 --- /dev/null +++ b/src/Squidex/app/features/content/shared/content-item-editor.component.ts @@ -0,0 +1,69 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { FormGroup } from '@angular/forms'; + +import { FieldDto } from '@app/shared'; + +@Component({ + selector: 'sqx-content-item-editor', + template: ` +
+
+
+
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+
`, + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class ContentItemEditorComponent { + @Input() + public field: FieldDto; + + @Input() + public form: FormGroup; +} \ 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 fea0c205f..5fd8b28c0 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.html +++ b/src/Squidex/app/features/content/shared/content-item.component.html @@ -1,65 +1,26 @@ - - + + + + + + + + - - - + + + + - -
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
- -
-
- -
-
-
-
-
-
- -
-
-
- -
-
-
-
-
-
-
- {{values[i]}} -
+ + {{values[i]}} + - + + {{content.lastModified | sqxFromNow}} - - - - - - - - + - + + + + + + + + + +
-
- + Publish - + Unpublish - + Archive - + Restore - + Clone @@ -119,7 +82,7 @@
- \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/content-item.component.ts b/src/Squidex/app/features/content/shared/content-item.component.ts index 697f9044e..606a027d3 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.ts +++ b/src/Squidex/app/features/content/shared/content-item.component.ts @@ -12,6 +12,7 @@ import { ContentDto, ContentsState, fadeAnimation, + FieldDto, FieldFormatter, fieldInvariant, ModalModel, @@ -69,6 +70,9 @@ export class ContentItemComponent implements OnChanges { @Input() public isReference = false; + @Input() + public isCompact = false; + @Input('sqxContent') public content: ContentDto; @@ -93,13 +97,18 @@ export class ContentItemComponent implements OnChanges { } } - public shouldStop(event: Event) { - if (this.patchForm.form.dirty) { + public shouldStop(event: Event, field?: FieldDto) { + if (this.patchForm.form.dirty || (field && field.isInlineEditable)) { event.stopPropagation(); event.stopImmediatePropagation(); } } + public stop(event: Event) { + event.stopPropagation(); + event.stopImmediatePropagation(); + } + public save() { const value = this.patchForm.submit(); diff --git a/src/Squidex/app/features/content/shared/contents-selector.component.html b/src/Squidex/app/features/content/shared/contents-selector.component.html index 263b77df6..a174dd63f 100644 --- a/src/Squidex/app/features/content/shared/contents-selector.component.html +++ b/src/Squidex/app/features/content/shared/contents-selector.component.html @@ -6,7 +6,7 @@
-
@@ -19,7 +19,7 @@
- +
@@ -63,7 +63,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 bfb764f39..f88608fba 100644 --- a/src/Squidex/app/features/content/shared/contents-selector.component.ts +++ b/src/Squidex/app/features/content/shared/contents-selector.component.ts @@ -115,7 +115,7 @@ export class ContentsSelectorComponent implements OnInit { this.isAllSelected = this.selectionCount === this.contentsState.snapshot.contents.length; } - public trackByContent(content: ContentDto): string { + public trackByContent(index: number, content: ContentDto): string { return content.id; } } diff --git a/src/Squidex/app/features/content/shared/field-editor.component.html b/src/Squidex/app/features/content/shared/field-editor.component.html index 5bcf53a3c..12d8ca479 100644 --- a/src/Squidex/app/features/content/shared/field-editor.component.html +++ b/src/Squidex/app/features/content/shared/field-editor.component.html @@ -5,7 +5,7 @@ Disabled - +
@@ -101,7 +101,7 @@ - + @@ -122,7 +122,7 @@ @@ -132,7 +132,8 @@ [formControl]="control" [language]="language" [languages]="languages" - [schemaId]="field.properties['schemaId']"> + [schemaId]="field.properties['schemaId']" + [isCompact]="isCompact"> diff --git a/src/Squidex/app/features/content/shared/field-editor.component.ts b/src/Squidex/app/features/content/shared/field-editor.component.ts index e15497238..e3690276c 100644 --- a/src/Squidex/app/features/content/shared/field-editor.component.ts +++ b/src/Squidex/app/features/content/shared/field-editor.component.ts @@ -11,8 +11,7 @@ import { FormControl } from '@angular/forms'; import { AppLanguageDto, EditContentForm, - FieldDto, - ImmutableArray + FieldDto } from '@app/shared'; @Component({ @@ -34,7 +33,10 @@ export class FieldEditorComponent { public language: AppLanguageDto; @Input() - public languages: ImmutableArray; + public languages: AppLanguageDto[]; + + @Input() + public isCompact = false; @Input() public displaySuffix: string; diff --git a/src/Squidex/app/features/content/shared/preview-button.component.html b/src/Squidex/app/features/content/shared/preview-button.component.html index 013dc9abb..1c189d2c4 100644 --- a/src/Squidex/app/features/content/shared/preview-button.component.html +++ b/src/Squidex/app/features/content/shared/preview-button.component.html @@ -1,16 +1,16 @@ - + Preview:
- -
+
- {{name}} + {{name}}
diff --git a/src/Squidex/app/features/content/shared/preview-button.component.ts b/src/Squidex/app/features/content/shared/preview-button.component.ts index 215500f7d..197fe8b65 100644 --- a/src/Squidex/app/features/content/shared/preview-button.component.ts +++ b/src/Squidex/app/features/content/shared/preview-button.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, Component, Input, OnInit } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; import { ContentDto, @@ -13,19 +13,26 @@ import { interpolate, LocalStoreService, ModalModel, - SchemaDetailsDto + SchemaDetailsDto, + StatefulComponent } from '@app/shared'; +interface State { + selectedName?: string; + + alternativeNames: string[]; +} + @Component({ selector: 'sqx-preview-button', styleUrls: ['./preview-button.component.scss'], templateUrl: './preview-button.component.html', - changeDetection: ChangeDetectionStrategy.OnPush, animations: [ fadeAnimation - ] + ], + changeDetection: ChangeDetectionStrategy.OnPush }) -export class PreviewButtonComponent implements OnInit { +export class PreviewButtonComponent extends StatefulComponent implements OnInit { @Input() public content: ContentDto; @@ -34,13 +41,12 @@ export class PreviewButtonComponent implements OnInit { public dropdown = new ModalModel(); - public selectedName: string | undefined; - - public alternativeNames: string[]; - - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly localStore: LocalStoreService ) { + super(changeDetector, { + alternativeNames: [] + }); } public ngOnInit() { @@ -62,16 +68,23 @@ export class PreviewButtonComponent implements OnInit { } private selectUrl(selectedName: string) { - if (this.selectedName !== selectedName) { + this.next(s => { + if (selectedName === s.selectedName) { + return s; + } + const state = { ...s }; + const keys = Object.keys(this.schema.previewUrls); - this.selectedName = selectedName; + state.selectedName = selectedName; - this.alternativeNames = keys.filter(x => x !== this.selectedName); - this.alternativeNames.sort(); + state.alternativeNames = keys.filter(x => x !== s.selectedName); + state.alternativeNames.sort(); this.localStore.set(this.configKey(), selectedName); - } + + return state; + }); } private configKey() { 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 7fbb63a25..83a7d5553 100644 --- a/src/Squidex/app/features/content/shared/references-editor.component.html +++ b/src/Squidex/app/features/content/shared/references-editor.component.html @@ -1,27 +1,28 @@ -
- +
+
Click here to link content items.
- - +
-
+
Schema not found or not configured yet.
@@ -30,7 +31,7 @@ \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/references-editor.component.ts b/src/Squidex/app/features/content/shared/references-editor.component.ts index 0fc562f6e..8cb079697 100644 --- a/src/Squidex/app/features/content/shared/references-editor.component.ts +++ b/src/Squidex/app/features/content/shared/references-editor.component.ts @@ -6,7 +6,7 @@ */ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input, OnInit } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { AppLanguageDto, @@ -18,6 +18,7 @@ import { MathHelper, SchemaDetailsDto, SchemasService, + StatefulControlComponent, Types } from '@app/shared'; @@ -25,6 +26,13 @@ export const SQX_REFERENCES_EDITOR_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => ReferencesEditorComponent), multi: true }; +interface State { + schema?: SchemaDetailsDto | null; + schemaInvalid: boolean; + + contentItems: ImmutableArray; +} + @Component({ selector: 'sqx-references-editor', styleUrls: ['./references-editor.component.scss'], @@ -32,10 +40,7 @@ export const SQX_REFERENCES_EDITOR_CONTROL_VALUE_ACCESSOR: any = { providers: [SQX_REFERENCES_EDITOR_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class ReferencesEditorComponent implements ControlValueAccessor, OnInit { - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; - +export class ReferencesEditorComponent extends StatefulControlComponent implements OnInit { @Input() public schemaId: string; @@ -43,53 +48,49 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit { public language: AppLanguageDto; @Input() - public languages: ImmutableArray; - - public selectorDialog = new DialogModel(); + public languages: AppLanguageDto[]; - public schema: SchemaDetailsDto; - - public contentItems = ImmutableArray.empty(); + @Input() + public isCompact = false; - public isDisabled = false; - public isInvalidSchema = false; + public selectorDialog = new DialogModel(); - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly appsState: AppsState, - private readonly changeDetector: ChangeDetectorRef, private readonly contentsService: ContentsService, private readonly schemasService: SchemasService ) { + super(changeDetector, { + schemaInvalid: false, + schema: null, + contentItems: ImmutableArray.empty() + }); } public ngOnInit() { if (this.schemaId === MathHelper.EMPTY_GUID) { - this.isInvalidSchema = true; + this.next(s => ({ ...s, schemaInvalid: true })); return; } this.schemasService.getSchema(this.appsState.appName, this.schemaId) - .subscribe(dto => { - this.schema = dto; - - this.changeDetector.markForCheck(); + .subscribe(schema => { + this.next(s => ({ ...s, schema })); }, () => { - this.isInvalidSchema = true; - - this.changeDetector.markForCheck(); + this.next(s => ({ ...s, schemaInvalid: true })); }); } public writeValue(obj: any) { if (Types.isArrayOfString(obj)) { - if (!Types.isEquals(obj, this.contentItems.map(x => x.id).values)) { + if (!Types.isEquals(obj, this.snapshot.contentItems.map(x => x.id).values)) { const contentIds: string[] = obj; this.contentsService.getContents(this.appsState.appName, this.schemaId, 10000, 0, undefined, contentIds) .subscribe(dtos => { this.setContentItems(ImmutableArray.of(contentIds.map(id => dtos.items.find(c => c.id === id)!).filter(r => !!r))); - if (this.contentItems.length !== contentIds.length) { + if (this.snapshot.contentItems.length !== contentIds.length) { this.updateValue(); } }, () => { @@ -101,29 +102,13 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit { } } - public setContentItems(contents: ImmutableArray) { - this.contentItems = contents; - - this.changeDetector.markForCheck(); - } - - public setDisabledState(isDisabled: boolean): void { - this.isDisabled = isDisabled; - - this.changeDetector.markForCheck(); - } - - public registerOnChange(fn: any) { - this.callChange = fn; - } - - public registerOnTouched(fn: any) { - this.callTouched = fn; + public setContentItems(contentItems: ImmutableArray) { + this.next(s => ({ ...s, contentItems })); } public select(contents: ContentDto[]) { for (let content of contents) { - this.contentItems = this.contentItems.push(content); + this.setContentItems(this.snapshot.contentItems.push(content)); } if (contents.length > 0) { @@ -135,7 +120,7 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit { public remove(content: ContentDto) { if (content) { - this.contentItems = this.contentItems.remove(content); + this.setContentItems(this.snapshot.contentItems.remove(content)); this.updateValue(); } @@ -143,14 +128,14 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit { public sort(contents: ContentDto[]) { if (contents) { - this.contentItems = ImmutableArray.of(contents); + this.setContentItems(ImmutableArray.of(contents)); this.updateValue(); } } private updateValue() { - let ids: string[] | null = this.contentItems.values.map(x => x.id); + let ids: string[] | null = this.snapshot.contentItems.values.map(x => x.id); if (ids.length === 0) { ids = null; @@ -158,7 +143,5 @@ export class ReferencesEditorComponent implements ControlValueAccessor, OnInit { this.callTouched(); this.callChange(ids); - - this.changeDetector.markForCheck(); } } \ No newline at end of file diff --git a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts index d4f6f202a..031d5d1b7 100644 --- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts +++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.ts @@ -5,8 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Subscription } from 'rxjs'; +import { Component, OnInit } from '@angular/core'; import { filter, map, switchMap } from 'rxjs/operators'; import { @@ -17,6 +16,7 @@ import { fadeAnimation, HistoryEventDto, HistoryService, + ResourceOwner, UsagesService } from '@app/shared'; @@ -42,9 +42,7 @@ const COLORS = [ fadeAnimation ] }) -export class DashboardPageComponent implements OnDestroy, OnInit { - private subscriptions: Subscription[] = []; - +export class DashboardPageComponent extends ResourceOwner implements OnInit { public profileDisplayName = ''; public chartStorageCount: any; @@ -104,18 +102,11 @@ export class DashboardPageComponent implements OnDestroy, OnInit { private readonly historyService: HistoryService, private readonly usagesService: UsagesService ) { - } - - public ngOnDestroy() { - for (let subscription of this.subscriptions) { - subscription.unsubscribe(); - } - - this.subscriptions = []; + super(); } public ngOnInit() { - this.subscriptions.push( + this.own( this.app.pipe( switchMap(app => this.usagesService.getTodayStorage(app.name))) .subscribe(dto => { @@ -123,7 +114,7 @@ export class DashboardPageComponent implements OnDestroy, OnInit { this.assetsMax = dto.maxAllowed; })); - this.subscriptions.push( + this.own( this.app.pipe( switchMap(app => this.usagesService.getMonthCalls(app.name))) .subscribe(dto => { @@ -131,14 +122,14 @@ export class DashboardPageComponent implements OnDestroy, OnInit { this.callsMax = dto.maxAllowed; })); - this.subscriptions.push( + this.own( this.app.pipe( switchMap(app => this.historyService.getHistory(app.name, ''))) .subscribe(dto => { this.history = dto; })); - this.subscriptions.push( + this.own( this.app.pipe( switchMap(app => this.usagesService.getStorageUsages(app.name, DateTime.today().addDays(-20), DateTime.today()))) .subscribe(dtos => { @@ -175,7 +166,7 @@ export class DashboardPageComponent implements OnDestroy, OnInit { }; })); - this.subscriptions.push( + this.own( this.app.pipe( switchMap(app => this.usagesService.getCallsUsages(app.name, DateTime.today().addDays(-20), DateTime.today()))) .subscribe(dtos => { diff --git a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html index c39cde203..9c9c6f5cb 100644 --- a/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html +++ b/src/Squidex/app/features/rules/pages/events/rule-events-page.component.html @@ -6,7 +6,7 @@ - @@ -70,11 +70,11 @@ Next: {{event.nextAttempt | sqxFromNow}}
- -
@@ -90,7 +90,7 @@ - + diff --git a/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.html b/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.html index 9b9b92009..341d20043 100644 --- a/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.html +++ b/src/Squidex/app/features/rules/pages/rules/actions/tweet-action.component.html @@ -2,7 +2,7 @@
- diff --git a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html index 7e2636362..aff31a2ad 100644 --- a/src/Squidex/app/features/rules/pages/rules/rules-page.component.html +++ b/src/Squidex/app/features/rules/pages/rules/rules-page.component.html @@ -6,14 +6,14 @@ - - @@ -24,7 +24,7 @@
No Rule created yet. -
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 d454b070d..107009588 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 @@ -94,14 +94,14 @@
- - - + + +
- - + +
\ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.html b/src/Squidex/app/features/schemas/pages/schema/field.component.html index 8a7eb1e5a..fce705986 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.html @@ -28,7 +28,7 @@ -
+
Enable in UI @@ -118,7 +118,7 @@
-
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html index 5caebdf85..46983f919 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html @@ -23,7 +23,7 @@ -
+
Edit Scripts @@ -61,7 +61,7 @@
No field created yet. -
@@ -75,7 +75,7 @@
- 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 4c5978824..6affed5fb 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 @@ -7,10 +7,9 @@ // tslint:disable:no-shadowed-variable -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Subscription } from 'rxjs'; -import { filter, onErrorResumeNext } from 'rxjs/operators'; +import { onErrorResumeNext } from 'rxjs/operators'; import { AppsState, @@ -21,6 +20,7 @@ import { MessageBus, ModalModel, PatternsState, + ResourceOwner, SchemaDetailsDto, SchemasState, Types @@ -38,9 +38,7 @@ import { fadeAnimation ] }) -export class SchemaPageComponent implements OnDestroy, OnInit { - private selectedSchemaSubscription: Subscription; - +export class SchemaPageComponent extends ResourceOwner implements OnInit { public fieldTypes = fieldTypes; public schemaExport: any; @@ -64,22 +62,21 @@ export class SchemaPageComponent implements OnDestroy, OnInit { private readonly router: Router, private readonly messageBus: MessageBus ) { - } - - public ngOnDestroy() { - this.selectedSchemaSubscription.unsubscribe(); + super(); } public ngOnInit() { this.patternsState.load().pipe(onErrorResumeNext()).subscribe(); - this.selectedSchemaSubscription = - this.schemasState.selectedSchema.pipe(filter(s => !!s)) + this.own( + this.schemasState.selectedSchema .subscribe(schema => { - this.schema = schema!; + if (schema) { + this.schema = schema; - this.export(); - }); + this.export(); + } + })); } public publish() { @@ -95,8 +92,7 @@ export class SchemaPageComponent implements OnDestroy, OnInit { } public trackByField(index: number, field: FieldDto) { - const a = this; - return field.fieldId + a.schema.id; + return field.fieldId + this.schema.id; } public deleteSchema() { 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 7d3d95408..0a5f6d787 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,9 +8,12 @@ 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'; +import { + BooleanFieldPropertiesDto, + FieldDto, + hasNoValue$ +} from '@app/shared'; @Component({ selector: 'sqx-boolean-validation', @@ -37,7 +40,6 @@ export class BooleanValidationComponent implements OnInit { new FormControl(this.properties.inlineEditable)); this.showDefaultValue = - this.editForm.controls['isRequired'].valueChanges.pipe( - startWith(this.properties.isRequired), map(x => !x)); + hasNoValue$(this.editForm.controls['isRequired']); } } \ 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 a6b1bda2d..fa5af2b84 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,9 +8,13 @@ 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'; +import { + DateTimeFieldPropertiesDto, + FieldDto, + hasNoValue$, + ValidatorsEx +} from '@app/shared'; @Component({ selector: 'sqx-date-time-validation', @@ -52,11 +56,9 @@ export class DateTimeValidationComponent implements OnInit { ])); this.showDefaultValues = - this.editForm.controls['isRequired'].valueChanges.pipe( - startWith(this.properties.isRequired), map(x => !x)); + hasNoValue$(this.editForm.controls['isRequired']); this.showDefaultValue = - this.editForm.controls['calculatedDefaultValue'].valueChanges.pipe( - startWith(this.properties.calculatedDefaultValue), map(x => !x)); + hasNoValue$(this.editForm.controls['calculatedDefaultValue']); } } \ 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 5a1394aaf..6a9932444 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 @@ -5,22 +5,25 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { Observable, Subscription } from 'rxjs'; -import { map, startWith } from 'rxjs/operators'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; -import { FieldDto, FloatConverter, NumberFieldPropertiesDto } from '@app/shared'; +import { + FieldDto, + FloatConverter, + NumberFieldPropertiesDto, + ResourceOwner, + value$ +} from '@app/shared'; @Component({ selector: 'sqx-number-ui', styleUrls: ['number-ui.component.scss'], templateUrl: 'number-ui.component.html' }) -export class NumberUIComponent implements OnDestroy, OnInit { - private hideAllowedValuesSubscription: Subscription; - private hideInlineEditableSubscription: Subscription; - +export class NumberUIComponent extends ResourceOwner implements OnInit { @Input() public editForm: FormGroup; @@ -35,11 +38,6 @@ export class NumberUIComponent implements OnDestroy, OnInit { public hideAllowedValues: Observable; public hideInlineEditable: Observable; - public ngOnDestroy() { - this.hideAllowedValuesSubscription.unsubscribe(); - this.hideInlineEditableSubscription.unsubscribe(); - } - public ngOnInit() { this.editForm.setControl('editor', new FormControl(this.properties.editor, [ @@ -53,25 +51,23 @@ export class NumberUIComponent implements OnDestroy, OnInit { new FormControl(this.properties.inlineEditable)); this.hideAllowedValues = - this.editForm.controls['editor'].valueChanges.pipe( - startWith(this.properties.editor), map(x => !(x && (x === 'Radio' || x === 'Dropdown')))); + value$(this.editForm.controls['editor']).pipe(map(x => !(x && (x === 'Radio' || x === 'Dropdown')))); this.hideInlineEditable = - this.editForm.controls['editor'].valueChanges.pipe( - startWith(this.properties.editor), map(x => !(x && (x === 'Input' || x === 'Dropdown')))); + value$(this.editForm.controls['editor']).pipe(map(x => !(x === 'Input' || x === 'Dropdown'))); - this.hideAllowedValuesSubscription = + this.own( this.hideAllowedValues.subscribe(isSelection => { if (isSelection) { this.editForm.controls['allowedValues'].setValue(undefined); } - }); + })); - this.hideInlineEditableSubscription = + this.own( this.hideInlineEditable.subscribe(isSelection => { if (isSelection) { this.editForm.controls['inlineEditable'].setValue(false); } - }); + })); } } \ No newline at end of file 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 489010653..082aed6f4 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,10 +8,10 @@ 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, + hasNoValue$, NumberFieldPropertiesDto, RootFieldDto, Types @@ -54,7 +54,6 @@ export class NumberValidationComponent implements OnInit { new FormControl(this.properties.defaultValue)); this.showDefaultValue = - this.editForm.controls['isRequired'].valueChanges.pipe( - startWith(this.properties.isRequired), map(x => !x)); + hasNoValue$(this.editForm.controls['isRequired']); } } \ 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 cee172769..b2af7c388 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 @@ -5,22 +5,24 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; -import { Observable, Subscription } from 'rxjs'; -import { map, startWith } from 'rxjs/operators'; +import { Observable } from 'rxjs'; +import { map } from 'rxjs/operators'; -import { FieldDto, StringFieldPropertiesDto } from '@app/shared'; +import { + FieldDto, + ResourceOwner, + StringFieldPropertiesDto, + value$ +} from '@app/shared'; @Component({ selector: 'sqx-string-ui', styleUrls: ['string-ui.component.scss'], templateUrl: 'string-ui.component.html' }) -export class StringUIComponent implements OnDestroy, OnInit { - private hideAllowedValuesSubscription: Subscription; - private hideInlineEditableSubscription: Subscription; - +export class StringUIComponent extends ResourceOwner implements OnInit { @Input() public editForm: FormGroup; @@ -33,11 +35,6 @@ export class StringUIComponent implements OnDestroy, OnInit { public hideAllowedValues: Observable; public hideInlineEditable: Observable; - public ngOnDestroy() { - this.hideAllowedValuesSubscription.unsubscribe(); - this.hideInlineEditableSubscription.unsubscribe(); - } - public ngOnInit() { this.editForm.setControl('editor', new FormControl(this.properties.editor, [ @@ -51,25 +48,23 @@ export class StringUIComponent implements OnDestroy, OnInit { new FormControl(this.properties.inlineEditable)); this.hideAllowedValues = - this.editForm.controls['editor'].valueChanges.pipe( - startWith(this.properties.editor), map(x => !(x && (x === 'Radio' || x === 'Dropdown')))); + value$(this.editForm.controls['editor']).pipe(map(x => !(x && (x === 'Radio' || x === 'Dropdown')))); this.hideInlineEditable = - this.editForm.controls['editor'].valueChanges.pipe( - startWith(this.properties.editor), map(x => !(x && (x === 'Input' || x === 'Dropdown' || x === 'Slug')))); + value$(this.editForm.controls['editor']).pipe(map(x => !(x && (x === 'Input' || x === 'Dropdown' || x === 'Slug')))); - this.hideAllowedValuesSubscription = + this.own( this.hideAllowedValues.subscribe(isSelection => { if (isSelection) { this.editForm.controls['allowedValues'].setValue(undefined); } - }); + })); - this.hideInlineEditableSubscription = + this.own( this.hideInlineEditable.subscribe(isSelection => { if (isSelection) { this.editForm.controls['inlineEditable'].setValue(false); } - }); + })); } } \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.html b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.html index b81865ed6..c1cec71ec 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-validation.component.html @@ -53,7 +53,7 @@
- + {{patternName}}
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 3f1c137a0..77cd4f192 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 @@ -5,16 +5,17 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { FormControl, FormGroup } from '@angular/forms'; -import { Observable, Subscription } from 'rxjs'; -import { map, startWith } from 'rxjs/operators'; +import { Observable } from 'rxjs'; import { AppPatternDto, FieldDto, + hasNoValue$, ImmutableArray, ModalModel, + ResourceOwner, RootFieldDto, StringFieldPropertiesDto, Types @@ -25,9 +26,7 @@ import { styleUrls: ['string-validation.component.scss'], templateUrl: 'string-validation.component.html' }) -export class StringValidationComponent implements OnDestroy, OnInit { - private patternSubscription: Subscription; - +export class StringValidationComponent extends ResourceOwner implements OnInit { @Input() public editForm: FormGroup; @@ -49,10 +48,6 @@ export class StringValidationComponent implements OnDestroy, OnInit { public showUnique: boolean; - public ngOnDestroy() { - this.patternSubscription.unsubscribe(); - } - public ngOnInit() { this.showUnique = Types.is(this.field, RootFieldDto) && !this.field.isLocalizable; @@ -77,24 +72,23 @@ export class StringValidationComponent implements OnDestroy, OnInit { new FormControl(this.properties.defaultValue)); this.showDefaultValue = - this.editForm.controls['isRequired'].valueChanges.pipe( - startWith(this.properties.isRequired), map(x => !x)); + hasNoValue$(this.editForm.controls['isRequired']); this.showPatternSuggestions = - this.editForm.controls['pattern'].valueChanges.pipe( - startWith(''), map(x => !x || x.trim().length === 0)); + hasNoValue$(this.editForm.controls['pattern']); this.showPatternMessage = this.editForm.controls['pattern'].value && this.editForm.controls['pattern'].value.trim().length > 0; - this.patternSubscription = + this.own( this.editForm.controls['pattern'].valueChanges .subscribe((value: string) => { if (!value || value.length === 0) { this.editForm.controls['patternMessage'].setValue(undefined); } + this.setPatternName(); - }); + })); this.setPatternName(); } diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html index f13edf18f..d3ee7d5b5 100644 --- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html +++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html @@ -9,7 +9,7 @@ - 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 6b212f8b5..cf0ac2093 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 @@ -5,10 +5,9 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, 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 { @@ -16,6 +15,7 @@ import { CreateCategoryForm, DialogModel, MessageBus, + ResourceOwner, SchemaDto, SchemasState } from '@app/shared'; @@ -27,9 +27,7 @@ import { SchemaCloning } from './../messages'; styleUrls: ['./schemas-page.component.scss'], templateUrl: './schemas-page.component.html' }) -export class SchemasPageComponent implements OnDestroy, OnInit { - private schemaCloningSubscription: Subscription; - +export class SchemasPageComponent extends ResourceOwner implements OnInit { public addSchemaDialog = new DialogModel(); public addCategoryForm = new CreateCategoryForm(this.formBuilder); @@ -45,27 +43,25 @@ export class SchemasPageComponent implements OnDestroy, OnInit { private readonly route: ActivatedRoute, private readonly router: Router ) { - } - - public ngOnDestroy() { - this.schemaCloningSubscription.unsubscribe(); + super(); } public ngOnInit() { - this.schemaCloningSubscription = + this.own( this.messageBus.of(SchemaCloning) .subscribe(m => { this.import = m.schema; this.addSchemaDialog.show(); - }); - - this.route.params.pipe(map(q => q['showDialog'])) - .subscribe(showDialog => { - if (showDialog) { - this.addSchemaDialog.show(); - } - }); + })); + + this.own( + this.route.params.pipe(map(q => q['showDialog'])) + .subscribe(showDialog => { + if (showDialog) { + this.addSchemaDialog.show(); + } + })); this.schemasState.load().pipe(onErrorResumeNext()).subscribe(); } diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html index 7e9ef4470..5906e2444 100644 --- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html +++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html @@ -6,13 +6,13 @@ - - @@ -27,7 +27,7 @@
No backups created yet. -
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 b2ef916a0..281c4f9e6 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 @@ -5,14 +5,15 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnDestroy, OnInit } from '@angular/core'; -import { Subscription, timer } from 'rxjs'; +import { Component, OnInit } from '@angular/core'; +import { timer } from 'rxjs'; import { onErrorResumeNext, switchMap } from 'rxjs/operators'; import { AppsState, BackupDto, - BackupsState + BackupsState, + ResourceOwner } from '@app/shared'; @Component({ @@ -20,25 +21,20 @@ import { styleUrls: ['./backups-page.component.scss'], templateUrl: './backups-page.component.html' }) -export class BackupsPageComponent implements OnInit, OnDestroy { - private timerSubscription: Subscription; - +export class BackupsPageComponent extends ResourceOwner implements OnInit { constructor( public readonly appsState: AppsState, public readonly backupsState: BackupsState ) { - } - - public ngOnDestroy() { - this.timerSubscription.unsubscribe(); + super(); } public ngOnInit() { this.backupsState.load().pipe(onErrorResumeNext()).subscribe(); - this.timerSubscription = - timer(3000, 3000).pipe(switchMap(t => this.backupsState.load(true, true).pipe(onErrorResumeNext()))) - .subscribe(); + this.own( + timer(3000, 3000).pipe(switchMap(() => this.backupsState.load(true, true).pipe(onErrorResumeNext()))) + .subscribe()); } public reload() { diff --git a/src/Squidex/app/features/settings/pages/clients/client.component.html b/src/Squidex/app/features/settings/pages/clients/client.component.html index 8d0ac010c..748772511 100644 --- a/src/Squidex/app/features/settings/pages/clients/client.component.html +++ b/src/Squidex/app/features/settings/pages/clients/client.component.html @@ -11,7 +11,7 @@ - @@ -25,7 +25,7 @@
- +
diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html index 4fcace09b..f4f9a428c 100644 --- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html +++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html @@ -6,7 +6,7 @@ - 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 fddd713e5..b540f1b75 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,7 +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 { onErrorResumeNext, withLatestFrom } from 'rxjs/operators'; import { AppContributorDto, @@ -34,7 +34,7 @@ export class UsersDataSource implements AutocompleteSource { public find(query: string): Observable { return this.usersService.getUsers(query).pipe( - withLatestFrom(this.contributorsState.contributors.pipe(filter(x => !!x)), (users, contributors) => { + withLatestFrom(this.contributorsState.contributors, (users, contributors) => { const results: any[] = []; for (let user of users) { diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.html b/src/Squidex/app/features/settings/pages/languages/languages-page.component.html index d7d9981e9..25d942fc8 100644 --- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.html +++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.html @@ -6,7 +6,7 @@ - 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 179323835..31634d509 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 @@ -5,16 +5,16 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { FormBuilder } from '@angular/forms'; -import { Subscription } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { AddLanguageForm, AppLanguageDto, AppsState, - LanguagesState + LanguagesState, + ResourceOwner } from '@app/shared'; @Component({ @@ -22,9 +22,7 @@ import { styleUrls: ['./languages-page.component.scss'], templateUrl: './languages-page.component.html' }) -export class LanguagesPageComponent implements OnDestroy, OnInit { - private newLanguagesSubscription: Subscription; - +export class LanguagesPageComponent extends ResourceOwner implements OnInit { public addLanguageForm = new AddLanguageForm(this.formBuilder); constructor( @@ -32,20 +30,17 @@ export class LanguagesPageComponent implements OnDestroy, OnInit { public readonly languagesState: LanguagesState, private readonly formBuilder: FormBuilder ) { - } - - public ngOnDestroy() { - this.newLanguagesSubscription.unsubscribe(); + super(); } public ngOnInit() { - this.newLanguagesSubscription = + this.own( this.languagesState.newLanguages .subscribe(languages => { if (languages.length > 0) { this.addLanguageForm.load({ language: languages.at(0) }); } - }); + })); this.languagesState.load().pipe(onErrorResumeNext()).subscribe(); } @@ -67,7 +62,7 @@ export class LanguagesPageComponent implements OnDestroy, OnInit { } } - public trackByLanguage(index: number, language: { language: AppLanguageDto }) { + public trackByLanguage(language: { language: AppLanguageDto }) { return language.language; } } diff --git a/src/Squidex/app/features/settings/pages/more/more-page.component.html b/src/Squidex/app/features/settings/pages/more/more-page.component.html index 43a4fb990..64ff6c060 100644 --- a/src/Squidex/app/features/settings/pages/more/more-page.component.html +++ b/src/Squidex/app/features/settings/pages/more/more-page.component.html @@ -17,7 +17,7 @@
Once you archive an app, there is no going back. Please be certain.
- diff --git a/src/Squidex/app/features/settings/pages/plans/plans-page.component.html b/src/Squidex/app/features/settings/pages/plans/plans-page.component.html index 34f456c26..c4849ea5f 100644 --- a/src/Squidex/app/features/settings/pages/plans/plans-page.component.html +++ b/src/Squidex/app/features/settings/pages/plans/plans-page.component.html @@ -6,7 +6,7 @@ - diff --git a/src/Squidex/app/features/settings/pages/roles/roles-page.component.html b/src/Squidex/app/features/settings/pages/roles/roles-page.component.html index 1a0e1a884..1d44a7fd6 100644 --- a/src/Squidex/app/features/settings/pages/roles/roles-page.component.html +++ b/src/Squidex/app/features/settings/pages/roles/roles-page.component.html @@ -6,7 +6,7 @@ - diff --git a/src/Squidex/app/framework/angular/code.component.ts b/src/Squidex/app/framework/angular/code.component.ts index ec02060f5..f78d5b637 100644 --- a/src/Squidex/app/framework/angular/code.component.ts +++ b/src/Squidex/app/framework/angular/code.component.ts @@ -13,5 +13,4 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; templateUrl: './code.component.html', changeDetection: ChangeDetectionStrategy.OnPush }) -export class CodeComponent { -} \ No newline at end of file +export class CodeComponent { } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/autocomplete.component.html b/src/Squidex/app/framework/angular/forms/autocomplete.component.html index 882956d72..ea2df131d 100644 --- a/src/Squidex/app/framework/angular/forms/autocomplete.component.html +++ b/src/Squidex/app/framework/angular/forms/autocomplete.component.html @@ -5,13 +5,13 @@ autocorrect="off" autocapitalize="off"> -
-
+
+ [sqxScrollActive]="i === snapshot.suggestedIndex"> {{item}} diff --git a/src/Squidex/app/framework/angular/forms/autocomplete.component.ts b/src/Squidex/app/framework/angular/forms/autocomplete.component.ts index 164f74ec3..147199400 100644 --- a/src/Squidex/app/framework/angular/forms/autocomplete.component.ts +++ b/src/Squidex/app/framework/angular/forms/autocomplete.component.ts @@ -5,11 +5,13 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, Component, ContentChild, ElementRef, forwardRef, Input, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/core'; -import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Observable, of, Subscription } from 'rxjs'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ContentChild, ElementRef, forwardRef, Input, OnInit, TemplateRef, ViewChild } from '@angular/core'; +import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { Observable, of } from 'rxjs'; import { catchError, debounceTime, distinctUntilChanged, filter, map, switchMap, tap } from 'rxjs/operators'; +import { StatefulControlComponent } from '@app/framework/internal'; + export interface AutocompleteSource { find(query: string): Observable; } @@ -23,6 +25,11 @@ export const SQX_AUTOCOMPLETE_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => AutocompleteComponent), multi: true }; +interface State { + suggestedItems: any[]; + suggestedIndex: number; +} + @Component({ selector: 'sqx-autocomplete', styleUrls: ['./autocomplete.component.scss'], @@ -30,11 +37,7 @@ export const SQX_AUTOCOMPLETE_CONTROL_VALUE_ACCESSOR: any = { providers: [SQX_AUTOCOMPLETE_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, OnInit { - private subscription: Subscription; - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; - +export class AutocompleteComponent extends StatefulControlComponent implements OnInit { @Input() public source: AutocompleteSource; @@ -53,17 +56,17 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O @ViewChild('input') public inputControl: ElementRef; - public suggestedItems: any[] = []; - public suggestedIndex = -1; - public queryInput = new FormControl(); - public ngOnDestroy() { - this.subscription.unsubscribe(); + constructor(changeDetector: ChangeDetectorRef) { + super(changeDetector, { + suggestedItems: [], + suggestedIndex: -1 + }); } public ngOnInit() { - this.subscription = + this.own( this.queryInput.valueChanges.pipe( tap(query => { this.callChange(query); @@ -80,9 +83,12 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O filter(query => !!query && !!this.source), switchMap(query => this.source.find(query)), catchError(() => of([]))) .subscribe(items => { - this.suggestedIndex = -1; - this.suggestedItems = items || []; - }); + this.next(s => ({ + ...s, + suggestedIndex: -1, + suggestedItems: items || [] + })); + })); } public onKeyDown(event: KeyboardEvent) { @@ -98,7 +104,7 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O this.reset(); return false; case KEY_ENTER: - if (this.suggestedItems.length > 0 && this.selectItem()) { + if (this.snapshot.suggestedItems.length > 0 && this.selectItem()) { return false; } break; @@ -149,11 +155,11 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O public selectItem(selection: any | null = null): boolean { if (!selection) { - selection = this.suggestedItems[this.suggestedIndex]; + selection = this.snapshot.suggestedItems[this.snapshot.suggestedIndex]; } - if (!selection && this.suggestedItems.length === 1) { - selection = this.suggestedItems[0]; + if (!selection && this.snapshot.suggestedItems.length === 1) { + selection = this.snapshot.suggestedItems[0]; } if (selection) { @@ -174,24 +180,24 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O return false; } - public selectIndex(selection: number) { - if (selection < 0) { - selection = 0; + public selectIndex(suggestedIndex: number) { + if (suggestedIndex < 0) { + suggestedIndex = 0; } - if (selection >= this.suggestedItems.length) { - selection = this.suggestedItems.length - 1; + if (suggestedIndex >= this.snapshot.suggestedItems.length) { + suggestedIndex = this.snapshot.suggestedItems.length - 1; } - this.suggestedIndex = selection; + this.next(s => ({ ...s, suggestedIndex })); } private up() { - this.selectIndex(this.suggestedIndex - 1); + this.selectIndex(this.snapshot.suggestedIndex - 1); } private down() { - this.selectIndex(this.suggestedIndex + 1); + this.selectIndex(this.snapshot.suggestedIndex + 1); } private resetForm() { @@ -199,7 +205,10 @@ export class AutocompleteComponent implements ControlValueAccessor, OnDestroy, O } private reset() { - this.suggestedItems = []; - this.suggestedIndex = -1; + this.next(s => ({ + ...s, + suggestedItems: [], + suggestedIndex: -1 + })); } } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/checkbox-group.component.html b/src/Squidex/app/framework/angular/forms/checkbox-group.component.html index 0f2a18bc1..f3245e6f2 100644 --- a/src/Squidex/app/framework/angular/forms/checkbox-group.component.html +++ b/src/Squidex/app/framework/angular/forms/checkbox-group.component.html @@ -1,9 +1,9 @@ - + [disabled]="snapshot.isDisabled"> - + \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/checkbox-group.component.ts b/src/Squidex/app/framework/angular/forms/checkbox-group.component.ts index 34c311056..d34486b19 100644 --- a/src/Squidex/app/framework/angular/forms/checkbox-group.component.ts +++ b/src/Squidex/app/framework/angular/forms/checkbox-group.component.ts @@ -6,16 +6,22 @@ */ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Types } from '@app/framework/internal'; - -import { MathHelper } from '../../utils/math-helper'; +import { + MathHelper, + StatefulControlComponent, + Types +} from '@app/framework/internal'; export const SQX_CHECKBOX_GROUP_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => CheckboxGroupComponent), multi: true }; +interface State { + checkedValues: string[]; +} + @Component({ selector: 'sqx-checkbox-group', styleUrls: ['./checkbox-group.component.scss'], @@ -23,58 +29,39 @@ export const SQX_CHECKBOX_GROUP_CONTROL_VALUE_ACCESSOR: any = { providers: [SQX_CHECKBOX_GROUP_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class CheckboxGroupComponent implements ControlValueAccessor { - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; - private checkedValues: string[] = []; +export class CheckboxGroupComponent extends StatefulControlComponent { + public readonly controlId = MathHelper.guid(); @Input() public values: string[] = []; - public isDisabled = false; - - public control = MathHelper.guid(); - - constructor( - private readonly changeDetector: ChangeDetectorRef - ) { + constructor(changeDetector: ChangeDetectorRef) { + super(changeDetector, { + checkedValues: [] + }); } public writeValue(obj: any) { - this.checkedValues = Types.isArrayOfString(obj) ? obj.filter(x => this.values.indexOf(x) >= 0) : []; - - this.changeDetector.markForCheck(); - } - - public setDisabledState(isDisabled: boolean): void { - this.isDisabled = isDisabled; + const checkedValues = Types.isArrayOfString(obj) ? obj.filter(x => this.values.indexOf(x) >= 0) : []; - this.changeDetector.markForCheck(); - } - - public registerOnChange(fn: any) { - this.callChange = fn; - } - - public registerOnTouched(fn: any) { - this.callTouched = fn; - } - - public blur() { - this.callTouched(); + this.next(s => ({ ...s, checkedValues })); } public check(isChecked: boolean, value: string) { + let checkedValues = this.snapshot.checkedValues; + if (isChecked) { - this.checkedValues = [value, ...this.checkedValues]; + checkedValues = [value, ...checkedValues]; } else { - this.checkedValues = this.checkedValues.filter(x => x !== value); + checkedValues = checkedValues.filter(x => x !== value); } - this.callChange(this.checkedValues); + this.next(s => ({ ...s, checkedValues })); + + this.callChange(checkedValues); } public isChecked(value: string) { - return this.checkedValues.indexOf(value) >= 0; + return this.snapshot.checkedValues.indexOf(value) >= 0; } } diff --git a/src/Squidex/app/framework/angular/forms/code-editor.component.ts b/src/Squidex/app/framework/angular/forms/code-editor.component.ts index fd7cf17ec..6d99cdef0 100644 --- a/src/Squidex/app/framework/angular/forms/code-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/code-editor.component.ts @@ -5,12 +5,16 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, forwardRef, Input, ViewChild } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, Input, ViewChild } from '@angular/core'; +import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; -import { ResourceLoaderService, Types } from '@app/framework/internal'; +import { + ExternalControlComponent, + ResourceLoaderService, + Types +} from '@app/framework/internal'; declare var ace: any; @@ -25,9 +29,7 @@ export const SQX_JSCRIPT_EDITOR_CONTROL_VALUE_ACCESSOR: any = { providers: [SQX_JSCRIPT_EDITOR_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class CodeEditorComponent implements ControlValueAccessor, AfterViewInit { - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; +export class CodeEditorComponent extends ExternalControlComponent implements AfterViewInit { private valueChanged = new Subject(); private aceEditor: any; private value: string; @@ -39,9 +41,10 @@ export class CodeEditorComponent implements ControlValueAccessor, AfterViewInit @Input() public mode = 'ace/mode/javascript'; - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly resourceLoader: ResourceLoaderService ) { + super(changeDetector); } public writeValue(obj: any) { @@ -60,14 +63,6 @@ export class CodeEditorComponent implements ControlValueAccessor, AfterViewInit } } - public registerOnChange(fn: any) { - this.callChange = fn; - } - - public registerOnTouched(fn: any) { - this.callTouched = fn; - } - public ngAfterViewInit() { this.valueChanged.pipe( debounceTime(500)) diff --git a/src/Squidex/app/framework/angular/forms/control-errors.component.html b/src/Squidex/app/framework/angular/forms/control-errors.component.html index 5cab06ca2..3626cf842 100644 --- a/src/Squidex/app/framework/angular/forms/control-errors.component.html +++ b/src/Squidex/app/framework/angular/forms/control-errors.component.html @@ -1,6 +1,6 @@ -
+
- + {{message}}
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 673975dfc..3a347ad06 100644 --- a/src/Squidex/app/framework/angular/forms/control-errors.component.ts +++ b/src/Squidex/app/framework/angular/forms/control-errors.component.ts @@ -7,12 +7,20 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Host, Input, OnChanges, OnDestroy, Optional } from '@angular/core'; import { AbstractControl, FormGroupDirective } from '@angular/forms'; -import { merge, Subscription } from 'rxjs'; +import { merge } from 'rxjs'; -import { fadeAnimation, Types } from '@app/framework/internal'; +import { + fadeAnimation, + StatefulComponent, + Types +} from '@app/framework/internal'; import { formatError } from './error-formatting'; +interface State { + errorMessages: string[]; +} + @Component({ selector: 'sqx-control-errors', styleUrls: ['./control-errors.component.scss'], @@ -22,10 +30,9 @@ import { formatError } from './error-formatting'; ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class ControlErrorsComponent implements OnChanges, OnDestroy { +export class ControlErrorsComponent extends StatefulComponent implements OnChanges, OnDestroy { private displayFieldName: string; private control: AbstractControl; - private controlSubscription: Subscription | null = null; private originalMarkAsTouched: any; @Input() @@ -43,16 +50,20 @@ export class ControlErrorsComponent implements OnChanges, OnDestroy { @Input() public submitOnly = false; - public errorMessages: string[] = []; - - constructor( - @Optional() @Host() private readonly formGroupDirective: FormGroupDirective, - private readonly changeDetector: ChangeDetectorRef + constructor(changeDetector: ChangeDetectorRef, + @Optional() @Host() private readonly formGroupDirective: FormGroupDirective ) { + super(changeDetector, { + errorMessages: [] + }); } public ngOnDestroy() { - this.unsubscribe(); + super.ngOnDestroy(); + + if (this.control && this.originalMarkAsTouched) { + this.control['markAsTouched'] = this.originalMarkAsTouched; + } } public ngOnChanges() { @@ -75,16 +86,16 @@ export class ControlErrorsComponent implements OnChanges, OnDestroy { } if (this.control !== control) { - this.unsubscribe(); + this.ngOnDestroy(); this.control = control; if (control) { - this.controlSubscription = + this.own( merge(control.valueChanges, control.statusChanges) .subscribe(() => { this.createMessages(); - }); + })); this.originalMarkAsTouched = this.control.markAsTouched; @@ -101,16 +112,6 @@ export class ControlErrorsComponent implements OnChanges, OnDestroy { this.createMessages(); } - private unsubscribe() { - if (this.controlSubscription) { - this.controlSubscription.unsubscribe(); - } - - if (this.control && this.originalMarkAsTouched) { - this.control['markAsTouched'] = this.originalMarkAsTouched; - } - } - private createMessages() { const errors: string[] = []; @@ -126,8 +127,8 @@ export class ControlErrorsComponent implements OnChanges, OnDestroy { } } - this.errorMessages = errors; - - this.changeDetector.markForCheck(); + if (errors.length !== this.snapshot.errorMessages.length || errors.length > 0) { + this.next(s => ({ ...s, errorMessages: errors })); + } } } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/date-time-editor.component.html b/src/Squidex/app/framework/angular/forms/date-time-editor.component.html index 730e2f679..8d17ff0b8 100644 --- a/src/Squidex/app/framework/angular/forms/date-time-editor.component.html +++ b/src/Squidex/app/framework/angular/forms/date-time-editor.component.html @@ -1,19 +1,19 @@
- +
- +
- +
- +
- +
diff --git a/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts b/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts index eee5c1890..3508ee929 100644 --- a/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/date-time-editor.component.ts @@ -5,12 +5,11 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, Input, OnInit, ViewChild } from '@angular/core'; +import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms'; import * as moment from 'moment'; -import { Subscription } from 'rxjs'; -import { Types } from '@app/framework/internal'; +import { StatefulControlComponent, Types } from '@app/framework/internal'; declare module 'pikaday/pikaday'; @@ -27,15 +26,11 @@ export const SQX_DATE_TIME_EDITOR_CONTROL_VALUE_ACCESSOR: any = { providers: [SQX_DATE_TIME_EDITOR_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, OnInit, AfterViewInit { - private timeSubscription: Subscription; - private dateSubscription: Subscription; +export class DateTimeEditorComponent extends StatefulControlComponent<{}, string | null> implements OnInit, AfterViewInit { private picker: any; private timeValue: any | null = null; private dateValue: any | null = null; private suppressEvents = false; - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; @Input() public mode: string; @@ -49,8 +44,6 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, @ViewChild('dateInput') public dateInput: ElementRef; - public isDisabled = false; - public timeControl = new FormControl(); public dateControl = new FormControl(); @@ -62,18 +55,12 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, return !!this.dateValue; } - constructor( - private readonly changeDetector: ChangeDetectorRef - ) { - } - - public ngOnDestroy() { - this.dateSubscription.unsubscribe(); - this.timeSubscription.unsubscribe(); + constructor(changeDetector: ChangeDetectorRef) { + super(changeDetector, {}); } public ngOnInit() { - this.timeSubscription = + this.own( this.timeControl.valueChanges.subscribe(value => { if (!value || value.length === 0) { this.timeValue = null; @@ -82,9 +69,9 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, } this.updateValue(); - }); + })); - this.dateSubscription = + this.own( this.dateControl.valueChanges.subscribe(value => { if (!value || value.length === 0) { this.dateValue = null; @@ -93,7 +80,7 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, } this.updateValue(); - }); + })); } public writeValue(obj: any) { @@ -114,7 +101,7 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, } public setDisabledState(isDisabled: boolean): void { - this.isDisabled = isDisabled; + super.setDisabledState(isDisabled); if (isDisabled) { this.dateControl.disable({ emitEvent: false }); @@ -123,8 +110,6 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, this.dateControl.enable({ emitEvent: false }); this.timeControl.enable({ emitEvent: false }); } - - this.changeDetector.markForCheck(); } public registerOnChange(fn: any) { @@ -144,25 +129,19 @@ export class DateTimeEditorComponent implements ControlValueAccessor, OnDestroy, this.dateValue = this.picker.getMoment(); this.updateValue(); - this.touched(); - - this.changeDetector.markForCheck(); + this.callTouched(); } }); this.updateControls(); } - public touched() { - this.callTouched(); - } - public writeNow() { this.writeValue(new Date().toUTCString()); this.updateControls(); this.updateValue(); - this.touched(); + this.callTouched(); return false; } diff --git a/src/Squidex/app/framework/angular/forms/file-drop.directive.ts b/src/Squidex/app/framework/angular/forms/file-drop.directive.ts index 30bbcff60..52968da94 100644 --- a/src/Squidex/app/framework/angular/forms/file-drop.directive.ts +++ b/src/Squidex/app/framework/angular/forms/file-drop.directive.ts @@ -30,6 +30,9 @@ export class FileDropDirective { @Input() public onlyImages: boolean; + @Input() + public noDrop: boolean; + @Output('sqxFileDrop') public drop = new EventEmitter(); @@ -41,6 +44,10 @@ export class FileDropDirective { @HostListener('paste', ['$event']) public onPaste(event: ClipboardEvent) { + if (this.noDrop) { + return; + } + const result: File[] = []; for (let i = 0; i < event.clipboardData.items.length; i++) { diff --git a/src/Squidex/app/framework/angular/forms/forms-helper.ts b/src/Squidex/app/framework/angular/forms/forms-helper.ts index d38f8125e..8597769a2 100644 --- a/src/Squidex/app/framework/angular/forms/forms-helper.ts +++ b/src/Squidex/app/framework/angular/forms/forms-helper.ts @@ -6,10 +6,12 @@ */ import { AbstractControl, FormArray, FormGroup } from '@angular/forms'; + import { Observable } from 'rxjs'; + import { map, startWith } from 'rxjs/operators'; import { Types } from '@app/framework/internal'; -export const formControls = (form: AbstractControl): AbstractControl[] => { +export function formControls(form: AbstractControl): AbstractControl[] { if (Types.is(form, FormGroup)) { return Object.values(form.controls); } else if (Types.is(form, FormArray)) { @@ -17,9 +19,25 @@ export const formControls = (form: AbstractControl): AbstractControl[] => { } else { return []; } -}; +} -export const fullValue = (form: AbstractControl): any => { +export function invalid$(form: AbstractControl): Observable { + return form.statusChanges.pipe(map(_ => form.invalid), startWith(form.invalid)); +} + +export function value$(form: AbstractControl): Observable { + return form.valueChanges.pipe(startWith(form.value)); +} + +export function hasValue$(form: AbstractControl): Observable { + return value$(form).pipe(map(v => !!v)); +} + +export function hasNoValue$(form: AbstractControl): Observable { + return value$(form).pipe(map(v => !v)); +} + +export function fullValue(form: AbstractControl): any { if (Types.is(form, FormGroup)) { const groupValue = {}; @@ -41,4 +59,4 @@ export const fullValue = (form: AbstractControl): any => { } else { return form.value; } -}; \ No newline at end of file +} \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/iframe-editor.component.ts b/src/Squidex/app/framework/angular/forms/iframe-editor.component.ts index 528eb663b..0a19695d5 100644 --- a/src/Squidex/app/framework/angular/forms/iframe-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/iframe-editor.component.ts @@ -5,11 +5,11 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, forwardRef, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, Input, OnInit, Renderer2, ViewChild } from '@angular/core'; +import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser'; -import { Types } from '@app/framework/internal'; +import { ExternalControlComponent, Types } from '@app/framework/internal'; export const SQX_IFRAME_EDITOR_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => IFrameEditorComponent), multi: true @@ -22,10 +22,7 @@ export const SQX_IFRAME_EDITOR_CONTROL_VALUE_ACCESSOR: any = { providers: [SQX_IFRAME_EDITOR_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class IFrameEditorComponent implements ControlValueAccessor, AfterViewInit, OnInit, OnDestroy { - private windowMessageListener: Function; - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; +export class IFrameEditorComponent extends ExternalControlComponent implements AfterViewInit, OnInit { private value: any; private isDisabled = false; private isInitialized = false; @@ -41,14 +38,11 @@ export class IFrameEditorComponent implements ControlValueAccessor, AfterViewIni public sanitizedUrl: SafeResourceUrl; - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly sanitizer: DomSanitizer, private readonly renderer: Renderer2 ) { - } - - public ngOnDestroy() { - this.windowMessageListener(); + super(changeDetector); } public ngAfterViewInit() { @@ -56,7 +50,7 @@ export class IFrameEditorComponent implements ControlValueAccessor, AfterViewIni } public ngOnInit(): void { - this.windowMessageListener = + this.own( this.renderer.listen('window', 'message', (event: MessageEvent) => { if (event.source === this.plugin.contentWindow) { const { type } = event.data; @@ -84,7 +78,7 @@ export class IFrameEditorComponent implements ControlValueAccessor, AfterViewIni this.callTouched(); } } - }); + })); } public writeValue(obj: any) { @@ -102,12 +96,4 @@ export class IFrameEditorComponent implements ControlValueAccessor, AfterViewIni this.plugin.contentWindow.postMessage({ type: 'disabled', isDisabled: this.isDisabled }, '*'); } } - - public registerOnChange(fn: any) { - this.callChange = fn; - } - - public registerOnTouched(fn: any) { - this.callTouched = fn; - } } \ No newline at end of file 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 35f84d0b5..e2baa6854 100644 --- a/src/Squidex/app/framework/angular/forms/json-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/json-editor.component.ts @@ -5,12 +5,12 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, forwardRef, ViewChild } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, ViewChild } from '@angular/core'; +import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { Subject } from 'rxjs'; import { debounceTime } from 'rxjs/operators'; -import { ResourceLoaderService } from '@app/framework/internal'; +import { ExternalControlComponent, ResourceLoaderService } from '@app/framework/internal'; declare var ace: any; @@ -25,9 +25,7 @@ export const SQX_JSON_EDITOR_CONTROL_VALUE_ACCESSOR: any = { providers: [SQX_JSON_EDITOR_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class JsonEditorComponent implements ControlValueAccessor, AfterViewInit { - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; +export class JsonEditorComponent extends ExternalControlComponent implements AfterViewInit { private valueChanged = new Subject(); private aceEditor: any; private value: any; @@ -35,11 +33,14 @@ export class JsonEditorComponent implements ControlValueAccessor, AfterViewInit private isDisabled = false; @ViewChild('editor') - public editor: ElementRef; + public editor: ElementRef; - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly resourceLoader: ResourceLoaderService ) { + super(changeDetector); + + changeDetector.detach(); } public writeValue(obj: any) { @@ -64,14 +65,6 @@ export class JsonEditorComponent implements ControlValueAccessor, AfterViewInit } } - public registerOnChange(fn: any) { - this.callChange = fn; - } - - public registerOnTouched(fn: any) { - this.callTouched = fn; - } - public ngAfterViewInit() { this.valueChanged.pipe( debounceTime(500)) diff --git a/src/Squidex/app/framework/angular/forms/progress-bar.component.ts b/src/Squidex/app/framework/angular/forms/progress-bar.component.ts index a5f300c0f..4a4d99649 100644 --- a/src/Squidex/app/framework/angular/forms/progress-bar.component.ts +++ b/src/Squidex/app/framework/angular/forms/progress-bar.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, Component, ElementRef, Input, OnChanges, OnInit, Renderer2, SimpleChanges } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Input, OnChanges, OnInit, Renderer2, SimpleChanges } from '@angular/core'; import * as ProgressBar from 'progressbar.js'; @@ -38,10 +38,11 @@ export class ProgressBarComponent implements OnChanges, OnInit { @Input() public value = 0; - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly element: ElementRef, private readonly renderer: Renderer2 ) { + changeDetector.detach(); } public ngOnInit() { diff --git a/src/Squidex/app/framework/angular/forms/slider.component.html b/src/Squidex/app/framework/angular/forms/slider.component.html deleted file mode 100644 index ab37c52ff..000000000 --- a/src/Squidex/app/framework/angular/forms/slider.component.html +++ /dev/null @@ -1,3 +0,0 @@ -
-
-
\ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/slider.component.scss b/src/Squidex/app/framework/angular/forms/slider.component.scss deleted file mode 100644 index da277a647..000000000 --- a/src/Squidex/app/framework/angular/forms/slider.component.scss +++ /dev/null @@ -1,51 +0,0 @@ -@import '_mixins'; -@import '_vars'; - -$bar-height: .8rem; - -$thumb-size: 1.25rem; -$thumb-margin: ($thumb-size - $bar-height) * .5; - -.slider { - &-bar { - & { - @include border-radius($bar-height * .5); - position: relative; - border: 1px solid $color-input-border; - margin-bottom: 1.25rem; - margin-top: .25rem; - margin-right: $thumb-size * .5; - background: $color-dark-foreground; - height: $bar-height; - } - - &.disabled { - background: lighten($color-border, 5%); - } - } - - &-thumb { - & { - @include border-radius($thumb-size * .5); - position: absolute; - width: $thumb-size; - height: $thumb-size; - border: 1px solid $color-input-border; - background: $color-dark-foreground; - margin-top: -$thumb-margin; - margin-left: -$thumb-size * .5; - } - - &.disabled { - background: lighten($color-border, 5%); - } - - &.focused { - border-color: $color-theme-blue; - } - } -} - -.disabled { - pointer-events: none; -} \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/slider.component.ts b/src/Squidex/app/framework/angular/forms/slider.component.ts deleted file mode 100644 index 2dcb73854..000000000 --- a/src/Squidex/app/framework/angular/forms/slider.component.ts +++ /dev/null @@ -1,196 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, Input, Renderer2, ViewChild } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; - -import { Types } from '@app/framework/internal'; - -export const SQX_SLIDER_CONTROL_VALUE_ACCESSOR: any = { - provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => SliderComponent), multi: true -}; - -@Component({ - selector: 'sqx-slider', - styleUrls: ['./slider.component.scss'], - templateUrl: './slider.component.html', - providers: [SQX_SLIDER_CONTROL_VALUE_ACCESSOR], - changeDetection: ChangeDetectionStrategy.OnPush -}) -export class SliderComponent implements ControlValueAccessor { - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; - private windowMouseMoveListener: Function | null = null; - private windowMouseUpListener: Function | null = null; - private centerStartOffset = 0; - private lastValue: number; - private value: number; - private isDragging = false; - - @ViewChild('bar') - public bar: ElementRef; - - @ViewChild('thumb') - public thumb: ElementRef; - - @Input() - public min = 0; - - @Input() - public max = 100; - - @Input() - public step = 1; - - public isDisabled = false; - - constructor( - private readonly changeDetector: ChangeDetectorRef, - private readonly renderer: Renderer2 - ) { - } - - public writeValue(obj: any) { - this.lastValue = this.value = Types.isNumber(obj) ? obj : 0; - - this.updateThumbPosition(); - - this.changeDetector.markForCheck(); - } - - public setDisabledState(isDisabled: boolean): void { - this.isDisabled = isDisabled; - - this.changeDetector.markForCheck(); - } - - public registerOnChange(fn: any) { - this.callChange = fn; - } - - public registerOnTouched(fn: any) { - this.callTouched = fn; - } - - public onBarMouseClick(event: MouseEvent): boolean { - if (this.windowMouseMoveListener) { - return true; - } - - const relativeValue = this.getRelativeX(event); - - this.value = Math.round((relativeValue * (this.max - this.min) + this.min) / this.step) * this.step; - - this.updateThumbPosition(); - this.updateTouched(); - this.updateValue(); - - return false; - } - - public onThumbMouseDown(event: MouseEvent): boolean { - this.centerStartOffset = event.offsetX - this.thumb.nativeElement.clientWidth * 0.5; - - this.windowMouseMoveListener = - this.renderer.listen('window', 'mousemove', (e: MouseEvent) => { - this.onMouseMove(e); - }); - - this.windowMouseUpListener = - this.renderer.listen('window', 'mouseup', () => { - this.onMouseUp(); - }); - - this.renderer.addClass(this.thumb.nativeElement, 'focused'); - - this.isDragging = true; - - return false; - } - - private onMouseMove(event: MouseEvent): boolean { - if (!this.isDragging) { - return true; - } - - const relativeValue = this.getRelativeX(event); - - this.value = Math.round((relativeValue * (this.max - this.min) + this.min) / this.step) * this.step; - - this.updateThumbPosition(); - this.updateTouched(); - - return false; - } - - private onMouseUp(): boolean { - this.updateValue(); - - setTimeout(() => { - this.releaseMouseHandlers(); - this.renderer.removeClass(this.thumb.nativeElement, 'focused'); - }, 10); - - this.centerStartOffset = 0; - - this.isDragging = false; - - return false; - } - - private getRelativeX(event: MouseEvent): number { - const parentOffsetX = this.getParentX(event, this.bar.nativeElement) - this.centerStartOffset; - const parentWidth = this.bar.nativeElement.clientWidth; - - const relativeValue = Math.min(1, Math.max(0, (parentOffsetX - this.centerStartOffset) / parentWidth)); - - return relativeValue; - } - - private getParentX(e: any, container: any): number { - const rect = container.getBoundingClientRect(); - - const x = - !!e.touches ? - e.touches[0].pageX : - e.pageX; - - return x - rect.left; - } - - private updateTouched() { - this.callTouched(); - } - - private updateValue() { - if (this.lastValue !== this.value) { - this.lastValue = this.value; - - this.callChange(this.value); - } - } - - private updateThumbPosition() { - const relativeValue = Math.min(1, Math.max(0, (this.value - this.min) / (this.max - this.min))); - - this.renderer.setStyle(this.thumb.nativeElement, 'left', relativeValue * 100 + '%'); - } - - private releaseMouseHandlers() { - if (this.windowMouseMoveListener) { - this.windowMouseMoveListener(); - this.windowMouseMoveListener = null; - } - - if (this.windowMouseUpListener) { - this.windowMouseUpListener(); - this.windowMouseUpListener = null; - } - - this.isDragging = false; - } -} \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/stars.component.html b/src/Squidex/app/framework/angular/forms/stars.component.html index 4f325a931..af4d6d7c9 100644 --- a/src/Squidex/app/framework/angular/forms/stars.component.html +++ b/src/Squidex/app/framework/angular/forms/stars.component.html @@ -4,10 +4,10 @@
- - + + - +
\ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/stars.component.ts b/src/Squidex/app/framework/angular/forms/stars.component.ts index 26f45ef20..69a0e24ca 100644 --- a/src/Squidex/app/framework/angular/forms/stars.component.ts +++ b/src/Squidex/app/framework/angular/forms/stars.component.ts @@ -6,14 +6,21 @@ */ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Types } from '@app/framework/internal'; +import { StatefulControlComponent, Types } from '@app/framework/internal'; export const SQX_STARS_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => StarsComponent), multi: true }; +interface State { + stars: number; + starsArray: number[]; + + value: number | null; +} + @Component({ selector: 'sqx-stars', styleUrls: ['./stars.component.scss'], @@ -21,9 +28,7 @@ export const SQX_STARS_CONTROL_VALUE_ACCESSOR: any = { providers: [SQX_STARS_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class StarsComponent implements ControlValueAccessor { - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; +export class StarsComponent extends StatefulControlComponent { private maximumStarsValue = 5; @Input() @@ -33,11 +38,13 @@ export class StarsComponent implements ControlValueAccessor { if (this.maximumStarsValue !== maxStars) { this.maximumStarsValue = value; - this.starsArray = []; + const starsArray: number[] = []; - for (let i = 1; i <= value; i++) { - this.starsArray.push(i); + for (let i = 1; i <= maxStars; i++) { + starsArray.push(i); } + + this.next(s => ({ ...s, starsArray })); } } @@ -45,64 +52,45 @@ export class StarsComponent implements ControlValueAccessor { return this.maximumStarsValue; } - public isDisabled = false; - - public stars: number; - public starsArray: number[] = [1, 2, 3, 4, 5]; - - public value: number | null = 1; - - constructor( - private readonly changeDetector: ChangeDetectorRef - ) { + constructor(changeDetector: ChangeDetectorRef) { + super(changeDetector, { + stars: -1, + starsArray: [1, 2, 3, 4, 5], + value: 1 + }); } public writeValue(obj: any) { - this.value = this.stars = Types.isNumber(obj) ? obj : 0; - - this.changeDetector.markForCheck(); - } - - public setDisabledState(isDisabled: boolean): void { - this.isDisabled = isDisabled; - - this.changeDetector.markForCheck(); - } - - public registerOnChange(fn: any) { - this.callChange = fn; - } + const value = Types.isNumber(obj) ? obj : 0; - public registerOnTouched(fn: any) { - this.callTouched = fn; + this.next(s => ({ ...s, stars: value, value })); } - public setPreview(value: number) { - if (this.isDisabled) { + public setPreview(stars: number) { + if (this.snapshot.isDisabled) { return; } - this.stars = value; + this.next(s => ({ ...s, stars })); } public stopPreview() { - if (this.isDisabled) { + if (this.snapshot.isDisabled) { return; } - this.stars = this.value || 0; + this.next(s => ({ ...s, stars: s.value || 0 })); } public reset() { - if (this.isDisabled) { + if (this.snapshot.isDisabled) { return false; } - if (this.value) { - this.value = null; - this.stars = 0; + if (this.snapshot.value) { + this.next(s => ({ ...s, stars: -1, value: null })); - this.callChange(this.value); + this.callChange(null); this.callTouched(); } @@ -110,14 +98,14 @@ export class StarsComponent implements ControlValueAccessor { } public setValue(value: number) { - if (this.isDisabled) { + if (this.snapshot.isDisabled) { return false; } - if (this.value !== value) { - this.value = this.stars = value; + if (this.snapshot.value !== value) { + this.next(s => ({ ...s, stars: value, value })); - this.callChange(this.value); + this.callChange(value); this.callTouched(); } diff --git a/src/Squidex/app/framework/angular/forms/tag-editor.component.html b/src/Squidex/app/framework/angular/forms/tag-editor.component.html index 5aa03539b..1877ad601 100644 --- a/src/Squidex/app/framework/angular/forms/tag-editor.component.html +++ b/src/Squidex/app/framework/angular/forms/tag-editor.component.html @@ -1,9 +1,9 @@
- + {{item}} @@ -23,13 +23,13 @@ spellcheck="false">
-
-
+
+ [sqxScrollActive]="i === snapshot.suggestedIndex"> {{item}}
diff --git a/src/Squidex/app/framework/angular/forms/tag-editor.component.ts b/src/Squidex/app/framework/angular/forms/tag-editor.component.ts index 0fa053881..9f70a8fc3 100644 --- a/src/Squidex/app/framework/angular/forms/tag-editor.component.ts +++ b/src/Squidex/app/framework/angular/forms/tag-editor.component.ts @@ -5,12 +5,11 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { ControlValueAccessor, FormControl, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Subscription } from 'rxjs'; +import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, Input, OnInit, ViewChild } from '@angular/core'; +import { FormControl, NG_VALUE_ACCESSOR } from '@angular/forms'; import { distinctUntilChanged, map, tap } from 'rxjs/operators'; -import { Types } from '@app/framework/internal'; +import { StatefulControlComponent, Types } from '@app/framework/internal'; const KEY_COMMA = 188; const KEY_DELETE = 8; @@ -75,6 +74,15 @@ const CACHED_SIZES: { [key: string]: number } = {}; let CACHED_FONT: string; +interface State { + hasFocus: boolean; + + suggestedItems: string[]; + suggestedIndex: number; + + items: any[]; +} + @Component({ selector: 'sqx-tag-editor', styleUrls: ['./tag-editor.component.scss'], @@ -82,11 +90,7 @@ let CACHED_FONT: string; providers: [SQX_TAG_EDITOR_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, OnDestroy, OnInit { - private subscription: Subscription; - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; - +export class TagEditorComponent extends StatefulControlComponent implements AfterViewInit, OnInit { @Input() public converter: Converter = new StringConverter(); @@ -115,27 +119,20 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, public inputName = 'tag-editor'; @ViewChild('form') - public formElement: ElementRef; + public formElement: ElementRef; @ViewChild('input') public inputElement: ElementRef; - public hasFocus = false; - - public suggestedItems: string[] = []; - public suggestedIndex = 0; - - public items: any[] = []; - public addInput = new FormControl(); - constructor( - private readonly changeDetector: ChangeDetectorRef - ) { - } - - public ngOnDestroy() { - this.subscription.unsubscribe(); + constructor(changeDetector: ChangeDetectorRef) { + super(changeDetector, { + hasFocus: false, + suggestedItems: [], + suggestedIndex: 0, + items: [] + }); } public ngAfterViewInit() { @@ -149,7 +146,7 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, } public ngOnInit() { - this.subscription = + this.own( this.addInput.valueChanges.pipe( tap(() => { this.resetSize(); @@ -164,15 +161,18 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, distinctUntilChanged(), map(query => { if (Types.isArray(this.suggestions) && query && query.length > 0) { - return this.suggestions.filter(s => s.indexOf(query) >= 0 && this.items.indexOf(s) < 0); + return this.suggestions.filter(s => s.indexOf(query) >= 0 && this.snapshot.items.indexOf(s) < 0); } else { return []; } })) .subscribe(items => { - this.suggestedIndex = -1; - this.suggestedItems = items || []; - }); + this.next(s => ({ + ...s, + suggestedIndex: -1, + suggestedItems: items || [] + })); + })); } public writeValue(obj: any) { @@ -180,15 +180,15 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, this.resetSize(); if (this.converter && Types.isArrayOf(obj, v => this.converter.isValidValue(v))) { - this.items = obj; + this.next(s => ({ ...s, items: obj })); } else { - this.items = []; + this.next(s => ({ ...s, items: [] })); } - - this.changeDetector.markForCheck(); } public setDisabledState(isDisabled: boolean): void { + super.setDisabledState(isDisabled); + if (isDisabled) { this.addInput.disable(); } else { @@ -196,17 +196,9 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, } } - public registerOnChange(fn: any) { - this.callChange = fn; - } - - public registerOnTouched(fn: any) { - this.callTouched = fn; - } - public focus() { if (this.addInput.enabled) { - this.hasFocus = true; + this.next(s => ({ ...s, hasFocus: true })); } } @@ -220,7 +212,7 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, } public remove(index: number) { - this.updateItems([...this.items.slice(0, index), ...this.items.splice(index + 1)]); + this.updateItems(this.snapshot.items.filter((_, i) => i !== index)); } public resetSize() { @@ -274,7 +266,7 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, const value = this.addInput.value; if (!value || value.length === 0) { - this.updateItems(this.items.slice(0, this.items.length - 1)); + this.updateItems(this.snapshot.items.slice(0, this.snapshot.items.length - 1)); return false; } @@ -285,8 +277,8 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, this.down(); return false; } else if (key === KEY_ENTER) { - if (this.suggestedIndex >= 0) { - if (this.selectValue(this.suggestedItems[this.suggestedIndex])) { + if (this.snapshot.suggestedIndex >= 0) { + if (this.selectValue(this.snapshot.suggestedItems[this.snapshot.suggestedIndex])) { return false; } } else if (this.acceptEnter) { @@ -307,8 +299,8 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, if (value && this.converter.isValidInput(value)) { const converted = this.converter.convert(value); - if (this.allowDuplicates || this.items.indexOf(converted) < 0) { - this.updateItems([...this.items, converted]); + if (this.allowDuplicates || this.snapshot.items.indexOf(converted) < 0) { + this.updateItems([...this.snapshot.items, converted]); } this.resetForm(); @@ -318,24 +310,27 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, } private resetAutocompletion() { - this.suggestedItems = []; - this.suggestedIndex = -1; + this.next(s => ({ + ...s, + suggestedItems: [], + suggestedIndex: -1 + })); } - public selectIndex(selection: number) { - if (selection < 0) { - selection = 0; + public selectIndex(suggestedIndex: number) { + if (suggestedIndex < 0) { + suggestedIndex = 0; } - if (selection >= this.suggestedItems.length) { - selection = this.suggestedItems.length - 1; + if (suggestedIndex >= this.snapshot.suggestedItems.length) { + suggestedIndex = this.snapshot.suggestedItems.length - 1; } - this.suggestedIndex = selection; + this.next(s => ({ ...s, suggestedIndex })); } public resetFocus(): any { - this.hasFocus = false; + this.next(s => ({ ...s, hasFocus: false })); } private resetForm() { @@ -343,11 +338,11 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, } private up() { - this.selectIndex(this.suggestedIndex - 1); + this.selectIndex(this.snapshot.suggestedIndex - 1); } private down() { - this.selectIndex(this.suggestedIndex + 1); + this.selectIndex(this.snapshot.suggestedIndex + 1); } public onCut(event: ClipboardEvent) { @@ -360,7 +355,7 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, public onCopy(event: ClipboardEvent) { if (!this.hasSelection()) { - event.clipboardData.setData('text/plain', this.items.filter(x => !!x).join(',')); + event.clipboardData.setData('text/plain', this.snapshot.items.filter(x => !!x).join(',')); event.preventDefault(); } @@ -372,7 +367,7 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, if (value) { this.resetForm(); - const values = [...this.items]; + const values = [...this.snapshot.items]; for (let part of value.split(',')) { const converted = this.converter.convert(part); @@ -396,12 +391,12 @@ export class TagEditorComponent implements AfterViewInit, ControlValueAccessor, } private updateItems(items: any[]) { - this.items = items; + this.next(s => ({ ...s, items })); if (items.length === 0 && this.undefinedWhenEmpty) { this.callChange(undefined); } else { - this.callChange(this.items); + this.callChange(items); } this.resetSize(); diff --git a/src/Squidex/app/framework/angular/forms/toggle.component.html b/src/Squidex/app/framework/angular/forms/toggle.component.html index 8c774acff..ecdde36e5 100644 --- a/src/Squidex/app/framework/angular/forms/toggle.component.html +++ b/src/Squidex/app/framework/angular/forms/toggle.component.html @@ -1,6 +1,6 @@
+ [class.disabled]="snapshot.isDisabled" + [class.checked]="snapshot.isChecked === true" + [class.unchecked]="snapshot.isChecked === false">
\ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/toggle.component.ts b/src/Squidex/app/framework/angular/forms/toggle.component.ts index 1524d908b..7105ada32 100644 --- a/src/Squidex/app/framework/angular/forms/toggle.component.ts +++ b/src/Squidex/app/framework/angular/forms/toggle.component.ts @@ -5,75 +5,63 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, forwardRef, Input } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { ChangeDetectorRef, Component, forwardRef, Input } from '@angular/core'; +import { NG_VALUE_ACCESSOR } from '@angular/forms'; -import { Types } from '@app/framework/internal'; +import { StatefulControlComponent, Types } from '@app/framework/internal'; export const SQX_TOGGLE_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => ToggleComponent), multi: true }; +interface State { + isChecked: boolean | null; +} + @Component({ selector: 'sqx-toggle', styleUrls: ['./toggle.component.scss'], templateUrl: './toggle.component.html', - providers: [SQX_TOGGLE_CONTROL_VALUE_ACCESSOR], - changeDetection: ChangeDetectionStrategy.OnPush + providers: [SQX_TOGGLE_CONTROL_VALUE_ACCESSOR] }) -export class ToggleComponent implements ControlValueAccessor { - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; - +export class ToggleComponent extends StatefulControlComponent { @Input() public threeStates = false; - public isChecked: boolean | null = null; - public isDisabled = false; - - constructor( - private readonly changeDetector: ChangeDetectorRef - ) { + constructor(changeDetector: ChangeDetectorRef) { + super(changeDetector, { + isChecked: null + }); } public writeValue(obj: any) { - this.isChecked = Types.isBoolean(obj) ? obj : null; - - this.changeDetector.markForCheck(); - } - - public setDisabledState(isDisabled: boolean): void { - this.isDisabled = isDisabled; + const isChecked = Types.isBoolean(obj) ? obj : null; - this.changeDetector.markForCheck(); - } - - public registerOnChange(fn: any) { - this.callChange = fn; - } - - public registerOnTouched(fn: any) { - this.callTouched = fn; + this.next(s => ({ ...s, isChecked })); } public changeState(event: MouseEvent) { - if (this.isDisabled) { + let { isDisabled, isChecked } = this.snapshot; + + if (isDisabled) { return; } if (this.threeStates && (event.ctrlKey || event.shiftKey)) { - if (this.isChecked) { - this.isChecked = null; - } else if (this.isChecked === null) { - this.isChecked = false; + if (isChecked) { + isChecked = null; + } else if (isChecked === null) { + isChecked = false; } else { - this.isChecked = true; + isChecked = true; } } else { - this.isChecked = !(this.isChecked === true); + isChecked = !(isChecked === true); } - this.callChange(this.isChecked); + this.next(s => ({ ...s, isChecked })); + + this.callChange(isChecked); this.callTouched(); } } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/ignore-scrollbar.directive.ts b/src/Squidex/app/framework/angular/ignore-scrollbar.directive.ts index 384bcb25c..c9d1ec641 100644 --- a/src/Squidex/app/framework/angular/ignore-scrollbar.directive.ts +++ b/src/Squidex/app/framework/angular/ignore-scrollbar.directive.ts @@ -5,27 +5,23 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AfterViewInit, Directive, ElementRef, OnDestroy, OnInit, Renderer2 } from '@angular/core'; +import { AfterViewInit, Directive, ElementRef, OnInit, Renderer2 } from '@angular/core'; +import { timer } from 'rxjs'; + +import { ResourceOwner } from '@app/framework/internal'; @Directive({ selector: '[sqxIgnoreScrollbar]' }) -export class IgnoreScrollbarDirective implements OnDestroy, OnInit, AfterViewInit { - private resizeListener: Function; +export class IgnoreScrollbarDirective extends ResourceOwner implements OnInit, AfterViewInit { private parent: any; - private checkTimer: any; private scollbarWidth = 0; constructor( private readonly element: ElementRef, private readonly renderer: Renderer2 ) { - } - - public ngOnDestroy() { - clearTimeout(this.checkTimer); - - this.resizeListener(); + super(); } public ngOnInit() { @@ -33,15 +29,12 @@ export class IgnoreScrollbarDirective implements OnDestroy, OnInit, AfterViewIni this.parent = this.renderer.parentNode(this.element.nativeElement); } - this.resizeListener = + this.own( this.renderer.listen(this.element.nativeElement, 'resize', () => { this.reposition(); - }); + })); - this.checkTimer = - setTimeout(() => { - this.reposition(); - }, 100); + this.own(timer(100, 100).subscribe(() => this.reposition)); } public ngAfterViewInit() { diff --git a/src/Squidex/app/framework/angular/image-source.directive.ts b/src/Squidex/app/framework/angular/image-source.directive.ts index c9406b524..ad4022b12 100644 --- a/src/Squidex/app/framework/angular/image-source.directive.ts +++ b/src/Squidex/app/framework/angular/image-source.directive.ts @@ -7,18 +7,16 @@ import { AfterViewInit, Directive, ElementRef, HostListener, Input, OnChanges, OnDestroy, OnInit, Renderer2 } from '@angular/core'; -import { MathHelper } from './../utils/math-helper'; +import { MathHelper, ResourceOwner } from '@app/framework/internal'; const LAYOUT_CACHE: { [key: string]: { width: number, height: number } } = {}; @Directive({ selector: '[sqxImageSource]' }) -export class ImageSourceDirective implements OnChanges, OnDestroy, OnInit, AfterViewInit { - private parentResizeListener: Function; - - private loadingTimer: any; +export class ImageSourceDirective extends ResourceOwner implements OnChanges, OnDestroy, OnInit, AfterViewInit { private size: any; + private loadTimer: any; private loadRetries = 0; private loadQuery: string | null = null; @@ -38,12 +36,13 @@ export class ImageSourceDirective implements OnChanges, OnDestroy, OnInit, After private readonly element: ElementRef, private readonly renderer: Renderer2 ) { + super(); } public ngOnDestroy() { - clearTimeout(this.loadingTimer); + super.ngOnDestroy(); - this.parentResizeListener(); + clearTimeout(this.loadTimer); } public ngOnInit() { @@ -51,10 +50,10 @@ export class ImageSourceDirective implements OnChanges, OnDestroy, OnInit, After this.parent = this.renderer.parentNode(this.element.nativeElement); } - this.parentResizeListener = + this.own( this.renderer.listen(this.parent, 'resize', () => { this.resize(); - }); + })); } public ngAfterViewInit() { @@ -127,7 +126,7 @@ export class ImageSourceDirective implements OnChanges, OnDestroy, OnInit, After this.loadRetries++; if (this.loadRetries <= 10) { - this.loadingTimer = + this.loadTimer = setTimeout(() => { this.loadQuery = MathHelper.guid(); diff --git a/src/Squidex/app/framework/angular/modals/dialog-renderer.component.html b/src/Squidex/app/framework/angular/modals/dialog-renderer.component.html index f39ac71d5..0dcb911a0 100644 --- a/src/Squidex/app/framework/angular/modals/dialog-renderer.component.html +++ b/src/Squidex/app/framework/angular/modals/dialog-renderer.component.html @@ -2,11 +2,11 @@ - {{dialogRequest?.title}} + {{snapshot.dialogRequest?.title}} - {{dialogRequest?.text}} + {{snapshot.dialogRequest?.text}} @@ -16,7 +16,7 @@
-
+
diff --git a/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts b/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts index 17c184f0c..594c3fc9a 100644 --- a/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts +++ b/src/Squidex/app/framework/angular/modals/dialog-renderer.component.ts @@ -5,17 +5,24 @@ * Copyright (c) Sebastian Stehle. All rights r vbeserved */ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core'; -import { Subscription } from 'rxjs'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit } from '@angular/core'; +import { timer } from 'rxjs'; import { DialogModel, DialogRequest, DialogService, fadeAnimation, - Notification + Notification, + StatefulComponent } from '@app/framework/internal'; +interface State { + dialogRequest?: DialogRequest | null; + + notifications: Notification[]; +} + @Component({ selector: 'sqx-dialog-renderer', styleUrls: ['./dialog-renderer.component.scss'], @@ -25,89 +32,74 @@ import { ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class DialogRendererComponent implements OnDestroy, OnInit { - private dialogSubscription: Subscription; - private dialogsSubscription: Subscription; - private notificationsSubscription: Subscription; - - public dialogView = new DialogModel(); - public dialogRequest: DialogRequest | null = null; - - public notifications: Notification[] = []; - +export class DialogRendererComponent extends StatefulComponent implements OnInit { @Input() public position = 'bottomright'; - constructor( - private readonly changeDetector: ChangeDetectorRef, + public dialogView = new DialogModel(); + + constructor(changeDetector: ChangeDetectorRef, private readonly dialogs: DialogService ) { - } - - public ngOnDestroy() { - this.notificationsSubscription.unsubscribe(); - this.dialogSubscription.unsubscribe(); - this.dialogsSubscription.unsubscribe(); + super(changeDetector, { notifications: [] }); } public ngOnInit() { - this.dialogSubscription = + this.own( this.dialogView.isOpen.subscribe(isOpen => { if (!isOpen) { - this.cancel(); - - this.changeDetector.detectChanges(); + this.finishRequest(false); } - }); + })); - this.notificationsSubscription = + this.own( this.dialogs.notifications.subscribe(notification => { - this.notifications.push(notification); + this.next(s => ({ + ...s, + notifications: [...s.notifications, notification] + })); if (notification.displayTime > 0) { - setTimeout(() => { + this.own(timer(notification.displayTime).subscribe(() => { this.close(notification); - }, notification.displayTime); + })); } + })); - this.changeDetector.detectChanges(); - }); - - this.dialogsSubscription = + this.own( this.dialogs.dialogs - .subscribe(request => { + .subscribe(dialogRequest => { this.cancel(); - this.dialogRequest = request; this.dialogView.show(); - this.changeDetector.detectChanges(); - }); + this.next(s => ({ ...s, dialogRequest })); + })); } public cancel() { - if (this.dialogRequest) { - this.dialogRequest.complete(false); - this.dialogRequest = null; - this.dialogView.hide(); - } + this.finishRequest(false); + + this.dialogView.hide(); } public confirm() { - if (this.dialogRequest) { - this.dialogRequest.complete(true); - this.dialogRequest = null; - this.dialogView.hide(); - } + this.finishRequest(true); + + this.dialogView.hide(); } - public close(notification: Notification) { - const index = this.notifications.indexOf(notification); + private finishRequest(value: boolean) { + this.next(s => { + if (s.dialogRequest) { + s.dialogRequest.complete(value); + } - if (index >= 0) { - this.notifications.splice(index, 1); + return { ...s, dialogRequest: null }; + }); + } - this.changeDetector.detectChanges(); - } + public close(notification: Notification) { + this.next(s => ({ ...s, notifications: s.notifications.filter(n => notification !== n) })); } } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/modals/modal-dialog.component.html b/src/Squidex/app/framework/angular/modals/modal-dialog.component.html index d7f3e5955..bf7383621 100644 --- a/src/Squidex/app/framework/angular/modals/modal-dialog.component.html +++ b/src/Squidex/app/framework/angular/modals/modal-dialog.component.html @@ -13,7 +13,7 @@
-
+
@@ -21,7 +21,7 @@
-
+
diff --git a/src/Squidex/app/framework/angular/modals/modal-dialog.component.ts b/src/Squidex/app/framework/angular/modals/modal-dialog.component.ts index 20c685ff0..e845e9bd2 100644 --- a/src/Squidex/app/framework/angular/modals/modal-dialog.component.ts +++ b/src/Squidex/app/framework/angular/modals/modal-dialog.component.ts @@ -7,7 +7,12 @@ import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core'; -import { fadeAnimation } from './../animations'; +import { fadeAnimation, StatefulComponent } from '@app/framework/internal'; + +interface State { + hasTabs: boolean; + hasFooter: boolean; +} @Component({ selector: 'sqx-modal-dialog', @@ -18,7 +23,7 @@ import { fadeAnimation } from './../animations'; ], changeDetection: ChangeDetectionStrategy.Default }) -export class ModalDialogComponent implements AfterViewInit { +export class ModalDialogComponent extends StatefulComponent implements AfterViewInit { @Input() public showClose = true; @@ -52,18 +57,17 @@ export class ModalDialogComponent implements AfterViewInit { @ViewChild('footerElement') public footerElement: ElementRef; - public hasTabs = false; - public hasFooter = false; - - constructor( - private readonly changeDetector: ChangeDetectorRef - ) { + constructor(changeDetector: ChangeDetectorRef) { + super(changeDetector, { + hasTabs: false, + hasFooter: false + }); } public ngAfterViewInit() { - this.hasTabs = this.tabsElement.nativeElement.children.length > 0; - this.hasFooter = this.footerElement.nativeElement.children.length > 0; + const hasTabs = this.tabsElement.nativeElement.children.length > 0; + const hasFooter = this.footerElement.nativeElement.children.length > 0; - this.changeDetector.detectChanges(); + this.next(() => ({ hasTabs, hasFooter })); } } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/modals/modal-target.directive.ts b/src/Squidex/app/framework/angular/modals/modal-target.directive.ts index b09776734..ab63bab3f 100644 --- a/src/Squidex/app/framework/angular/modals/modal-target.directive.ts +++ b/src/Squidex/app/framework/angular/modals/modal-target.directive.ts @@ -5,7 +5,10 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AfterViewInit, Directive, ElementRef, Input, OnDestroy, OnInit, Renderer2 } from '@angular/core'; +import { AfterViewInit, Directive, ElementRef, Input, OnInit, Renderer2 } from '@angular/core'; +import { timer } from 'rxjs'; + +import { ResourceOwner } from '@app/framework/internal'; const POSITION_TOPLEFT = 'topLeft'; const POSITION_TOPRIGHT = 'topRight'; @@ -20,10 +23,7 @@ const POSITION_FULL = 'full'; @Directive({ selector: '[sqxModalTarget]' }) -export class ModalTargetDirective implements AfterViewInit, OnDestroy, OnInit { - private elementResizeListener: Function; - private targetResizeListener: Function; - private renderTimer: any; +export class ModalTargetDirective extends ResourceOwner implements AfterViewInit, OnInit { private targetElement: any; @Input('sqxModalTarget') @@ -42,38 +42,24 @@ export class ModalTargetDirective implements AfterViewInit, OnDestroy, OnInit { private readonly renderer: Renderer2, private readonly element: ElementRef ) { - } - - public ngOnDestroy() { - if (this.targetResizeListener) { - this.targetResizeListener(); - } - - if (this.elementResizeListener) { - this.elementResizeListener(); - } - - clearInterval(this.renderTimer); + super(); } public ngOnInit() { if (this.target) { this.targetElement = this.target; - this.targetResizeListener = + this.own( this.renderer.listen(this.targetElement, 'resize', () => { this.updatePosition(); - }); + })); - this.elementResizeListener = + this.own( this.renderer.listen(this.element.nativeElement, 'resize', () => { this.updatePosition(); - }); + })); - this.renderTimer = - setInterval(() => { - this.updatePosition(); - }, 100); + this.own(timer(100, 100).subscribe(() => this.updatePosition())); } } diff --git a/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts b/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts index 14a8fc598..98fc8ee3f 100644 --- a/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts +++ b/src/Squidex/app/framework/angular/modals/onboarding-tooltip.component.ts @@ -6,11 +6,13 @@ */ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, Renderer2 } from '@angular/core'; +import { timer } from 'rxjs'; import { fadeAnimation, ModalModel, OnboardingService, + StatefulComponent, Types } from '@app/framework/internal'; @@ -23,13 +25,7 @@ import { ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class OnboardingTooltipComponent implements OnDestroy, OnInit { - private showTimer: any; - private closeTimer: any; - private forMouseDownListener: Function | null; - - public tooltipModal = new ModalModel(); - +export class OnboardingTooltipComponent extends StatefulComponent implements OnDestroy, OnInit { @Input() public for: any; @@ -42,56 +38,52 @@ export class OnboardingTooltipComponent implements OnDestroy, OnInit { @Input() public position = 'left'; - constructor( - private readonly changeDetector: ChangeDetectorRef, + public tooltipModal = new ModalModel(); + + constructor(changeDetector: ChangeDetectorRef, private readonly onboardingService: OnboardingService, private readonly renderer: Renderer2 ) { + super(changeDetector, {}); } public ngOnDestroy() { - clearTimeout(this.showTimer); - clearTimeout(this.closeTimer); + super.ngOnDestroy(); this.tooltipModal.hide(); - - if (this.forMouseDownListener) { - this.forMouseDownListener(); - this.forMouseDownListener = null; - } } public ngOnInit() { if (this.for && this.helpId && Types.isFunction(this.for.addEventListener)) { - this.showTimer = setTimeout(() => { - if (this.onboardingService.shouldShow(this.helpId)) { - const forRect = this.for.getBoundingClientRect(); - - const x = forRect.left + 0.5 * forRect.width; - const y = forRect.top + 0.5 * forRect.height; + this.own( + timer(this.after).subscribe(() => { + if (this.onboardingService.shouldShow(this.helpId)) { + const forRect = this.for.getBoundingClientRect(); - const fromPoint = document.elementFromPoint(x, y); + const x = forRect.left + 0.5 * forRect.width; + const y = forRect.top + 0.5 * forRect.height; - if (this.isSameOrParent(fromPoint)) { - this.tooltipModal.show(); + const fromPoint = document.elementFromPoint(x, y); - this.changeDetector.markForCheck(); + if (this.isSameOrParent(fromPoint)) { + this.tooltipModal.show(); - this.closeTimer = setTimeout(() => { - this.hideThis(); - }, 10000); + this.own( + timer(10000).subscribe(() => { + this.hideThis(); + })); - this.onboardingService.disable(this.helpId); + this.onboardingService.disable(this.helpId); + } } - } - }, this.after); + })); - this.forMouseDownListener = + this.own( this.renderer.listen(this.for, 'mousedown', () => { this.onboardingService.disable(this.helpId); this.hideThis(); - }); + })); } } diff --git a/src/Squidex/app/framework/angular/modals/tooltip.component.ts b/src/Squidex/app/framework/angular/modals/tooltip.component.ts index e58c03243..8d25f819e 100644 --- a/src/Squidex/app/framework/angular/modals/tooltip.component.ts +++ b/src/Squidex/app/framework/angular/modals/tooltip.component.ts @@ -5,11 +5,13 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnDestroy, OnInit, Renderer2 } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, Renderer2 } from '@angular/core'; -import { ModalModel } from './../../utils/modal-view'; - -import { fadeAnimation } from './../animations'; +import { + fadeAnimation, + ModalModel, + StatefulComponent +} from '@app/framework/internal'; @Component({ selector: 'sqx-tooltip', @@ -20,10 +22,7 @@ import { fadeAnimation } from './../animations'; ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class TooltipComponent implements OnDestroy, OnInit { - private targetMouseEnterListener: any; - private targetMouseLeaveListener: any; - +export class TooltipComponent extends StatefulComponent implements OnInit { @Input() public target: any; @@ -32,35 +31,23 @@ export class TooltipComponent implements OnDestroy, OnInit { public modal = new ModalModel(); - constructor( - private readonly changeDetector: ChangeDetectorRef, + constructor(changeDetector: ChangeDetectorRef, private readonly renderer: Renderer2 ) { - } - - public ngOnDestroy() { - if (this.targetMouseEnterListener) { - this.targetMouseEnterListener(); - } - - if (this.targetMouseLeaveListener) { - this.targetMouseLeaveListener(); - } + super(changeDetector, {}); } public ngOnInit() { if (this.target) { - this.targetMouseEnterListener = + this.own( this.renderer.listen(this.target, 'mouseenter', () => { this.modal.show(); + })); - this.changeDetector.markForCheck(); - }); - - this.targetMouseLeaveListener = + this.own( this.renderer.listen(this.target, 'mouseleave', () => { this.modal.hide(); - }); + })); } } } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/pager.component.html b/src/Squidex/app/framework/angular/pager.component.html index cd328ec9d..e54c52966 100644 --- a/src/Squidex/app/framework/angular/pager.component.html +++ b/src/Squidex/app/framework/angular/pager.component.html @@ -2,10 +2,10 @@ diff --git a/src/Squidex/app/framework/angular/pager.component.ts b/src/Squidex/app/framework/angular/pager.component.ts index ce88403d7..c85eaf9cd 100644 --- a/src/Squidex/app/framework/angular/pager.component.ts +++ b/src/Squidex/app/framework/angular/pager.component.ts @@ -7,7 +7,7 @@ import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; -import { Pager } from './../internal'; +import { Pager } from '@app/framework/internal'; @Component({ selector: 'sqx-pager', @@ -16,15 +16,15 @@ import { Pager } from './../internal'; changeDetection: ChangeDetectionStrategy.OnPush }) export class PagerComponent { + @Output() + public nextPage = new EventEmitter(); + + @Output() + public prevPage = new EventEmitter(); + @Input() public pager: Pager; @Input() public hideWhenButtonsDisabled = false; - - @Output() - public next = new EventEmitter(); - - @Output() - public prev = new EventEmitter(); } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/panel.component.ts b/src/Squidex/app/framework/angular/panel.component.ts index 4556ed9b7..bc03b2379 100644 --- a/src/Squidex/app/framework/angular/panel.component.ts +++ b/src/Squidex/app/framework/angular/panel.component.ts @@ -7,7 +7,7 @@ import { AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, Input, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core'; -import { slideRightAnimation } from './animations'; +import { slideRightAnimation } from '@app/framework/internal'; import { PanelContainerDirective } from './panel-container.directive'; @@ -31,6 +31,9 @@ export class PanelComponent implements AfterViewInit, OnDestroy, OnInit { @Input() public desiredWidth = '10rem'; + @Input() + public minWidth?: string; + @Input() public isBlank = false; @@ -84,6 +87,7 @@ export class PanelComponent implements AfterViewInit, OnDestroy, OnInit { this.styleWidth = size; this.renderer.setStyle(this.panel.nativeElement, 'width', size); + this.renderer.setStyle(this.panel.nativeElement, 'minWidth', this.minWidth); this.renderWidth = this.panel.nativeElement.offsetWidth; } } diff --git a/src/Squidex/app/framework/angular/pipes/date-time.pipes.ts b/src/Squidex/app/framework/angular/pipes/date-time.pipes.ts index 145014c81..1da8095fc 100644 --- a/src/Squidex/app/framework/angular/pipes/date-time.pipes.ts +++ b/src/Squidex/app/framework/angular/pipes/date-time.pipes.ts @@ -7,8 +7,7 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { DateTime } from './../../utils/date-time'; -import { Duration } from './../../utils/duration'; +import { DateTime, Duration } from '@app/framework/internal'; @Pipe({ name: 'sqxShortDate', diff --git a/src/Squidex/app/framework/angular/pipes/money.pipe.ts b/src/Squidex/app/framework/angular/pipes/money.pipe.ts index 8508ae21b..0c4cc4f71 100644 --- a/src/Squidex/app/framework/angular/pipes/money.pipe.ts +++ b/src/Squidex/app/framework/angular/pipes/money.pipe.ts @@ -7,7 +7,7 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { CurrencyConfig, DecimalSeparatorConfig } from './../../configurations'; +import { CurrencyConfig, DecimalSeparatorConfig } from '@app/framework/internal'; @Pipe({ name: 'sqxMoney', diff --git a/src/Squidex/app/framework/angular/pipes/name.pipe.ts b/src/Squidex/app/framework/angular/pipes/name.pipe.ts index 49e12ec4c..c82448a55 100644 --- a/src/Squidex/app/framework/angular/pipes/name.pipe.ts +++ b/src/Squidex/app/framework/angular/pipes/name.pipe.ts @@ -7,7 +7,7 @@ import { Pipe, PipeTransform } from '@angular/core'; -import { StringHelper } from './../../utils/string-helper'; +import { StringHelper } from '@app/framework/internal'; @Pipe({ name: 'sqxDisplayName', diff --git a/src/Squidex/app/framework/angular/routers/parent-link.directive.ts b/src/Squidex/app/framework/angular/routers/parent-link.directive.ts index 9a093d53f..fd29a6404 100644 --- a/src/Squidex/app/framework/angular/routers/parent-link.directive.ts +++ b/src/Squidex/app/framework/angular/routers/parent-link.directive.ts @@ -5,15 +5,15 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Directive, ElementRef, HostListener, Input, OnDestroy, OnInit, Renderer2 } from '@angular/core'; +import { Directive, ElementRef, HostListener, Input, OnInit, Renderer2 } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { Subscription } from 'rxjs'; + +import { ResourceOwner } from '@app/framework/internal'; @Directive({ selector: '[sqxParentLink]' }) -export class ParentLinkDirective implements OnDestroy, OnInit { - private urlSubscription: Subscription; +export class ParentLinkDirective extends ResourceOwner implements OnInit { private url: string; @Input() @@ -25,23 +25,18 @@ export class ParentLinkDirective implements OnDestroy, OnInit { private readonly element: ElementRef, private readonly renderer: Renderer2 ) { - } - - public ngOnDestroy() { - if (this.urlSubscription) { - this.urlSubscription.unsubscribe(); - } + super(); } public ngOnInit() { - this.urlSubscription = + this.own( this.route.url.subscribe(() => { this.url = this.isLazyLoaded ? this.router.createUrlTree(['.'], { relativeTo: this.route.parent!.parent }).toString() : this.router.createUrlTree(['.'], { relativeTo: this.route.parent }).toString(); this.renderer.setProperty(this.element.nativeElement, 'href', this.url); - }); + })); } @HostListener('click') diff --git a/src/Squidex/app/framework/angular/shortcut.component.spec.ts b/src/Squidex/app/framework/angular/shortcut.component.spec.ts index 146285756..50009a2cb 100644 --- a/src/Squidex/app/framework/angular/shortcut.component.spec.ts +++ b/src/Squidex/app/framework/angular/shortcut.component.spec.ts @@ -11,6 +11,12 @@ import { ShortcutService } from './../'; import { ShortcutComponent } from './shortcut.component'; describe('ShortcutComponent', () => { + let changeDetector: any = { + detach: () => { + return 0; + } + }; + let shortcutService: ShortcutService; beforeEach(() => { @@ -18,13 +24,13 @@ describe('ShortcutComponent', () => { }); it('should instantiate', () => { - const shortcutComponent = new ShortcutComponent(shortcutService, new NgZone({})); + const shortcutComponent = new ShortcutComponent(changeDetector, shortcutService, new NgZone({})); expect(shortcutComponent).toBeDefined(); }); it('should init without keys', () => { - const shortcutComponent = new ShortcutComponent(shortcutService, new NgZone({})); + const shortcutComponent = new ShortcutComponent(changeDetector, shortcutService, new NgZone({})); shortcutComponent.keys = null!; shortcutComponent.ngOnInit(); @@ -33,7 +39,7 @@ describe('ShortcutComponent', () => { }); it('should destroy without keys', () => { - const shortcutComponent = new ShortcutComponent(shortcutService, new NgZone({})); + const shortcutComponent = new ShortcutComponent(changeDetector, shortcutService, new NgZone({})); shortcutComponent.keys = null!; shortcutComponent.ngOnDestroy(); @@ -42,7 +48,7 @@ describe('ShortcutComponent', () => { }); it('should raise event when triggered', () => { - const shortcutComponent = new ShortcutComponent(shortcutService, new NgZone({})); + const shortcutComponent = new ShortcutComponent(changeDetector, shortcutService, new NgZone({})); let isTriggered = false; @@ -56,7 +62,7 @@ describe('ShortcutComponent', () => { }); it('should not raise event when triggered but disabled', () => { - const shortcutComponent = new ShortcutComponent(shortcutService, new NgZone({})); + const shortcutComponent = new ShortcutComponent(changeDetector, shortcutService, new NgZone({})); let isTriggered = false; @@ -71,7 +77,7 @@ describe('ShortcutComponent', () => { }); it('should not raise event when triggered but destroyed', () => { - const shortcutComponent = new ShortcutComponent(shortcutService, new NgZone({})); + const shortcutComponent = new ShortcutComponent(changeDetector, shortcutService, new NgZone({})); let isTriggered = false; diff --git a/src/Squidex/app/framework/angular/shortcut.component.ts b/src/Squidex/app/framework/angular/shortcut.component.ts index 26191b2eb..d1b2b993f 100644 --- a/src/Squidex/app/framework/angular/shortcut.component.ts +++ b/src/Squidex/app/framework/angular/shortcut.component.ts @@ -5,16 +5,17 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output } from '@angular/core'; +import { ChangeDetectorRef, Component, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output } from '@angular/core'; -import { ShortcutService } from './../services/shortcut.service'; +import { ShortcutService, StatefulComponent } from '@app/framework/internal'; @Component({ selector: 'sqx-shortcut', - template: '', - changeDetection: ChangeDetectionStrategy.OnPush + template: '' }) -export class ShortcutComponent implements OnDestroy, OnInit { +export class ShortcutComponent extends StatefulComponent implements OnDestroy, OnInit { + private lastKeys: string; + @Input() public keys: string; @@ -24,12 +25,14 @@ export class ShortcutComponent implements OnDestroy, OnInit { @Output() public trigger = new EventEmitter(); - private lastKeys: string; - constructor( + changeDetector: ChangeDetectorRef, private readonly shortcutService: ShortcutService, private readonly zone: NgZone ) { + super(changeDetector, {}); + + changeDetector.detach(); } public ngOnDestroy() { @@ -42,10 +45,10 @@ export class ShortcutComponent implements OnDestroy, OnInit { this.lastKeys = this.keys; if (this.lastKeys) { - this.shortcutService.on(this.lastKeys, e => { + this.shortcutService.on(this.lastKeys, () => { if (!this.disabled) { this.zone.run(() => { - this.trigger.next(e); + this.trigger.next(); }); } diff --git a/src/Squidex/app/framework/angular/sorted.directive.ts b/src/Squidex/app/framework/angular/sorted.directive.ts index d70c00da2..0951fb933 100644 --- a/src/Squidex/app/framework/angular/sorted.directive.ts +++ b/src/Squidex/app/framework/angular/sorted.directive.ts @@ -5,14 +5,14 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Directive, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; +import { Directive, ElementRef, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; import * as Sortable from 'sortablejs'; @Directive({ selector: '[sqxSortModel]' }) -export class SortedDirective implements OnDestroy, OnInit { +export class SortedDirective implements OnDestroy, OnInit, OnChanges { private sortable: Sortable.Ref; @Input() @@ -29,8 +29,17 @@ export class SortedDirective implements OnDestroy, OnInit { ) { } + public ngOnChanges(changes: SimpleChanges) { + const sortModel = changes['sortModel'].currentValue; + if (sortModel) { + console.log(JSON.stringify(sortModel.map((x: any) => x.fileName))); + } + } + public ngOnDestroy() { - this.sortable.destroy(); + if (this.sortable) { + this.sortable.destroy(); + } } public ngOnInit() { @@ -39,6 +48,7 @@ export class SortedDirective implements OnDestroy, OnInit { animation: 150, onSort: (event: { oldIndex: number, newIndex: number }) => { + console.log('FOO'); if (this.sortModel && event.newIndex !== event.oldIndex) { const newModel = [...this.sortModel]; diff --git a/src/Squidex/app/framework/angular/stateful.component.ts b/src/Squidex/app/framework/angular/stateful.component.ts new file mode 100644 index 000000000..c29ddefed --- /dev/null +++ b/src/Squidex/app/framework/angular/stateful.component.ts @@ -0,0 +1,133 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { ChangeDetectorRef, OnDestroy } from '@angular/core'; +import { ControlValueAccessor } from '@angular/forms'; +import { Observable, Subscription } from 'rxjs'; +import { onErrorResumeNext, skip } from 'rxjs/operators'; + +import { Types } from './../utils/types'; + +import { State } from '../state'; + +declare type UnsubscribeFunction = () => void; + +export class ResourceOwner implements OnDestroy { + private subscriptions: (Subscription | UnsubscribeFunction)[] = []; + + public own(subscription: Subscription | UnsubscribeFunction | Observable) { + if (subscription) { + if (Types.isFunction(subscription['subscribe'])) { + const observable = >subscription; + + this.subscriptions.push(observable.pipe(onErrorResumeNext()).subscribe()); + } else { + this.subscriptions.push(subscription); + } + } + } + + public ngOnDestroy() { + try { + for (let subscription of this.subscriptions) { + if (Types.isFunction(subscription)) { + subscription(); + } else { + subscription.unsubscribe(); + } + } + } finally { + this.subscriptions = []; + } + } +} + +export abstract class StatefulComponent extends State implements OnDestroy { + private readonly subscriptions = new ResourceOwner(); + + constructor( + private readonly changeDetector: ChangeDetectorRef, + state: T + ) { + super(state); + + this.own( + this.changes.pipe(skip(1)).subscribe(() => { + this.changeDetector.detectChanges(); + })); + } + + public ngOnDestroy() { + this.subscriptions.ngOnDestroy(); + } + + public own(subscription: Subscription | UnsubscribeFunction | Observable) { + this.subscriptions.own(subscription); + } +} + +export abstract class StatefulControlComponent extends StatefulComponent implements ControlValueAccessor { + private fnChanged = (v: any) => { /* NOOP */ }; + private fnTouched = () => { /* NOOP */ }; + + constructor(changeDetector: ChangeDetectorRef, state: T) { + super(changeDetector, { ...state, isDisabled: false }); + } + + public registerOnChange(fn: any) { + this.fnChanged = fn; + } + + public registerOnTouched(fn: any) { + this.fnTouched = fn; + } + + public callTouched() { + this.fnTouched(); + } + + public callChange(value: TValue | null | undefined) { + this.fnChanged(value); + } + + public setDisabledState(isDisabled: boolean): void { + this.next(s => ({ ...s, isDisabled })); + } + + public abstract writeValue(obj: any): void; +} + +export abstract class ExternalControlComponent extends StatefulComponent implements ControlValueAccessor { + private fnChanged = (v: any) => { /* NOOP */ }; + private fnTouched = () => { /* NOOP */ }; + + constructor(changeDetector: ChangeDetectorRef) { + super(changeDetector, {}); + + changeDetector.detach(); + } + + public registerOnChange(fn: any) { + this.fnChanged = fn; + } + + public registerOnTouched(fn: any) { + this.fnTouched = fn; + } + + protected callTouched() { + this.fnTouched(); + } + + protected callChange(value: TValue) { + this.fnChanged(value); + } + + public abstract setDisabledState(isDisabled: boolean): void; + + public abstract writeValue(obj: any): void; +} \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/title.component.ts b/src/Squidex/app/framework/angular/title.component.ts index 20161b09a..63510e7dc 100644 --- a/src/Squidex/app/framework/angular/title.component.ts +++ b/src/Squidex/app/framework/angular/title.component.ts @@ -7,7 +7,7 @@ import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core'; -import { TitleService } from './../services/title.service'; +import { TitleService } from '@app/framework/internal'; @Component({ selector: 'sqx-title', diff --git a/src/Squidex/app/framework/angular/user-report.component.ts b/src/Squidex/app/framework/angular/user-report.component.ts index 0cb33edb7..7abc5dd45 100644 --- a/src/Squidex/app/framework/angular/user-report.component.ts +++ b/src/Squidex/app/framework/angular/user-report.component.ts @@ -5,36 +5,36 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; +import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; +import { timer } from 'rxjs'; -import { UserReportConfig } from './../configurations'; -import { ResourceLoaderService } from './../services/resource-loader.service'; +import { + ResourceLoaderService, + ResourceOwner, + UserReportConfig +} from '@app/framework/internal'; @Component({ selector: 'sqx-user-report', - template: '', - changeDetection: ChangeDetectionStrategy.OnPush + template: '' }) -export class UserReportComponent implements OnDestroy, OnInit { - private loadingTimer: any; - - constructor(config: UserReportConfig, changeDetector: ChangeDetectorRef, +export class UserReportComponent extends ResourceOwner implements OnInit { + constructor(changeDetector: ChangeDetectorRef, + private readonly config: UserReportConfig, private readonly resourceLoader: ResourceLoaderService ) { - changeDetector.detach(); - - window['_urq'] = window['_urq'] || []; - window['_urq'].push(['initSite', config.siteId]); - } + super(); - public ngOnDestroy() { - clearTimeout(this.loadingTimer); + changeDetector.detach(); } public ngOnInit() { - this.loadingTimer = - setTimeout(() => { + window['_urq'] = window['_urq'] || []; + window['_urq'].push(['initSite', this.config.siteId]); + + this.own( + timer(4000).subscribe(() => { this.resourceLoader.loadScript('https://cdn.userreport.com/userreport.js'); - }, 4000); + })); } } \ No newline at end of file diff --git a/src/Squidex/app/framework/declarations.ts b/src/Squidex/app/framework/declarations.ts index f8ebdfc58..443df2412 100644 --- a/src/Squidex/app/framework/declarations.ts +++ b/src/Squidex/app/framework/declarations.ts @@ -20,7 +20,6 @@ export * from './angular/forms/iframe-editor.component'; export * from './angular/forms/indeterminate-value.directive'; export * from './angular/forms/json-editor.component'; export * from './angular/forms/progress-bar.component'; -export * from './angular/forms/slider.component'; export * from './angular/forms/stars.component'; export * from './angular/forms/tag-editor.component'; export * from './angular/forms/toggle.component'; diff --git a/src/Squidex/app/framework/internal.ts b/src/Squidex/app/framework/internal.ts index e738bbd3d..0f1556ebe 100644 --- a/src/Squidex/app/framework/internal.ts +++ b/src/Squidex/app/framework/internal.ts @@ -35,4 +35,6 @@ export * from './utils/string-helper'; export * from './utils/types'; export * from './utils/version'; +export * from './angular/stateful.component'; + export * from './configurations'; \ No newline at end of file diff --git a/src/Squidex/app/framework/module.ts b/src/Squidex/app/framework/module.ts index 823abd164..0e65813a3 100644 --- a/src/Squidex/app/framework/module.ts +++ b/src/Squidex/app/framework/module.ts @@ -73,7 +73,6 @@ import { ShortcutService, ShortDatePipe, ShortTimePipe, - SliderComponent, SortedDirective, StarsComponent, TagEditorComponent, @@ -143,7 +142,6 @@ import { ShortcutComponent, ShortDatePipe, ShortTimePipe, - SliderComponent, SortedDirective, StarsComponent, TagEditorComponent, @@ -208,7 +206,6 @@ import { ShortcutComponent, ShortDatePipe, ShortTimePipe, - SliderComponent, SortedDirective, StarsComponent, TagEditorComponent, diff --git a/src/Squidex/app/framework/services/loading.service.ts b/src/Squidex/app/framework/services/loading.service.ts index 78598a271..5cdc53ba7 100644 --- a/src/Squidex/app/framework/services/loading.service.ts +++ b/src/Squidex/app/framework/services/loading.service.ts @@ -41,7 +41,9 @@ export class LoadingService implements OnDestroy { } public ngOnDestroy() { - this.routerSubscription.unsubscribe(); + if (this.routerSubscription) { + this.routerSubscription.unsubscribe(); + } } public startLoading(key: string) { diff --git a/src/Squidex/app/framework/state.ts b/src/Squidex/app/framework/state.ts index 03ed7e181..4a911778d 100644 --- a/src/Squidex/app/framework/state.ts +++ b/src/Squidex/app/framework/state.ts @@ -9,13 +9,15 @@ import { AbstractControl } from '@angular/forms'; import { BehaviorSubject, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; -import { ErrorDto, Types } from '@app/framework/internal'; +import { ErrorDto } from './utils/error'; +import { Types } from './utils/types'; + import { fullValue} from './angular/forms/forms-helper'; export interface FormState { submitted: boolean; - error?: string; + error?: string | null; } export class Form { @@ -49,13 +51,13 @@ export class Form { } public load(value: any) { - this.state.next({ submitted: false, error: null }); + this.state.next(_ => ({ submitted: false, error: null })); this.setValue(value); } public submit(): any | null { - this.state.next({ submitted: true }); + this.state.next(_ => ({ submitted: true })); if (this.form.valid) { const value = fullValue(this.form); @@ -69,7 +71,7 @@ export class Form { } public submitCompleted(newValue?: any) { - this.state.next({ submitted: false, error: null }); + this.state.next(_ => ({ submitted: false, error: null })); this.enable(); @@ -81,7 +83,7 @@ export class Form { } public submitFailed(error?: string | ErrorDto) { - this.state.next({ submitted: false, error: this.getError(error) }); + this.state.next(_ => ({ submitted: false, error: this.getError(error) })); this.enable(); } diff --git a/src/Squidex/app/framework/utils/version.spec.ts b/src/Squidex/app/framework/utils/version.spec.ts index 4af85456d..20603d4d3 100644 --- a/src/Squidex/app/framework/utils/version.spec.ts +++ b/src/Squidex/app/framework/utils/version.spec.ts @@ -13,6 +13,13 @@ describe('Version', () => { expect(version.value).toBe('1.0'); }); + + it('should ignore prefix for equal comparison', () => { + expect(new Version('2').eq(new Version('2'))).toBeTruthy(); + expect(new Version('2').eq(new Version('W/2'))).toBeTruthy(); + expect(new Version('W/2').eq(new Version('2'))).toBeTruthy(); + expect(new Version('W/2').eq(new Version('W/2'))).toBeTruthy(); + }); }); describe('Versioned', () => { diff --git a/src/Squidex/app/framework/utils/version.ts b/src/Squidex/app/framework/utils/version.ts index 92016cd90..e7bf99dd6 100644 --- a/src/Squidex/app/framework/utils/version.ts +++ b/src/Squidex/app/framework/utils/version.ts @@ -10,6 +10,18 @@ export class Version { public readonly value: string ) { } + + public eq(other: Version) { + return other && other.trimmed() === this.trimmed(); + } + + private trimmed(): string { + if (this.value.startsWith('W/')) { + return this.value.substr(2); + } else { + return this.value; + } + } } export class Versioned { diff --git a/src/Squidex/app/shared/components/app-form.component.ts b/src/Squidex/app/shared/components/app-form.component.ts index 808139bf7..7ebd576ad 100644 --- a/src/Squidex/app/shared/components/app-form.component.ts +++ b/src/Squidex/app/shared/components/app-form.component.ts @@ -30,7 +30,8 @@ export class AppFormComponent { public createForm = new CreateAppForm(this.formBuilder); - constructor(public readonly apiUrl: ApiUrlConfig, + constructor( + public readonly apiUrl: ApiUrlConfig, private readonly appsStore: AppsState, private readonly formBuilder: FormBuilder ) { diff --git a/src/Squidex/app/shared/components/asset.component.html b/src/Squidex/app/shared/components/asset.component.html index 5a34b522d..237b69fa5 100644 --- a/src/Squidex/app/shared/components/asset.component.html +++ b/src/Squidex/app/shared/components/asset.component.html @@ -1,7 +1,7 @@ -
+
-
+
{{asset.fileType}} @@ -21,10 +21,10 @@ - + - +
@@ -44,11 +44,11 @@
-
- +
+
-
+
Drop to update
@@ -56,10 +56,10 @@
-
+
{{asset.fileName}}
-
+
@@ -85,55 +85,57 @@ -
+
-
+
-
+
-
-
-
- {{asset.fileName}} -
-
- - + + + + + + + + +
+
+ {{asset.fileName}} +
+
+ + - - -
- -
- {{asset.pixelWidth}}x{{asset.pixelHeight}}px, {{asset.fileSize | sqxFileSize}} -
-
- -
-
- - - -
-
- - -
- + + + + 		+ {{asset.pixelWidth}}x{{asset.pixelHeight}}px, {{asset.fileSize | sqxFileSize}} + + + + + + + + + +
-
- +
+
-
+
Drop to update
diff --git a/src/Squidex/app/shared/components/asset.component.scss b/src/Squidex/app/shared/components/asset.component.scss index 78d880e2e..58ab1e5d0 100644 --- a/src/Squidex/app/shared/components/asset.component.scss +++ b/src/Squidex/app/shared/components/asset.component.scss @@ -107,8 +107,7 @@ $list-height: 2.375rem; background: $color-dark-black; } - &-name, - &-info { + &-name, &-info { @include truncate; } @@ -187,7 +186,7 @@ $list-height: 2.375rem; .table-items-row { & { position: relative; - padding-left: $list-height + 2rem; + padding-left: $list-height + 3rem; height: $list-height + 2rem; } @@ -229,36 +228,31 @@ $list-height: 2.375rem; height: $list-height; } - &-user { - padding-top: .2rem; - } - - &-actions { - line-height: $list-height; + &-name { + width: 100%; + padding-right: .5rem; } - &-name, - &-info { - @include truncate; - padding-right: 1rem; - padding-left: 1rem; - line-height: $list-height; + &-user { + width: 3rem; } - &-actions, - &-user { - max-width: 3rem; - min-width: 3rem; + &-actions { + width: 3rem; } &-info { color: $color-text-decent; font-size: .9rem; - max-width: 12rem; - min-width: 12rem; + font-weight: normal; + width: 12rem; } } + table { + width: 100%; + } + .upload-progress { padding: .25rem 0; } diff --git a/src/Squidex/app/shared/components/asset.component.ts b/src/Squidex/app/shared/components/asset.component.ts index 61b6dcffa..9a082df4a 100644 --- a/src/Squidex/app/shared/components/asset.component.ts +++ b/src/Squidex/app/shared/components/asset.component.ts @@ -5,9 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostBinding, Input, OnChanges, OnDestroy, OnInit, Output, SimpleChanges } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostBinding, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; import { FormBuilder, FormControl } from '@angular/forms'; -import { Subscription } from 'rxjs'; import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; import { @@ -20,11 +19,19 @@ import { fadeAnimation, RenameAssetDto, RenameAssetForm, + StatefulComponent, TagAssetDto, Types, Versioned } from '@app/shared/internal'; +interface State { + isTagging: boolean; + isRenaming: boolean; + + progress: number; +} + @Component({ selector: 'sqx-asset', styleUrls: ['./asset.component.scss'], @@ -34,9 +41,7 @@ import { ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class AssetComponent implements OnChanges, OnDestroy, OnInit { - private tagSubscription: Subscription; - +export class AssetComponent extends StatefulComponent implements OnChanges, OnInit { @Input() public initFile: File; @@ -46,6 +51,9 @@ export class AssetComponent implements OnChanges, OnDestroy, OnInit { @Input() public removeMode = false; + @Input() + public isCompact = false; + @Input() public isDisabled = false; @@ -79,27 +87,22 @@ export class AssetComponent implements OnChanges, OnDestroy, OnInit { @Output() public failed = new EventEmitter(); - public isTagging = false; - - public renaming = false; public renameForm = new RenameAssetForm(this.formBuilder); public tagInput = new FormControl(); - public progress = 0; - - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly appsState: AppsState, private readonly assetsService: AssetsService, private readonly authState: AuthService, - private readonly changeDetector: ChangeDetectorRef, private readonly dialogs: DialogService, private readonly formBuilder: FormBuilder ) { - } - - public ngOnDestroy() { - this.tagSubscription.unsubscribe(); + super(changeDetector, { + isRenaming: false, + isTagging: false, + progress: 0 + }); } public ngOnInit() { @@ -122,13 +125,13 @@ export class AssetComponent implements OnChanges, OnDestroy, OnInit { }); } - this.tagSubscription = + this.own( this.tagInput.valueChanges.pipe( distinctUntilChanged(), debounceTime(2000) ).subscribe(tags => { this.tagAsset(tags); - }); + })); } public ngOnChanges(changes: SimpleChanges) { @@ -189,13 +192,15 @@ export class AssetComponent implements OnChanges, OnDestroy, OnInit { public renameStart() { if (!this.isDisabled) { this.renameForm.load(this.asset); - this.renaming = true; + + this.next(s => ({ ...s, isRenaming: true })); } } public renameCancel() { this.renameForm.submitCompleted(); - this.renaming = false; + + this.next(s => ({ ...s, isRenaming: false })); } private emitFailed(error: any) { @@ -211,14 +216,11 @@ export class AssetComponent implements OnChanges, OnDestroy, OnInit { } private setProgress(progress: number) { - this.progress = progress; - - this.changeDetector.markForCheck(); + this.next(s => ({ ...s, progress })); } private updateAsset(asset: AssetDto, emitEvent: boolean) { this.asset = asset; - this.progress = 0; this.tagInput.setValue(asset.tags, { emitEvent: false }); @@ -228,6 +230,6 @@ export class AssetComponent implements OnChanges, OnDestroy, OnInit { this.renameCancel(); - this.changeDetector.markForCheck(); + this.next(s => ({ ...s, progress: 0 })); } } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/assets-list.component.html b/src/Squidex/app/shared/components/assets-list.component.html index fb8b2b304..48eb6cc2f 100644 --- a/src/Squidex/app/shared/components/assets-list.component.html +++ b/src/Squidex/app/shared/components/assets-list.component.html @@ -14,7 +14,7 @@
Drop file on existing item to replace the asset with a newer version.
-
+
- \ No newline at end of file + \ No newline at end of file diff --git a/src/Squidex/app/shared/components/assets-selector.component.html b/src/Squidex/app/shared/components/assets-selector.component.html index cec3b005d..237f4cab2 100644 --- a/src/Squidex/app/shared/components/assets-selector.component.html +++ b/src/Squidex/app/shared/components/assets-selector.component.html @@ -6,7 +6,7 @@
-
@@ -14,8 +14,8 @@
@@ -23,7 +23,7 @@
@@ -31,10 +31,10 @@
- -
@@ -44,15 +44,15 @@ + [selectedIds]="snapshot.selectedAssets" + [state]="assetsState" isDisabled="true"> - + \ No newline at end of file diff --git a/src/Squidex/app/shared/components/assets-selector.component.ts b/src/Squidex/app/shared/components/assets-selector.component.ts index 711af55e0..30bf9307a 100644 --- a/src/Squidex/app/shared/components/assets-selector.component.ts +++ b/src/Squidex/app/shared/components/assets-selector.component.ts @@ -5,16 +5,24 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, Component, EventEmitter, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, OnInit, Output } from '@angular/core'; import { onErrorResumeNext } from 'rxjs/operators'; import { AssetDto, AssetsDialogState, fadeAnimation, - LocalStoreService + LocalStoreService, + StatefulComponent } from '@app/shared/internal'; +interface State { + selectedAssets: { [id: string]: AssetDto }; + selectionCount: number; + + isListView: boolean; +} + @Component({ selector: 'sqx-assets-selector', styleUrls: ['./assets-selector.component.scss'], @@ -24,32 +32,31 @@ import { ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class AssetsSelectorComponent implements OnInit { - public selectedAssets: { [id: string]: AssetDto } = {}; - public selectionCount = 0; - - public isListView = false; - +export class AssetsSelectorComponent extends StatefulComponent implements OnInit { @Output() public selected = new EventEmitter(); - constructor( - public readonly state: AssetsDialogState, - private readonly localStore: LocalStoreService + constructor(changeDector: ChangeDetectorRef, + public readonly assetsState: AssetsDialogState, + public readonly localStore: LocalStoreService ) { - this.isListView = this.localStore.getBoolean('squidex.assets.list-view'); + super(changeDector, { + selectedAssets: {}, + selectionCount: 0, + isListView: localStore.getBoolean('squidex.assets.list-view') + }); } public ngOnInit() { - this.state.load().pipe(onErrorResumeNext()).subscribe(); + this.assetsState.load().pipe(onErrorResumeNext()).subscribe(); } public reload() { - this.state.load(true).pipe(onErrorResumeNext()).subscribe(); + this.assetsState.load(true).pipe(onErrorResumeNext()).subscribe(); } public search(query: string) { - this.state.search(query).pipe(onErrorResumeNext()).subscribe(); + this.assetsState.search(query).pipe(onErrorResumeNext()).subscribe(); } public complete() { @@ -57,25 +64,31 @@ export class AssetsSelectorComponent implements OnInit { } public select() { - this.selected.emit(Object.values(this.selectedAssets)); + this.selected.emit(Object.values(this.snapshot.selectedAssets)); } public selectTags(tags: string[]) { - this.state.selectTags(tags).pipe(onErrorResumeNext()).subscribe(); + this.assetsState.selectTags(tags).pipe(onErrorResumeNext()).subscribe(); } public selectAsset(asset: AssetDto) { - if (this.selectedAssets[asset.id]) { - delete this.selectedAssets[asset.id]; - } else { - this.selectedAssets[asset.id] = asset; - } + this.next(s => { + const selectedAssets = { ...s.selectedAssets }; + + if (selectedAssets[asset.id]) { + delete selectedAssets[asset.id]; + } else { + selectedAssets[asset.id] = asset; + } + + const selectionCount = Object.keys(selectedAssets).length; - this.selectionCount = Object.keys(this.selectedAssets).length; + return { ...s, selectedAssets, selectionCount }; + }); } public changeView(isListView: boolean) { - this.isListView = isListView; + this.next(s => ({ ...s, isListView })); this.localStore.setBoolean('squidex.assets.list-view', isListView); } diff --git a/src/Squidex/app/shared/components/comments.component.ts b/src/Squidex/app/shared/components/comments.component.ts index a3b2926ff..5cbea6db8 100644 --- a/src/Squidex/app/shared/components/comments.component.ts +++ b/src/Squidex/app/shared/components/comments.component.ts @@ -5,9 +5,9 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { Component, Input, OnInit } from '@angular/core'; import { FormBuilder } from '@angular/forms'; -import { Subscription, timer } from 'rxjs'; +import { timer } from 'rxjs'; import { onErrorResumeNext, switchMap } from 'rxjs/operators'; import { @@ -17,6 +17,7 @@ import { CommentsService, CommentsState, DialogService, + ResourceOwner, UpsertCommentForm } from '@app/shared/internal'; @@ -25,9 +26,7 @@ import { styleUrls: ['./comments.component.scss'], templateUrl: './comments.component.html' }) -export class CommentsComponent implements OnDestroy, OnInit { - private timerSubscription: Subscription; - +export class CommentsComponent extends ResourceOwner implements OnInit { public state: CommentsState; public userId: string; @@ -43,19 +42,17 @@ export class CommentsComponent implements OnDestroy, OnInit { private readonly dialogs: DialogService, private readonly formBuilder: FormBuilder ) { - this.userId = authService.user!.token; - } + super(); - public ngOnDestroy() { - this.timerSubscription.unsubscribe(); + this.userId = authService.user!.token; } public ngOnInit() { this.state = new CommentsState(this.appsState, this.commentsId, this.commentsService, this.dialogs); - this.timerSubscription = + this.own( timer(0, 4000).pipe(switchMap(() => this.state.load().pipe(onErrorResumeNext()))) - .subscribe(); + .subscribe()); } public delete(comment: CommentDto) { diff --git a/src/Squidex/app/shared/components/geolocation-editor.component.html b/src/Squidex/app/shared/components/geolocation-editor.component.html index fdf03b724..6372c12ed 100644 --- a/src/Squidex/app/shared/components/geolocation-editor.component.html +++ b/src/Squidex/app/shared/components/geolocation-editor.component.html @@ -1,7 +1,7 @@
- +
@@ -9,7 +9,7 @@
- +
@@ -18,13 +18,13 @@
- +
- +
diff --git a/src/Squidex/app/shared/components/geolocation-editor.component.ts b/src/Squidex/app/shared/components/geolocation-editor.component.ts index 8d1ec494a..00de85805 100644 --- a/src/Squidex/app/shared/components/geolocation-editor.component.ts +++ b/src/Squidex/app/shared/components/geolocation-editor.component.ts @@ -6,10 +6,11 @@ */ import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, ViewChild } from '@angular/core'; -import { ControlValueAccessor, FormBuilder, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { FormBuilder, NG_VALUE_ACCESSOR } from '@angular/forms'; import { ResourceLoaderService, + StatefulControlComponent, Types, UIState, ValidatorsEx @@ -27,6 +28,10 @@ interface Geolocation { longitude: number; } +interface State { + isGoogleMaps: boolean; +} + @Component({ selector: 'sqx-geolocation-editor', styleUrls: ['./geolocation-editor.component.scss'], @@ -34,9 +39,7 @@ interface Geolocation { providers: [SQX_GEOLOCATION_EDITOR_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class GeolocationEditorComponent implements ControlValueAccessor, AfterViewInit { - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; +export class GeolocationEditorComponent extends StatefulControlComponent implements AfterViewInit { private marker: any; private map: any; private value: Geolocation | null = null; @@ -62,20 +65,19 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi }); @ViewChild('editor') - public editor: ElementRef; + public editor: ElementRef; @ViewChild('searchBox') - public searchBoxInput: ElementRef; - - public isGoogleMaps = false; - public isDisabled = false; + public searchBoxInput: ElementRef; - constructor( - private readonly changeDetector: ChangeDetectorRef, + constructor(changeDetector: ChangeDetectorRef, private readonly resourceLoader: ResourceLoaderService, private readonly formBuilder: FormBuilder, private readonly uiState: UIState ) { + super(changeDetector, { + isGoogleMaps: false + }); } public writeValue(obj: any) { @@ -91,9 +93,9 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi } public setDisabledState(isDisabled: boolean): void { - this.isDisabled = isDisabled; + super.setDisabledState(isDisabled); - if (!this.isGoogleMaps) { + if (!this.snapshot.isGoogleMaps) { this.setDisabledStateOSM(isDisabled); } else { this.setDisabledStateGoogle(isDisabled); @@ -104,8 +106,6 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi } else { this.geolocationForm.enable(); } - - this.changeDetector.markForCheck(); } private setDisabledStateOSM(isDisabled: boolean): void { @@ -139,14 +139,6 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi } } - public registerOnChange(fn: any) { - this.callChange = fn; - } - - public registerOnTouched(fn: any) { - this.callTouched = fn; - } - public updateValueByInput() { const lat = this.geolocationForm.controls['latitude'].value; const lng = this.geolocationForm.controls['longitude'].value; @@ -164,9 +156,11 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi public ngAfterViewInit() { this.uiState.settings .subscribe(settings => { - this.isGoogleMaps = settings.mapType === 'GoogleMaps'; + const isGoogleMaps = settings.mapType === 'GoogleMaps'; + + this.next(s => ({ ...s, isGoogleMaps })); - if (!this.isGoogleMaps) { + if (!this.snapshot.isGoogleMaps) { this.ngAfterViewInitOSM(); } else { this.ngAfterViewInitGoogle(settings.mapKey); @@ -189,7 +183,7 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi this.map.on('click', (event: any) => { - if (!this.marker && !this.isDisabled) { + if (!this.marker && !this.snapshot.isDisabled) { const latlng = event.latlng.wrap(); this.updateValue(latlng.lat, latlng.lng); @@ -199,7 +193,7 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi this.updateMarker(true, false); - if (this.isDisabled) { + if (this.snapshot.isDisabled) { this.map.zoomControl.disable(); this.map._handlers.forEach((handler: any) => { @@ -224,7 +218,7 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi this.map.addListener('click', (event: any) => { - if (!this.isDisabled) { + if (!this.snapshot.isDisabled) { this.updateValue(event.latLng.lat(), event.latLng.lng()); this.updateMarker(false, true); } @@ -244,7 +238,7 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi return; } - if (!this.isDisabled) { + if (!this.snapshot.isDisabled) { let lat = place.geometry.location.lat(); let lng = place.geometry.location.lng(); @@ -256,7 +250,7 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi this.updateMarker(true, false); - if (this.isDisabled) { + if (this.snapshot.isDisabled) { this.map.setOptions({ draggable: false, zoomControl: false }); } }); @@ -264,7 +258,7 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi public reset() { this.value = null; - this.searchBoxInput.nativeElement.value = null; + this.searchBoxInput.nativeElement.value = ''; this.updateMarker(true, true); } @@ -274,7 +268,7 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi } private updateMarker(zoom: boolean, fireEvent: boolean) { - if (!this.isGoogleMaps) { + if (!this.snapshot.isGoogleMaps) { this.updateMarkerOSM(zoom); } else { this.updateMarkerGoogle(zoom); @@ -307,7 +301,7 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi this.updateMarker(false, true); }); - if (this.isDisabled) { + if (this.snapshot.isDisabled) { this.marker.dragging.disable(); } } @@ -344,12 +338,12 @@ export class GeolocationEditorComponent implements ControlValueAccessor, AfterVi }); this.marker.addListener('drag', (event: any) => { - if (!this.isDisabled) { + if (!this.snapshot.isDisabled) { this.updateValue(event.latLng.lat(), event.LatLng.lng()); } }); this.marker.addListener('dragend', (event: any) => { - if (!this.isDisabled) { + if (!this.snapshot.isDisabled) { this.updateValue(event.latLng.lat(), event.LatLng.lng()); this.updateMarker(false, true); } diff --git a/src/Squidex/app/shared/components/language-selector.component.html b/src/Squidex/app/shared/components/language-selector.component.html index 4215489e6..ef39cfd30 100644 --- a/src/Squidex/app/shared/components/language-selector.component.html +++ b/src/Squidex/app/shared/components/language-selector.component.html @@ -5,7 +5,7 @@
-
diff --git a/src/Squidex/app/shared/components/markdown-editor.component.html b/src/Squidex/app/shared/components/markdown-editor.component.html index 042807d13..fee67d1f6 100644 --- a/src/Squidex/app/shared/components/markdown-editor.component.html +++ b/src/Squidex/app/shared/components/markdown-editor.component.html @@ -1,5 +1,5 @@
-
+
diff --git a/src/Squidex/app/shared/components/markdown-editor.component.ts b/src/Squidex/app/shared/components/markdown-editor.component.ts index dde539e6e..564f0b599 100644 --- a/src/Squidex/app/shared/components/markdown-editor.component.ts +++ b/src/Squidex/app/shared/components/markdown-editor.component.ts @@ -6,7 +6,7 @@ */ import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, Renderer2, ViewChild } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { AppsState, @@ -16,6 +16,7 @@ import { DateTime, DialogModel, ResourceLoaderService, + StatefulControlComponent, Types } from '@app/shared/internal'; @@ -25,6 +26,10 @@ export const SQX_MARKDOWN_EDITOR_CONTROL_VALUE_ACCESSOR: any = { provide: NG_VALUE_ACCESSOR, useExisting: forwardRef(() => MarkdownEditorComponent), multi: true }; +interface State { + isFullscreen: false; +} + @Component({ selector: 'sqx-markdown-editor', styleUrls: ['./markdown-editor.component.scss'], @@ -32,15 +37,11 @@ export const SQX_MARKDOWN_EDITOR_CONTROL_VALUE_ACCESSOR: any = { providers: [SQX_MARKDOWN_EDITOR_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class MarkdownEditorComponent implements ControlValueAccessor, AfterViewInit { - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; +export class MarkdownEditorComponent extends StatefulControlComponent implements AfterViewInit { private simplemde: any; private value: string; private isDisabled = false; - public assetsDialog = new DialogModel(); - @ViewChild('editor') public editor: ElementRef; @@ -50,17 +51,18 @@ export class MarkdownEditorComponent implements ControlValueAccessor, AfterViewI @ViewChild('inner') public inner: ElementRef; - public isFullscreen = false; + public assetsDialog = new DialogModel(); - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly appsState: AppsState, private readonly assetsService: AssetsService, private readonly authState: AuthService, - private readonly changeDetector: ChangeDetectorRef, private readonly renderer: Renderer2, private readonly resourceLoader: ResourceLoaderService ) { - this.resourceLoader.loadStyle('https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css'); + super(changeDetector, { + isFullscreen: false + }); } public writeValue(obj: any) { @@ -79,21 +81,12 @@ export class MarkdownEditorComponent implements ControlValueAccessor, AfterViewI } } - public registerOnChange(fn: any) { - this.callChange = fn; - } - - public registerOnTouched(fn: any) { - this.callTouched = fn; - } - private showSelector = () => { this.assetsDialog.show(); - - this.changeDetector.detectChanges(); } public ngAfterViewInit() { + this.resourceLoader.loadStyle('https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.css'); this.resourceLoader.loadScript('https://cdn.jsdelivr.net/simplemde/latest/simplemde.min.js').then(() => { this.simplemde = new SimpleMDE({ toolbar: [ @@ -189,17 +182,17 @@ export class MarkdownEditorComponent implements ControlValueAccessor, AfterViewI }); this.simplemde.codemirror.on('refresh', () => { - this.isFullscreen = this.simplemde.isFullscreenActive(); + const isFullscreen = this.simplemde.isFullscreenActive(); let target = this.container.nativeElement; - if (this.isFullscreen) { + if (isFullscreen) { target = document.body; } this.renderer.appendChild(target, this.inner.nativeElement); - this.changeDetector.detectChanges(); + this.next(s => ({ ...s, isFullscreen })); }); this.simplemde.codemirror.on('blur', () => { diff --git a/src/Squidex/app/shared/components/permission.directive.ts b/src/Squidex/app/shared/components/permission.directive.ts index 0a7128a84..540b16c2f 100644 --- a/src/Squidex/app/shared/components/permission.directive.ts +++ b/src/Squidex/app/shared/components/permission.directive.ts @@ -5,25 +5,22 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectorRef, Directive, Input, OnChanges, OnDestroy, OnInit, TemplateRef, ViewContainerRef } from '@angular/core'; +import { ChangeDetectorRef, Directive, Input, OnChanges, OnInit, TemplateRef, ViewContainerRef } from '@angular/core'; import { AppDto, AppsState, AuthService, Permission, + ResourceOwner, SchemaDto, SchemasState } from '@app/shared/internal'; -import { Subscription } from 'rxjs'; @Directive({ selector: '[sqxPermission]' }) -export class PermissionDirective implements OnChanges, OnInit, OnDestroy { - private selectedAppSubscription: Subscription; - private selectedSchemaSubscription: Subscription; - +export class PermissionDirective extends ResourceOwner implements OnChanges, OnInit { private viewCreated = false; @Input('sqxPermissionApp') @@ -43,32 +40,23 @@ export class PermissionDirective implements OnChanges, OnInit, OnDestroy { private readonly templateRef: TemplateRef, private readonly viewContainer: ViewContainerRef ) { - } - - public ngOnDestroy() { - if (this.selectedAppSubscription) { - this.selectedAppSubscription.unsubscribe(); - } - - if (this.selectedSchemaSubscription) { - this.selectedSchemaSubscription.unsubscribe(); - } + super(); } public ngOnInit() { - this.selectedAppSubscription = + this.own( this.appsState.selectedApp.subscribe(app => { if (app && !this.app) { this.update(app, this.schemasState.snapshot.selectedSchema); } - }); + })); - this.selectedSchemaSubscription = + this.own( this.schemasState.selectedSchema.subscribe(schema => { if (schema && !this.schema) { this.update(this.appsState.snapshot.selectedApp, schema); } - }); + })); } public ngOnChanges() { diff --git a/src/Squidex/app/shared/components/rich-editor.component.ts b/src/Squidex/app/shared/components/rich-editor.component.ts index 66b618840..eb3fb10dd 100644 --- a/src/Squidex/app/shared/components/rich-editor.component.ts +++ b/src/Squidex/app/shared/components/rich-editor.component.ts @@ -8,7 +8,7 @@ // tslint:disable:prefer-for-of import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, EventEmitter, forwardRef, OnDestroy, Output, ViewChild } from '@angular/core'; -import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { NG_VALUE_ACCESSOR } from '@angular/forms'; import { AppsState, @@ -17,6 +17,7 @@ import { AuthService, DateTime, DialogModel, + ExternalControlComponent, ResourceLoaderService, Types } from '@app/shared/internal'; @@ -41,35 +42,35 @@ const ImageTypes = [ providers: [SQX_RICH_EDITOR_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class RichEditorComponent implements ControlValueAccessor, AfterViewInit, OnDestroy { - private callChange = (v: any) => { /* NOOP */ }; - private callTouched = () => { /* NOOP */ }; +export class RichEditorComponent extends ExternalControlComponent implements AfterViewInit, OnDestroy { private tinyEditor: any; private tinyInitTimer: any; private value: string; private isDisabled = false; - public assetsDialog = new DialogModel(); - @ViewChild('editor') public editor: ElementRef; @Output() public assetPluginClicked = new EventEmitter(); - constructor( + public assetsDialog = new DialogModel(); + + constructor(changeDetector: ChangeDetectorRef, private readonly appsState: AppsState, private readonly assetsService: AssetsService, private readonly authState: AuthService, - private readonly changeDetector: ChangeDetectorRef, private readonly resourceLoader: ResourceLoaderService ) { + super(changeDetector); } public ngOnDestroy() { clearTimeout(this.tinyInitTimer); - tinymce.remove(this.editor); + if (tinymce && this.editor) { + tinymce.remove(this.editor); + } } public ngAfterViewInit() { @@ -82,8 +83,6 @@ export class RichEditorComponent implements ControlValueAccessor, AfterViewInit, private showSelector = () => { this.assetsDialog.show(); - - this.changeDetector.detectChanges(); } private getEditorOptions() { @@ -183,14 +182,6 @@ export class RichEditorComponent implements ControlValueAccessor, AfterViewInit, } } - public registerOnChange(fn: any) { - this.callChange = fn; - } - - public registerOnTouched(fn: any) { - this.callTouched = fn; - } - public insertAssets(assets: AssetDto[]) { let content = ''; diff --git a/src/Squidex/app/shared/components/schema-category.component.html b/src/Squidex/app/shared/components/schema-category.component.html index 426b5ebd7..dce6a0904 100644 --- a/src/Squidex/app/shared/components/schema-category.component.html +++ b/src/Squidex/app/shared/components/schema-category.component.html @@ -1,20 +1,20 @@ -
+
- -

{{displayName}} ({{schemasFiltered.length}})

+

{{snapshot.displayName}} ({{snapshot.schemasFiltered.length}})

-
-
    - +
      +
    • diff --git a/src/Squidex/app/shared/components/schema-category.component.scss b/src/Squidex/app/shared/components/schema-category.component.scss index 320cc3303..0db9907fc 100644 --- a/src/Squidex/app/shared/components/schema-category.component.scss +++ b/src/Squidex/app/shared/components/schema-category.component.scss @@ -8,7 +8,13 @@ h3 { } .btn { - width: 2rem; + & { + width: 2rem; + } + + &:focus { + border-color: transparent; + } } .category { diff --git a/src/Squidex/app/shared/components/schema-category.component.ts b/src/Squidex/app/shared/components/schema-category.component.ts index 7daecdf73..9b17d2e59 100644 --- a/src/Squidex/app/shared/components/schema-category.component.ts +++ b/src/Squidex/app/shared/components/schema-category.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; import { onErrorResumeNext } from 'rxjs/operators'; import { @@ -15,9 +15,19 @@ import { SchemaDetailsDto, SchemaDto, SchemasState, + StatefulComponent, Types } from '@app/shared/internal'; +interface State { + displayName?: string; + + schemasFiltered: ImmutableArray; + schemasForCategory: ImmutableArray; + + isOpen: boolean; +} + @Component({ selector: 'sqx-schema-category', styleUrls: ['./schema-category.component.scss'], @@ -27,7 +37,7 @@ import { ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class SchemaCategoryComponent implements OnInit, OnChanges { +export class SchemaCategoryComponent extends StatefulComponent implements OnInit, OnChanges { @Output() public removing = new EventEmitter(); @@ -46,31 +56,29 @@ export class SchemaCategoryComponent implements OnInit, OnChanges { @Input() public schemas: ImmutableArray; - public displayName: string; - - public schemasFiltered: ImmutableArray; - public schemasForCategory: ImmutableArray; - - public isOpen = true; - public allowDrop = (schema: any) => { return (Types.is(schema, SchemaDto) || Types.is(schema, SchemaDetailsDto)) && !this.isSameCategory(schema); } - constructor( + constructor(changeDetector: ChangeDetectorRef, private readonly localStore: LocalStoreService, private readonly schemasState: SchemasState ) { + super(changeDetector, { + schemasFiltered: ImmutableArray.empty(), + schemasForCategory: ImmutableArray.empty(), + isOpen: true + }); } public ngOnInit() { - this.isOpen = !this.localStore.getBoolean(this.configKey()); + this.next(s => ({ ...s, isOpen: !this.localStore.getBoolean(this.configKey()) })); } public toggle() { - this.isOpen = !this.isOpen; + this.next(s => ({ ...s, isOpen: !s.isOpen })); - this.localStore.setBoolean(this.configKey(), !this.isOpen); + this.localStore.setBoolean(this.configKey(), !this.snapshot.isOpen); } public ngOnChanges(changes: SimpleChanges): void { @@ -81,22 +89,28 @@ export class SchemaCategoryComponent implements OnInit, OnChanges { const query = this.schemasFilter; - this.schemasForCategory = this.schemas.filter(x => isSameCategory(x)); - this.schemasFiltered = this.schemasForCategory.filter(x => !query || x.name.indexOf(query) >= 0); + const schemasForCategory = this.schemas.filter(x => isSameCategory(x)); + const schemasFiltered = schemasForCategory.filter(x => !query || x.name.indexOf(query) >= 0); + + let isOpen = false; if (query) { - this.isOpen = true; + isOpen = true; } else { - this.isOpen = this.localStore.get(`schema-category.${this.name}`) !== 'false'; + isOpen = this.localStore.get(`schema-category.${this.name}`) !== 'false'; } + + this.next(s => ({ ...s, isOpen, schemasFiltered, schemasForCategory })); } if (changes['name']) { - if (!this.name || this.name.length === 0) { - this.displayName = 'Schemas'; - } else { - this.displayName = this.name; + let displayName = 'Schemas'; + + if (this.name && this.name.length > 0) { + displayName = this.name; } + + this.next(s => ({ ...s, displayName })); } } @@ -116,14 +130,14 @@ export class SchemaCategoryComponent implements OnInit, OnChanges { this.schemasState.changeCategory(schema, this.name).pipe(onErrorResumeNext()).subscribe(); } - public schemaPermission(schema: SchemaDto) { - return `?squidex.apps.{app}.schemas.${schema.name}.*;squidex.apps.{app}.contents.${schema.name}.*`; - } - public trackBySchema(index: number, schema: SchemaDto) { return schema.id; } + public schemaPermission(schema: SchemaDto) { + return `?squidex.apps.{app}.schemas.${schema.name}.*;squidex.apps.{app}.contents.${schema.name}.*`; + } + private configKey(): string { return `squidex.schema.category.${this.name}.closed`; } diff --git a/src/Squidex/app/shared/services/app-roles.service.spec.ts b/src/Squidex/app/shared/services/app-roles.service.spec.ts index 6746d8a79..1138a3b43 100644 --- a/src/Squidex/app/shared/services/app-roles.service.spec.ts +++ b/src/Squidex/app/shared/services/app-roles.service.spec.ts @@ -14,10 +14,10 @@ import { AppRoleDto, AppRolesDto, AppRolesService, + CreateAppRoleDto, UpdateAppRoleDto, Version } from './../'; -import { CreateAppRoleDto } from './app-roles.service'; describe('AppRolesService', () => { const version = new Version('1'); diff --git a/src/Squidex/app/shared/services/contents.service.spec.ts b/src/Squidex/app/shared/services/contents.service.spec.ts index 6e9d7fb9f..87fc4112e 100644 --- a/src/Squidex/app/shared/services/contents.service.spec.ts +++ b/src/Squidex/app/shared/services/contents.service.spec.ts @@ -16,7 +16,8 @@ import { ContentsService, DateTime, ScheduleDto, - Version + Version, + Versioned } from './../'; describe('ContentsService', () => { @@ -216,6 +217,7 @@ describe('ContentsService', () => { createdBy: 'Created1', lastModified: '2017-12-12T10:10', lastModifiedBy: 'LastModifiedBy1', + isPending: false, data: {} }, { headers: { @@ -228,7 +230,7 @@ describe('ContentsService', () => { DateTime.parseISO_UTC('2016-12-12T10:10'), 'Created1', DateTime.parseISO_UTC('2017-12-12T10:10'), 'LastModifiedBy1', null, - true, + false, null, {}, new Version('2'))); @@ -239,7 +241,7 @@ describe('ContentsService', () => { const response = {}; - let data: any; + let data: Versioned; contentsService.getVersionData('my-app', 'my-schema', 'content1', version).subscribe(result => { data = result; @@ -252,7 +254,7 @@ describe('ContentsService', () => { req.flush(response); - expect(data).toBe(response); + expect(data!.payload).toBe(response); })); it('should make put request to update content', diff --git a/src/Squidex/app/shared/services/contents.service.ts b/src/Squidex/app/shared/services/contents.service.ts index 05bb55fd8..7fa8358fc 100644 --- a/src/Squidex/app/shared/services/contents.service.ts +++ b/src/Squidex/app/shared/services/contents.service.ts @@ -162,12 +162,12 @@ export class ContentsService { pretifyError('Failed to load content. Please reload.')); } - public getVersionData(appName: string, schemaName: string, id: string, version: Version): Observable { + 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).pipe( map(response => { - return response.payload.body; + return new Versioned(response.version, response.payload.body); }), pretifyError('Failed to load data. Please reload.')); } @@ -185,7 +185,7 @@ export class ContentsService { DateTime.parseISO_UTC(body.created), body.createdBy, DateTime.parseISO_UTC(body.lastModified), body.lastModifiedBy, null, - true, + body.isPending, null, body.data, response.version); diff --git a/src/Squidex/app/shared/state/apps.forms.ts b/src/Squidex/app/shared/state/apps.forms.ts index 57fb0995b..16d37f9de 100644 --- a/src/Squidex/app/shared/state/apps.forms.ts +++ b/src/Squidex/app/shared/state/apps.forms.ts @@ -6,15 +6,18 @@ */ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { map, startWith } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; -import { Form, ValidatorsEx } from '@app/framework'; +import { + Form, + ValidatorsEx, + value$ +} 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)); + public appName = value$(this.form.controls['name']).pipe(map(v => v || FALLBACK_NAME)); constructor(formBuilder: FormBuilder) { super(formBuilder.group({ diff --git a/src/Squidex/app/shared/state/apps.state.ts b/src/Squidex/app/shared/state/apps.state.ts index 1eff17ed3..03a261594 100644 --- a/src/Squidex/app/shared/state/apps.state.ts +++ b/src/Squidex/app/shared/state/apps.state.ts @@ -35,7 +35,7 @@ function sameApp(lhs: AppDto, rhs?: AppDto): boolean { @Injectable() export class AppsState extends State { public get appName() { - return this.snapshot.selectedApp!.name; + return this.snapshot.selectedApp ? this.snapshot.selectedApp.name : ''; } public selectedApp = @@ -67,9 +67,9 @@ export class AppsState extends State { public load(): Observable { return this.appsService.getApps().pipe( - tap(dtos => { + tap((dto: AppDto[]) => { this.next(s => { - const apps = ImmutableArray.of(dtos); + const apps = ImmutableArray.of(dto); return { ...s, apps }; }); diff --git a/src/Squidex/app/shared/state/assets.state.ts b/src/Squidex/app/shared/state/assets.state.ts index 39f08819d..8563f4ee6 100644 --- a/src/Squidex/app/shared/state/assets.state.ts +++ b/src/Squidex/app/shared/state/assets.state.ts @@ -28,7 +28,7 @@ interface Snapshot { assetsPager: Pager; assetsQuery?: string; - isLoaded?: false; + isLoaded?: boolean; } @Injectable() diff --git a/src/Squidex/app/shared/state/backups.forms.ts b/src/Squidex/app/shared/state/backups.forms.ts index 475050a6c..f13acac93 100644 --- a/src/Squidex/app/shared/state/backups.forms.ts +++ b/src/Squidex/app/shared/state/backups.forms.ts @@ -6,13 +6,15 @@ */ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { map, startWith } from 'rxjs/operators'; -import { Form, ValidatorsEx } from '@app/framework'; +import { + Form, + hasValue$, + ValidatorsEx +} from '@app/framework'; export class RestoreForm extends Form { - public hasNoUrl = - this.form.controls['url'].valueChanges.pipe(startWith(null), map(x => !x)); + public hasNoUrl = hasValue$(this.form.controls['url']); constructor(formBuilder: FormBuilder) { super(formBuilder.group({ diff --git a/src/Squidex/app/shared/state/clients.forms.ts b/src/Squidex/app/shared/state/clients.forms.ts index 5c155f673..323cfc758 100644 --- a/src/Squidex/app/shared/state/clients.forms.ts +++ b/src/Squidex/app/shared/state/clients.forms.ts @@ -6,9 +6,12 @@ */ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { map, startWith } from 'rxjs/operators'; -import { Form, ValidatorsEx } from '@app/framework'; +import { + Form, + hasValue$, + ValidatorsEx +} from '@app/framework'; export class RenameClientForm extends Form { constructor(formBuilder: FormBuilder) { @@ -23,8 +26,7 @@ export class RenameClientForm extends Form { } export class AttachClientForm extends Form { - public hasNoName = - this.form.controls['name'].valueChanges.pipe(startWith(''), map(x => !x || x.length === 0)); + public hasNoName = hasValue$(this.form.controls['name']); constructor(formBuilder: FormBuilder) { super(formBuilder.group({ diff --git a/src/Squidex/app/shared/state/contents.state.ts b/src/Squidex/app/shared/state/contents.state.ts index 41612be52..d7a0f4e75 100644 --- a/src/Squidex/app/shared/state/contents.state.ts +++ b/src/Squidex/app/shared/state/contents.state.ts @@ -301,7 +301,8 @@ export abstract class ContentsStateBase extends State { } public loadVersion(content: ContentDto, version: Version): Observable> { - return this.contentsService.getVersionData(this.appName, this.schemaName, content.id, version).pipe(notify(this.dialogs)); + return this.contentsService.getVersionData(this.appName, this.schemaName, content.id, version).pipe( + notify(this.dialogs)); } private get appName() { diff --git a/src/Squidex/app/shared/state/contributors.forms.ts b/src/Squidex/app/shared/state/contributors.forms.ts index 3680fa2e6..5459228de 100644 --- a/src/Squidex/app/shared/state/contributors.forms.ts +++ b/src/Squidex/app/shared/state/contributors.forms.ts @@ -6,13 +6,11 @@ */ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { map, startWith } from 'rxjs/operators'; -import { Form } from '@app/framework'; +import { Form, hasValue$ } from '@app/framework'; export class AssignContributorForm extends Form { - public hasNoUser = - this.form.controls['user'].valueChanges.pipe(startWith(null), map(x => !x)); + public hasNoUser = hasValue$(this.form.controls['user']); constructor(formBuilder: FormBuilder) { super(formBuilder.group({ diff --git a/src/Squidex/app/shared/state/roles.forms.ts b/src/Squidex/app/shared/state/roles.forms.ts index 71392bbd4..7505362a7 100644 --- a/src/Squidex/app/shared/state/roles.forms.ts +++ b/src/Squidex/app/shared/state/roles.forms.ts @@ -6,9 +6,8 @@ */ import { FormArray, FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; -import { map, startWith } from 'rxjs/operators'; -import { Form } from '@app/framework'; +import { Form, hasValue$ } from '@app/framework'; export class EditPermissionsForm extends Form { constructor() { @@ -37,8 +36,7 @@ export class EditPermissionsForm extends Form { } export class AddPermissionForm extends Form { - public hasPermission = - this.form.controls['permission'].valueChanges.pipe(startWith(''), map(x => !x || x.length === 0)); + public hasPermission = hasValue$(this.form.controls['permission']); constructor(formBuilder: FormBuilder) { super(formBuilder.group({ @@ -52,8 +50,7 @@ export class AddPermissionForm extends Form { } export class AddRoleForm extends Form { - public hasNoName = - this.form.controls['name'].valueChanges.pipe(startWith(''), map(x => !x || x.length === 0)); + public hasNoName = hasValue$(this.form.controls['name']); constructor(formBuilder: FormBuilder) { super(formBuilder.group({ diff --git a/src/Squidex/app/shared/state/schemas.forms.ts b/src/Squidex/app/shared/state/schemas.forms.ts index bb935406d..6f7e52207 100644 --- a/src/Squidex/app/shared/state/schemas.forms.ts +++ b/src/Squidex/app/shared/state/schemas.forms.ts @@ -6,12 +6,12 @@ */ import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'; -import { map, startWith } from 'rxjs/operators'; import { Form, Types, - ValidatorsEx + ValidatorsEx, + value$ } from '@app/framework'; import { createProperties } from './../services/schemas.types'; @@ -28,8 +28,7 @@ export class CreateCategoryForm extends Form { export class CreateSchemaForm extends Form { public schemaName = - this.form.controls['name'].valueChanges.pipe( - map(n => n || FALLBACK_NAME), startWith(FALLBACK_NAME)); + value$(this.form.controls['name']).pipe(n => n || FALLBACK_NAME); constructor(formBuilder: FormBuilder) { super(formBuilder.group({ diff --git a/src/Squidex/app/shared/state/schemas.state.ts b/src/Squidex/app/shared/state/schemas.state.ts index a4f7aa4de..d878e3704 100644 --- a/src/Squidex/app/shared/state/schemas.state.ts +++ b/src/Squidex/app/shared/state/schemas.state.ts @@ -44,7 +44,6 @@ type AnyFieldDto = NestedFieldDto | RootFieldDto; interface Snapshot { categories: { [name: string]: boolean }; - schemasApp?: string; schemas: ImmutableArray; isLoaded?: boolean; @@ -58,6 +57,10 @@ function sameSchema(lhs: SchemaDetailsDto | null, rhs?: SchemaDetailsDto | null) @Injectable() export class SchemasState extends State { + public get schemaName() { + return this.snapshot.selectedSchema ? this.snapshot.selectedSchema.name : ''; + } + public selectedSchema = this.changes.pipe(map(x => x.selectedSchema), distinctUntilChanged(sameSchema)); @@ -78,10 +81,6 @@ export class SchemasState extends State { this.changes.pipe(map(x => !!x.isLoaded), distinctUntilChanged()); - public get schemaName() { - return this.snapshot.selectedSchema!.name; - } - constructor( private readonly appsState: AppsState, private readonly authState: AuthService, @@ -93,11 +92,11 @@ export class SchemasState extends State { public select(idOrName: string | null): Observable { return this.loadSchema(idOrName).pipe( - tap(schema => { + tap(selectedSchema => { this.next(s => { - const schemas = schema ? s.schemas.replaceBy('id', schema) : s.schemas; + const schemas = selectedSchema ? s.schemas.replaceBy('id', selectedSchema) : s.schemas; - return { ...s, selectedSchema: schema, schemas }; + return { ...s, selectedSchema, schemas }; }); })); } @@ -124,7 +123,7 @@ export class SchemasState extends State { const categories = buildCategories(s.categories, schemas); - return { ...s, schemas, schemasApp: this.appName, isLoaded: true, categories }; + return { ...s, schemas, isLoaded: true, categories }; }); }), notify(this.dialogs)); @@ -325,7 +324,7 @@ export class SchemasState extends State { private replaceSchema(schema: SchemaDto) { return this.next(s => { const schemas = s.schemas.replaceBy('id', schema).sortByStringAsc(x => x.displayName); - const selectedSchema = s.selectedSchema && s.selectedSchema.id === schema.id ? schema : s.selectedSchema; + const selectedSchema = Types.is(schema, SchemaDetailsDto) && s.selectedSchema && s.selectedSchema.id === schema.id ? schema : s.selectedSchema; const categories = buildCategories(s.categories, schemas); diff --git a/src/Squidex/app/shared/state/ui.state.ts b/src/Squidex/app/shared/state/ui.state.ts index 84a633a81..f71f500c2 100644 --- a/src/Squidex/app/shared/state/ui.state.ts +++ b/src/Squidex/app/shared/state/ui.state.ts @@ -53,7 +53,7 @@ export class UIState extends State { this.uiService.getSettings(this.appName) .subscribe(dtos => { - return this.next({ settings: dtos }); + return this.next(s => ({ ...s, settings: dtos })); }); } @@ -65,7 +65,7 @@ export class UIState extends State { current[key] = value; - this.next({ settings: root }); + this.next(s => ({ ...s, settings: root })); } } @@ -77,7 +77,7 @@ export class UIState extends State { delete current[key]; - this.next({ settings: root }); + this.next(s => ({ ...s, settings: root })); } } diff --git a/src/Squidex/app/shell/pages/home/home-page.component.html b/src/Squidex/app/shell/pages/home/home-page.component.html index 0a8c74f78..1623b5307 100644 --- a/src/Squidex/app/shell/pages/home/home-page.component.html +++ b/src/Squidex/app/shell/pages/home/home-page.component.html @@ -4,7 +4,7 @@
      -
      diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.html b/src/Squidex/app/shell/pages/internal/apps-menu.component.html index 6a539b0ee..485780e9e 100644 --- a/src/Squidex/app/shell/pages/internal/apps-menu.component.html +++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.html @@ -28,7 +28,7 @@
      -
      diff --git a/src/Squidex/app/shell/pages/internal/internal-area.component.ts b/src/Squidex/app/shell/pages/internal/internal-area.component.ts index c9d266794..8282cdf9a 100644 --- a/src/Squidex/app/shell/pages/internal/internal-area.component.ts +++ b/src/Squidex/app/shell/pages/internal/internal-area.component.ts @@ -5,15 +5,15 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { Subscription } from 'rxjs'; import { DialogService, fadeAnimation, LoadingService, - Notification + Notification, + ResourceOwner } from '@app/shared'; @Component({ @@ -24,24 +24,17 @@ import { fadeAnimation ] }) -export class InternalAreaComponent implements OnDestroy, OnInit { - private queryParamsSubscription: Subscription; - - public notifications: Notification[] = []; - +export class InternalAreaComponent extends ResourceOwner implements OnInit { constructor( public readonly loadingService: LoadingService, private readonly dialogs: DialogService, private readonly route: ActivatedRoute ) { - } - - public ngOnDestroy() { - this.queryParamsSubscription.unsubscribe(); + super(); } public ngOnInit() { - this.queryParamsSubscription = + this.own( this.route.queryParams.subscribe(params => { const successMessage = params['successMessage']; @@ -54,6 +47,6 @@ export class InternalAreaComponent implements OnDestroy, OnInit { if (errorMessage) { this.dialogs.notify(Notification.error(errorMessage)); } - }); + })); } } \ No newline at end of file diff --git a/src/Squidex/app/shell/pages/internal/profile-menu.component.html b/src/Squidex/app/shell/pages/internal/profile-menu.component.html index c6e05c3ff..7d6c4c1f7 100644 --- a/src/Squidex/app/shell/pages/internal/profile-menu.component.html +++ b/src/Squidex/app/shell/pages/internal/profile-menu.component.html @@ -2,9 +2,9 @@
    • - + - {{profileDisplayName}} + {{snapshot.profileDisplayName}} @@ -13,7 +13,7 @@ Administration - + Profile 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 659468937..8332fb646 100644 --- a/src/Squidex/app/shell/pages/internal/profile-menu.component.ts +++ b/src/Squidex/app/shell/pages/internal/profile-menu.component.ts @@ -5,17 +5,23 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core'; -import { Subscription } from 'rxjs'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { filter } from 'rxjs/operators'; import { ApiUrlConfig, AuthService, fadeAnimation, - ModalModel + ModalModel, + StatefulComponent } from '@app/shared'; +interface State { + profileDisplayName: string; + profileId: string; + profileUrl: string; +} + @Component({ selector: 'sqx-profile-menu', styleUrls: ['./profile-menu.component.scss'], @@ -25,36 +31,27 @@ import { ], changeDetection: ChangeDetectionStrategy.OnPush }) -export class ProfileMenuComponent implements OnDestroy, OnInit { - private authenticationSubscription: Subscription; - +export class ProfileMenuComponent extends StatefulComponent implements OnInit { public modalMenu = new ModalModel(); - public profileDisplayName = ''; - public profileId = ''; - - public profileUrl = this.apiUrl.buildUrl('/identity-server/account/profile'); - - constructor( - private readonly authService: AuthService, - private readonly apiUrl: ApiUrlConfig, - private readonly changeDetector: ChangeDetectorRef + constructor(changeDetector: ChangeDetectorRef, apiUrl: ApiUrlConfig, + private readonly authService: AuthService ) { + super(changeDetector, { + profileDisplayName: '', + profileId: '', + profileUrl: apiUrl.buildUrl('/identity-server/account/profile') + }); } - - public ngOnDestroy() { - this.authenticationSubscription.unsubscribe(); - } - public ngOnInit() { - this.authenticationSubscription = + this.own( this.authService.userChanges.pipe(filter(user => !!user)) .subscribe(user => { - this.profileId = user!.id; - this.profileDisplayName = user!.displayName; + const profileId = user!.id; + const profileDisplayName = user!.displayName; - this.changeDetector.markForCheck(); - }); + this.next(s => ({ ...s, profileId, profileDisplayName })); + })); } public logout() { diff --git a/src/Squidex/app/theme/icomoon/demo-files/demo.css b/src/Squidex/app/theme/icomoon/demo-files/demo.css index 1d2e3901d..8aefb78fe 100644 --- a/src/Squidex/app/theme/icomoon/demo-files/demo.css +++ b/src/Squidex/app/theme/icomoon/demo-files/demo.css @@ -147,10 +147,10 @@ p { font-size: 16px; } .fs1 { - font-size: 28px; + font-size: 24px; } .fs2 { - font-size: 24px; + font-size: 28px; } .fs3 { font-size: 24px; diff --git a/src/Squidex/app/theme/icomoon/demo.html b/src/Squidex/app/theme/icomoon/demo.html index 903707ae3..c575fd9ad 100644 --- a/src/Squidex/app/theme/icomoon/demo.html +++ b/src/Squidex/app/theme/icomoon/demo.html @@ -9,20 +9,20 @@
      -

      Font Name: icomoon (Glyphs: 113)

      +

      Font Name: icomoon (Glyphs: 114)

      -

      Grid Size: 14

      +

      Grid Size: 24

      - + - icon-clone + icon-arrow_back
      - - + +
      liga: @@ -31,14 +31,14 @@
      - + - icon-control-Tags + icon-external-link
      - - + +
      liga: @@ -47,14 +47,14 @@
      - + - icon-control-Checkboxes + icon-minus-square
      - - + +
      liga: @@ -63,14 +63,14 @@
      - + - icon-control-Html + icon-plus-square
      - - + +
      liga: @@ -79,14 +79,14 @@
      - + - icon-single-content + icon-drag2
      - - + +
      liga: @@ -95,14 +95,14 @@
      - + - icon-multiple-content + icon-comments
      - - + +
      liga: @@ -111,14 +111,14 @@
      - + - icon-type-Array + icon-backup
      - - + +
      liga: @@ -127,14 +127,14 @@
      - + - icon-exclamation + icon-support
      - - + +
      liga: @@ -143,14 +143,14 @@
      - + - icon-orleans + icon-control-RichText
      - - + +
      liga: @@ -159,369 +159,369 @@
      - + - icon-document-lock + icon-download
      - - + +
      liga:
      -
      +
      +
      +

      Grid Size: 14

      +
      - + - icon-document-unpublish + icon-clone
      - - + +
      liga:
      -
      +
      - + - icon-angle-down + icon-control-Tags
      - - + +
      liga:
      -
      +
      - + - icon-angle-left + icon-control-Checkboxes
      - - + +
      liga:
      -
      +
      - + - icon-angle-right + icon-control-Html
      - - + +
      liga:
      -
      +
      - + - icon-angle-up + icon-single-content
      - - + +
      liga:
      -
      +
      - + - icon-api + icon-multiple-content
      - - + +
      liga:
      -
      +
      - + - icon-assets + icon-type-Array
      - - + +
      liga:
      -
      +
      - + - icon-bug + icon-exclamation
      - - + +
      liga:
      -
      +
      - + - icon-caret-down + icon-orleans
      - - + +
      liga:
      -
      +
      - + - icon-caret-left + icon-document-lock
      - - + +
      liga:
      -
      +
      - + - icon-caret-right + icon-document-unpublish
      - - + +
      liga:
      -
      +
      - + - icon-caret-up + icon-angle-down
      - - + +
      liga:
      -
      +
      - + - icon-contents + icon-angle-left
      - - + +
      liga:
      -
      +
      - + - icon-trigger-ContentChanged + icon-angle-right
      - - + +
      liga:
      -
      +
      - + - icon-control-Date + icon-angle-up
      - - + +
      liga:
      -
      +
      - + - icon-control-DateTime + icon-api
      - - + +
      liga:
      -
      +
      - + - icon-control-Markdown + icon-assets
      - - + +
      liga:
      -
      +
      - + - icon-grid + icon-bug
      - - + +
      liga:
      -
      +
      - + - icon-list1 + icon-caret-down
      - - + +
      liga:
      -
      +
      - + - icon-user-o + icon-caret-left
      - - + +
      liga:
      -
      +
      - + - icon-rules + icon-caret-right
      - - + +
      liga:
      -
      -
      -

      Grid Size: 24

      - + - icon-external-link + icon-caret-up
      - - + +
      liga: @@ -530,14 +530,14 @@
      - + - icon-minus-square + icon-contents
      - - + +
      liga: @@ -546,14 +546,14 @@
      - + - icon-plus-square + icon-trigger-ContentChanged
      - - + +
      liga: @@ -562,14 +562,14 @@
      - + - icon-drag2 + icon-control-Date
      - - + +
      liga: @@ -578,14 +578,14 @@
      - + - icon-comments + icon-control-DateTime
      - - + +
      liga: @@ -594,14 +594,14 @@
      - + - icon-backup + icon-control-Markdown
      - - + +
      liga: @@ -610,14 +610,14 @@
      - + - icon-support + icon-grid
      - - + +
      liga: @@ -626,14 +626,14 @@
      - + - icon-control-RichText + icon-list1
      - - + +
      liga: @@ -642,14 +642,30 @@
      - + - icon-download + icon-user-o
      - - + + +
      +
      + liga: + +
      +
      +
      +
      + + + + icon-rules +
      +
      + +
      liga: @@ -668,7 +684,7 @@
      - +
      liga: @@ -684,7 +700,7 @@
      - +
      liga: @@ -700,7 +716,7 @@
      - +
      liga: @@ -716,7 +732,7 @@
      - +
      liga: @@ -732,7 +748,7 @@
      - +
      liga: @@ -748,7 +764,7 @@
      - +
      liga: @@ -764,7 +780,7 @@
      - +
      liga: @@ -780,7 +796,7 @@
      - +
      liga: @@ -796,7 +812,7 @@
      - +
      liga: @@ -812,7 +828,7 @@
      - +
      liga: @@ -828,7 +844,7 @@
      - +
      liga: @@ -844,7 +860,7 @@
      - +
      liga: @@ -860,7 +876,7 @@
      - +
      liga: @@ -876,7 +892,7 @@
      - +
      liga: @@ -892,7 +908,7 @@
      - +
      liga: @@ -908,7 +924,7 @@
      - +
      liga: @@ -924,7 +940,7 @@
      - +
      liga: @@ -940,7 +956,7 @@
      - +
      liga: @@ -956,7 +972,7 @@
      - +
      liga: @@ -972,7 +988,7 @@
      - +
      liga: @@ -988,7 +1004,7 @@
      - +
      liga: @@ -1004,7 +1020,7 @@
      - +
      liga: @@ -1020,7 +1036,7 @@
      - +
      liga: @@ -1036,7 +1052,7 @@
      - +
      liga: @@ -1052,7 +1068,7 @@
      - +
      liga: @@ -1071,7 +1087,7 @@
      - +
      liga: @@ -1087,7 +1103,7 @@
      - +
      liga: @@ -1103,7 +1119,7 @@
      - +
      liga: @@ -1122,7 +1138,7 @@
      - +
      liga: @@ -1138,7 +1154,7 @@
      - +
      liga: @@ -1154,7 +1170,7 @@
      - +
      liga: @@ -1170,7 +1186,7 @@
      - +
      liga: @@ -1189,7 +1205,7 @@
      - +
      liga: @@ -1205,7 +1221,7 @@
      - +
      liga: @@ -1221,7 +1237,7 @@
      - +
      liga: @@ -1237,7 +1253,7 @@
      - +
      liga: @@ -1253,7 +1269,7 @@
      - +
      liga: @@ -1269,7 +1285,7 @@
      - +
      liga: @@ -1285,7 +1301,7 @@
      - +
      liga: @@ -1301,7 +1317,7 @@
      - +
      liga: @@ -1317,7 +1333,7 @@
      - +
      liga: @@ -1333,7 +1349,7 @@
      - +
      liga: @@ -1349,7 +1365,7 @@
      - +
      liga: @@ -1365,7 +1381,7 @@
      - +
      liga: @@ -1381,7 +1397,7 @@
      - +
      liga: @@ -1397,7 +1413,7 @@
      - +
      liga: @@ -1413,7 +1429,7 @@
      - +
      liga: @@ -1429,7 +1445,7 @@
      - +
      liga: @@ -1445,7 +1461,7 @@
      - +
      liga: @@ -1461,7 +1477,7 @@
      - +
      liga: @@ -1477,7 +1493,7 @@
      - +
      liga: @@ -1493,7 +1509,7 @@
      - +
      liga: @@ -1509,7 +1525,7 @@
      - +
      liga: @@ -1525,7 +1541,7 @@
      - +
      liga: @@ -1541,7 +1557,7 @@
      - +
      liga: @@ -1557,7 +1573,7 @@
      - +
      liga: @@ -1573,7 +1589,7 @@
      - +
      liga: @@ -1589,7 +1605,7 @@
      - +
      liga: @@ -1605,7 +1621,7 @@
      - +
      liga: @@ -1621,7 +1637,7 @@
      - +
      liga: @@ -1637,7 +1653,7 @@
      - +
      liga: @@ -1653,7 +1669,7 @@
      - +
      liga: @@ -1669,7 +1685,7 @@
      - +
      liga: @@ -1685,7 +1701,7 @@
      - +
      liga: @@ -1701,7 +1717,7 @@
      - +
      liga: @@ -1717,7 +1733,7 @@
      - +
      liga: @@ -1733,7 +1749,7 @@
      - +
      liga: @@ -1749,7 +1765,7 @@
      - +
      liga: @@ -1765,7 +1781,7 @@
      - +
      liga: @@ -1781,7 +1797,7 @@
      - +
      liga: @@ -1797,7 +1813,7 @@
      - +
      liga: @@ -1813,7 +1829,7 @@
      - +
      liga: @@ -1829,7 +1845,7 @@
      - +
      liga: @@ -1845,7 +1861,7 @@
      - +
      liga: @@ -1861,7 +1877,7 @@
      - +
      liga: @@ -1877,7 +1893,7 @@
      - +
      liga: @@ -1893,7 +1909,7 @@
      - +
      liga: @@ -1909,7 +1925,7 @@
      - +
      liga: @@ -1925,7 +1941,7 @@
      - +
      liga: @@ -1941,7 +1957,7 @@
      - +
      liga: @@ -1957,7 +1973,7 @@
      - +
      liga: @@ -1973,7 +1989,7 @@
      - +
      liga: @@ -1989,7 +2005,7 @@
      - +
      liga: @@ -2005,7 +2021,7 @@
      - +
      liga: diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot index d55d2effe..839014719 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 f36479998..1a34a42a8 100644 --- a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg +++ b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg @@ -117,6 +117,7 @@ + diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf index f977e9c80..bc9a86121 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 23d0a69c9..0061d0bad 100644 Binary files a/src/Squidex/app/theme/icomoon/fonts/icomoon.woff and b/src/Squidex/app/theme/icomoon/fonts/icomoon.woff differ diff --git a/src/Squidex/app/theme/icomoon/selection.json b/src/Squidex/app/theme/icomoon/selection.json index ac218b906..3be446990 100644 --- a/src/Squidex/app/theme/icomoon/selection.json +++ b/src/Squidex/app/theme/icomoon/selection.json @@ -1 +1 @@ -{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M950.857 932.571v-621.714c0-9.714-8.571-18.286-18.286-18.286h-621.714c-9.714 0-18.286 8.571-18.286 18.286v621.714c0 9.714 8.571 18.286 18.286 18.286h621.714c9.714 0 18.286-8.571 18.286-18.286zM1024 310.857v621.714c0 50.286-41.143 91.429-91.429 91.429h-621.714c-50.286 0-91.429-41.143-91.429-91.429v-621.714c0-50.286 41.143-91.429 91.429-91.429h621.714c50.286 0 91.429 41.143 91.429 91.429zM804.571 91.429v91.429h-73.143v-91.429c0-9.714-8.571-18.286-18.286-18.286h-621.714c-9.714 0-18.286 8.571-18.286 18.286v621.714c0 9.714 8.571 18.286 18.286 18.286h91.429v73.143h-91.429c-50.286 0-91.429-41.143-91.429-91.429v-621.714c0-50.286 41.143-91.429 91.429-91.429h621.714c50.286 0 91.429 41.143 91.429 91.429z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["clone"],"grid":14},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":28,"code":59754,"name":"clone"},"setIdx":0,"setId":3,"iconIdx":0},{"icon":{"paths":["M498.787 330.323v-49.548h112.31v-66.065c0-49.548-39.639-89.187-89.187-89.187s-89.187 39.639-89.187 89.187v541.729l89.187 161.858 89.187-161.858v-426.116z","M360.052 716.8h-66.065c-59.458 0-105.703-46.245-105.703-105.703v-254.348c0-59.458 46.245-105.703 105.703-105.703h66.065v-42.942h-66.065c-82.581 0-148.645 66.065-148.645 148.645v254.348c0 82.581 66.065 148.645 148.645 148.645h66.065z","M852.232 260.955c-26.426-33.032-66.065-52.852-109.006-52.852h-59.458v42.942h39.639c42.942 0 82.581 19.819 109.006 52.852l145.342 181.677-142.039 178.374c-26.426 33.032-69.368 52.852-112.31 52.852h-36.335v42.942h56.155c42.942 0 85.884-19.819 112.31-52.852l178.374-221.316z"],"attrs":[{},{},{}],"width":1140,"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["control-Tags"]},"attrs":[{},{},{}],"properties":{"order":119,"id":220,"name":"control-Tags","prevSize":28,"code":59747},"setIdx":2,"setId":1,"iconIdx":80},{"icon":{"paths":["M384 179.2h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6zM998.4 486.4h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6zM998.4 844.8h-614.4c-38.406 15.539-22.811 37.543 0 51.2h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6z","M0 0v307.2h307.2v-307.2zM47.4 47.4h212.4v212.4h-212.4z","M0 716.8v307.2h307.2v-307.2zM47.4 764.2h212.4v212.4h-212.4z","M0 358.4v307.2h307.2v-307.2zM47.4 405.8h212.4v212.4h-212.4z","M89.6 89.6h128v128h-128v-128z"],"attrs":[{},{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["control-Checkboxes"]},"attrs":[{},{},{},{},{}],"properties":{"order":118,"id":219,"name":"control-Checkboxes","prevSize":28,"code":59746},"setIdx":2,"setId":1,"iconIdx":81},{"icon":{"paths":["M159.073 665.6l-159.073-134.055 159.073-133.819 36.818 37.29-117.062 96.057 117.062 97.237z","M493.247 536.029q0 33.042-9.441 57.115-9.205 24.073-25.961 40.122-16.521 15.813-39.178 23.601-22.657 7.552-49.327 7.552-26.197 0-48.855-4.012-22.421-3.776-42.954-10.385v-323.338h57.587v78.356l-2.36 47.203q12.981-16.757 30.21-26.905 17.465-10.149 41.774-10.149 21.241 0 37.762 8.496t27.614 24.309q11.329 15.577 17.229 37.998 5.9 22.185 5.9 50.035zM432.828 538.389q0-19.825-2.832-33.75t-8.26-22.893q-5.192-8.969-12.981-12.981-7.552-4.248-17.465-4.248-14.633 0-28.086 11.801-13.217 11.801-28.086 32.098v104.79q6.844 2.596 16.757 4.248 10.149 1.652 20.533 1.652 13.689 0 24.781-5.664 11.329-5.664 19.117-16.049 8.024-10.385 12.273-25.253 4.248-15.105 4.248-33.75z","M700.682 513.608q0.472-13.453-1.416-22.893-1.652-9.441-5.664-15.577-3.776-6.136-9.441-8.968t-12.981-2.832q-12.745 0-26.433 10.621-13.453 10.385-29.738 34.458v151.756h-59.003v-239.789h52.159l2.124 34.93q5.9-9.205 13.217-16.521 7.552-7.316 16.521-12.509 9.205-5.428 20.297-8.26t24.309-2.832q18.173 0 32.098 6.372 14.161 6.136 23.601 18.409 9.677 12.273 14.161 30.918 4.72 18.409 4.012 42.718z","M864.927 397.725l159.073 133.819-159.073 134.055-36.582-37.29 116.826-96.293-116.826-97.001z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["control-Html"]},"attrs":[{},{},{},{}],"properties":{"order":116,"id":217,"name":"control-Html","prevSize":28,"code":59744},"setIdx":2,"setId":1,"iconIdx":82},{"icon":{"paths":["M251.429 100.58c-87.896 0-160 72.104-160 160v525.714c0 87.896 72.104 160 160 160h525.714c87.896 0 160-72.104 160-160v-525.714c0-87.896-72.104-160-160-160zM251.429 146.295h525.714c62.961 0 114.286 51.325 114.286 114.286v525.714c0 62.961-51.325 114.286-114.286 114.286h-525.714c-62.961 0-114.286-51.325-114.286-114.286v-525.714c0-62.961 51.325-114.286 114.286-114.286z","M251.429 306.295c-0.096-0.001-0.21-0.002-0.323-0.002-12.625 0-22.859 10.235-22.859 22.859s10.235 22.859 22.859 22.859c0.114 0 0.227-0.001 0.34-0.002l-0.017 0h525.714c0.096 0.001 0.21 0.002 0.323 0.002 12.625 0 22.859-10.235 22.859-22.859s-10.235-22.859-22.859-22.859c-0.114 0-0.227 0.001-0.34 0.002l0.017-0z","M251.429 443.438c-0.096-0.001-0.21-0.002-0.323-0.002-12.625 0-22.859 10.235-22.859 22.859s10.235 22.859 22.859 22.859c0.114 0 0.227-0.001 0.34-0.002l-0.017 0h297.143c0.096 0.001 0.21 0.002 0.323 0.002 12.625 0 22.859-10.235 22.859-22.859s-10.235-22.859-22.859-22.859c-0.114 0-0.227 0.001-0.34 0.002l0.017-0z","M251.429 580.58c-0.096-0.001-0.21-0.002-0.323-0.002-12.625 0-22.859 10.235-22.859 22.859s10.235 22.859 22.859 22.859c0.114 0 0.227-0.001 0.34-0.002l-0.017 0h297.143c0.096 0.001 0.21 0.002 0.323 0.002 12.625 0 22.859-10.235 22.859-22.859s-10.235-22.859-22.859-22.859c-0.114 0-0.227 0.001-0.34 0.002l0.017-0z"],"attrs":[{},{},{},{}],"width":1029,"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["single-content"]},"attrs":[{},{},{},{}],"properties":{"order":112,"id":214,"name":"single-content","prevSize":28,"code":59736},"setIdx":2,"setId":1,"iconIdx":83},{"icon":{"paths":["M777.143 946.286h-525.714c-89.143 0-160-70.857-160-160v-297.143c0-89.143 70.857-160 160-160h525.714c89.143 0 160 70.857 160 160v297.143c0 89.143-70.857 160-160 160zM251.429 374.857c-64 0-114.286 50.286-114.286 114.286v297.143c0 64 50.286 114.286 114.286 114.286h525.714c64 0 114.286-50.286 114.286-114.286v-297.143c0-64-50.286-114.286-114.286-114.286h-525.714z","M731.429 580.571h-457.143c-13.714 0-22.857-9.143-22.857-22.857s9.143-22.857 22.857-22.857h457.143c13.714 0 22.857 9.143 22.857 22.857s-9.143 22.857-22.857 22.857z","M502.857 740.571h-228.571c-13.714 0-22.857-9.143-22.857-22.857s9.143-22.857 22.857-22.857h228.571c13.714 0 22.857 9.143 22.857 22.857s-9.143 22.857-22.857 22.857z","M777.143 260.571h-525.714c-13.714 0-22.857-9.143-22.857-22.857s9.143-22.857 22.857-22.857h525.714c13.714 0 22.857 9.143 22.857 22.857s-9.143 22.857-22.857 22.857z","M685.714 146.286h-342.857c-13.714 0-22.857-9.143-22.857-22.857s9.143-22.857 22.857-22.857h342.857c13.714 0 22.857 9.143 22.857 22.857s-9.143 22.857-22.857 22.857z"],"attrs":[{},{},{},{},{}],"width":1029,"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["multiple-content"]},"attrs":[{},{},{},{},{}],"properties":{"order":113,"id":213,"name":"multiple-content","prevSize":28,"code":59735},"setIdx":2,"setId":1,"iconIdx":84},{"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":2,"setId":1,"iconIdx":85},{"icon":{"paths":["M292.571 713.143v128c0 20-16.571 36.571-36.571 36.571h-146.286c-20 0-36.571-16.571-36.571-36.571v-128c0-20 16.571-36.571 36.571-36.571h146.286c20 0 36.571 16.571 36.571 36.571zM309.714 109.714l-16 438.857c-0.571 20-17.714 36.571-37.714 36.571h-146.286c-20 0-37.143-16.571-37.714-36.571l-16-438.857c-0.571-20 15.429-36.571 35.429-36.571h182.857c20 0 36 16.571 35.429 36.571z"],"attrs":[{}],"width":366,"isMulticolor":false,"isMulticolor2":false,"tags":["exclamation"],"grid":14},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":28,"code":59733,"name":"exclamation"},"setIdx":2,"setId":1,"iconIdx":86},{"icon":{"paths":["M512 26.38l-424.96 242.8v485.64l424.96 242.8 424.96-242.8v-485.64l-424.96-242.8zM512 235.52l245.76 138.24v276.48l-245.76 138.24-245.76-138.24v-276.48l245.76-138.24z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["orleans"]},"attrs":[{}],"properties":{"order":99,"id":209,"name":"orleans","prevSize":28,"code":59723},"setIdx":2,"setId":1,"iconIdx":87},{"icon":{"paths":["M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v204.8h51.2v-204.8h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-307.2v51.2h307.2c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM716.8 189.8l117.4 117.4h-117.4z","M153.6 640v281.6h358.4v-281.6zM179.2 640v-76.8c0-84.48 69.12-153.6 153.6-153.6s153.6 69.12 153.6 153.6v76.8h-51.2v-76.8c0-56.32-46.080-102.4-102.4-102.4s-102.4 46.080-102.4 102.4v76.8z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["document-lock"]},"attrs":[{},{}],"properties":{"order":97,"id":208,"name":"document-lock","prevSize":28,"code":59721},"setIdx":2,"setId":1,"iconIdx":88},{"icon":{"paths":["M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v153.6h51.2v-153.6h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM716.8 189.8l117.4 117.4h-117.4zM332.8 460.8l-230.4 256v51.2h102.4v153.6h256v-153.6h102.4v-51.2zM332.8 537.3l161.5 179.5h-84.7v153.6h-153.6v-153.6h-84.7z","M102.4 357.532h460.8v52.068h-460.8v-52.068z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["document-unpublish"]},"attrs":[{},{}],"properties":{"order":96,"id":207,"name":"document-unpublish","prevSize":28,"code":59711},"setIdx":2,"setId":1,"iconIdx":89},{"icon":{"paths":["M614.286 420.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8-5.714 13.143-5.714 4.571 0 9.714 2.286 13.143 5.714l224.571 224.571 224.571-224.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8.571 5.714 13.143z"],"attrs":[{}],"width":658,"isMulticolor":false,"isMulticolor2":false,"tags":["angle-down"],"grid":14},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":28,"code":59648,"name":"angle-down"},"setIdx":2,"setId":1,"iconIdx":90},{"icon":{"paths":["M358.286 310.857c0 4.571-2.286 9.714-5.714 13.143l-224.571 224.571 224.571 224.571c3.429 3.429 5.714 8.571 5.714 13.143s-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8 5.714 13.143z"],"attrs":[{}],"width":384,"isMulticolor":false,"isMulticolor2":false,"tags":["angle-left"],"grid":14},"attrs":[{}],"properties":{"order":2,"id":0,"prevSize":28,"code":59649,"name":"angle-left"},"setIdx":2,"setId":1,"iconIdx":91},{"icon":{"paths":["M340 548.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8-5.714-13.143 0-4.571 2.286-9.714 5.714-13.143l224.571-224.571-224.571-224.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143z"],"attrs":[{}],"width":347,"isMulticolor":false,"isMulticolor2":false,"tags":["angle-right"],"grid":14},"attrs":[{}],"properties":{"order":67,"id":0,"prevSize":28,"code":59697,"name":"angle-right"},"setIdx":2,"setId":1,"iconIdx":92},{"icon":{"paths":["M614.286 676.571c0 4.571-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8 5.714-13.143 5.714-4.571 0-9.714-2.286-13.143-5.714l-224.571-224.571-224.571 224.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143z"],"attrs":[{}],"width":658,"isMulticolor":false,"isMulticolor2":false,"tags":["angle-up"],"grid":14},"attrs":[{}],"properties":{"order":2,"id":2,"prevSize":28,"code":59651,"name":"angle-up"},"setIdx":2,"setId":1,"iconIdx":93},{"icon":{"paths":["M592 393.6h-156.8c-57.6 0-105.6-48-105.6-105.6v-182.4c0-57.6 48-105.6 105.6-105.6h156.8c57.6 0 105.6 48 105.6 105.6v182.4c-3.2 57.6-48 105.6-105.6 105.6zM432 64c-22.4 0-41.6 19.2-41.6 41.6v182.4c0 22.4 19.2 41.6 41.6 41.6h156.8c22.4 0 41.6-19.2 41.6-41.6v-182.4c0-22.4-19.2-41.6-41.6-41.6h-156.8z","M195.2 1024c-105.6 0-195.2-89.6-195.2-195.2 0-108.8 89.6-195.2 195.2-195.2s195.2 89.6 195.2 195.2c3.2 105.6-86.4 195.2-195.2 195.2zM195.2 694.4c-73.6 0-131.2 60.8-131.2 131.2 0 73.6 60.8 134.4 131.2 134.4 73.6 0 131.2-60.8 131.2-131.2 3.2-73.6-57.6-134.4-131.2-134.4z","M828.8 1024c-108.8 0-195.2-89.6-195.2-195.2 0-108.8 89.6-195.2 195.2-195.2s195.2 89.6 195.2 195.2c0 105.6-89.6 195.2-195.2 195.2zM828.8 694.4c-73.6 0-131.2 60.8-131.2 131.2 0 73.6 60.8 131.2 131.2 131.2 73.6 0 131.2-60.8 131.2-131.2s-60.8-131.2-131.2-131.2z","M332.8 640c-6.4 0-12.8 0-16-3.2-16-9.6-19.2-28.8-9.6-44.8l83.2-137.6c9.6-16 28.8-19.2 44.8-9.6s19.2 28.8 9.6 44.8l-83.2 137.6c-6.4 6.4-16 12.8-28.8 12.8z","M691.2 640c-9.6 0-22.4-6.4-28.8-16l-83.2-137.6c-9.6-16-3.2-35.2 9.6-44.8s35.2-3.2 44.8 9.6l83.2 137.6c9.6 16 3.2 35.2-9.6 44.8-6.4 6.4-12.8 6.4-16 6.4z"],"attrs":[{},{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["api"]},"attrs":[{},{},{},{},{}],"properties":{"order":94,"id":206,"name":"api","prevSize":28,"code":59717},"setIdx":2,"setId":1,"iconIdx":94},{"icon":{"paths":["M800 1024h-576c-124.8 0-224-99.2-224-224v-576c0-124.8 99.2-224 224-224h576c124.8 0 224 99.2 224 224v576c0 124.8-99.2 224-224 224zM224 64c-89.6 0-160 70.4-160 160v576c0 89.6 70.4 160 160 160h576c89.6 0 160-70.4 160-160v-576c0-89.6-70.4-160-160-160h-576z","M771.2 860.8h-438.4c-12.8 0-22.4-6.4-28.8-19.2s-3.2-25.6 3.2-35.2l300.8-355.2c6.4-6.4 16-12.8 25.6-12.8s19.2 6.4 25.6 12.8l192 275.2c3.2 3.2 3.2 6.4 3.2 9.6 16 44.8 3.2 73.6-6.4 89.6-22.4 32-70.4 35.2-76.8 35.2zM403.2 796.8h371.2c6.4 0 22.4-3.2 25.6-9.6 3.2-3.2 3.2-12.8 0-25.6l-166.4-236.8-230.4 272z","M332.8 502.4c-76.8 0-140.8-64-140.8-140.8s64-140.8 140.8-140.8 140.8 64 140.8 140.8-60.8 140.8-140.8 140.8zM332.8 284.8c-41.6 0-76.8 32-76.8 76.8s35.2 76.8 76.8 76.8 76.8-35.2 76.8-76.8-32-76.8-76.8-76.8z"],"attrs":[{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["assets"]},"attrs":[{},{},{}],"properties":{"order":95,"id":205,"name":"assets","prevSize":28,"code":59720},"setIdx":2,"setId":1,"iconIdx":95},{"icon":{"paths":["M932.571 548.571c0 20-16.571 36.571-36.571 36.571h-128c0 71.429-15.429 125.143-38.286 165.714l118.857 119.429c14.286 14.286 14.286 37.143 0 51.429-6.857 7.429-16.571 10.857-25.714 10.857s-18.857-3.429-25.714-10.857l-113.143-112.571s-74.857 68.571-172 68.571v-512h-73.143v512c-103.429 0-178.857-75.429-178.857-75.429l-104.571 118.286c-7.429 8-17.143 12-27.429 12-8.571 0-17.143-2.857-24.571-9.143-14.857-13.714-16-36.571-2.857-52l115.429-129.714c-20-39.429-33.143-90.286-33.143-156.571h-128c-20 0-36.571-16.571-36.571-36.571s16.571-36.571 36.571-36.571h128v-168l-98.857-98.857c-14.286-14.286-14.286-37.143 0-51.429s37.143-14.286 51.429 0l98.857 98.857h482.286l98.857-98.857c14.286-14.286 37.143-14.286 51.429 0s14.286 37.143 0 51.429l-98.857 98.857v168h128c20 0 36.571 16.571 36.571 36.571zM658.286 219.429h-365.714c0-101.143 81.714-182.857 182.857-182.857s182.857 81.714 182.857 182.857z"],"attrs":[{}],"width":951,"isMulticolor":false,"isMulticolor2":false,"tags":["bug"],"grid":14},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":28,"code":59709,"name":"bug"},"setIdx":2,"setId":1,"iconIdx":96},{"icon":{"paths":["M585.143 402.286c0 9.714-4 18.857-10.857 25.714l-256 256c-6.857 6.857-16 10.857-25.714 10.857s-18.857-4-25.714-10.857l-256-256c-6.857-6.857-10.857-16-10.857-25.714 0-20 16.571-36.571 36.571-36.571h512c20 0 36.571 16.571 36.571 36.571z"],"attrs":[{}],"width":585,"isMulticolor":false,"isMulticolor2":false,"tags":["caret-down"],"grid":14},"attrs":[{}],"properties":{"order":4,"id":4,"prevSize":28,"code":59692,"name":"caret-down"},"setIdx":2,"setId":1,"iconIdx":97},{"icon":{"paths":["M365.714 256v512c0 20-16.571 36.571-36.571 36.571-9.714 0-18.857-4-25.714-10.857l-256-256c-6.857-6.857-10.857-16-10.857-25.714s4-18.857 10.857-25.714l256-256c6.857-6.857 16-10.857 25.714-10.857 20 0 36.571 16.571 36.571 36.571z"],"attrs":[{}],"width":402,"isMulticolor":false,"isMulticolor2":false,"tags":["caret-left"],"grid":14},"attrs":[{}],"properties":{"order":2,"id":6,"prevSize":28,"code":59690,"name":"caret-left"},"setIdx":2,"setId":1,"iconIdx":98},{"icon":{"paths":["M329.143 512c0 9.714-4 18.857-10.857 25.714l-256 256c-6.857 6.857-16 10.857-25.714 10.857-20 0-36.571-16.571-36.571-36.571v-512c0-20 16.571-36.571 36.571-36.571 9.714 0 18.857 4 25.714 10.857l256 256c6.857 6.857 10.857 16 10.857 25.714z"],"attrs":[{}],"width":329,"isMulticolor":false,"isMulticolor2":false,"tags":["caret-right"],"grid":14},"attrs":[{}],"properties":{"order":1,"id":7,"prevSize":28,"code":59689,"name":"caret-right"},"setIdx":2,"setId":1,"iconIdx":99},{"icon":{"paths":["M585.143 694.857c0 20-16.571 36.571-36.571 36.571h-512c-20 0-36.571-16.571-36.571-36.571 0-9.714 4-18.857 10.857-25.714l256-256c6.857-6.857 16-10.857 25.714-10.857s18.857 4 25.714 10.857l256 256c6.857 6.857 10.857 16 10.857 25.714z"],"attrs":[{}],"width":585,"isMulticolor":false,"isMulticolor2":false,"tags":["caret-up"],"grid":14},"attrs":[{}],"properties":{"order":3,"id":5,"prevSize":28,"code":59691,"name":"caret-up"},"setIdx":2,"setId":1,"iconIdx":100},{"icon":{"paths":["M800 1024h-576c-124.8 0-224-99.2-224-224v-576c0-124.8 99.2-224 224-224h576c124.8 0 224 99.2 224 224v576c0 124.8-99.2 224-224 224zM224 64c-89.6 0-160 70.4-160 160v576c0 89.6 70.4 160 160 160h576c89.6 0 160-70.4 160-160v-576c0-89.6-70.4-160-160-160h-576z","M480 448h-211.2c-57.6 0-105.6-48-105.6-105.6v-73.6c0-57.6 48-105.6 105.6-105.6h211.2c57.6 0 105.6 48 105.6 105.6v73.6c0 57.6-48 105.6-105.6 105.6zM268.8 227.2c-22.4 0-41.6 19.2-41.6 41.6v73.6c0 22.4 19.2 41.6 41.6 41.6h211.2c22.4 0 41.6-19.2 41.6-41.6v-73.6c0-22.4-19.2-41.6-41.6-41.6h-211.2z","M828.8 611.2h-633.6c-19.2 0-32-12.8-32-32s12.8-32 32-32h630.4c19.2 0 32 12.8 32 32s-12.8 32-28.8 32z","M553.6 777.6h-358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h355.2c19.2 0 32 12.8 32 32s-12.8 32-28.8 32z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["content"]},"attrs":[{},{},{},{}],"properties":{"order":93,"id":204,"name":"contents, trigger-ContentChanged","prevSize":28,"code":59718},"setIdx":2,"setId":1,"iconIdx":101},{"icon":{"paths":["M947.2 102.4h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-512v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v716.8c0 42.342 34.458 76.8 76.8 76.8h870.4c42.342 0 76.8-34.458 76.8-76.8v-716.8c0-42.342-34.458-76.8-76.8-76.8zM972.8 896c0 14.131-11.469 25.6-25.6 25.6h-870.4c-14.080 0-25.6-11.469-25.6-25.6v-537.6h921.6v537.6zM972.8 307.2h-921.6v-128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h512v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128zM332.8 512h51.2c14.080 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM640 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["control-date"]},"attrs":[{}],"properties":{"order":71,"id":42,"name":"control-Date","prevSize":28,"code":59702},"setIdx":2,"setId":1,"iconIdx":102},{"icon":{"paths":["M486.4 409.6h51.2c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6zM230.4 614.4c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM230.4 512c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM51.2 742.4v-435.2h665.6v102.4h51.2v-281.6c0-42.342-34.458-76.8-76.8-76.8h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-256v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v614.4c0 42.342 34.458 76.8 76.8 76.8h332.8v-51.2h-332.8c-14.080 0-25.6-11.469-25.6-25.6zM51.2 128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h256v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128h-665.6v-128zM384 409.6c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM742.4 460.8c-155.546 0-281.6 126.054-281.6 281.6s126.054 281.6 281.6 281.6 281.6-126.054 281.6-281.6-126.054-281.6-281.6-281.6zM742.4 972.8c-127.232 0-230.4-103.168-230.4-230.4s103.168-230.4 230.4-230.4 230.4 103.168 230.4 230.4-103.168 230.4-230.4 230.4zM384 512c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM384 614.4c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM844.8 716.8c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-102.4c-14.131 0-25.6-11.469-25.6-25.6v-102.4c0-14.131 11.469-25.6 25.6-25.6s25.6 11.469 25.6 25.6v76.8h76.8z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["control-date-time"]},"attrs":[{}],"properties":{"order":70,"id":41,"name":"control-DateTime","prevSize":28,"code":59703},"setIdx":2,"setId":1,"iconIdx":103},{"icon":{"paths":["M793.6 609.416h-61.838v-28.108h-0.783q-21.135 33.092-62.034 33.092-37.573 0-60.469-26.912-22.896-27.112-22.896-75.554 0-50.635 25.244-81.136t66.144-30.501q38.747 0 54.011 28.308h0.783v-121.405h61.838v302.216zM732.936 510.139v-15.35q0-19.935-11.35-33.092t-29.549-13.157q-20.548 0-32.093 16.546-11.546 16.347-11.546 45.053 0 26.912 11.154 41.465t30.919 14.553q18.786 0 30.528-15.35 11.937-15.35 11.937-40.668zM548.594 609.416h-61.643v-116.421q0-44.455-32.093-44.455-15.264 0-24.853 13.357t-9.589 33.292v114.228h-61.839v-117.617q0-43.259-31.506-43.259-15.851 0-25.44 12.758-9.393 12.758-9.393 34.687v113.431h-61.838v-204.135h61.838v31.896h0.783q9.589-16.347 26.81-26.514 17.417-10.366 37.964-10.366 42.465 0 58.12 38.076 22.896-38.076 67.318-38.076 65.361 0 65.361 82.133v126.987zM0 0v204.8h76.8v76.8h51.2v-76.8h76.8v-204.8zM819.2 0v204.8h204.8v-204.8zM51.2 51.2h102.4v102.4h-102.4zM870.4 51.2h102.4v102.4h-102.4zM281.6 76.8v51.2h102.4v-51.2zM486.4 76.8v51.2h102.4v-51.2zM691.2 76.8v51.2h102.4v-51.2zM896 281.6v102.4h51.2v-102.4zM76.8 384v102.4h51.2v-102.4zM896 486.4v102.4h51.2v-102.4zM76.8 588.8v102.4h51.2v-102.4zM896 691.2v102.4h51.2v-102.4zM76.8 793.6v25.6h-76.8v204.8h204.8v-76.8h76.8v-51.2h-76.8v-76.8h-76.8v-25.6zM819.2 819.2v76.8h-25.6v51.2h25.6v76.8h204.8v-204.8zM51.2 870.4h102.4v102.4h-102.4zM870.4 870.4h102.4v102.4h-102.4zM384 896v51.2h102.4v-51.2zM588.8 896v51.2h102.4v-51.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["control-Markdown"]},"attrs":[{}],"properties":{"order":72,"id":43,"name":"control-Markdown","prevSize":28,"code":59704},"setIdx":2,"setId":1,"iconIdx":104},{"icon":{"paths":["M292.571 713.143v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM292.571 420.571v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM658.286 713.143v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM292.571 128v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM658.286 420.571v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM1024 713.143v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM658.286 128v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM1024 420.571v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM1024 128v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857z"],"width":1024,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["th"],"defaultCode":61450,"grid":14},"attrs":[],"properties":{"name":"grid","id":14,"order":83,"prevSize":28,"code":61450},"setIdx":2,"setId":1,"iconIdx":105},{"icon":{"paths":["M877.714 768v73.143c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h804.571c20 0 36.571 16.571 36.571 36.571zM877.714 475.429v73.143c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h804.571c20 0 36.571 16.571 36.571 36.571zM877.714 182.857v73.143c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h804.571c20 0 36.571 16.571 36.571 36.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["bars","navicon","reorder"],"defaultCode":61641,"grid":14},"attrs":[],"properties":{"name":"list1","id":178,"order":89,"prevSize":28,"code":61641},"setIdx":2,"setId":1,"iconIdx":106},{"icon":{"paths":["M512 64c-131.696 0-239.125 107.4-239.125 239 0 65.8 24.831 146.717 65.375 215.25 19.653 33.221 43.902 63.853 71.75 87.125-59.423 7.524-122.009 9.415-172.125 32-79.809 35.967-144.343 94.74-172.375 178.625-1.5 9.499 0 0-1.5 9v0.499c0 73.995 60.563 134.501 134.375 134.501h627.125c73.888 0 134.5-60.506 134.5-134.5l-1.5-9.375c-27.845-84.263-92.273-143.119-172.125-179-50.17-22.544-112.844-24.421-172.375-31.875 27.792-23.26 52.002-53.831 71.625-87 40.544-68.533 65.375-149.45 65.375-215.25 0-131.6-107.304-239-239-239zM512 124c99.241 0 179 79.875 179 179 0 49.562-21.877 125.381-57 184.75s-81.435 98.75-122 98.75c-40.565 0-86.877-39.381-122-98.75s-57.125-135.188-57.125-184.75c0-99.125 79.884-179 179.125-179zM512 646.5c92.551 0 180.829 14.406 249.75 45.375 66.784 30.009 113.649 74.724 136.5 137.75-2.447 39.259-32.9 70.375-72.75 70.375h-627.125c-39.678 0-70.116-31.051-72.625-70.25 22.978-62.705 69.953-107.523 136.75-137.625 68.937-31.067 157.205-45.625 249.5-45.625z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["user-o"]},"attrs":[{}],"properties":{"order":64,"id":38,"name":"user-o","prevSize":28,"code":59698},"setIdx":2,"setId":1,"iconIdx":107},{"icon":{"paths":["M217.6 992c-3.2 0-3.2 0-6.4 0h-3.2c-144-25.6-208-144-208-249.6 0-99.2 57.6-208 185.6-240v-147.2c0-19.2 12.8-32 32-32s32 12.8 32 32v172.8c0 16-12.8 28.8-25.6 32-108.8 16-160 102.4-160 182.4s48 166.4 153.6 185.6h6.4c16 3.2 28.8 19.2 25.6 38.4-3.2 16-16 25.6-32 25.6z","M774.4 1001.6c0 0 0 0 0 0-102.4 0-211.2-60.8-243.2-185.6h-176c-19.2 0-32-12.8-32-32s12.8-32 32-32h201.6c16 0 28.8 12.8 32 25.6 16 108.8 102.4 156.8 182.4 160 80 0 166.4-48 185.6-153.6v-3.2c3.2-16 19.2-28.8 38.4-25.6 16 3.2 28.8 19.2 25.6 38.4v3.2c-22.4 140.8-140.8 204.8-246.4 204.8z","M787.2 678.4c-19.2 0-32-12.8-32-32v-176c0-16 12.8-28.8 25.6-32 108.8-16 156.8-102.4 160-182.4 0-80-48-166.4-153.6-185.6h-3.2c-19.2-6.4-32-22.4-28.8-38.4s19.2-28.8 38.4-25.6h3.2c144 25.6 208 144 208 249.6 0 99.2-60.8 208-185.6 240v150.4c0 16-16 32-32 32z","M41.6 246.4c-3.2 0-3.2 0-6.4 0-16-3.2-28.8-19.2-25.6-35.2v-3.2c25.6-144 140.8-208 246.4-208 0 0 3.2 0 3.2 0 99.2 0 208 60.8 240 185.6h147.2c19.2 0 32 12.8 32 32s-12.8 32-32 32h-172.8c-16 0-28.8-12.8-32-25.6-16-108.8-102.4-156.8-182.4-160-80 0-166.4 48-185.6 153.6v3.2c-3.2 16-16 25.6-32 25.6z","M256 387.2c-32 0-67.2-12.8-92.8-38.4-51.2-51.2-51.2-134.4 0-185.6 25.6-22.4 57.6-35.2 92.8-35.2s67.2 12.8 92.8 38.4c25.6 25.6 38.4 57.6 38.4 92.8s-12.8 67.2-38.4 92.8c-25.6 22.4-57.6 35.2-92.8 35.2zM256 192c-16 0-32 6.4-44.8 19.2-25.6 25.6-25.6 67.2 0 92.8s67.2 25.6 92.8 0c12.8-12.8 19.2-28.8 19.2-48s-6.4-32-19.2-44.8-28.8-19.2-48-19.2z","M771.2 873.6c-32 0-67.2-12.8-92.8-38.4-51.2-51.2-51.2-134.4 0-185.6 25.6-25.6 57.6-38.4 92.8-38.4s67.2 12.8 92.8 38.4c25.6 25.6 38.4 57.6 38.4 92.8s-12.8 67.2-38.4 92.8c-28.8 25.6-60.8 38.4-92.8 38.4zM771.2 678.4c-19.2 0-35.2 6.4-48 19.2-25.6 25.6-25.6 67.2 0 92.8s67.2 25.6 92.8 0c12.8-12.8 19.2-28.8 19.2-48s-6.4-35.2-19.2-48-28.8-16-44.8-16z","M745.6 387.2c-32 0-67.2-12.8-92.8-38.4s-38.4-57.6-38.4-92.8 12.8-67.2 38.4-92.8c25.6-22.4 60.8-35.2 92.8-35.2s67.2 12.8 92.8 38.4c51.2 51.2 51.2 134.4 0 185.6v0c-25.6 22.4-57.6 35.2-92.8 35.2zM745.6 192c-19.2 0-35.2 6.4-48 19.2s-19.2 28.8-19.2 48 6.4 35.2 19.2 48c25.6 25.6 67.2 25.6 92.8 0s25.6-67.2 0-92.8c-9.6-16-25.6-22.4-44.8-22.4z","M259.2 873.6c-32 0-67.2-12.8-92.8-38.4s-38.4-57.6-38.4-92.8 12.8-67.2 38.4-92.8c25.6-22.4 57.6-35.2 92.8-35.2s67.2 12.8 92.8 38.4c51.2 51.2 51.2 134.4 0 185.6v0c-25.6 22.4-57.6 35.2-92.8 35.2zM259.2 678.4c-19.2 0-35.2 6.4-48 19.2s-19.2 28.8-19.2 48 6.4 35.2 19.2 48c25.6 25.6 67.2 25.6 92.8 0s25.6-67.2 0-92.8c-9.6-16-25.6-22.4-44.8-22.4z"],"attrs":[{},{},{},{},{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["webhooks"]},"attrs":[{},{},{},{},{},{},{},{}],"properties":{"order":92,"id":203,"name":"rules","prevSize":28,"code":59719},"setIdx":2,"setId":1,"iconIdx":108},{"icon":{"paths":["M768 512c-25.6 0-42.667 17.067-42.667 42.667v256c0 25.6-17.067 42.667-42.667 42.667h-469.333c-25.6 0-42.667-17.067-42.667-42.667v-469.333c0-25.6 17.067-42.667 42.667-42.667h256c25.6 0 42.667-17.067 42.667-42.667s-17.067-42.667-42.667-42.667h-256c-72.533 0-128 55.467-128 128v469.333c0 72.533 55.467 128 128 128h469.333c72.533 0 128-55.467 128-128v-256c0-25.6-17.067-42.667-42.667-42.667z","M934.4 110.933c-4.267-8.533-12.8-17.067-21.333-21.333-4.267-4.267-12.8-4.267-17.067-4.267h-256c-25.6 0-42.667 17.067-42.667 42.667s17.067 42.667 42.667 42.667h153.6l-396.8 396.8c-17.067 17.067-17.067 42.667 0 59.733 8.533 8.533 17.067 12.8 29.867 12.8s21.333-4.267 29.867-12.8l396.8-396.8v153.6c0 25.6 17.067 42.667 42.667 42.667s42.667-17.067 42.667-42.667v-256c0-4.267 0-12.8-4.267-17.067z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["external-link"],"grid":24},"attrs":[{},{}],"properties":{"order":1,"id":2,"prevSize":24,"code":59757,"name":"external-link"},"setIdx":1,"setId":2,"iconIdx":0},{"icon":{"paths":["M810.667 85.333h-597.333c-72.533 0-128 55.467-128 128v597.333c0 72.533 55.467 128 128 128h597.333c72.533 0 128-55.467 128-128v-597.333c0-72.533-55.467-128-128-128zM853.333 810.667c0 25.6-17.067 42.667-42.667 42.667h-597.333c-25.6 0-42.667-17.067-42.667-42.667v-597.333c0-25.6 17.067-42.667 42.667-42.667h597.333c25.6 0 42.667 17.067 42.667 42.667v597.333z","M682.667 469.333h-341.333c-25.6 0-42.667 17.067-42.667 42.667s17.067 42.667 42.667 42.667h341.333c25.6 0 42.667-17.067 42.667-42.667s-17.067-42.667-42.667-42.667z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["minus-square"],"grid":24},"attrs":[{},{}],"properties":{"order":1,"id":1,"prevSize":24,"code":59753,"name":"minus-square"},"setIdx":1,"setId":2,"iconIdx":1},{"icon":{"paths":["M810.667 85.333h-597.333c-72.533 0-128 55.467-128 128v597.333c0 72.533 55.467 128 128 128h597.333c72.533 0 128-55.467 128-128v-597.333c0-72.533-55.467-128-128-128zM853.333 810.667c0 25.6-17.067 42.667-42.667 42.667h-597.333c-25.6 0-42.667-17.067-42.667-42.667v-597.333c0-25.6 17.067-42.667 42.667-42.667h597.333c25.6 0 42.667 17.067 42.667 42.667v597.333z","M682.667 469.333h-128v-128c0-25.6-17.067-42.667-42.667-42.667s-42.667 17.067-42.667 42.667v128h-128c-25.6 0-42.667 17.067-42.667 42.667s17.067 42.667 42.667 42.667h128v128c0 25.6 17.067 42.667 42.667 42.667s42.667-17.067 42.667-42.667v-128h128c25.6 0 42.667-17.067 42.667-42.667s-17.067-42.667-42.667-42.667z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["plus-square"],"grid":24},"attrs":[{},{}],"properties":{"order":1,"id":0,"name":"plus-square","prevSize":24,"code":59752},"setIdx":1,"setId":2,"iconIdx":2},{"icon":{"paths":["M170 640v-86h684v86h-684zM854 384v86h-684v-86h684z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["drag_handle"],"grid":24},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":24,"code":59745,"name":"drag2"},"setIdx":2,"setId":1,"iconIdx":6},{"icon":{"paths":["M854 682v-512h-684v598l86-86h598zM854 86c46 0 84 38 84 84v512c0 46-38 86-84 86h-598l-170 170v-768c0-46 38-84 84-84h684z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["chat_bubble_outline"],"grid":24},"attrs":[{}],"properties":{"order":1,"id":0,"name":"comments","prevSize":24,"code":59743},"setIdx":2,"setId":1,"iconIdx":7},{"icon":{"paths":["M512 128c212 0 384 172 384 384s-172 384-384 384c-88 0-170-30-234-80l60-60c50 34 110 54 174 54 166 0 298-132 298-298s-132-298-298-298-298 132-298 298h128l-172 170-170-170h128c0-212 172-384 384-384zM598 512c0 46-40 86-86 86s-86-40-86-86 40-86 86-86 86 40 86 86z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["settings_backup_restore"],"grid":24},"attrs":[{}],"properties":{"order":1,"id":2,"prevSize":24,"code":59739,"name":"backup"},"setIdx":2,"setId":1,"iconIdx":8},{"icon":{"paths":["M726 512c0 24-20 42-44 42h-426l-170 172v-598c0-24 18-42 42-42h554c24 0 44 18 44 42v384zM896 256c24 0 42 18 42 42v640l-170-170h-470c-24 0-42-18-42-42v-86h554v-384h86z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["question_answer"],"grid":24},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59738,"name":"support"},"setIdx":2,"setId":1,"iconIdx":9},{"icon":{"paths":["M918 384v128h-128v298h-128v-298h-128v-128h384zM106 170h556v128h-214v512h-128v-512h-214v-128z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["text_fields"],"grid":24},"attrs":[{}],"properties":{"order":75,"id":0,"prevSize":24,"code":59705,"name":"control-RichText"},"setIdx":2,"setId":1,"iconIdx":10},{"icon":{"paths":["M640 85.333q78 0 149.167 30.5t122.5 81.833 81.833 122.5 30.5 149.167q0 85-35 160.667t-96.667 129.167-140 77.5l21-20.667q18-18.333 28-42.667 9.333-22.667 9.333-49.333 0-6.667-0.333-9.333 59.333-41.333 93.833-105.833t34.5-139.5q0-60.667-23.667-116t-63.667-95.333-95.333-63.667-116-23.667q-55.333 0-106.5 19.833t-90 53.833-65 81.333-33.833 101h-88.667q-70.667 0-120.667 50t-50 120.667q0 38.667 15.167 71.667t39.833 54.167 54.833 33 60.833 11.833h50q11.667 29.333 30 48l37.667 37.333h-117.667q-69.667 0-128.5-34.333t-93.167-93.167-34.333-128.5 34.333-128.5 93.167-93.167 128.5-34.333h22q26.333-74.333 79.333-132.167t126.833-90.833 155.833-33zM554.667 426.667q17.667 0 30.167 12.5t12.5 30.167v281l55-55.333q12.333-12.333 30.333-12.333 18.333 0 30.5 12.167t12.167 30.5q0 18-12.333 30.333l-128 128q-12.333 12.333-30.333 12.333t-30.333-12.333l-128-128q-12.333-13-12.333-30.333 0-17.667 12.5-30.167t30.167-12.5q18 0 30.333 12.333l55 55.333v-281q0-17.667 12.5-30.167t30.167-12.5z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["cloud-download"],"grid":24},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59710,"name":"download"},"setIdx":2,"setId":1,"iconIdx":11},{"icon":{"paths":["M585.143 548.557c0 9.728-3.986 18.871-10.862 25.71l-256 256c-6.839 6.839-16.018 10.862-25.71 10.862s-18.871-3.986-25.71-10.862l-256-256c-6.839-6.839-10.862-16.018-10.862-25.71 0-20.005 16.567-36.571 36.571-36.571h512c20.005 0 36.571 16.567 36.571 36.571z","M585.143 219.443c0 9.728-3.986 18.871-10.862 25.71l-256 256c-6.839 6.839-16.018 10.862-25.71 10.862s-18.871-3.986-25.71-10.862l-256-256c-6.839-6.839-10.862-16.018-10.862-25.71 0-20.005 16.567-36.571 36.571-36.571h512c20.005 0 36.571 16.567 36.571 36.571z"],"attrs":[{},{}],"width":585,"isMulticolor":false,"isMulticolor2":false,"grid":16,"tags":["caret-bottom"]},"attrs":[{},{}],"properties":{"order":125,"id":226,"name":"caret-bottom","prevSize":24,"code":59755},"setIdx":2,"setId":1,"iconIdx":0},{"icon":{"paths":["M585.143 804.577c0 20.005-16.567 36.571-36.571 36.571h-512c-20.005 0-36.571-16.567-36.571-36.571 0-9.728 3.986-18.871 10.862-25.71l256-256c6.839-6.839 16.018-10.862 25.71-10.862s18.871 3.986 25.71 10.862l256 256c6.839 6.839 10.862 16.018 10.862 25.71z","M585.143 475.423c0 20.005-16.567 36.571-36.571 36.571h-512c-20.005 0-36.571-16.567-36.571-36.571 0-9.728 3.986-18.871 10.862-25.71l256-256c6.839-6.839 16.018-10.862 25.71-10.862s18.871 3.986 25.71 10.862l256 256c6.839 6.839 10.862 16.018 10.862 25.71z"],"attrs":[{},{}],"width":585,"isMulticolor":false,"isMulticolor2":false,"grid":16,"tags":["caret-top"]},"attrs":[{},{}],"properties":{"order":124,"id":225,"name":"caret-top","prevSize":24,"code":59756},"setIdx":2,"setId":1,"iconIdx":1},{"icon":{"paths":["M256 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-512v-460.8h-51.2v460.8c0 28.314 22.886 51.2 51.2 51.2h512c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM614.4 189.8l117.4 117.4h-117.4z","M408.906 587.72l-35.3-37 138.1-131.9 138 131.9-35.3 37-102.7-98.1z","M511.706 773.12l-138.1-131.9 35.3-37 102.8 98.1 102.7-98.1 35.3 37z"],"attrs":[{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":16,"tags":["show"]},"attrs":[{},{},{}],"properties":{"order":123,"id":224,"name":"show","prevSize":24,"code":59748},"setIdx":2,"setId":1,"iconIdx":2},{"icon":{"paths":["M256 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-512v-460.8h-51.2v460.8c0 28.314 22.886 51.2 51.2 51.2h512c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM614.4 189.8l117.4 117.4h-117.4z","M348.394 15.988c-28.314 0-51.2 22.886-51.2 51.2v23.7h51.2v-23.7h307.2l204.8 204.8v512h-23.8v51.2h23.8c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2z","M408.906 587.72l-35.3-37 138.1-131.9 138 131.9-35.3 37-102.7-98.1z","M511.706 773.12l-138.1-131.9 35.3-37 102.8 98.1 102.7-98.1 35.3 37z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":16,"tags":["show-all"]},"attrs":[{},{},{},{}],"properties":{"order":122,"id":223,"name":"show-all","prevSize":24,"code":59749},"setIdx":2,"setId":1,"iconIdx":3},{"icon":{"paths":["M256 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-512v-460.8h-51.2v460.8c0 28.314 22.886 51.2 51.2 51.2h512c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM614.4 189.8l117.4 117.4h-117.4z","M408.9 418.8l-35.3 37 138 131.9 138.1-131.9-35.3-37-102.8 98.1z","M511.6 604.2l-138 131.9 35.3 37 102.7-98.1 102.8 98.1 35.3-37z"],"attrs":[{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":16,"tags":["hide"]},"attrs":[{},{},{}],"properties":{"order":121,"id":222,"name":"hide","prevSize":24,"code":59750},"setIdx":2,"setId":1,"iconIdx":4},{"icon":{"paths":["M408.9 418.8l-35.3 37 138.1 131.9 138-131.9-35.3-37-102.7 98.1z","M511.7 604.2l-138.1 131.9 35.3 37 102.8-98.1 102.7 98.1 35.3-37z","M256 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-512v-460.8h-51.2v460.8c0 28.314 22.886 51.2 51.2 51.2h512c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM614.4 189.8l117.4 117.4h-117.4z","M348.394 15.988c-28.314 0-51.2 22.886-51.2 51.2v23.7h51.2v-23.7h307.2l204.8 204.8v512h-23.8v51.2h23.8c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":16,"tags":["hide-all"]},"attrs":[{},{},{},{}],"properties":{"order":120,"id":221,"name":"hide-all","prevSize":24,"code":59751},"setIdx":2,"setId":1,"iconIdx":5},{"icon":{"paths":["M512 1024c-136.76 0-265.334-53.258-362.040-149.96-96.702-96.706-149.96-225.28-149.96-362.040 0-96.838 27.182-191.134 78.606-272.692 50-79.296 120.664-143.372 204.356-185.3l43 85.832c-68.038 34.084-125.492 86.186-166.15 150.67-41.746 66.208-63.812 142.798-63.812 221.49 0 229.382 186.618 416 416 416s416-186.618 416-416c0-78.692-22.066-155.282-63.81-221.49-40.66-64.484-98.114-116.584-166.15-150.67l43-85.832c83.692 41.928 154.358 106.004 204.356 185.3 51.422 81.558 78.604 175.854 78.604 272.692 0 136.76-53.258 265.334-149.96 362.040-96.706 96.702-225.28 149.96-362.040 149.96z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["spinner","loading","loading-wheel","busy","wait"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59737,"name":"spinner2"},"setIdx":2,"setId":1,"iconIdx":12},{"icon":{"paths":["M1024 397.050l-353.78-51.408-158.22-320.582-158.216 320.582-353.784 51.408 256 249.538-60.432 352.352 316.432-166.358 316.432 166.358-60.434-352.352 256.002-249.538z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["star-full","rate","star","favorite","bookmark"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":2,"prevSize":24,"code":59741,"name":"star-full"},"setIdx":2,"setId":1,"iconIdx":13},{"icon":{"paths":["M1024 397.050l-353.78-51.408-158.22-320.582-158.216 320.582-353.784 51.408 256 249.538-60.432 352.352 316.432-166.358 316.432 166.358-60.434-352.352 256.002-249.538zM512 753.498l-223.462 117.48 42.676-248.83-180.786-176.222 249.84-36.304 111.732-226.396 111.736 226.396 249.836 36.304-180.788 176.222 42.678 248.83-223.462-117.48z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["star-empty","rate","star","favorite","bookmark"],"grid":16},"attrs":[{}],"properties":{"order":2,"id":1,"prevSize":24,"code":59742,"name":"star-empty"},"setIdx":2,"setId":1,"iconIdx":14},{"icon":{"paths":["M1024 226.4c-37.6 16.8-78.2 28-120.6 33 43.4-26 76.6-67.2 92.4-116.2-40.6 24-85.6 41.6-133.4 51-38.4-40.8-93-66.2-153.4-66.2-116 0-210 94-210 210 0 16.4 1.8 32.4 5.4 47.8-174.6-8.8-329.4-92.4-433-219.6-18 31-28.4 67.2-28.4 105.6 0 72.8 37 137.2 93.4 174.8-34.4-1-66.8-10.6-95.2-26.2 0 0.8 0 1.8 0 2.6 0 101.8 72.4 186.8 168.6 206-17.6 4.8-36.2 7.4-55.4 7.4-13.6 0-26.6-1.4-39.6-3.8 26.8 83.4 104.4 144.2 196.2 146-72 56.4-162.4 90-261 90-17 0-33.6-1-50.2-3 93.2 59.8 203.6 94.4 322.2 94.4 386.4 0 597.8-320.2 597.8-597.8 0-9.2-0.2-18.2-0.6-27.2 41-29.4 76.6-66.4 104.8-108.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["twitter","brand","tweet","social"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59740,"name":"twitter"},"setIdx":2,"setId":1,"iconIdx":15},{"icon":{"paths":["M728.992 512c137.754-87.334 231.008-255.208 231.008-448 0-21.676-1.192-43.034-3.478-64h-889.042c-2.29 20.968-3.48 42.326-3.48 64 0 192.792 93.254 360.666 231.006 448-137.752 87.334-231.006 255.208-231.006 448 0 21.676 1.19 43.034 3.478 64h889.042c2.288-20.966 3.478-42.324 3.478-64 0.002-192.792-93.252-360.666-231.006-448zM160 960c0-186.912 80.162-345.414 224-397.708v-100.586c-143.838-52.29-224-210.792-224-397.706v0h704c0 186.914-80.162 345.416-224 397.706v100.586c143.838 52.294 224 210.796 224 397.708h-704zM619.626 669.594c-71.654-40.644-75.608-93.368-75.626-125.366v-64.228c0-31.994 3.804-84.914 75.744-125.664 38.504-22.364 71.808-56.348 97.048-98.336h-409.582c25.266 42.032 58.612 76.042 97.166 98.406 71.654 40.644 75.606 93.366 75.626 125.366v64.228c0 31.992-3.804 84.914-75.744 125.664-72.622 42.18-126.738 125.684-143.090 226.336h501.67c-16.364-100.708-70.53-184.248-143.212-226.406z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["hour-glass","loading","busy","wait"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":24,"code":59732,"name":"hour-glass"},"setIdx":2,"setId":1,"iconIdx":16},{"icon":{"paths":["M192 512c0-12.18 0.704-24.196 2.030-36.022l-184.98-60.104c-5.916 31.14-9.050 63.264-9.050 96.126 0 147.23 62.166 279.922 161.654 373.324l114.284-157.296c-52.124-56.926-83.938-132.758-83.938-216.028zM832 512c0 83.268-31.812 159.102-83.938 216.028l114.284 157.296c99.488-93.402 161.654-226.094 161.654-373.324 0-32.862-3.132-64.986-9.048-96.126l-184.98 60.104c1.324 11.828 2.028 23.842 2.028 36.022zM576 198.408c91.934 18.662 169.544 76.742 214.45 155.826l184.978-60.102c-73.196-155.42-222.24-268.060-399.428-290.156v194.432zM233.55 354.232c44.906-79.084 122.516-137.164 214.45-155.826v-194.43c-177.188 22.096-326.23 134.736-399.426 290.154l184.976 60.102zM644.556 803.328c-40.39 18.408-85.272 28.672-132.556 28.672s-92.166-10.264-132.554-28.67l-114.292 157.31c73.206 40.366 157.336 63.36 246.846 63.36s173.64-22.994 246.848-63.36l-114.292-157.312z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["spinner","loading","loading-wheel","busy","wait"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59731,"name":"spinner"},"setIdx":2,"setId":1,"iconIdx":17},{"icon":{"paths":["M658.744 749.256l-210.744-210.746v-282.51h128v229.49l173.256 173.254zM512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 896c-212.078 0-384-171.922-384-384s171.922-384 384-384c212.078 0 384 171.922 384 384s-171.922 384-384 384z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["clock","time","schedule"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59728,"name":"clock"},"setIdx":2,"setId":1,"iconIdx":18},{"icon":{"paths":["M128 320v640c0 35.2 28.8 64 64 64h576c35.2 0 64-28.8 64-64v-640h-704zM320 896h-64v-448h64v448zM448 896h-64v-448h64v448zM576 896h-64v-448h64v448zM704 896h-64v-448h64v448z","M848 128h-208v-80c0-26.4-21.6-48-48-48h-224c-26.4 0-48 21.6-48 48v80h-208c-26.4 0-48 21.6-48 48v80h832v-80c0-26.4-21.6-48-48-48zM576 128h-192v-63.198h192v63.198z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["bin","trashcan","remove","delete","recycle","dispose"],"grid":16},"attrs":[{},{}],"properties":{"order":1,"id":0,"name":"bin2","prevSize":24,"code":59650},"setIdx":2,"setId":1,"iconIdx":19},{"icon":{"paths":["M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 960.002c-62.958 0-122.872-13.012-177.23-36.452l233.148-262.29c5.206-5.858 8.082-13.422 8.082-21.26v-96c0-17.674-14.326-32-32-32-112.99 0-232.204-117.462-233.374-118.626-6-6.002-14.14-9.374-22.626-9.374h-128c-17.672 0-32 14.328-32 32v192c0 12.122 6.848 23.202 17.69 28.622l110.31 55.156v187.886c-116.052-80.956-192-215.432-192-367.664 0-68.714 15.49-133.806 43.138-192h116.862c8.488 0 16.626-3.372 22.628-9.372l128-128c6-6.002 9.372-14.14 9.372-22.628v-77.412c40.562-12.074 83.518-18.588 128-18.588 70.406 0 137.004 16.26 196.282 45.2-4.144 3.502-8.176 7.164-12.046 11.036-36.266 36.264-56.236 84.478-56.236 135.764s19.97 99.5 56.236 135.764c36.434 36.432 85.218 56.264 135.634 56.26 3.166 0 6.342-0.080 9.518-0.236 13.814 51.802 38.752 186.656-8.404 372.334-0.444 1.744-0.696 3.488-0.842 5.224-81.324 83.080-194.7 134.656-320.142 134.656z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["earth","globe","language","web","internet","sphere","planet"],"defaultCode":59850,"grid":16},"attrs":[],"properties":{"ligatures":"earth, globe2","name":"earth","id":202,"order":91,"prevSize":24,"code":59850},"setIdx":2,"setId":1,"iconIdx":20},{"icon":{"paths":["M512.002 193.212v-65.212h128v-64c0-35.346-28.654-64-64.002-64h-191.998c-35.346 0-64 28.654-64 64v64h128v65.212c-214.798 16.338-384 195.802-384 414.788 0 229.75 186.25 416 416 416s416-186.25 416-416c0-218.984-169.202-398.448-384-414.788zM706.276 834.274c-60.442 60.44-140.798 93.726-226.274 93.726s-165.834-33.286-226.274-93.726c-60.44-60.44-93.726-140.8-93.726-226.274s33.286-165.834 93.726-226.274c58.040-58.038 134.448-91.018 216.114-93.548l-21.678 314.020c-1.86 26.29 12.464 37.802 31.836 37.802s33.698-11.512 31.836-37.802l-21.676-314.022c81.666 2.532 158.076 35.512 216.116 93.55 60.44 60.44 93.726 140.8 93.726 226.274s-33.286 165.834-93.726 226.274z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["stopwatch","time","speed","meter","chronometer"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":2,"prevSize":24,"code":59715,"name":"elapsed"},"setIdx":2,"setId":1,"iconIdx":21},{"icon":{"paths":["M522.2 438.8v175.6h290.4c-11.8 75.4-87.8 220.8-290.4 220.8-174.8 0-317.4-144.8-317.4-323.2s142.6-323.2 317.4-323.2c99.4 0 166 42.4 204 79l139-133.8c-89.2-83.6-204.8-134-343-134-283 0-512 229-512 512s229 512 512 512c295.4 0 491.6-207.8 491.6-500.2 0-33.6-3.6-59.2-8-84.8l-483.6-0.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["google","brand"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59707,"name":"google"},"setIdx":2,"setId":1,"iconIdx":22},{"icon":{"paths":["M592 448h-16v-192c0-105.87-86.13-192-192-192h-128c-105.87 0-192 86.13-192 192v192h-16c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h544c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48zM192 256c0-35.29 28.71-64 64-64h128c35.29 0 64 28.71 64 64v192h-256v-192z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["lock","secure","private","encrypted"],"grid":16},"attrs":[{}],"properties":{"order":2,"id":0,"prevSize":24,"code":59700,"name":"lock"},"setIdx":2,"setId":1,"iconIdx":23},{"icon":{"paths":["M0.35 512l-0.35-312.074 384-52.144v364.218zM448 138.482l511.872-74.482v448h-511.872zM959.998 576l-0.126 448-511.872-72.016v-375.984zM384 943.836l-383.688-52.594-0.020-315.242h383.708z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["windows8","brand","os"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":24,"code":59712,"name":"microsoft"},"setIdx":2,"setId":1,"iconIdx":24},{"icon":{"paths":["M128 128h320v768h-320zM576 128h320v768h-320z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["pause","player"],"grid":16},"attrs":[{}],"properties":{"order":2,"id":1,"prevSize":24,"code":59695,"name":"pause"},"setIdx":2,"setId":1,"iconIdx":25},{"icon":{"paths":["M192 128l640 384-640 384z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["play","player"],"grid":16},"attrs":[{}],"properties":{"order":3,"id":0,"prevSize":24,"code":59696,"name":"play"},"setIdx":2,"setId":1,"iconIdx":26},{"icon":{"paths":["M889.68 166.32c-93.608-102.216-228.154-166.32-377.68-166.32-282.77 0-512 229.23-512 512h96c0-229.75 186.25-416 416-416 123.020 0 233.542 53.418 309.696 138.306l-149.696 149.694h352v-352l-134.32 134.32z","M928 512c0 229.75-186.25 416-416 416-123.020 0-233.542-53.418-309.694-138.306l149.694-149.694h-352v352l134.32-134.32c93.608 102.216 228.154 166.32 377.68 166.32 282.77 0 512-229.23 512-512h-96z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["loop","repeat","player","reload","refresh","update","synchronize","arrows"],"grid":16},"attrs":[{},{}],"properties":{"order":49,"id":2,"prevSize":24,"code":59694,"name":"reset"},"setIdx":2,"setId":1,"iconIdx":27},{"icon":{"paths":["M933.79 610.25c-53.726-93.054-21.416-212.304 72.152-266.488l-100.626-174.292c-28.75 16.854-62.176 26.518-97.846 26.518-107.536 0-194.708-87.746-194.708-195.99h-201.258c0.266 33.41-8.074 67.282-25.958 98.252-53.724 93.056-173.156 124.702-266.862 70.758l-100.624 174.292c28.97 16.472 54.050 40.588 71.886 71.478 53.638 92.908 21.512 211.92-71.708 266.224l100.626 174.292c28.65-16.696 61.916-26.254 97.4-26.254 107.196 0 194.144 87.192 194.7 194.958h201.254c-0.086-33.074 8.272-66.57 25.966-97.218 53.636-92.906 172.776-124.594 266.414-71.012l100.626-174.29c-28.78-16.466-53.692-40.498-71.434-71.228zM512 719.332c-114.508 0-207.336-92.824-207.336-207.334 0-114.508 92.826-207.334 207.336-207.334 114.508 0 207.332 92.826 207.332 207.334-0.002 114.51-92.824 207.334-207.332 207.334z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["cog","gear","preferences","settings","generate","control","options"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":24,"code":59693,"name":"settings2"},"setIdx":2,"setId":1,"iconIdx":28},{"icon":{"paths":["M512 128c-247.424 0-448 200.576-448 448s200.576 448 448 448 448-200.576 448-448-200.576-448-448-448zM512 936c-198.824 0-360-161.178-360-360 0-198.824 161.176-360 360-360 198.822 0 360 161.176 360 360 0 198.822-161.178 360-360 360zM934.784 287.174c16.042-28.052 25.216-60.542 25.216-95.174 0-106.040-85.96-192-192-192-61.818 0-116.802 29.222-151.92 74.596 131.884 27.236 245.206 105.198 318.704 212.578v0zM407.92 74.596c-35.116-45.374-90.102-74.596-151.92-74.596-106.040 0-192 85.96-192 192 0 34.632 9.174 67.122 25.216 95.174 73.5-107.38 186.822-185.342 318.704-212.578z","M512 576v-256h-64v320h256v-64z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["alarm","time","clock"],"grid":16},"attrs":[{},{}],"properties":{"order":2,"id":1,"prevSize":24,"code":59716,"name":"timeout"},"setIdx":2,"setId":1,"iconIdx":29},{"icon":{"paths":["M768 64c105.87 0 192 86.13 192 192v192h-128v-192c0-35.29-28.71-64-64-64h-128c-35.29 0-64 28.71-64 64v192h16c26.4 0 48 21.6 48 48v480c0 26.4-21.6 48-48 48h-544c-26.4 0-48-21.6-48-48v-480c0-26.4 21.6-48 48-48h400v-192c0-105.87 86.13-192 192-192h128z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["unlocked","lock-open"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":24,"code":59699,"name":"unlocked"},"setIdx":2,"setId":1,"iconIdx":30},{"icon":{"paths":["M409.6 204.8h-153.6c-28.314 0-51.2 22.886-51.2 51.2v153.6c0 28.262 22.886 51.2 51.2 51.2h153.6c28.314 0 51.2-22.938 51.2-51.2v-153.6c0-28.262-22.886-51.2-51.2-51.2zM768 204.8h-153.6c-28.314 0-51.2 22.886-51.2 51.2v153.6c0 28.262 22.886 51.2 51.2 51.2h153.6c28.314 0 51.2-22.938 51.2-51.2v-153.6c0-28.262-22.886-51.2-51.2-51.2zM409.6 563.2h-153.6c-28.314 0-51.2 22.886-51.2 51.2v153.6c0 28.262 22.886 51.2 51.2 51.2h153.6c28.314 0 51.2-22.938 51.2-51.2v-153.6c0-28.262-22.886-51.2-51.2-51.2zM768 563.2h-153.6c-28.314 0-51.2 22.886-51.2 51.2v153.6c0 28.262 22.886 51.2 51.2 51.2h153.6c28.314 0 51.2-22.938 51.2-51.2v-153.6c0-28.262-22.886-51.2-51.2-51.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["grid"],"grid":20},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":20,"code":59730,"name":"grid1"},"setIdx":2,"setId":1,"iconIdx":31},{"icon":{"paths":["M737.28 460.8h-296.96c-28.262 0-30.72 22.886-30.72 51.2s2.458 51.2 30.72 51.2h296.96c28.262 0 30.72-22.886 30.72-51.2s-2.458-51.2-30.72-51.2zM839.68 716.8h-399.36c-28.262 0-30.72 22.886-30.72 51.2s2.458 51.2 30.72 51.2h399.36c28.262 0 30.72-22.886 30.72-51.2s-2.458-51.2-30.72-51.2zM440.32 307.2h399.36c28.262 0 30.72-22.886 30.72-51.2s-2.458-51.2-30.72-51.2h-399.36c-28.262 0-30.72 22.886-30.72 51.2s2.458 51.2 30.72 51.2zM276.48 460.8h-92.16c-28.262 0-30.72 22.886-30.72 51.2s2.458 51.2 30.72 51.2h92.16c28.262 0 30.72-22.886 30.72-51.2s-2.458-51.2-30.72-51.2zM276.48 716.8h-92.16c-28.262 0-30.72 22.886-30.72 51.2s2.458 51.2 30.72 51.2h92.16c28.262 0 30.72-22.886 30.72-51.2s-2.458-51.2-30.72-51.2zM276.48 204.8h-92.16c-28.262 0-30.72 22.886-30.72 51.2s2.458 51.2 30.72 51.2h92.16c28.262 0 30.72-22.886 30.72-51.2s-2.458-51.2-30.72-51.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["list"],"grid":20},"attrs":[{}],"properties":{"order":1,"id":0,"name":"list","prevSize":20,"code":59726},"setIdx":2,"setId":1,"iconIdx":32},{"icon":{"paths":["M636.518 0c68.608 0 102.912 46.694 102.912 100.198 0 66.816-59.597 128.614-137.165 128.614-64.973 0-102.861-38.4-101.069-101.888 0-53.402 45.107-126.925 135.322-126.925zM425.421 1024c-54.17 0-93.85-33.382-55.962-180.429l62.157-260.71c10.803-41.677 12.595-58.419 0-58.419-16.23 0-86.477 28.774-128.102 57.19l-27.034-45.056c131.686-111.923 283.187-177.51 348.211-177.51 54.118 0 63.13 65.178 36.096 165.376l-71.219 274.022c-12.595 48.384-7.219 65.075 5.427 65.075 16.23 0 69.478-20.070 121.805-61.798l30.72 41.677c-128.102 130.406-268.032 180.582-322.099 180.582z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["info"],"grid":20},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":20,"code":59708,"name":"info"},"setIdx":2,"setId":1,"iconIdx":33},{"icon":{"paths":["M832 416h-320v64h-64v-96h384v-192h-32v96c0 17.664-14.336 32-32 32h-576c-17.696 0-32-14.336-32-32v-128c0-17.696 14.304-32 32-32h576c17.664 0 32 14.304 32 32h64v256h-32zM736 160h-512v32h512v-32zM544 832c0 35.328-28.672 64-64 64s-64-28.672-64-64v-320h128v320zM480 786.656c-17.696 0-32 14.336-32 32 0 17.696 14.304 32 32 32 17.664 0 32-14.304 32-32 0-17.664-14.336-32-32-32z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["paint","tool"],"grid":32},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":32,"code":59725,"name":"control-Color"},"setIdx":2,"setId":1,"iconIdx":34},{"icon":{"paths":["M1328 320c-8.832 0-16 7.168-16 16v640c0 8.832-7.168 16-16 16h-1248c-8.832 0-16-7.168-16-16v-640c0-8.832-7.168-16-16-16s-16 7.168-16 16v640c0 26.464 21.536 48 48 48h1248c26.464 0 48-21.536 48-48v-640c0-8.832-7.168-16-16-16zM1296 0h-1248c-26.464 0-48 21.536-48 48v192c0 8.832 7.168 16 16 16h1312c8.832 0 16-7.168 16-16v-192c0-26.464-21.536-48-48-48zM1312 224h-1280v-176c0-8.832 7.168-16 16-16h1248c8.832 0 16 7.168 16 16v176zM560 896c8.832 0 16-7.168 16-16v-512c0-8.832-7.168-16-16-16h-416c-8.832 0-16 7.168-16 16v512c0 8.832 7.168 16 16 16h416zM160 384h384v480h-384v-480zM720 480h480c8.832 0 16-7.168 16-16s-7.168-16-16-16h-480c-8.832 0-16 7.168-16 16s7.168 16 16 16zM720 640h480c8.832 0 16-7.168 16-16s-7.168-16-16-16h-480c-8.832 0-16 7.168-16 16s7.168 16 16 16zM720 800h480c8.832 0 16-7.168 16-16s-7.168-16-16-16h-480c-8.832 0-16 7.168-16 16s7.168 16 16 16zM96 128c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM224 128c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM352 128c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32z"],"attrs":[{}],"width":1344,"isMulticolor":false,"isMulticolor2":false,"tags":["browser","window","software","program"],"grid":32},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":32,"code":59701,"name":"browser"},"setIdx":2,"setId":1,"iconIdx":35},{"icon":{"paths":["M927.936 272.992l-68.288-68.288c-12.608-12.576-32.96-12.576-45.536 0l-409.44 409.44-194.752-196.16c-12.576-12.576-32.928-12.576-45.536 0l-68.288 68.288c-12.576 12.608-12.576 32.96 0 45.536l285.568 287.488c12.576 12.576 32.96 12.576 45.536 0l500.736-500.768c12.576-12.544 12.576-32.96 0-45.536z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["checkmark","tick","approve","submit"],"grid":32},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":32,"code":59714,"name":"checkmark"},"setIdx":2,"setId":1,"iconIdx":36},{"icon":{"paths":["M1020.192 401.824c-8.864-25.568-31.616-44.288-59.008-48.352l-266.432-39.616-115.808-240.448c-12.192-25.248-38.272-41.408-66.944-41.408s-54.752 16.16-66.944 41.408l-115.808 240.448-266.464 39.616c-27.36 4.064-50.112 22.784-58.944 48.352-8.8 25.632-2.144 53.856 17.184 73.12l195.264 194.944-45.28 270.432c-4.608 27.232 7.2 54.56 30.336 70.496 12.704 8.736 27.648 13.184 42.592 13.184 12.288 0 24.608-3.008 35.776-8.992l232.288-125.056 232.32 125.056c11.168 5.984 23.488 8.992 35.744 8.992 14.944 0 29.888-4.448 42.624-13.184 23.136-15.936 34.88-43.264 30.304-70.496l-45.312-270.432 195.328-194.944c19.296-19.296 25.92-47.52 17.184-73.12zM754.816 619.616c-16.384 16.32-23.808 39.328-20.064 61.888l45.312 270.432-232.32-124.992c-11.136-6.016-23.424-8.992-35.776-8.992-12.288 0-24.608 3.008-35.744 8.992l-232.32 124.992 45.312-270.432c3.776-22.56-3.648-45.568-20.032-61.888l-195.264-194.944 266.432-39.68c24.352-3.616 45.312-18.848 55.776-40.576l115.872-240.384 115.84 240.416c10.496 21.728 31.424 36.928 55.744 40.576l266.496 39.68-195.264 194.912z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["star","favorite"],"grid":32},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":32,"code":59706,"name":"control-Stars"},"setIdx":2,"setId":1,"iconIdx":37},{"icon":{"paths":["M66.337 575.491l276.668-171.531v-57.177l-331.627 207.614v42.189l331.627 207.614-0-57.177z","M957.663 575.49l-276.668-171.531v-57.177l331.627 207.614v42.189l-331.627 207.614 0-57.177z","M583.295 214.183l-200.825 621.623 53.007 17.527 200.837-621.623z"],"attrs":[{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["prerender"]},"attrs":[{},{},{}],"properties":{"order":114,"id":1,"name":"prerender","prevSize":32,"code":59724},"setIdx":2,"setId":1,"iconIdx":38},{"icon":{"paths":["M1024 512c0 282.77-229.23 512-512 512s-512-229.23-512-512c0-282.77 229.23-512 512-512s512 229.23 512 512z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["circle"]},"attrs":[{}],"properties":{"order":106,"id":0,"name":"circle","prevSize":32,"code":59729},"setIdx":2,"setId":1,"iconIdx":39},{"icon":{"paths":["M512 0c-15.36 0-25.6 10.24-25.6 25.6s10.24 25.6 25.6 25.6h128v870.4h-128c-15.36 0-25.6 10.24-25.6 25.6s10.24 25.6 25.6 25.6h307.2c15.36 0 25.6-10.24 25.6-25.6s-10.24-25.6-25.6-25.6h-128v-870.4h128c15.36 0 25.6-10.24 25.6-25.6s-10.24-25.6-25.6-25.6h-307.2zM51.2 204.8c-28.16 0-51.2 23.040-51.2 51.2v460.8c0 28.16 23.040 51.2 51.2 51.2h537.6v-51.2h-512c-15.36 0-25.6-10.24-25.6-25.6v-409.6c0-15.36 10.24-25.6 25.6-25.6h512v-51.2h-537.6zM742.4 204.8v51.2h204.8c15.36 0 25.6 10.24 25.6 25.6v409.6c0 15.36-10.24 25.6-25.6 25.6h-204.8v51.2h230.4c28.16 0 51.2-23.040 51.2-51.2v-460.8c0-28.16-23.040-51.2-51.2-51.2h-230.4z","M386.56 606.72c0 12.8-7.68 23.040-20.48 25.6-28.16 10.24-58.88 15.36-92.16 15.36-35.84 0-66.56-10.24-84.48-25.6s-25.6-38.4-25.6-66.56 10.24-51.2 25.6-66.56c17.92-17.92 46.080-23.040 84.48-23.040h69.12v-38.4c0-35.84-25.6-53.76-64-53.76-23.040 0-46.080 7.68-69.12 20.48-2.56 2.56-5.12 2.56-10.24 2.56-10.24 0-20.48-7.68-20.48-20.48 0-7.68 2.56-12.8 10.24-17.92 30.72-20.48 61.44-25.6 92.16-25.6 56.32 0 104.96 30.72 104.96 92.16v181.76zM345.6 501.76h-69.12c-61.44 0-69.12 28.16-69.12 53.76s7.68 56.32 69.12 56.32c23.040 0 46.080-2.56 69.12-10.24v-99.84z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-Slug"]},"attrs":[{},{}],"properties":{"order":103,"id":0,"name":"control-Slug","prevSize":32,"code":59727},"setIdx":2,"setId":1,"iconIdx":40},{"icon":{"paths":["M295.954 822.751h-94.705c-47.353 0-88.786-41.434-88.786-88.786v-491.283c0-47.353 41.434-88.786 88.786-88.786h94.705v-59.191h-94.705c-82.867 0-147.977 65.11-147.977 147.977v491.283c0 82.867 65.11 147.977 147.977 147.977h94.705v-59.191z","M970.728 473.526c-82.867-171.653-201.249-378.821-272.277-378.821h-112.462v59.191h112.462c35.514 11.838 136.139 177.572 213.087 337.387-76.948 153.896-177.572 325.549-213.087 337.387h-112.462v59.191h112.462c71.029 0 183.491-207.168 272.277-384.74l5.919-11.838-5.919-17.757z","M266.358 337.341v260.462h59.191v-260.462z","M479.422 337.341v260.462h59.191v-260.462z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["Tags"]},"attrs":[{},{},{},{}],"properties":{"order":98,"id":0,"name":"type-Tags","prevSize":32,"code":59722},"setIdx":2,"setId":1,"iconIdx":41},{"icon":{"paths":["M512 102.4c-200.4 0-366.954 144.072-402.4 334.2-0.031 0.165-0.069 0.335-0.1 0.5-2.974 16.061-4.76 32.441-5.8 49.1-0.017 0.271-0.084 0.529-0.1 0.8 0.019 0.004 0.080-0.004 0.1 0-0.503 8.31-1.3 16.564-1.3 25 0 226.202 183.398 409.6 409.6 409.6 208.165 0 379.707-155.44 405.8-356.5 0.004-0.033-0.004-0.067 0-0.1 1.94-14.978 3.124-30.16 3.4-45.6 0.044-2.487 0.4-4.903 0.4-7.4 0-226.202-183.398-409.6-409.6-409.6zM512 153.6c185.461 0 337.902 140.924 356.4 321.5-35.181-21.812-84.232-39.9-151.6-39.9-85.35 0-140.891 41.606-194.6 81.9-49.152 36.864-95.55 71.7-163.8 71.7-86.067 0-135.862-54.67-175.9-98.6-9.001-9.901-17.11-17.483-25.4-25.3 23.131-175.603 172.981-311.3 354.9-311.3zM716.8 486.4c77.828 0 125.173 28.221 152.2 52.8-13.96 185.173-168.254 331.2-357 331.2-190.097 0-345.175-148.14-357.2-335.2 41.826 45.372 102.577 104.8 203.6 104.8 85.35 0 140.891-41.606 194.6-81.9 49.152-36.915 95.55-71.7 163.8-71.7z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["activity"]},"attrs":[{}],"properties":{"order":12,"id":36,"name":"activity, history, time","prevSize":32,"code":59652},"setIdx":2,"setId":1,"iconIdx":42},{"icon":{"paths":["M512 0c-35.392 0-64 28.608-64 64v384h-384c-35.392 0-64 28.608-64 64s28.608 64 64 64h384v384c0 35.392 28.608 64 64 64s64-28.608 64-64v-384h384c35.392 0 64-28.608 64-64s-28.608-64-64-64h-384v-384c0-35.392-28.608-64-64-64z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["add"]},"attrs":[{}],"properties":{"order":13,"id":35,"name":"add, plus","prevSize":32,"code":59653},"setIdx":2,"setId":1,"iconIdx":43},{"icon":{"paths":["M512 102.4c-226.202 0-409.6 183.398-409.6 409.6s183.398 409.6 409.6 409.6c226.202 0 409.6-183.398 409.6-409.6s-183.398-409.6-409.6-409.6zM512 153.6c197.632 0 358.4 160.819 358.4 358.4s-160.768 358.4-358.4 358.4c-197.632 0-358.4-160.819-358.4-358.4s160.768-358.4 358.4-358.4zM691.9 333c-12.893 0.002-25.782 4.882-35.5 14.6l-222.2 221.9-67.7-67.5c-19.19-19.294-51.085-19.215-70.3 0-19.15 19.15-19.15 51.050 0 70.2 0.198 0.2 26.198 26.681 52 53 12.95 13.209 25.761 26.372 35.2 36 4.719 4.814 8.607 8.755 11.2 11.4 1.296 1.322 2.293 2.281 2.9 2.9 0.279 0.282 0.488 0.486 0.6 0.6 0.001 0.001 7.591-7.429 14.6-14.3l-14.5 14.4 0.2 0.2v0.1c19.43 19.327 51.57 19.327 71 0v-0.1l258.1-257.6c19.546-19.447 19.521-51.885-0.1-71.3-9.731-9.679-22.607-14.502-35.5-14.5z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["check-circle"]},"attrs":[{}],"properties":{"order":14,"id":34,"name":"check-circle","prevSize":32,"code":59654},"setIdx":2,"setId":1,"iconIdx":44},{"icon":{"paths":["M512 1024c-282.778 0-512-229.222-512-512s229.222-512 512-512 512 229.222 512 512-229.222 512-512 512zM855.808 270.592c-19.2-19.2-50.278-19.2-69.478 0l-376.73 376.73-171.878-171.93c-19.2-19.2-50.278-19.2-69.478 0s-19.2 50.278 0 69.478c0 0 201.523 205.261 204.8 208.486 9.984 10.138 23.347 14.643 36.557 14.080 13.21 0.563 26.573-3.942 36.608-14.029 3.277-3.226 409.6-413.286 409.6-413.286 19.2-19.2 19.2-50.33 0-69.53z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["check-circle-filled"]},"attrs":[{}],"properties":{"order":27,"id":33,"name":"check-circle-filled","prevSize":32,"code":59655},"setIdx":2,"setId":1,"iconIdx":45},{"icon":{"paths":["M601.024 512l276.736 276.736c24.512 24.576 24.512 64.384 0 89.024-24.64 24.576-64.384 24.576-89.024 0l-276.736-276.736-276.736 276.736c-24.512 24.576-64.384 24.576-89.024 0-24.512-24.64-24.512-64.448 0-89.024l276.736-276.736-276.736-276.736c-24.512-24.576-24.512-64.384 0-89.024 24.64-24.576 64.512-24.576 89.024 0l276.736 276.736 276.736-276.736c24.64-24.576 64.384-24.576 89.024 0 24.512 24.64 24.512 64.448 0 89.024l-276.736 276.736z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["close"]},"attrs":[{}],"properties":{"order":28,"id":32,"name":"close","prevSize":32,"code":59656},"setIdx":2,"setId":1,"iconIdx":46},{"icon":{"paths":["M409.6 435.2h-153.6v51.2h153.6v-51.2zM409.6 332.8h-153.6v51.2h153.6v-51.2zM256 691.2h409.6v-51.2h-409.6v51.2zM409.6 230.4h-153.6v51.2h153.6v-51.2zM870.4 179.2h-51.2v-51.2c0-28.262-22.938-51.2-51.2-51.2h-614.4c-28.262 0-51.2 22.938-51.2 51.2v665.6c0 28.262 22.938 51.2 51.2 51.2h51.2v51.2c0 28.262 22.938 51.2 51.2 51.2h614.4c28.262 0 51.2-22.938 51.2-51.2v-665.6c0-28.262-22.938-51.2-51.2-51.2zM179.2 793.6c-14.157 0-25.6-11.443-25.6-25.6v-614.4c0-14.131 11.443-25.6 25.6-25.6h563.2c14.157 0 25.6 11.469 25.6 25.6v614.4c0 14.157-11.443 25.6-25.6 25.6h-563.2zM870.4 870.4c0 14.157-11.443 25.6-25.6 25.6h-563.2c-14.157 0-25.6-11.443-25.6-25.6v-25.6h512c28.262 0 51.2-22.938 51.2-51.2v-563.2h25.6c14.157 0 25.6 11.469 25.6 25.6v614.4zM614.4 230.4h-102.4c-28.262 0-51.2 22.938-51.2 51.2v153.6c0 28.262 22.938 51.2 51.2 51.2h102.4c28.262 0 51.2-22.938 51.2-51.2v-153.6c0-28.262-22.938-51.2-51.2-51.2zM614.4 435.2h-102.4v-153.6h102.4v153.6zM256 588.8h409.6v-51.2h-409.6v51.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["content"]},"attrs":[{}],"properties":{"order":37,"id":31,"name":"type-References","prevSize":32,"code":59657},"setIdx":2,"setId":1,"iconIdx":47},{"icon":{"paths":["M793.6 844.8c0 14.157-11.443 25.6-25.6 25.6h-665.6c-14.131 0-25.6-11.443-25.6-25.6v-665.6c0-14.157 11.469-25.6 25.6-25.6h665.6c14.157 0 25.6 11.443 25.6 25.6v102.4h51.2v-128c0-28.262-22.938-51.2-51.2-51.2h-716.8c-28.262 0-51.2 22.938-51.2 51.2v716.8c0 28.262 22.938 51.2 51.2 51.2h716.8c28.262 0 51.2-22.938 51.2-51.2v-281.6h-51.2v256zM991.078 237.747c-9.958-9.958-26.035-9.958-35.968 0l-391.91 391.91-238.31-238.31c-9.958-9.958-26.061-9.958-35.942 0-9.958 9.907-9.958 26.010 0 35.942l254.874 254.874c0.461 0.538 0.614 1.203 1.126 1.69 5.043 5.018 11.674 7.475 18.278 7.373 6.605 0.102 13.235-2.355 18.278-7.373 0.512-0.512 0.666-1.178 1.126-1.69l408.448-408.474c9.933-9.933 9.933-26.035 0-35.942z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-checkbox"]},"attrs":[{}],"properties":{"order":38,"id":30,"name":"control-Checkbox","prevSize":32,"code":59658},"setIdx":2,"setId":1,"iconIdx":48},{"icon":{"paths":["M51.2 0c-28.262 0-51.2 22.938-51.2 51.2v281.6c0 28.262 22.938 51.2 51.2 51.2h921.6c28.262 0 51.2-22.938 51.2-51.2v-281.6c0-28.262-22.938-51.2-51.2-51.2h-921.6zM76.8 51.2h512v281.6h-512c-14.157 0-25.6-11.443-25.6-25.6v-230.4c0-14.157 11.443-25.6 25.6-25.6zM640 51.2h307.2c14.157 0 25.6 11.443 25.6 25.6v230.4c0 14.157-11.443 25.6-25.6 25.6h-307.2v-281.6zM716.8 153.6c-0.41 0.358 89.139 102.938 89.6 102.4 0.512 0 89.6-95.36 89.6-102.4 0 0.384-172.16 0-179.2 0zM128 435.2c-42.394 0-76.8 34.406-76.8 76.8s34.406 76.8 76.8 76.8c42.394 0 76.8-34.406 76.8-76.8s-34.406-76.8-76.8-76.8zM128 486.4c14.157 0 25.6 11.443 25.6 25.6s-11.443 25.6-25.6 25.6c-14.157 0-25.6-11.443-25.6-25.6s11.443-25.6 25.6-25.6zM307.2 486.4c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h640c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-640zM128 640c-42.394 0-76.8 34.381-76.8 76.8s34.406 76.8 76.8 76.8c42.394 0 76.8-34.381 76.8-76.8s-34.406-76.8-76.8-76.8zM128 691.2c14.157 0 25.6 11.443 25.6 25.6s-11.443 25.6-25.6 25.6c-14.157 0-25.6-11.443-25.6-25.6s11.443-25.6 25.6-25.6zM307.2 691.2c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h640c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-640zM128 844.8c-42.394 0-76.8 34.381-76.8 76.8s34.406 76.8 76.8 76.8c42.394 0 76.8-34.381 76.8-76.8s-34.406-76.8-76.8-76.8zM128 896c14.157 0 25.6 11.443 25.6 25.6s-11.443 25.6-25.6 25.6c-14.157 0-25.6-11.443-25.6-25.6s11.443-25.6 25.6-25.6zM307.2 896c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h640c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-640z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-dropdown"]},"attrs":[{}],"properties":{"order":39,"id":29,"name":"control-Dropdown","prevSize":32,"code":59659},"setIdx":2,"setId":1,"iconIdx":49},{"icon":{"paths":["M512 0c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h128v870.4h-128c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h307.2c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-128v-870.4h128c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-307.2zM51.2 204.8c-28.262 0-51.2 22.938-51.2 51.2v460.8c0 28.262 22.938 51.2 51.2 51.2h537.6v-51.2h-512c-14.131 0-25.6-11.443-25.6-25.6v-409.6c0-14.157 11.469-25.6 25.6-25.6h512v-51.2h-537.6zM742.4 204.8v51.2h204.8c14.157 0 25.6 11.443 25.6 25.6v409.6c0 14.157-11.443 25.6-25.6 25.6h-204.8v51.2h230.4c28.262 0 51.2-22.938 51.2-51.2v-460.8c0-28.262-22.938-51.2-51.2-51.2h-230.4zM285.9 307c-0.589 0.051-1.161 0.048-1.75 0.15-8.243 0.051-16.396 4.474-20.85 13.050l-132.55 306.25c-6.656 12.749-2.866 28.981 8.5 36.2 11.341 7.219 25.97 2.749 32.6-10l27.65-63.85h170.5c0.512 0 0.914-0.224 1.4-0.25l27.45 64.050c6.63 12.749 21.136 17.269 32.4 10.050s15.005-23.451 8.4-36.2l-131.3-306.25c-4.454-8.576-12.432-12.973-20.65-13.050-0.614-0.102-1.211-0.099-1.8-0.15zM285.9 389.15l63.65 148.45h-127.9l64.25-148.45z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-input"]},"attrs":[{}],"properties":{"order":41,"id":28,"name":"control-Input","prevSize":32,"code":59660},"setIdx":2,"setId":1,"iconIdx":50},{"icon":{"paths":["M153.6 716.8c-84.787 0-153.6 68.813-153.6 153.6s68.813 153.6 153.6 153.6c84.787 0 153.6-68.813 153.6-153.6s-68.813-153.6-153.6-153.6zM153.6 972.8c-56.55 0-102.4-45.85-102.4-102.4s45.85-102.4 102.4-102.4c56.55 0 102.4 45.85 102.4 102.4s-45.85 102.4-102.4 102.4zM384 179.2h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6zM998.4 486.4h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6zM153.6 0c-84.787 0-153.6 68.787-153.6 153.6s68.813 153.6 153.6 153.6c84.787 0 153.6-68.787 153.6-153.6s-68.813-153.6-153.6-153.6zM153.6 256c-56.55 0-102.4-45.85-102.4-102.4s45.85-102.4 102.4-102.4c56.55 0 102.4 45.85 102.4 102.4s-45.85 102.4-102.4 102.4zM153.6 358.4c-84.787 0-153.6 68.787-153.6 153.6 0 84.787 68.813 153.6 153.6 153.6s153.6-68.813 153.6-153.6c0-84.813-68.813-153.6-153.6-153.6zM153.6 614.4c-56.55 0-102.4-45.85-102.4-102.4s45.85-102.4 102.4-102.4c56.55 0 102.4 45.85 102.4 102.4s-45.85 102.4-102.4 102.4zM153.6 102.4c-28.262 0-51.2 22.938-51.2 51.2s22.938 51.2 51.2 51.2c28.262 0 51.2-22.938 51.2-51.2s-22.938-51.2-51.2-51.2zM998.4 844.8h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-radio"]},"attrs":[{}],"properties":{"order":42,"id":27,"name":"control-Radio","prevSize":32,"code":59661},"setIdx":2,"setId":1,"iconIdx":51},{"icon":{"paths":["M0 0v204.8h76.8v76.8h51.2v-76.8h76.8v-204.8h-204.8zM819.2 0v204.8h204.8v-204.8h-204.8zM51.2 51.2h102.4v102.4h-102.4v-102.4zM870.4 51.2h102.4v102.4h-102.4v-102.4zM281.6 76.8v51.2h102.4v-51.2h-102.4zM486.4 76.8v51.2h102.4v-51.2h-102.4zM691.2 76.8v51.2h102.4v-51.2h-102.4zM333.25 204.8c-7.091-0.307-14.348 2.097-19.75 7.55l-74.75 74.75c-10.317 10.291-10.317 27.083 0 37.4s27.059 10.317 37.35 0l68.45-68.5h141.85v486.4h-50.7c-7.117-0.307-14.348 2.097-19.75 7.55l-23.6 23.55c-10.317 10.317-10.317 27.083 0 37.4 10.291 10.317 27.109 10.317 37.4 0l17.25-17.3h129.75l18.050 18c10.394 10.368 27.181 10.368 37.6 0 10.368-10.394 10.368-27.181 0-37.6l-24-24c-5.478-5.478-12.682-7.907-19.85-7.6h-50.95v-486.4h141.55l69.25 69.2c10.394 10.368 27.155 10.368 37.6 0 10.368-10.368 10.368-27.181 0-37.6l-75.2-75.2c-5.478-5.478-12.706-7.907-19.9-7.6h-357.65zM896 281.6v102.4h51.2v-102.4h-51.2zM76.8 384v102.4h51.2v-102.4h-51.2zM896 486.4v102.4h51.2v-102.4h-51.2zM76.8 588.8v102.4h51.2v-102.4h-51.2zM896 691.2v102.4h51.2v-102.4h-51.2zM76.8 793.6v25.6h-76.8v204.8h204.8v-76.8h76.8v-51.2h-76.8v-76.8h-76.8v-25.6h-51.2zM819.2 819.2v76.8h-25.6v51.2h25.6v76.8h204.8v-204.8h-204.8zM51.2 870.4h102.4v102.4h-102.4v-102.4zM870.4 870.4h102.4v102.4h-102.4v-102.4zM384 896v51.2h102.4v-51.2h-102.4zM588.8 896v51.2h102.4v-51.2h-102.4z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-textarea"]},"attrs":[{}],"properties":{"order":17,"id":26,"name":"control-TextArea","prevSize":32,"code":59662},"setIdx":2,"setId":1,"iconIdx":52},{"icon":{"paths":["M332.8 25.6c-127.258 0-230.4 103.142-230.4 230.4s103.142 230.4 230.4 230.4h358.4c127.258 0 230.4-103.142 230.4-230.4s-103.142-230.4-230.4-230.4h-358.4zM332.8 76.8h358.4c98.97 0 179.2 80.23 179.2 179.2s-80.23 179.2-179.2 179.2h-358.4c-98.97 0-179.2-80.23-179.2-179.2s80.23-179.2 179.2-179.2zM332.8 128c-70.707 0-128 57.293-128 128s57.293 128 128 128c70.707 0 128-57.293 128-128s-57.293-128-128-128zM332.8 179.2c42.419 0 76.8 34.381 76.8 76.8s-34.381 76.8-76.8 76.8c-42.419 0-76.8-34.381-76.8-76.8s34.381-76.8 76.8-76.8zM332.8 537.6c-127.258 0-230.4 103.142-230.4 230.4s103.142 230.4 230.4 230.4h358.4c127.258 0 230.4-103.142 230.4-230.4s-103.142-230.4-230.4-230.4h-358.4zM332.8 588.8h358.4c98.97 0 179.2 80.23 179.2 179.2s-80.23 179.2-179.2 179.2h-358.4c-98.97 0-179.2-80.23-179.2-179.2s80.23-179.2 179.2-179.2zM691.2 640c-70.707 0-128 57.293-128 128s57.293 128 128 128c70.707 0 128-57.293 128-128s-57.293-128-128-128zM691.2 691.2c42.419 0 76.8 34.381 76.8 76.8s-34.381 76.8-76.8 76.8c-42.419 0-76.8-34.381-76.8-76.8s34.381-76.8 76.8-76.8z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-toggle"]},"attrs":[{}],"properties":{"order":16,"id":25,"name":"control-Toggle","prevSize":32,"code":59663},"setIdx":2,"setId":1,"iconIdx":53},{"icon":{"paths":["M204.8 51.2c-56.525 0-102.4 45.875-102.4 102.4v512c0 56.525 45.875 102.4 102.4 102.4h409.6c56.525 0 102.4-45.875 102.4-102.4v-512c0-56.525-45.875-102.4-102.4-102.4h-409.6zM204.8 102.4h409.6c28.262 0 51.2 22.886 51.2 51.2v512c0 28.314-22.938 51.2-51.2 51.2h-409.6c-28.262 0-51.2-22.886-51.2-51.2v-512c0-28.314 22.938-51.2 51.2-51.2zM768 204.8v51.2c28.262 0 51.2 22.886 51.2 51.2v512c0 28.314-22.938 51.2-51.2 51.2h-409.6c-28.262 0-51.2-22.886-51.2-51.2h-51.2c0 56.525 45.875 102.4 102.4 102.4h409.6c56.525 0 102.4-45.875 102.4-102.4v-512c0-56.525-45.875-102.4-102.4-102.4z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["copy"]},"attrs":[{}],"properties":{"order":90,"id":24,"name":"copy","prevSize":32,"code":59664},"setIdx":2,"setId":1,"iconIdx":54},{"icon":{"paths":["M828.8 1024h-633.6c-105.6 0-195.2-89.6-195.2-195.2v-320c0-281.6 227.2-508.8 505.6-508.8 288 0 518.4 230.4 518.4 518.4v310.4c0 105.6-89.6 195.2-195.2 195.2zM505.6 64c-243.2 0-441.6 198.4-441.6 441.6v320c0 73.6 60.8 134.4 131.2 134.4h630.4c73.6 0 131.2-60.8 131.2-131.2v-310.4c3.2-249.6-201.6-454.4-451.2-454.4z","M512 668.8c-3.2 0-6.4 0-6.4 0-32-3.2-64-19.2-80-48l-192-278.4c-9.6-9.6-9.6-25.6-0-38.4 9.6-9.6 25.6-12.8 38.4-6.4l294.4 172.8c28.8 16 48 44.8 51.2 76.8s-6.4 64-28.8 89.6c-19.2 22.4-48 32-76.8 32zM364.8 428.8l108.8 160c6.4 9.6 19.2 19.2 32 19.2s25.6-3.2 35.2-12.8c9.6-9.6 12.8-22.4 9.6-35.2s-9.6-22.4-19.2-32l-166.4-99.2z","M678.4 364.8c-6.4 0-12.8-3.2-19.2-6.4-16-9.6-19.2-28.8-9.6-44.8l54.4-83.2c9.6-16 28.8-19.2 44.8-9.6 19.2 12.8 22.4 35.2 12.8 48l-54.4 83.2c-6.4 9.6-16 12.8-28.8 12.8z"],"attrs":[{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["dashboard"]},"attrs":[{},{},{}],"properties":{"order":26,"id":23,"name":"dashboard","prevSize":32,"code":59665},"setIdx":2,"setId":1,"iconIdx":55},{"icon":{"paths":["M597.35 819.2c14.131 0 25.6-11.469 25.6-25.6v-307.2c0-14.080-11.469-25.6-25.6-25.6s-25.6 11.52-25.6 25.6v307.2c0 14.131 11.418 25.6 25.6 25.6zM776.55 204.8h-153.6v-51.2c0-28.314-22.886-51.2-51.2-51.2h-102.4c-28.262 0-51.2 22.886-51.2 51.2v51.2h-153.6c-28.262 0-51.2 22.886-51.2 51.2v102.4c0 28.314 22.938 51.2 51.2 51.2v460.8c0 28.314 22.938 51.2 51.2 51.2h409.6c28.314 0 51.2-22.886 51.2-51.2v-460.8c28.314 0 51.2-22.886 51.2-51.2v-102.4c0-28.314-22.938-51.2-51.2-51.2zM469.35 153.6h102.4v51.2h-102.4v-51.2zM725.35 870.4h-409.6v-460.8h409.6v460.8zM776.55 358.4h-512v-102.4h512v102.4zM443.75 819.2c14.131 0 25.6-11.469 25.6-25.6v-307.2c0-14.080-11.469-25.6-25.6-25.6s-25.6 11.52-25.6 25.6v307.2c0 14.131 11.469 25.6 25.6 25.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["delete"]},"attrs":[{}],"properties":{"order":29,"id":22,"name":"delete, bin","prevSize":32,"code":59666},"setIdx":2,"setId":1,"iconIdx":56},{"icon":{"paths":["M832 128h-192v-64c0-35.392-28.608-64-64-64h-128c-35.328 0-64 28.608-64 64v64h-192c-35.328 0-64 28.608-64 64v128c0 35.392 28.672 64 64 64v512c0 35.392 28.672 64 64 64h512c35.392 0 64-28.608 64-64v-512c35.392 0 64-28.608 64-64v-128c0-35.392-28.608-64-64-64zM448 64h128v64h-128v-64zM448 800c0 17.664-14.336 32-32 32s-32-14.336-32-32v-320c0-17.6 14.336-32 32-32s32 14.4 32 32v320zM640 800c0 17.664-14.336 32-32 32s-32-14.336-32-32v-320c0-17.6 14.336-32 32-32s32 14.4 32 32v320zM832 320h-640v-128h640v128z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["delete-filled"]},"attrs":[{}],"properties":{"order":36,"id":21,"name":"delete-filled","prevSize":32,"code":59667},"setIdx":2,"setId":1,"iconIdx":57},{"icon":{"paths":["M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-343.4zM716.8 189.8l117.4 117.4h-117.4v-117.4zM332.8 460.8c-127.232 0-230.4 103.168-230.4 230.4s103.168 230.4 230.4 230.4c127.232 0 230.4-103.168 230.4-230.4s-103.168-230.4-230.4-230.4zM332.8 512c98.816 0 179.2 80.384 179.2 179.2s-80.384 179.2-179.2 179.2c-98.816 0-179.2-80.384-179.2-179.2s80.384-179.2 179.2-179.2zM227.2 665.6c-12.39 0-22.4 10.061-22.4 22.4v6.4c0 12.39 10.010 22.4 22.4 22.4h211.2c12.39 0 22.4-10.010 22.4-22.4v-6.4c0-12.39-10.061-22.4-22.4-22.4h-211.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["document-delete"]},"attrs":[{}],"properties":{"order":35,"id":20,"name":"document-delete","prevSize":32,"code":59668},"setIdx":2,"setId":1,"iconIdx":58},{"icon":{"paths":["M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-343.4zM716.8 189.8l117.4 117.4h-117.4v-117.4zM332.8 460.8c-127.232 0-230.4 103.168-230.4 230.4s103.168 230.4 230.4 230.4c127.232 0 230.4-103.168 230.4-230.4s-103.168-230.4-230.4-230.4zM332.8 512c39.934 0 76.475 13.533 106.3 35.7l-250.4 249c-21.807-29.683-35.1-65.924-35.1-105.5 0-98.816 80.384-179.2 179.2-179.2zM477 585.7c21.785 29.674 35 65.947 35 105.5 0 98.816-80.384 179.2-179.2 179.2-39.906 0-76.386-13.561-106.2-35.7l250.4-249z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["document-disable"]},"attrs":[{}],"properties":{"order":40,"id":19,"name":"document-disable","prevSize":32,"code":59669},"setIdx":2,"setId":1,"iconIdx":59},{"icon":{"paths":["M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-343.4zM716.8 189.8l117.4 117.4h-117.4v-117.4zM332.8 460.8l-230.4 256v51.2h102.4v153.6h256v-153.6h102.4v-51.2l-230.4-256zM332.8 537.3l161.5 179.5h-84.7v153.6h-153.6v-153.6h-84.7l161.5-179.5z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["document-publish"]},"attrs":[{}],"properties":{"order":44,"id":18,"name":"document-publish","prevSize":32,"code":59670},"setIdx":2,"setId":1,"iconIdx":60},{"icon":{"paths":["M665.6 51.2v102.4h102.4v-102.4h-102.4zM460.8 153.6h102.4v-102.4h-102.4v102.4zM460.8 358.4h102.4v-102.4h-102.4v102.4zM665.6 358.4h102.4v-102.4h-102.4v102.4zM665.6 563.2h102.4v-102.4h-102.4v102.4zM460.8 563.2h102.4v-102.4h-102.4v102.4zM460.8 768h102.4v-102.4h-102.4v102.4zM665.6 768h102.4v-102.4h-102.4v102.4zM665.6 972.8h102.4v-102.4h-102.4v102.4zM460.8 972.8h102.4v-102.4h-102.4v102.4zM256 153.6h102.4v-102.4h-102.4v102.4zM256 358.4h102.4v-102.4h-102.4v102.4zM256 563.2h102.4v-102.4h-102.4v102.4zM256 768h102.4v-102.4h-102.4v102.4zM256 972.8h102.4v-102.4h-102.4v102.4z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["drag"]},"attrs":[{}],"properties":{"order":43,"id":17,"name":"drag","prevSize":32,"code":59671},"setIdx":2,"setId":1,"iconIdx":61},{"icon":{"paths":["M921.6 281.958c0-70.707-171.878-128.154-384-128.154s-384 57.19-384 127.898c0 10.035 3.789 19.712 10.342 29.030 0-0.051 296.858 406.067 296.858 406.067v256l153.6-51.2v-204.8c0 0 298.752-408.166 299.725-409.702 0 0 7.475-16.64 7.475-25.139zM537.6 204.8c206.899 0 318.208 53.248 332.083 76.8-13.875 23.552-125.184 76.8-332.083 76.8s-318.208-53.248-332.083-76.8c13.875-23.552 125.184-76.8 332.083-76.8zM869.376 345.856v0 0zM573.030 686.592c-6.4 8.755-9.83 19.354-9.83 30.208v167.885l-51.2 17.050v-184.934c0-10.854-3.43-21.453-9.83-30.208l-228.147-312.115c68.762 21.709 161.382 35.123 263.578 35.123 102.298 0 195.021-13.414 263.834-35.174-0.102 0.051-0.205 0.051-0.307 0.102l-228.096 312.064z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["filter"]},"attrs":[{}],"properties":{"order":18,"id":16,"name":"filter","prevSize":32,"code":59672},"setIdx":2,"setId":1,"iconIdx":62},{"icon":{"paths":["M512 0c-282.88 0-512 229.248-512 512 0 226.24 146.688 418.112 350.080 485.76 25.6 4.8 35.008-11.008 35.008-24.64 0-12.16-0.448-44.352-0.64-87.040-142.464 30.912-172.48-68.672-172.48-68.672-23.296-59.136-56.96-74.88-56.96-74.88-46.4-31.744 3.584-31.104 3.584-31.104 51.392 3.584 78.4 52.736 78.4 52.736 45.696 78.272 119.872 55.68 149.12 42.56 4.608-33.088 17.792-55.68 32.448-68.48-113.728-12.8-233.216-56.832-233.216-252.992 0-55.872 19.84-101.568 52.672-137.408-5.76-12.928-23.040-64.96 4.48-135.488 0 0 42.88-13.76 140.8 52.48 40.96-11.392 84.48-17.024 128-17.28 43.52 0.256 87.040 5.888 128 17.28 97.28-66.24 140.16-52.48 140.16-52.48 27.52 70.528 10.24 122.56 5.12 135.488 32.64 35.84 52.48 81.536 52.48 137.408 0 196.672-119.68 240-233.6 252.608 17.92 15.36 34.56 46.72 34.56 94.72 0 68.48-0.64 123.52-0.64 140.16 0 13.44 8.96 29.44 35.2 24.32 204.864-67.136 351.424-259.136 351.424-485.056 0-282.752-229.248-512-512-512z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["brand","github"],"grid":0},"attrs":[{}],"properties":{"order":77,"id":0,"name":"github","prevSize":32,"code":59713},"setIdx":2,"setId":1,"iconIdx":63},{"icon":{"paths":["M512 512h-204.8v51.2h204.8v-51.2zM768 153.6h-51.2c0-28.314-22.886-51.2-51.2-51.2h-307.2c-28.314 0-51.2 22.886-51.2 51.2h-51.2c-28.314 0-51.2 22.886-51.2 51.2v665.6c0 28.314 22.886 51.2 51.2 51.2h512c28.314 0 51.2-22.886 51.2-51.2v-665.6c0-28.314-22.886-51.2-51.2-51.2zM358.4 153.6h307.2v51.2h-307.2v-51.2zM768 819.2c0 28.314-22.886 51.2-51.2 51.2h-409.6c-28.314 0-51.2-22.886-51.2-51.2v-563.2c0-28.314 22.886-51.2 51.2-51.2 0 28.314 22.886 51.2 51.2 51.2h307.2c28.314 0 51.2-22.886 51.2-51.2 28.314 0 51.2 22.886 51.2 51.2v563.2zM307.2 460.8h409.6v-51.2h-409.6v51.2zM307.2 665.6h409.6v-51.2h-409.6v51.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["help"]},"attrs":[{}],"properties":{"order":19,"id":15,"name":"help","prevSize":32,"code":59673},"setIdx":2,"setId":1,"iconIdx":64},{"icon":{"paths":["M512 0c-169.421 0-307.2 137.779-307.2 307.2 0 78.643 15.258 164.915 45.261 256.41 23.859 72.55 56.986 148.582 98.56 226.099 70.707 131.635 140.339 220.774 143.309 224.512 4.813 6.195 12.288 9.779 20.070 9.779 7.834 0 15.258-3.584 20.122-9.779 2.97-3.686 72.602-92.826 143.309-224.512 41.574-77.517 74.701-153.549 98.56-226.099 29.952-91.494 45.21-177.766 45.21-256.41 0-169.421-137.83-307.2-307.2-307.2zM630.682 764.672c-46.234 86.374-92.979 154.982-118.682 190.822-25.6-35.635-72.038-103.885-118.221-189.952-62.874-117.146-137.779-291.738-137.779-458.342 0-141.158 114.842-256 256-256s256 114.842 256 256c0 166.298-74.65 340.582-137.318 457.472zM512 153.6c-84.685 0-153.6 68.915-153.6 153.6s68.915 153.6 153.6 153.6 153.6-68.915 153.6-153.6-68.915-153.6-153.6-153.6zM512 409.6c-56.525 0-102.4-45.875-102.4-102.4 0-56.474 45.875-102.4 102.4-102.4 56.474 0 102.4 45.926 102.4 102.4 0 56.525-45.926 102.4-102.4 102.4z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["location"]},"attrs":[{}],"properties":{"order":25,"id":13,"name":"location, control-Map, type-Geolocation","prevSize":32,"code":59675},"setIdx":2,"setId":1,"iconIdx":65},{"icon":{"paths":["M512.273 83.782c-0.141 0.056-182.959 84.073-229.418 256.782-4.481 16.584 32.696 9.296 31.036 27.527-2.034 22.136-44.668 31.201-39.109 94.764 5.659 64.734 60.321 130.141 68.527 169.673v27.655c-0.497 8.54-4.566 31.715-18.018 43.036-7.378 6.19-17.322 8.421-30.436 6.782-18.205-2.275-25.449-14.468-28.345-24.309-4.753-16.218-0.322-35.123 10.345-44 10.724-8.924 12.17-24.842 3.236-35.564-8.934-10.712-24.858-12.161-35.582-3.218-25.995 21.64-36.887 61.52-26.491 97 9.815 33.392 36.197 55.884 70.6 60.182 4.903 0.609 9.566 0.909 14 0.909 26.623 0 44.661-10.175 55.582-19.455 32.866-27.97 35.449-74.593 35.636-79.818 0.009-0.309 0.018-0.618 0.018-0.927v-21.218h0.109v-1.418c0-12.351 10.008-22.364 22.382-22.364 11.944 0 21.609 9.346 22.273 21.109v202.491c-0.206 2.912-2.536 29.892-17.891 42.945-7.368 6.274-17.384 8.53-30.545 6.873-18.214-2.275-25.476-14.468-28.364-24.291-4.762-16.228-0.322-35.151 10.345-44.018 10.724-8.933 12.188-24.833 3.255-35.564-8.924-10.694-24.876-12.161-35.6-3.218-26.013 21.631-36.887 61.52-26.491 97 9.796 33.392 36.197 55.893 70.6 60.2 4.903 0.609 9.566 0.891 14 0.891 26.623 0 44.671-10.156 55.564-19.436 32.875-27.97 35.458-74.611 35.636-79.836 0.019-0.328 0.018-0.609 0.018-0.909v-225.636l0.127-0.055v-1c0-12.595 10.219-22.8 22.836-22.8 12.349 0 22.333 9.824 22.727 22.073v227.418c0 0.309-0 0.591 0.018 0.909 0.187 5.216 2.779 51.866 35.655 79.836 10.912 9.28 28.959 19.436 55.582 19.436 4.443 0 9.088-0.282 13.982-0.891 34.394-4.307 60.804-26.818 70.6-60.2 10.405-35.48-0.487-75.36-26.491-97-10.743-8.943-26.676-7.466-35.6 3.218-8.934 10.74-7.488 26.63 3.236 35.564 10.668 8.868 15.135 27.79 10.364 44.018-2.878 9.823-10.159 22.015-28.364 24.291-13.105 1.648-23.050-0.592-30.418-6.782-13.508-11.358-17.558-34.657-18.036-43v-201.818c0.297-12.093 10.14-21.818 22.327-21.818 12.374 0 22.4 10.003 22.4 22.364v1.418h0.073v21.218c0 0.318-0 0.628 0.018 0.927 0.178 5.216 2.779 51.848 35.655 79.818 10.912 9.28 28.941 19.455 55.564 19.455 4.434 0 9.107-0.292 14-0.891 34.394-4.298 60.786-26.818 70.582-60.2 10.405-35.48-0.487-75.351-26.491-97-10.743-8.933-26.667-7.476-35.582 3.236-8.943 10.722-7.488 26.622 3.236 35.545 10.668 8.877 15.117 27.8 10.345 44.018-2.878 9.842-10.159 22.025-28.364 24.291-13.086 1.648-23.050-0.583-30.418-6.764-13.508-11.368-17.549-34.675-18.018-43v-21.018c5.305-54.103 63.095-107.777 69.091-176.364 5.531-63.563-37.121-72.627-39.145-94.764-1.669-18.232 35.498-10.944 31.036-27.527-46.468-172.709-229.269-256.726-229.4-256.782z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["logo"]},"attrs":[{}],"properties":{"order":31,"id":12,"name":"logo","prevSize":32,"code":59676},"setIdx":2,"setId":1,"iconIdx":66},{"icon":{"paths":["M947.2 0h-870.4c-42.342 0-76.8 34.458-76.8 76.8v870.4c0 42.342 34.458 76.8 76.8 76.8h870.4c42.342 0 76.8-34.458 76.8-76.8v-870.4c0-42.342-34.458-76.8-76.8-76.8zM972.8 947.2c0 14.157-11.443 25.6-25.6 25.6h-870.4c-14.131 0-25.6-11.443-25.6-25.6v-870.4c0-14.131 11.469-25.6 25.6-25.6h870.4c14.157 0 25.6 11.469 25.6 25.6v870.4zM665.6 460.8c56.448 0 102.4-45.926 102.4-102.4s-45.952-102.4-102.4-102.4c-56.448 0-102.4 45.926-102.4 102.4s45.952 102.4 102.4 102.4zM665.6 307.2c28.211 0 51.2 22.989 51.2 51.2s-22.989 51.2-51.2 51.2c-28.211 0-51.2-22.989-51.2-51.2s22.989-51.2 51.2-51.2zM896 102.4h-768c-14.131 0-25.6 11.469-25.6 25.6v614.4c0 14.157 11.469 25.6 25.6 25.6h768c14.157 0 25.6-11.443 25.6-25.6v-614.4c0-14.131-11.443-25.6-25.6-25.6zM153.6 716.8v-118.246l164.301-184.858c4.198-4.787 9.728-7.373 15.462-7.475 5.734-0.051 11.29 2.458 15.642 7.040l283.238 303.539h-478.643zM870.4 716.8h-168.090l-315.853-338.432c-14.285-15.334-33.331-23.603-53.709-23.347-20.326 0.256-39.219 9.011-53.094 24.627l-126.054 141.798v-367.846h716.8v563.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["media"]},"attrs":[{}],"properties":{"order":30,"id":11,"name":"media, type-Assets, trigger-AssetChanged","prevSize":32,"code":59677},"setIdx":2,"setId":1,"iconIdx":67},{"icon":{"paths":["M128 384c-70.656 0-128 57.344-128 128s57.344 128 128 128c70.656 0 128-57.344 128-128s-57.344-128-128-128zM512 384c-70.656 0-128 57.344-128 128s57.344 128 128 128c70.656 0 128-57.344 128-128s-57.344-128-128-128zM896 384c-70.656 0-128 57.344-128 128s57.344 128 128 128c70.656 0 128-57.344 128-128s-57.344-128-128-128z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["more"]},"attrs":[{}],"properties":{"order":34,"id":10,"name":"more, dots","prevSize":32,"code":59678},"setIdx":2,"setId":1,"iconIdx":68},{"icon":{"paths":["M877.12 311.104l-66.304 66.368-228.224-228.224 66.368-66.368c25.216-25.152 66.048-25.152 91.264 0l136.896 137.024c25.216 25.216 25.216 65.984 0 91.2zM760.896 427.392l-386.176 386.112c-25.216 25.28-66.048 25.28-91.264 0l-136.96-136.896c-25.216-25.28-25.216-66.112 0-91.264l386.24-386.24 228.16 228.288zM64 896v-191.872l191.936 191.872h-191.936z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["pencil"]},"attrs":[{}],"properties":{"order":47,"id":9,"name":"pencil","prevSize":32,"code":59679},"setIdx":2,"setId":1,"iconIdx":69},{"icon":{"paths":["M892.083 131.917c-73.523-73.498-193.152-73.498-266.65 0l-157.184 157.107c-9.958 10.035-9.958 26.214 0 36.275 10.061 9.984 26.24 9.984 36.25 0l157.133-157.107c53.504-53.555 140.672-53.555 194.176 0 53.581 53.504 53.581 140.672 0 194.176l-186.138 186.163c-53.53 53.581-140.672 53.581-194.176 0-10.086-10.010-26.24-10.010-36.275 0-10.035 10.086-10.035 26.189 0 36.25 36.787 36.736 84.992 55.117 133.325 55.117s96.589-18.432 133.376-55.117l186.163-186.214c73.498-73.472 73.498-193.152 0-266.65zM519.45 698.726l-157.082 157.082c-53.504 53.555-140.672 53.555-194.176 0-53.581-53.504-53.581-140.672 0-194.176l186.138-186.163c53.53-53.581 140.672-53.581 194.176 0 10.086 9.984 26.189 9.984 36.275 0 10.035-10.086 10.035-26.214 0-36.25-73.549-73.498-193.203-73.498-266.701 0l-186.163 186.163c-73.498 73.574-73.498 193.203 0 266.701 36.787 36.71 85.043 55.117 133.325 55.117 48.333 0 96.538-18.406 133.325-55.117l157.133-157.133c10.010-10.010 10.010-26.189 0-36.224-10.010-9.984-26.189-9.984-36.25 0z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["reference"]},"attrs":[{}],"properties":{"order":45,"id":8,"name":"reference","prevSize":32,"code":59680},"setIdx":2,"setId":1,"iconIdx":70},{"icon":{"paths":["M800 1024h-576c-124.8 0-224-99.2-224-224v-300.8c0-124.8 99.2-224 224-224h576c124.8 0 224 99.2 224 224v300.8c0 124.8-99.2 224-224 224zM224 339.2c-89.6 0-160 70.4-160 160v300.8c0 89.6 70.4 160 160 160h576c89.6 0 160-70.4 160-160v-300.8c0-89.6-70.4-160-160-160h-576z","M828.8 201.6h-633.6c-19.2 0-32-12.8-32-32s12.8-32 32-32h630.4c19.2 0 32 12.8 32 32s-12.8 32-28.8 32z","M716.8 64h-409.6c-19.2 0-32-12.8-32-32s12.8-32 32-32h412.8c19.2 0 32 12.8 32 32s-16 32-35.2 32z","M800 416v64c0 48-38.4 83.2-83.2 83.2h-409.6c-44.8 3.2-83.2-35.2-83.2-83.2v-64h-54.4v64c0 76.8 64 140.8 140.8 140.8h406.4c76.8 0 140.8-64 140.8-140.8v-64h-57.6z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["schemas"]},"attrs":[{},{},{},{}],"properties":{"order":46,"id":7,"name":"schemas","prevSize":32,"code":59681},"setIdx":2,"setId":1,"iconIdx":71},{"icon":{"paths":["M939.776 1003.776c-27.2 27.008-71.232 27.008-98.368 0l-168.96-168.96c-66.176 38.464-142.016 62.080-224 62.080-247.744 0-448.448-200.832-448.448-448.448 0-247.744 200.704-448.448 448.448-448.448 247.68 0 448.512 200.704 448.512 448.448 0 115.136-44.672 218.944-115.904 298.304l158.656 158.656c27.008 27.136 27.008 71.168 0.064 98.368zM448.448 128.128c-176.896 0-320.32 143.36-320.32 320.32s143.424 320.32 320.32 320.32c176.96 0 320.384-143.36 320.384-320.32s-143.488-320.32-320.384-320.32z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["search"]},"attrs":[{}],"properties":{"order":23,"id":6,"name":"search","prevSize":32,"code":59682},"setIdx":2,"setId":1,"iconIdx":72},{"icon":{"paths":["M1019.11 440.755c-1.946-13.747-14.438-23.398-28.16-21.888-16.947 1.843-34.253-0.589-50.048-7.091-52.25-21.504-77.261-81.459-55.757-133.709 6.605-15.846 16.947-29.85 30.208-40.602 10.803-8.653 12.698-24.294 4.352-35.354-28.902-37.99-62.797-71.706-100.838-100.045-10.701-8.090-25.805-6.451-34.662 3.661-28.8 33.254-75.546 44.262-116.198 27.546-40.704-16.742-66.099-57.498-63.206-101.453 0.845-13.338-8.755-25.19-21.99-27.008-47.002-6.605-94.797-6.605-142.054 0.077-13.722 1.946-23.398 14.387-21.862 28.211 1.843 16.896-0.614 34.202-7.168 49.997-21.504 52.25-81.408 77.21-133.632 55.706-15.821-6.502-29.85-16.947-40.602-30.157-8.653-10.752-24.32-12.698-35.379-4.301-37.99 28.851-71.68 62.694-100.045 100.762-8.090 10.701-6.451 25.83 3.635 34.637 33.28 28.902 44.288 75.597 27.546 116.301-16.742 40.653-57.498 66.048-101.427 63.155-13.363-0.845-25.19 8.755-26.982 21.99-6.63 47.002-6.63 94.822 0.102 142.080 1.946 13.696 14.387 23.322 28.16 21.811 16.896-1.818 34.202 0.691 50.022 7.168 52.224 21.53 77.21 81.459 55.706 133.734-6.502 15.795-16.947 29.773-30.157 40.525-10.803 8.73-12.698 24.346-4.352 35.354 28.877 38.042 62.822 71.731 100.813 100.122 1.741 1.357 3.661 2.355 5.606 3.2 9.933 4.045 21.709 1.536 29.082-6.938 28.826-33.178 75.571-44.262 116.275-27.52 40.653 16.742 66.048 57.498 63.13 101.453-0.819 13.338 8.755 25.165 22.067 27.059 47.002 6.579 94.72 6.554 142.029-0.102 13.645-1.971 23.347-14.464 21.811-28.237-1.843-16.947 0.691-34.253 7.194-50.048 21.504-52.25 81.459-77.21 133.658-55.68 15.795 6.528 29.85 16.947 40.55 30.157 8.704 10.803 24.346 12.698 35.405 4.326 37.99-28.902 71.654-62.746 100.096-100.813 7.987-10.675 6.4-25.805-3.712-34.662-33.254-28.826-44.288-75.571-27.546-116.224 16.742-40.73 57.498-66.099 101.453-63.232 13.338 0.922 25.139-8.678 27.008-21.965 6.554-47.002 6.502-94.771-0.128-142.003zM971.059 554.010c-56.141 5.274-105.702 41.114-127.642 94.464s-12.058 113.613 24.090 156.902c-17.69 21.478-37.453 41.318-58.854 59.315-12.749-11.213-27.392-20.352-43.238-26.854-78.259-32.282-168.243 5.197-200.499 83.584-6.502 15.718-10.291 32.563-11.29 49.536-27.853 2.56-55.859 2.637-83.61 0.077-5.274-56.090-41.114-105.677-94.464-127.616-53.35-21.99-113.613-11.981-156.928 24.064-21.504-17.69-41.318-37.453-59.29-58.88 11.213-12.723 20.352-27.392 26.906-43.136 32.205-78.387-5.274-168.294-83.584-200.55-15.821-6.502-32.589-10.342-49.613-11.366-2.534-27.853-2.586-55.859 0-83.558 56.090-5.299 105.626-41.088 127.565-94.438 21.965-53.402 12.058-113.638-24.090-156.902 17.69-21.555 37.478-41.395 58.88-59.341 12.749 11.213 27.392 20.352 43.213 26.854 78.285 32.256 168.218-5.248 200.474-83.558 6.528-15.795 10.342-32.589 11.366-49.613 27.853-2.509 55.808-2.56 83.558 0 5.299 56.090 41.139 105.6 94.49 127.59 53.35 21.939 113.638 12.006 156.902-24.090 21.504 17.741 41.293 37.453 59.29 58.854-11.213 12.8-20.352 27.392-26.854 43.213-32.256 78.31 5.248 168.294 83.507 200.499 15.846 6.502 32.691 10.342 49.638 11.392 2.56 27.853 2.611 55.808 0.077 83.558zM512 307.2c-113.101 0-204.8 91.699-204.8 204.8 0 113.126 91.699 204.826 204.8 204.826s204.8-91.699 204.8-204.826c0-113.101-91.699-204.8-204.8-204.8zM512 665.626c-84.813 0-153.6-68.813-153.6-153.626 0-84.838 68.787-153.6 153.6-153.6 84.838 0 153.6 68.762 153.6 153.6 0 84.813-68.762 153.626-153.6 153.626z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["settings"]},"attrs":[{}],"properties":{"order":22,"id":5,"name":"settings","prevSize":32,"code":59683},"setIdx":2,"setId":1,"iconIdx":73},{"icon":{"paths":["M77.005 102.605h128v332.8c0 14.131 11.418 25.6 25.6 25.6 14.106 0 25.6-11.469 25.6-25.6v-332.8h128c14.106 0 25.6-11.469 25.6-25.6 0-14.157-11.494-25.6-25.6-25.6h-307.2c-14.182 0-25.6 11.443-25.6 25.6 0 14.106 11.418 25.6 25.6 25.6zM947.405 716.979h-179.2v-102.4h179.2c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-204.8c-14.182 0-25.6 11.443-25.6 25.6v358.4c0 14.157 11.418 25.6 25.6 25.6 14.157 0 25.6-11.443 25.6-25.6v-179.2h179.2c14.157 0 25.6-11.443 25.6-25.6s-11.494-25.6-25.6-25.6zM965.094 58.47c-9.958-9.933-26.112-9.933-36.045 0l-870.605 870.579c-9.958 9.984-9.958 26.086 0 36.045 10.010 9.984 26.112 9.984 36.045 0l870.605-870.579c9.958-9.933 9.958-26.086 0-36.045z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["type-boolean"]},"attrs":[{}],"properties":{"order":21,"id":4,"name":"type-Boolean","prevSize":32,"code":59684},"setIdx":2,"setId":1,"iconIdx":74},{"icon":{"paths":["M947.2 102.4h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-512v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v716.8c0 42.342 34.458 76.8 76.8 76.8h870.4c42.342 0 76.8-34.458 76.8-76.8v-716.8c0-42.342-34.458-76.8-76.8-76.8zM972.8 896c0 14.131-11.469 25.6-25.6 25.6h-870.4c-14.080 0-25.6-11.469-25.6-25.6v-537.6h921.6v537.6zM972.8 307.2h-921.6v-128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h512v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128zM332.8 512h51.2c14.080 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM640 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["type-datetime"]},"attrs":[{}],"properties":{"order":24,"id":3,"name":"type-DateTime","prevSize":32,"code":59685},"setIdx":2,"setId":1,"iconIdx":75},{"icon":{"paths":["M179.2 256c0-28.262 22.938-51.2 51.2-51.2h25.6c14.157 0 25.6-11.443 25.6-25.6 0-14.131-11.443-25.6-25.6-25.6h-25.6c-56.55 0-102.4 45.85-102.4 102.4v179.2c0 28.262-22.938 51.2-51.2 51.2h-25.6c-14.157 0-25.6 11.469-25.6 25.6 0 14.157 11.443 25.6 25.6 25.6h25.6c28.262 0 51.2 22.938 51.2 51.2v179.2c0 56.55 45.85 102.4 102.4 102.4h25.6c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-25.6c-28.262 0-51.2-22.938-51.2-51.2v-179.2c0-30.746-13.85-58.061-35.328-76.8 21.478-18.765 35.328-46.029 35.328-76.8v-179.2zM972.8 486.4h-25.6c-28.262 0-51.2-22.938-51.2-51.2v-179.2c0-56.55-45.85-102.4-102.4-102.4h-25.6c-14.157 0-25.6 11.469-25.6 25.6 0 14.157 11.443 25.6 25.6 25.6h25.6c28.262 0 51.2 22.938 51.2 51.2v179.2c0 30.771 13.85 58.035 35.328 76.8-21.478 18.739-35.328 46.054-35.328 76.8v179.2c0 28.262-22.938 51.2-51.2 51.2h-25.6c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h25.6c56.55 0 102.4-45.85 102.4-102.4v-179.2c0-28.262 22.938-51.2 51.2-51.2h25.6c14.157 0 25.6-11.443 25.6-25.6 0-14.131-11.443-25.6-25.6-25.6zM512 332.8c-14.157 0-25.6 11.469-25.6 25.6 0 14.157 11.443 25.6 25.6 25.6s25.6-11.443 25.6-25.6c0-14.131-11.443-25.6-25.6-25.6zM512 435.2c-14.157 0-25.6 11.469-25.6 25.6v204.8c0 14.157 11.443 25.6 25.6 25.6s25.6-11.443 25.6-25.6v-204.8c0-14.131-11.443-25.6-25.6-25.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["json"]},"attrs":[{}],"properties":{"order":20,"id":14,"name":"type-Json, json","prevSize":32,"code":59674},"setIdx":2,"setId":1,"iconIdx":76},{"icon":{"paths":["M256 665.6h-76.8v-332.8c0-14.131-11.469-25.6-25.6-25.6h-76.8c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h51.2v307.2h-76.8c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h204.8c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6zM614.4 307.2h-204.8c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h179.2v128h-179.2c-14.131 0-25.6 11.469-25.6 25.6v179.2c0 14.131 11.469 25.6 25.6 25.6h204.8c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-179.2v-128h179.2c14.131 0 25.6-11.469 25.6-25.6v-179.2c0-14.131-11.469-25.6-25.6-25.6zM972.8 307.2h-204.8c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h179.2v128h-179.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h179.2v128h-179.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h204.8c14.131 0 25.6-11.469 25.6-25.6v-358.4c0-14.131-11.469-25.6-25.6-25.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["type-number"]},"attrs":[{}],"properties":{"order":32,"id":2,"name":"type-Number","prevSize":32,"code":59686},"setIdx":2,"setId":1,"iconIdx":77},{"icon":{"paths":["M870.4 921.6h-716.8c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6h716.8c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6zM194.688 817.152c13.030 5.555 28.083-0.461 33.613-13.44l125.030-291.712h317.338l125.005 291.712c4.173 9.677 13.568 15.488 23.526 15.488 3.405 0 6.81-0.64 10.112-2.048 13.005-5.606 18.995-20.659 13.44-33.638l-131.61-306.944c-0.051-0.051-0.051-0.154-0.102-0.205l-175.488-409.6c-4.045-9.472-13.312-15.565-23.552-15.565s-19.507 6.093-23.552 15.514l-175.488 409.6c-0.051 0.051-0.051 0.154-0.102 0.205l-131.61 306.97c-5.53 13.005 0.461 28.058 13.44 33.664zM512 141.773l136.704 319.027h-273.408l136.704-319.027z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["type-string"]},"attrs":[{}],"properties":{"order":48,"id":1,"name":"type-String","prevSize":32,"code":59687},"setIdx":2,"setId":1,"iconIdx":78},{"icon":{"paths":["M955.221 848c0-0.109 10.752 0 0 0-52.751-161.392-240.461-224-443.178-224-202.269 0-389.979 63.392-443.066 224-11.2-0.109 0-1.232 0 0 0 61.936 49.615 112 110.654 112h664.823c61.151 0 110.766-50.064 110.766-112zM290.399 288c0 123.648 99.231 336 221.645 336s221.645-212.352 221.645-336c0-123.648-99.231-224-221.645-224s-221.645 100.352-221.645 224z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["user"]},"attrs":[{}],"properties":{"order":33,"id":0,"name":"user","prevSize":32,"code":59688},"setIdx":2,"setId":1,"iconIdx":79}],"height":1024,"metadata":{"name":"icomoon"},"preferences":{"showGlyphs":true,"showCodes":true,"showQuickUse":true,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"icomoon"},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"classSelector":".icon","name":"icomoon"},"historySize":100,"gridSize":16}} \ No newline at end of file +{"IcoMoonType":"selection","icons":[{"icon":{"paths":["M854 470v84h-520l238 240-60 60-342-342 342-342 60 60-238 240h520z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["arrow_back"],"grid":24},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59758,"name":"arrow_back"},"setIdx":0,"setId":2,"iconIdx":0},{"icon":{"paths":["M768 512c-25.6 0-42.667 17.067-42.667 42.667v256c0 25.6-17.067 42.667-42.667 42.667h-469.333c-25.6 0-42.667-17.067-42.667-42.667v-469.333c0-25.6 17.067-42.667 42.667-42.667h256c25.6 0 42.667-17.067 42.667-42.667s-17.067-42.667-42.667-42.667h-256c-72.533 0-128 55.467-128 128v469.333c0 72.533 55.467 128 128 128h469.333c72.533 0 128-55.467 128-128v-256c0-25.6-17.067-42.667-42.667-42.667z","M934.4 110.933c-4.267-8.533-12.8-17.067-21.333-21.333-4.267-4.267-12.8-4.267-17.067-4.267h-256c-25.6 0-42.667 17.067-42.667 42.667s17.067 42.667 42.667 42.667h153.6l-396.8 396.8c-17.067 17.067-17.067 42.667 0 59.733 8.533 8.533 17.067 12.8 29.867 12.8s21.333-4.267 29.867-12.8l396.8-396.8v153.6c0 25.6 17.067 42.667 42.667 42.667s42.667-17.067 42.667-42.667v-256c0-4.267 0-12.8-4.267-17.067z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["external-link"],"grid":24},"attrs":[{},{}],"properties":{"order":1,"id":2,"prevSize":24,"code":59757,"name":"external-link"},"setIdx":1,"setId":1,"iconIdx":30},{"icon":{"paths":["M810.667 85.333h-597.333c-72.533 0-128 55.467-128 128v597.333c0 72.533 55.467 128 128 128h597.333c72.533 0 128-55.467 128-128v-597.333c0-72.533-55.467-128-128-128zM853.333 810.667c0 25.6-17.067 42.667-42.667 42.667h-597.333c-25.6 0-42.667-17.067-42.667-42.667v-597.333c0-25.6 17.067-42.667 42.667-42.667h597.333c25.6 0 42.667 17.067 42.667 42.667v597.333z","M682.667 469.333h-341.333c-25.6 0-42.667 17.067-42.667 42.667s17.067 42.667 42.667 42.667h341.333c25.6 0 42.667-17.067 42.667-42.667s-17.067-42.667-42.667-42.667z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["minus-square"],"grid":24},"attrs":[{},{}],"properties":{"order":1,"id":1,"prevSize":24,"code":59753,"name":"minus-square"},"setIdx":1,"setId":1,"iconIdx":31},{"icon":{"paths":["M810.667 85.333h-597.333c-72.533 0-128 55.467-128 128v597.333c0 72.533 55.467 128 128 128h597.333c72.533 0 128-55.467 128-128v-597.333c0-72.533-55.467-128-128-128zM853.333 810.667c0 25.6-17.067 42.667-42.667 42.667h-597.333c-25.6 0-42.667-17.067-42.667-42.667v-597.333c0-25.6 17.067-42.667 42.667-42.667h597.333c25.6 0 42.667 17.067 42.667 42.667v597.333z","M682.667 469.333h-128v-128c0-25.6-17.067-42.667-42.667-42.667s-42.667 17.067-42.667 42.667v128h-128c-25.6 0-42.667 17.067-42.667 42.667s17.067 42.667 42.667 42.667h128v128c0 25.6 17.067 42.667 42.667 42.667s42.667-17.067 42.667-42.667v-128h128c25.6 0 42.667-17.067 42.667-42.667s-17.067-42.667-42.667-42.667z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["plus-square"],"grid":24},"attrs":[{},{}],"properties":{"order":1,"id":0,"name":"plus-square","prevSize":24,"code":59752},"setIdx":1,"setId":1,"iconIdx":32},{"icon":{"paths":["M170 640v-86h684v86h-684zM854 384v86h-684v-86h684z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["drag_handle"],"grid":24},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":24,"code":59745,"name":"drag2"},"setIdx":1,"setId":1,"iconIdx":33},{"icon":{"paths":["M854 682v-512h-684v598l86-86h598zM854 86c46 0 84 38 84 84v512c0 46-38 86-84 86h-598l-170 170v-768c0-46 38-84 84-84h684z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["chat_bubble_outline"],"grid":24},"attrs":[{}],"properties":{"order":1,"id":0,"name":"comments","prevSize":24,"code":59743},"setIdx":1,"setId":1,"iconIdx":34},{"icon":{"paths":["M512 128c212 0 384 172 384 384s-172 384-384 384c-88 0-170-30-234-80l60-60c50 34 110 54 174 54 166 0 298-132 298-298s-132-298-298-298-298 132-298 298h128l-172 170-170-170h128c0-212 172-384 384-384zM598 512c0 46-40 86-86 86s-86-40-86-86 40-86 86-86 86 40 86 86z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["settings_backup_restore"],"grid":24},"attrs":[{}],"properties":{"order":1,"id":2,"prevSize":24,"code":59739,"name":"backup"},"setIdx":1,"setId":1,"iconIdx":35},{"icon":{"paths":["M726 512c0 24-20 42-44 42h-426l-170 172v-598c0-24 18-42 42-42h554c24 0 44 18 44 42v384zM896 256c24 0 42 18 42 42v640l-170-170h-470c-24 0-42-18-42-42v-86h554v-384h86z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["question_answer"],"grid":24},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59738,"name":"support"},"setIdx":1,"setId":1,"iconIdx":36},{"icon":{"paths":["M918 384v128h-128v298h-128v-298h-128v-128h384zM106 170h556v128h-214v512h-128v-512h-214v-128z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["text_fields"],"grid":24},"attrs":[{}],"properties":{"order":75,"id":0,"prevSize":24,"code":59705,"name":"control-RichText"},"setIdx":1,"setId":1,"iconIdx":37},{"icon":{"paths":["M640 85.333q78 0 149.167 30.5t122.5 81.833 81.833 122.5 30.5 149.167q0 85-35 160.667t-96.667 129.167-140 77.5l21-20.667q18-18.333 28-42.667 9.333-22.667 9.333-49.333 0-6.667-0.333-9.333 59.333-41.333 93.833-105.833t34.5-139.5q0-60.667-23.667-116t-63.667-95.333-95.333-63.667-116-23.667q-55.333 0-106.5 19.833t-90 53.833-65 81.333-33.833 101h-88.667q-70.667 0-120.667 50t-50 120.667q0 38.667 15.167 71.667t39.833 54.167 54.833 33 60.833 11.833h50q11.667 29.333 30 48l37.667 37.333h-117.667q-69.667 0-128.5-34.333t-93.167-93.167-34.333-128.5 34.333-128.5 93.167-93.167 128.5-34.333h22q26.333-74.333 79.333-132.167t126.833-90.833 155.833-33zM554.667 426.667q17.667 0 30.167 12.5t12.5 30.167v281l55-55.333q12.333-12.333 30.333-12.333 18.333 0 30.5 12.167t12.167 30.5q0 18-12.333 30.333l-128 128q-12.333 12.333-30.333 12.333t-30.333-12.333l-128-128q-12.333-13-12.333-30.333 0-17.667 12.5-30.167t30.167-12.5q18 0 30.333 12.333l55 55.333v-281q0-17.667 12.5-30.167t30.167-12.5z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["cloud-download"],"grid":24},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59710,"name":"download"},"setIdx":1,"setId":1,"iconIdx":38},{"icon":{"paths":["M950.857 932.571v-621.714c0-9.714-8.571-18.286-18.286-18.286h-621.714c-9.714 0-18.286 8.571-18.286 18.286v621.714c0 9.714 8.571 18.286 18.286 18.286h621.714c9.714 0 18.286-8.571 18.286-18.286zM1024 310.857v621.714c0 50.286-41.143 91.429-91.429 91.429h-621.714c-50.286 0-91.429-41.143-91.429-91.429v-621.714c0-50.286 41.143-91.429 91.429-91.429h621.714c50.286 0 91.429 41.143 91.429 91.429zM804.571 91.429v91.429h-73.143v-91.429c0-9.714-8.571-18.286-18.286-18.286h-621.714c-9.714 0-18.286 8.571-18.286 18.286v621.714c0 9.714 8.571 18.286 18.286 18.286h91.429v73.143h-91.429c-50.286 0-91.429-41.143-91.429-91.429v-621.714c0-50.286 41.143-91.429 91.429-91.429h621.714c50.286 0 91.429 41.143 91.429 91.429z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["clone"],"grid":14},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":28,"code":59754,"name":"clone"},"setIdx":1,"setId":1,"iconIdx":0},{"icon":{"paths":["M498.787 330.323v-49.548h112.31v-66.065c0-49.548-39.639-89.187-89.187-89.187s-89.187 39.639-89.187 89.187v541.729l89.187 161.858 89.187-161.858v-426.116z","M360.052 716.8h-66.065c-59.458 0-105.703-46.245-105.703-105.703v-254.348c0-59.458 46.245-105.703 105.703-105.703h66.065v-42.942h-66.065c-82.581 0-148.645 66.065-148.645 148.645v254.348c0 82.581 66.065 148.645 148.645 148.645h66.065z","M852.232 260.955c-26.426-33.032-66.065-52.852-109.006-52.852h-59.458v42.942h39.639c42.942 0 82.581 19.819 109.006 52.852l145.342 181.677-142.039 178.374c-26.426 33.032-69.368 52.852-112.31 52.852h-36.335v42.942h56.155c42.942 0 85.884-19.819 112.31-52.852l178.374-221.316z"],"attrs":[{},{},{}],"width":1140,"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["control-Tags"]},"attrs":[{},{},{}],"properties":{"order":119,"id":220,"name":"control-Tags","prevSize":28,"code":59747},"setIdx":1,"setId":1,"iconIdx":1},{"icon":{"paths":["M384 179.2h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6zM998.4 486.4h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6zM998.4 844.8h-614.4c-38.406 15.539-22.811 37.543 0 51.2h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6z","M0 0v307.2h307.2v-307.2zM47.4 47.4h212.4v212.4h-212.4z","M0 716.8v307.2h307.2v-307.2zM47.4 764.2h212.4v212.4h-212.4z","M0 358.4v307.2h307.2v-307.2zM47.4 405.8h212.4v212.4h-212.4z","M89.6 89.6h128v128h-128v-128z"],"attrs":[{},{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["control-Checkboxes"]},"attrs":[{},{},{},{},{}],"properties":{"order":118,"id":219,"name":"control-Checkboxes","prevSize":28,"code":59746},"setIdx":1,"setId":1,"iconIdx":2},{"icon":{"paths":["M159.073 665.6l-159.073-134.055 159.073-133.819 36.818 37.29-117.062 96.057 117.062 97.237z","M493.247 536.029q0 33.042-9.441 57.115-9.205 24.073-25.961 40.122-16.521 15.813-39.178 23.601-22.657 7.552-49.327 7.552-26.197 0-48.855-4.012-22.421-3.776-42.954-10.385v-323.338h57.587v78.356l-2.36 47.203q12.981-16.757 30.21-26.905 17.465-10.149 41.774-10.149 21.241 0 37.762 8.496t27.614 24.309q11.329 15.577 17.229 37.998 5.9 22.185 5.9 50.035zM432.828 538.389q0-19.825-2.832-33.75t-8.26-22.893q-5.192-8.969-12.981-12.981-7.552-4.248-17.465-4.248-14.633 0-28.086 11.801-13.217 11.801-28.086 32.098v104.79q6.844 2.596 16.757 4.248 10.149 1.652 20.533 1.652 13.689 0 24.781-5.664 11.329-5.664 19.117-16.049 8.024-10.385 12.273-25.253 4.248-15.105 4.248-33.75z","M700.682 513.608q0.472-13.453-1.416-22.893-1.652-9.441-5.664-15.577-3.776-6.136-9.441-8.968t-12.981-2.832q-12.745 0-26.433 10.621-13.453 10.385-29.738 34.458v151.756h-59.003v-239.789h52.159l2.124 34.93q5.9-9.205 13.217-16.521 7.552-7.316 16.521-12.509 9.205-5.428 20.297-8.26t24.309-2.832q18.173 0 32.098 6.372 14.161 6.136 23.601 18.409 9.677 12.273 14.161 30.918 4.72 18.409 4.012 42.718z","M864.927 397.725l159.073 133.819-159.073 134.055-36.582-37.29 116.826-96.293-116.826-97.001z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["control-Html"]},"attrs":[{},{},{},{}],"properties":{"order":116,"id":217,"name":"control-Html","prevSize":28,"code":59744},"setIdx":1,"setId":1,"iconIdx":3},{"icon":{"paths":["M251.429 100.58c-87.896 0-160 72.104-160 160v525.714c0 87.896 72.104 160 160 160h525.714c87.896 0 160-72.104 160-160v-525.714c0-87.896-72.104-160-160-160zM251.429 146.295h525.714c62.961 0 114.286 51.325 114.286 114.286v525.714c0 62.961-51.325 114.286-114.286 114.286h-525.714c-62.961 0-114.286-51.325-114.286-114.286v-525.714c0-62.961 51.325-114.286 114.286-114.286z","M251.429 306.295c-0.096-0.001-0.21-0.002-0.323-0.002-12.625 0-22.859 10.235-22.859 22.859s10.235 22.859 22.859 22.859c0.114 0 0.227-0.001 0.34-0.002l-0.017 0h525.714c0.096 0.001 0.21 0.002 0.323 0.002 12.625 0 22.859-10.235 22.859-22.859s-10.235-22.859-22.859-22.859c-0.114 0-0.227 0.001-0.34 0.002l0.017-0z","M251.429 443.438c-0.096-0.001-0.21-0.002-0.323-0.002-12.625 0-22.859 10.235-22.859 22.859s10.235 22.859 22.859 22.859c0.114 0 0.227-0.001 0.34-0.002l-0.017 0h297.143c0.096 0.001 0.21 0.002 0.323 0.002 12.625 0 22.859-10.235 22.859-22.859s-10.235-22.859-22.859-22.859c-0.114 0-0.227 0.001-0.34 0.002l0.017-0z","M251.429 580.58c-0.096-0.001-0.21-0.002-0.323-0.002-12.625 0-22.859 10.235-22.859 22.859s10.235 22.859 22.859 22.859c0.114 0 0.227-0.001 0.34-0.002l-0.017 0h297.143c0.096 0.001 0.21 0.002 0.323 0.002 12.625 0 22.859-10.235 22.859-22.859s-10.235-22.859-22.859-22.859c-0.114 0-0.227 0.001-0.34 0.002l0.017-0z"],"attrs":[{},{},{},{}],"width":1029,"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["single-content"]},"attrs":[{},{},{},{}],"properties":{"order":112,"id":214,"name":"single-content","prevSize":28,"code":59736},"setIdx":1,"setId":1,"iconIdx":4},{"icon":{"paths":["M777.143 946.286h-525.714c-89.143 0-160-70.857-160-160v-297.143c0-89.143 70.857-160 160-160h525.714c89.143 0 160 70.857 160 160v297.143c0 89.143-70.857 160-160 160zM251.429 374.857c-64 0-114.286 50.286-114.286 114.286v297.143c0 64 50.286 114.286 114.286 114.286h525.714c64 0 114.286-50.286 114.286-114.286v-297.143c0-64-50.286-114.286-114.286-114.286h-525.714z","M731.429 580.571h-457.143c-13.714 0-22.857-9.143-22.857-22.857s9.143-22.857 22.857-22.857h457.143c13.714 0 22.857 9.143 22.857 22.857s-9.143 22.857-22.857 22.857z","M502.857 740.571h-228.571c-13.714 0-22.857-9.143-22.857-22.857s9.143-22.857 22.857-22.857h228.571c13.714 0 22.857 9.143 22.857 22.857s-9.143 22.857-22.857 22.857z","M777.143 260.571h-525.714c-13.714 0-22.857-9.143-22.857-22.857s9.143-22.857 22.857-22.857h525.714c13.714 0 22.857 9.143 22.857 22.857s-9.143 22.857-22.857 22.857z","M685.714 146.286h-342.857c-13.714 0-22.857-9.143-22.857-22.857s9.143-22.857 22.857-22.857h342.857c13.714 0 22.857 9.143 22.857 22.857s-9.143 22.857-22.857 22.857z"],"attrs":[{},{},{},{},{}],"width":1029,"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["multiple-content"]},"attrs":[{},{},{},{},{}],"properties":{"order":113,"id":213,"name":"multiple-content","prevSize":28,"code":59735},"setIdx":1,"setId":1,"iconIdx":5},{"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":1,"setId":1,"iconIdx":6},{"icon":{"paths":["M292.571 713.143v128c0 20-16.571 36.571-36.571 36.571h-146.286c-20 0-36.571-16.571-36.571-36.571v-128c0-20 16.571-36.571 36.571-36.571h146.286c20 0 36.571 16.571 36.571 36.571zM309.714 109.714l-16 438.857c-0.571 20-17.714 36.571-37.714 36.571h-146.286c-20 0-37.143-16.571-37.714-36.571l-16-438.857c-0.571-20 15.429-36.571 35.429-36.571h182.857c20 0 36 16.571 35.429 36.571z"],"attrs":[{}],"width":366,"isMulticolor":false,"isMulticolor2":false,"tags":["exclamation"],"grid":14},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":28,"code":59733,"name":"exclamation"},"setIdx":1,"setId":1,"iconIdx":7},{"icon":{"paths":["M512 26.38l-424.96 242.8v485.64l424.96 242.8 424.96-242.8v-485.64l-424.96-242.8zM512 235.52l245.76 138.24v276.48l-245.76 138.24-245.76-138.24v-276.48l245.76-138.24z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["orleans"]},"attrs":[{}],"properties":{"order":99,"id":209,"name":"orleans","prevSize":28,"code":59723},"setIdx":1,"setId":1,"iconIdx":8},{"icon":{"paths":["M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v204.8h51.2v-204.8h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-307.2v51.2h307.2c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM716.8 189.8l117.4 117.4h-117.4z","M153.6 640v281.6h358.4v-281.6zM179.2 640v-76.8c0-84.48 69.12-153.6 153.6-153.6s153.6 69.12 153.6 153.6v76.8h-51.2v-76.8c0-56.32-46.080-102.4-102.4-102.4s-102.4 46.080-102.4 102.4v76.8z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["document-lock"]},"attrs":[{},{}],"properties":{"order":97,"id":208,"name":"document-lock","prevSize":28,"code":59721},"setIdx":1,"setId":1,"iconIdx":9},{"icon":{"paths":["M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v153.6h51.2v-153.6h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM716.8 189.8l117.4 117.4h-117.4zM332.8 460.8l-230.4 256v51.2h102.4v153.6h256v-153.6h102.4v-51.2zM332.8 537.3l161.5 179.5h-84.7v153.6h-153.6v-153.6h-84.7z","M102.4 357.532h460.8v52.068h-460.8v-52.068z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["document-unpublish"]},"attrs":[{},{}],"properties":{"order":96,"id":207,"name":"document-unpublish","prevSize":28,"code":59711},"setIdx":1,"setId":1,"iconIdx":10},{"icon":{"paths":["M614.286 420.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8-5.714 13.143-5.714 4.571 0 9.714 2.286 13.143 5.714l224.571 224.571 224.571-224.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8.571 5.714 13.143z"],"attrs":[{}],"width":658,"isMulticolor":false,"isMulticolor2":false,"tags":["angle-down"],"grid":14},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":28,"code":59648,"name":"angle-down"},"setIdx":1,"setId":1,"iconIdx":11},{"icon":{"paths":["M358.286 310.857c0 4.571-2.286 9.714-5.714 13.143l-224.571 224.571 224.571 224.571c3.429 3.429 5.714 8.571 5.714 13.143s-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-266.286-266.286c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l28.571 28.571c3.429 3.429 5.714 8 5.714 13.143z"],"attrs":[{}],"width":384,"isMulticolor":false,"isMulticolor2":false,"tags":["angle-left"],"grid":14},"attrs":[{}],"properties":{"order":2,"id":0,"prevSize":28,"code":59649,"name":"angle-left"},"setIdx":1,"setId":1,"iconIdx":12},{"icon":{"paths":["M340 548.571c0 4.571-2.286 9.714-5.714 13.143l-266.286 266.286c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8-5.714-13.143 0-4.571 2.286-9.714 5.714-13.143l224.571-224.571-224.571-224.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l28.571-28.571c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143z"],"attrs":[{}],"width":347,"isMulticolor":false,"isMulticolor2":false,"tags":["angle-right"],"grid":14},"attrs":[{}],"properties":{"order":67,"id":0,"prevSize":28,"code":59697,"name":"angle-right"},"setIdx":1,"setId":1,"iconIdx":13},{"icon":{"paths":["M614.286 676.571c0 4.571-2.286 9.714-5.714 13.143l-28.571 28.571c-3.429 3.429-8 5.714-13.143 5.714-4.571 0-9.714-2.286-13.143-5.714l-224.571-224.571-224.571 224.571c-3.429 3.429-8.571 5.714-13.143 5.714s-9.714-2.286-13.143-5.714l-28.571-28.571c-3.429-3.429-5.714-8.571-5.714-13.143s2.286-9.714 5.714-13.143l266.286-266.286c3.429-3.429 8.571-5.714 13.143-5.714s9.714 2.286 13.143 5.714l266.286 266.286c3.429 3.429 5.714 8.571 5.714 13.143z"],"attrs":[{}],"width":658,"isMulticolor":false,"isMulticolor2":false,"tags":["angle-up"],"grid":14},"attrs":[{}],"properties":{"order":2,"id":2,"prevSize":28,"code":59651,"name":"angle-up"},"setIdx":1,"setId":1,"iconIdx":14},{"icon":{"paths":["M592 393.6h-156.8c-57.6 0-105.6-48-105.6-105.6v-182.4c0-57.6 48-105.6 105.6-105.6h156.8c57.6 0 105.6 48 105.6 105.6v182.4c-3.2 57.6-48 105.6-105.6 105.6zM432 64c-22.4 0-41.6 19.2-41.6 41.6v182.4c0 22.4 19.2 41.6 41.6 41.6h156.8c22.4 0 41.6-19.2 41.6-41.6v-182.4c0-22.4-19.2-41.6-41.6-41.6h-156.8z","M195.2 1024c-105.6 0-195.2-89.6-195.2-195.2 0-108.8 89.6-195.2 195.2-195.2s195.2 89.6 195.2 195.2c3.2 105.6-86.4 195.2-195.2 195.2zM195.2 694.4c-73.6 0-131.2 60.8-131.2 131.2 0 73.6 60.8 134.4 131.2 134.4 73.6 0 131.2-60.8 131.2-131.2 3.2-73.6-57.6-134.4-131.2-134.4z","M828.8 1024c-108.8 0-195.2-89.6-195.2-195.2 0-108.8 89.6-195.2 195.2-195.2s195.2 89.6 195.2 195.2c0 105.6-89.6 195.2-195.2 195.2zM828.8 694.4c-73.6 0-131.2 60.8-131.2 131.2 0 73.6 60.8 131.2 131.2 131.2 73.6 0 131.2-60.8 131.2-131.2s-60.8-131.2-131.2-131.2z","M332.8 640c-6.4 0-12.8 0-16-3.2-16-9.6-19.2-28.8-9.6-44.8l83.2-137.6c9.6-16 28.8-19.2 44.8-9.6s19.2 28.8 9.6 44.8l-83.2 137.6c-6.4 6.4-16 12.8-28.8 12.8z","M691.2 640c-9.6 0-22.4-6.4-28.8-16l-83.2-137.6c-9.6-16-3.2-35.2 9.6-44.8s35.2-3.2 44.8 9.6l83.2 137.6c9.6 16 3.2 35.2-9.6 44.8-6.4 6.4-12.8 6.4-16 6.4z"],"attrs":[{},{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["api"]},"attrs":[{},{},{},{},{}],"properties":{"order":94,"id":206,"name":"api","prevSize":28,"code":59717},"setIdx":1,"setId":1,"iconIdx":15},{"icon":{"paths":["M800 1024h-576c-124.8 0-224-99.2-224-224v-576c0-124.8 99.2-224 224-224h576c124.8 0 224 99.2 224 224v576c0 124.8-99.2 224-224 224zM224 64c-89.6 0-160 70.4-160 160v576c0 89.6 70.4 160 160 160h576c89.6 0 160-70.4 160-160v-576c0-89.6-70.4-160-160-160h-576z","M771.2 860.8h-438.4c-12.8 0-22.4-6.4-28.8-19.2s-3.2-25.6 3.2-35.2l300.8-355.2c6.4-6.4 16-12.8 25.6-12.8s19.2 6.4 25.6 12.8l192 275.2c3.2 3.2 3.2 6.4 3.2 9.6 16 44.8 3.2 73.6-6.4 89.6-22.4 32-70.4 35.2-76.8 35.2zM403.2 796.8h371.2c6.4 0 22.4-3.2 25.6-9.6 3.2-3.2 3.2-12.8 0-25.6l-166.4-236.8-230.4 272z","M332.8 502.4c-76.8 0-140.8-64-140.8-140.8s64-140.8 140.8-140.8 140.8 64 140.8 140.8-60.8 140.8-140.8 140.8zM332.8 284.8c-41.6 0-76.8 32-76.8 76.8s35.2 76.8 76.8 76.8 76.8-35.2 76.8-76.8-32-76.8-76.8-76.8z"],"attrs":[{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["assets"]},"attrs":[{},{},{}],"properties":{"order":95,"id":205,"name":"assets","prevSize":28,"code":59720},"setIdx":1,"setId":1,"iconIdx":16},{"icon":{"paths":["M932.571 548.571c0 20-16.571 36.571-36.571 36.571h-128c0 71.429-15.429 125.143-38.286 165.714l118.857 119.429c14.286 14.286 14.286 37.143 0 51.429-6.857 7.429-16.571 10.857-25.714 10.857s-18.857-3.429-25.714-10.857l-113.143-112.571s-74.857 68.571-172 68.571v-512h-73.143v512c-103.429 0-178.857-75.429-178.857-75.429l-104.571 118.286c-7.429 8-17.143 12-27.429 12-8.571 0-17.143-2.857-24.571-9.143-14.857-13.714-16-36.571-2.857-52l115.429-129.714c-20-39.429-33.143-90.286-33.143-156.571h-128c-20 0-36.571-16.571-36.571-36.571s16.571-36.571 36.571-36.571h128v-168l-98.857-98.857c-14.286-14.286-14.286-37.143 0-51.429s37.143-14.286 51.429 0l98.857 98.857h482.286l98.857-98.857c14.286-14.286 37.143-14.286 51.429 0s14.286 37.143 0 51.429l-98.857 98.857v168h128c20 0 36.571 16.571 36.571 36.571zM658.286 219.429h-365.714c0-101.143 81.714-182.857 182.857-182.857s182.857 81.714 182.857 182.857z"],"attrs":[{}],"width":951,"isMulticolor":false,"isMulticolor2":false,"tags":["bug"],"grid":14},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":28,"code":59709,"name":"bug"},"setIdx":1,"setId":1,"iconIdx":17},{"icon":{"paths":["M585.143 402.286c0 9.714-4 18.857-10.857 25.714l-256 256c-6.857 6.857-16 10.857-25.714 10.857s-18.857-4-25.714-10.857l-256-256c-6.857-6.857-10.857-16-10.857-25.714 0-20 16.571-36.571 36.571-36.571h512c20 0 36.571 16.571 36.571 36.571z"],"attrs":[{}],"width":585,"isMulticolor":false,"isMulticolor2":false,"tags":["caret-down"],"grid":14},"attrs":[{}],"properties":{"order":4,"id":4,"prevSize":28,"code":59692,"name":"caret-down"},"setIdx":1,"setId":1,"iconIdx":18},{"icon":{"paths":["M365.714 256v512c0 20-16.571 36.571-36.571 36.571-9.714 0-18.857-4-25.714-10.857l-256-256c-6.857-6.857-10.857-16-10.857-25.714s4-18.857 10.857-25.714l256-256c6.857-6.857 16-10.857 25.714-10.857 20 0 36.571 16.571 36.571 36.571z"],"attrs":[{}],"width":402,"isMulticolor":false,"isMulticolor2":false,"tags":["caret-left"],"grid":14},"attrs":[{}],"properties":{"order":2,"id":6,"prevSize":28,"code":59690,"name":"caret-left"},"setIdx":1,"setId":1,"iconIdx":19},{"icon":{"paths":["M329.143 512c0 9.714-4 18.857-10.857 25.714l-256 256c-6.857 6.857-16 10.857-25.714 10.857-20 0-36.571-16.571-36.571-36.571v-512c0-20 16.571-36.571 36.571-36.571 9.714 0 18.857 4 25.714 10.857l256 256c6.857 6.857 10.857 16 10.857 25.714z"],"attrs":[{}],"width":329,"isMulticolor":false,"isMulticolor2":false,"tags":["caret-right"],"grid":14},"attrs":[{}],"properties":{"order":1,"id":7,"prevSize":28,"code":59689,"name":"caret-right"},"setIdx":1,"setId":1,"iconIdx":20},{"icon":{"paths":["M585.143 694.857c0 20-16.571 36.571-36.571 36.571h-512c-20 0-36.571-16.571-36.571-36.571 0-9.714 4-18.857 10.857-25.714l256-256c6.857-6.857 16-10.857 25.714-10.857s18.857 4 25.714 10.857l256 256c6.857 6.857 10.857 16 10.857 25.714z"],"attrs":[{}],"width":585,"isMulticolor":false,"isMulticolor2":false,"tags":["caret-up"],"grid":14},"attrs":[{}],"properties":{"order":3,"id":5,"prevSize":28,"code":59691,"name":"caret-up"},"setIdx":1,"setId":1,"iconIdx":21},{"icon":{"paths":["M800 1024h-576c-124.8 0-224-99.2-224-224v-576c0-124.8 99.2-224 224-224h576c124.8 0 224 99.2 224 224v576c0 124.8-99.2 224-224 224zM224 64c-89.6 0-160 70.4-160 160v576c0 89.6 70.4 160 160 160h576c89.6 0 160-70.4 160-160v-576c0-89.6-70.4-160-160-160h-576z","M480 448h-211.2c-57.6 0-105.6-48-105.6-105.6v-73.6c0-57.6 48-105.6 105.6-105.6h211.2c57.6 0 105.6 48 105.6 105.6v73.6c0 57.6-48 105.6-105.6 105.6zM268.8 227.2c-22.4 0-41.6 19.2-41.6 41.6v73.6c0 22.4 19.2 41.6 41.6 41.6h211.2c22.4 0 41.6-19.2 41.6-41.6v-73.6c0-22.4-19.2-41.6-41.6-41.6h-211.2z","M828.8 611.2h-633.6c-19.2 0-32-12.8-32-32s12.8-32 32-32h630.4c19.2 0 32 12.8 32 32s-12.8 32-28.8 32z","M553.6 777.6h-358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h355.2c19.2 0 32 12.8 32 32s-12.8 32-28.8 32z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["content"]},"attrs":[{},{},{},{}],"properties":{"order":93,"id":204,"name":"contents, trigger-ContentChanged","prevSize":28,"code":59718},"setIdx":1,"setId":1,"iconIdx":22},{"icon":{"paths":["M947.2 102.4h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-512v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v716.8c0 42.342 34.458 76.8 76.8 76.8h870.4c42.342 0 76.8-34.458 76.8-76.8v-716.8c0-42.342-34.458-76.8-76.8-76.8zM972.8 896c0 14.131-11.469 25.6-25.6 25.6h-870.4c-14.080 0-25.6-11.469-25.6-25.6v-537.6h921.6v537.6zM972.8 307.2h-921.6v-128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h512v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128zM332.8 512h51.2c14.080 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM640 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["control-date"]},"attrs":[{}],"properties":{"order":71,"id":42,"name":"control-Date","prevSize":28,"code":59702},"setIdx":1,"setId":1,"iconIdx":23},{"icon":{"paths":["M486.4 409.6h51.2c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6zM230.4 614.4c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM230.4 512c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM51.2 742.4v-435.2h665.6v102.4h51.2v-281.6c0-42.342-34.458-76.8-76.8-76.8h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-256v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v614.4c0 42.342 34.458 76.8 76.8 76.8h332.8v-51.2h-332.8c-14.080 0-25.6-11.469-25.6-25.6zM51.2 128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h256v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128h-665.6v-128zM384 409.6c14.080 0 25.6 11.52 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.52-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM742.4 460.8c-155.546 0-281.6 126.054-281.6 281.6s126.054 281.6 281.6 281.6 281.6-126.054 281.6-281.6-126.054-281.6-281.6-281.6zM742.4 972.8c-127.232 0-230.4-103.168-230.4-230.4s103.168-230.4 230.4-230.4 230.4 103.168 230.4 230.4-103.168 230.4-230.4 230.4zM384 512c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM384 614.4c14.080 0 25.6 11.469 25.6 25.6s-11.52 25.6-25.6 25.6h-51.2c-14.080 0-25.6-11.469-25.6-25.6s11.52-25.6 25.6-25.6h51.2zM844.8 716.8c14.131 0 25.6 11.469 25.6 25.6s-11.469 25.6-25.6 25.6h-102.4c-14.131 0-25.6-11.469-25.6-25.6v-102.4c0-14.131 11.469-25.6 25.6-25.6s25.6 11.469 25.6 25.6v76.8h76.8z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["control-date-time"]},"attrs":[{}],"properties":{"order":70,"id":41,"name":"control-DateTime","prevSize":28,"code":59703},"setIdx":1,"setId":1,"iconIdx":24},{"icon":{"paths":["M793.6 609.416h-61.838v-28.108h-0.783q-21.135 33.092-62.034 33.092-37.573 0-60.469-26.912-22.896-27.112-22.896-75.554 0-50.635 25.244-81.136t66.144-30.501q38.747 0 54.011 28.308h0.783v-121.405h61.838v302.216zM732.936 510.139v-15.35q0-19.935-11.35-33.092t-29.549-13.157q-20.548 0-32.093 16.546-11.546 16.347-11.546 45.053 0 26.912 11.154 41.465t30.919 14.553q18.786 0 30.528-15.35 11.937-15.35 11.937-40.668zM548.594 609.416h-61.643v-116.421q0-44.455-32.093-44.455-15.264 0-24.853 13.357t-9.589 33.292v114.228h-61.839v-117.617q0-43.259-31.506-43.259-15.851 0-25.44 12.758-9.393 12.758-9.393 34.687v113.431h-61.838v-204.135h61.838v31.896h0.783q9.589-16.347 26.81-26.514 17.417-10.366 37.964-10.366 42.465 0 58.12 38.076 22.896-38.076 67.318-38.076 65.361 0 65.361 82.133v126.987zM0 0v204.8h76.8v76.8h51.2v-76.8h76.8v-204.8zM819.2 0v204.8h204.8v-204.8zM51.2 51.2h102.4v102.4h-102.4zM870.4 51.2h102.4v102.4h-102.4zM281.6 76.8v51.2h102.4v-51.2zM486.4 76.8v51.2h102.4v-51.2zM691.2 76.8v51.2h102.4v-51.2zM896 281.6v102.4h51.2v-102.4zM76.8 384v102.4h51.2v-102.4zM896 486.4v102.4h51.2v-102.4zM76.8 588.8v102.4h51.2v-102.4zM896 691.2v102.4h51.2v-102.4zM76.8 793.6v25.6h-76.8v204.8h204.8v-76.8h76.8v-51.2h-76.8v-76.8h-76.8v-25.6zM819.2 819.2v76.8h-25.6v51.2h25.6v76.8h204.8v-204.8zM51.2 870.4h102.4v102.4h-102.4zM870.4 870.4h102.4v102.4h-102.4zM384 896v51.2h102.4v-51.2zM588.8 896v51.2h102.4v-51.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["control-Markdown"]},"attrs":[{}],"properties":{"order":72,"id":43,"name":"control-Markdown","prevSize":28,"code":59704},"setIdx":1,"setId":1,"iconIdx":25},{"icon":{"paths":["M292.571 713.143v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM292.571 420.571v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM658.286 713.143v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM292.571 128v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM658.286 420.571v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM1024 713.143v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM658.286 128v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM1024 420.571v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857zM1024 128v109.714c0 30.286-24.571 54.857-54.857 54.857h-182.857c-30.286 0-54.857-24.571-54.857-54.857v-109.714c0-30.286 24.571-54.857 54.857-54.857h182.857c30.286 0 54.857 24.571 54.857 54.857z"],"width":1024,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["th"],"defaultCode":61450,"grid":14},"attrs":[],"properties":{"name":"grid","id":14,"order":83,"prevSize":28,"code":61450},"setIdx":1,"setId":1,"iconIdx":26},{"icon":{"paths":["M877.714 768v73.143c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h804.571c20 0 36.571 16.571 36.571 36.571zM877.714 475.429v73.143c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h804.571c20 0 36.571 16.571 36.571 36.571zM877.714 182.857v73.143c0 20-16.571 36.571-36.571 36.571h-804.571c-20 0-36.571-16.571-36.571-36.571v-73.143c0-20 16.571-36.571 36.571-36.571h804.571c20 0 36.571 16.571 36.571 36.571z"],"width":877.7142857142857,"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["bars","navicon","reorder"],"defaultCode":61641,"grid":14},"attrs":[],"properties":{"name":"list1","id":178,"order":89,"prevSize":28,"code":61641},"setIdx":1,"setId":1,"iconIdx":27},{"icon":{"paths":["M512 64c-131.696 0-239.125 107.4-239.125 239 0 65.8 24.831 146.717 65.375 215.25 19.653 33.221 43.902 63.853 71.75 87.125-59.423 7.524-122.009 9.415-172.125 32-79.809 35.967-144.343 94.74-172.375 178.625-1.5 9.499 0 0-1.5 9v0.499c0 73.995 60.563 134.501 134.375 134.501h627.125c73.888 0 134.5-60.506 134.5-134.5l-1.5-9.375c-27.845-84.263-92.273-143.119-172.125-179-50.17-22.544-112.844-24.421-172.375-31.875 27.792-23.26 52.002-53.831 71.625-87 40.544-68.533 65.375-149.45 65.375-215.25 0-131.6-107.304-239-239-239zM512 124c99.241 0 179 79.875 179 179 0 49.562-21.877 125.381-57 184.75s-81.435 98.75-122 98.75c-40.565 0-86.877-39.381-122-98.75s-57.125-135.188-57.125-184.75c0-99.125 79.884-179 179.125-179zM512 646.5c92.551 0 180.829 14.406 249.75 45.375 66.784 30.009 113.649 74.724 136.5 137.75-2.447 39.259-32.9 70.375-72.75 70.375h-627.125c-39.678 0-70.116-31.051-72.625-70.25 22.978-62.705 69.953-107.523 136.75-137.625 68.937-31.067 157.205-45.625 249.5-45.625z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["user-o"]},"attrs":[{}],"properties":{"order":64,"id":38,"name":"user-o","prevSize":28,"code":59698},"setIdx":1,"setId":1,"iconIdx":28},{"icon":{"paths":["M217.6 992c-3.2 0-3.2 0-6.4 0h-3.2c-144-25.6-208-144-208-249.6 0-99.2 57.6-208 185.6-240v-147.2c0-19.2 12.8-32 32-32s32 12.8 32 32v172.8c0 16-12.8 28.8-25.6 32-108.8 16-160 102.4-160 182.4s48 166.4 153.6 185.6h6.4c16 3.2 28.8 19.2 25.6 38.4-3.2 16-16 25.6-32 25.6z","M774.4 1001.6c0 0 0 0 0 0-102.4 0-211.2-60.8-243.2-185.6h-176c-19.2 0-32-12.8-32-32s12.8-32 32-32h201.6c16 0 28.8 12.8 32 25.6 16 108.8 102.4 156.8 182.4 160 80 0 166.4-48 185.6-153.6v-3.2c3.2-16 19.2-28.8 38.4-25.6 16 3.2 28.8 19.2 25.6 38.4v3.2c-22.4 140.8-140.8 204.8-246.4 204.8z","M787.2 678.4c-19.2 0-32-12.8-32-32v-176c0-16 12.8-28.8 25.6-32 108.8-16 156.8-102.4 160-182.4 0-80-48-166.4-153.6-185.6h-3.2c-19.2-6.4-32-22.4-28.8-38.4s19.2-28.8 38.4-25.6h3.2c144 25.6 208 144 208 249.6 0 99.2-60.8 208-185.6 240v150.4c0 16-16 32-32 32z","M41.6 246.4c-3.2 0-3.2 0-6.4 0-16-3.2-28.8-19.2-25.6-35.2v-3.2c25.6-144 140.8-208 246.4-208 0 0 3.2 0 3.2 0 99.2 0 208 60.8 240 185.6h147.2c19.2 0 32 12.8 32 32s-12.8 32-32 32h-172.8c-16 0-28.8-12.8-32-25.6-16-108.8-102.4-156.8-182.4-160-80 0-166.4 48-185.6 153.6v3.2c-3.2 16-16 25.6-32 25.6z","M256 387.2c-32 0-67.2-12.8-92.8-38.4-51.2-51.2-51.2-134.4 0-185.6 25.6-22.4 57.6-35.2 92.8-35.2s67.2 12.8 92.8 38.4c25.6 25.6 38.4 57.6 38.4 92.8s-12.8 67.2-38.4 92.8c-25.6 22.4-57.6 35.2-92.8 35.2zM256 192c-16 0-32 6.4-44.8 19.2-25.6 25.6-25.6 67.2 0 92.8s67.2 25.6 92.8 0c12.8-12.8 19.2-28.8 19.2-48s-6.4-32-19.2-44.8-28.8-19.2-48-19.2z","M771.2 873.6c-32 0-67.2-12.8-92.8-38.4-51.2-51.2-51.2-134.4 0-185.6 25.6-25.6 57.6-38.4 92.8-38.4s67.2 12.8 92.8 38.4c25.6 25.6 38.4 57.6 38.4 92.8s-12.8 67.2-38.4 92.8c-28.8 25.6-60.8 38.4-92.8 38.4zM771.2 678.4c-19.2 0-35.2 6.4-48 19.2-25.6 25.6-25.6 67.2 0 92.8s67.2 25.6 92.8 0c12.8-12.8 19.2-28.8 19.2-48s-6.4-35.2-19.2-48-28.8-16-44.8-16z","M745.6 387.2c-32 0-67.2-12.8-92.8-38.4s-38.4-57.6-38.4-92.8 12.8-67.2 38.4-92.8c25.6-22.4 60.8-35.2 92.8-35.2s67.2 12.8 92.8 38.4c51.2 51.2 51.2 134.4 0 185.6v0c-25.6 22.4-57.6 35.2-92.8 35.2zM745.6 192c-19.2 0-35.2 6.4-48 19.2s-19.2 28.8-19.2 48 6.4 35.2 19.2 48c25.6 25.6 67.2 25.6 92.8 0s25.6-67.2 0-92.8c-9.6-16-25.6-22.4-44.8-22.4z","M259.2 873.6c-32 0-67.2-12.8-92.8-38.4s-38.4-57.6-38.4-92.8 12.8-67.2 38.4-92.8c25.6-22.4 57.6-35.2 92.8-35.2s67.2 12.8 92.8 38.4c51.2 51.2 51.2 134.4 0 185.6v0c-25.6 22.4-57.6 35.2-92.8 35.2zM259.2 678.4c-19.2 0-35.2 6.4-48 19.2s-19.2 28.8-19.2 48 6.4 35.2 19.2 48c25.6 25.6 67.2 25.6 92.8 0s25.6-67.2 0-92.8c-9.6-16-25.6-22.4-44.8-22.4z"],"attrs":[{},{},{},{},{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":14,"tags":["webhooks"]},"attrs":[{},{},{},{},{},{},{},{}],"properties":{"order":92,"id":203,"name":"rules","prevSize":28,"code":59719},"setIdx":1,"setId":1,"iconIdx":29},{"icon":{"paths":["M585.143 548.557c0 9.728-3.986 18.871-10.862 25.71l-256 256c-6.839 6.839-16.018 10.862-25.71 10.862s-18.871-3.986-25.71-10.862l-256-256c-6.839-6.839-10.862-16.018-10.862-25.71 0-20.005 16.567-36.571 36.571-36.571h512c20.005 0 36.571 16.567 36.571 36.571z","M585.143 219.443c0 9.728-3.986 18.871-10.862 25.71l-256 256c-6.839 6.839-16.018 10.862-25.71 10.862s-18.871-3.986-25.71-10.862l-256-256c-6.839-6.839-10.862-16.018-10.862-25.71 0-20.005 16.567-36.571 36.571-36.571h512c20.005 0 36.571 16.567 36.571 36.571z"],"attrs":[{},{}],"width":585,"isMulticolor":false,"isMulticolor2":false,"grid":16,"tags":["caret-bottom"]},"attrs":[{},{}],"properties":{"order":125,"id":226,"name":"caret-bottom","prevSize":24,"code":59755},"setIdx":1,"setId":1,"iconIdx":39},{"icon":{"paths":["M585.143 804.577c0 20.005-16.567 36.571-36.571 36.571h-512c-20.005 0-36.571-16.567-36.571-36.571 0-9.728 3.986-18.871 10.862-25.71l256-256c6.839-6.839 16.018-10.862 25.71-10.862s18.871 3.986 25.71 10.862l256 256c6.839 6.839 10.862 16.018 10.862 25.71z","M585.143 475.423c0 20.005-16.567 36.571-36.571 36.571h-512c-20.005 0-36.571-16.567-36.571-36.571 0-9.728 3.986-18.871 10.862-25.71l256-256c6.839-6.839 16.018-10.862 25.71-10.862s18.871 3.986 25.71 10.862l256 256c6.839 6.839 10.862 16.018 10.862 25.71z"],"attrs":[{},{}],"width":585,"isMulticolor":false,"isMulticolor2":false,"grid":16,"tags":["caret-top"]},"attrs":[{},{}],"properties":{"order":124,"id":225,"name":"caret-top","prevSize":24,"code":59756},"setIdx":1,"setId":1,"iconIdx":40},{"icon":{"paths":["M256 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-512v-460.8h-51.2v460.8c0 28.314 22.886 51.2 51.2 51.2h512c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM614.4 189.8l117.4 117.4h-117.4z","M408.906 587.72l-35.3-37 138.1-131.9 138 131.9-35.3 37-102.7-98.1z","M511.706 773.12l-138.1-131.9 35.3-37 102.8 98.1 102.7-98.1 35.3 37z"],"attrs":[{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":16,"tags":["show"]},"attrs":[{},{},{}],"properties":{"order":123,"id":224,"name":"show","prevSize":24,"code":59748},"setIdx":1,"setId":1,"iconIdx":41},{"icon":{"paths":["M256 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-512v-460.8h-51.2v460.8c0 28.314 22.886 51.2 51.2 51.2h512c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM614.4 189.8l117.4 117.4h-117.4z","M348.394 15.988c-28.314 0-51.2 22.886-51.2 51.2v23.7h51.2v-23.7h307.2l204.8 204.8v512h-23.8v51.2h23.8c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2z","M408.906 587.72l-35.3-37 138.1-131.9 138 131.9-35.3 37-102.7-98.1z","M511.706 773.12l-138.1-131.9 35.3-37 102.8 98.1 102.7-98.1 35.3 37z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":16,"tags":["show-all"]},"attrs":[{},{},{},{}],"properties":{"order":122,"id":223,"name":"show-all","prevSize":24,"code":59749},"setIdx":1,"setId":1,"iconIdx":42},{"icon":{"paths":["M256 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-512v-460.8h-51.2v460.8c0 28.314 22.886 51.2 51.2 51.2h512c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM614.4 189.8l117.4 117.4h-117.4z","M408.9 418.8l-35.3 37 138 131.9 138.1-131.9-35.3-37-102.8 98.1z","M511.6 604.2l-138 131.9 35.3 37 102.7-98.1 102.8 98.1 35.3-37z"],"attrs":[{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":16,"tags":["hide"]},"attrs":[{},{},{}],"properties":{"order":121,"id":222,"name":"hide","prevSize":24,"code":59750},"setIdx":1,"setId":1,"iconIdx":43},{"icon":{"paths":["M408.9 418.8l-35.3 37 138.1 131.9 138-131.9-35.3-37-102.7 98.1z","M511.7 604.2l-138.1 131.9 35.3 37 102.8-98.1 102.7 98.1 35.3-37z","M256 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-512v-460.8h-51.2v460.8c0 28.314 22.886 51.2 51.2 51.2h512c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2zM614.4 189.8l117.4 117.4h-117.4z","M348.394 15.988c-28.314 0-51.2 22.886-51.2 51.2v23.7h51.2v-23.7h307.2l204.8 204.8v512h-23.8v51.2h23.8c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-292.2z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":16,"tags":["hide-all"]},"attrs":[{},{},{},{}],"properties":{"order":120,"id":221,"name":"hide-all","prevSize":24,"code":59751},"setIdx":1,"setId":1,"iconIdx":44},{"icon":{"paths":["M512 1024c-136.76 0-265.334-53.258-362.040-149.96-96.702-96.706-149.96-225.28-149.96-362.040 0-96.838 27.182-191.134 78.606-272.692 50-79.296 120.664-143.372 204.356-185.3l43 85.832c-68.038 34.084-125.492 86.186-166.15 150.67-41.746 66.208-63.812 142.798-63.812 221.49 0 229.382 186.618 416 416 416s416-186.618 416-416c0-78.692-22.066-155.282-63.81-221.49-40.66-64.484-98.114-116.584-166.15-150.67l43-85.832c83.692 41.928 154.358 106.004 204.356 185.3 51.422 81.558 78.604 175.854 78.604 272.692 0 136.76-53.258 265.334-149.96 362.040-96.706 96.702-225.28 149.96-362.040 149.96z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["spinner","loading","loading-wheel","busy","wait"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59737,"name":"spinner2"},"setIdx":1,"setId":1,"iconIdx":45},{"icon":{"paths":["M1024 397.050l-353.78-51.408-158.22-320.582-158.216 320.582-353.784 51.408 256 249.538-60.432 352.352 316.432-166.358 316.432 166.358-60.434-352.352 256.002-249.538z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["star-full","rate","star","favorite","bookmark"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":2,"prevSize":24,"code":59741,"name":"star-full"},"setIdx":1,"setId":1,"iconIdx":46},{"icon":{"paths":["M1024 397.050l-353.78-51.408-158.22-320.582-158.216 320.582-353.784 51.408 256 249.538-60.432 352.352 316.432-166.358 316.432 166.358-60.434-352.352 256.002-249.538zM512 753.498l-223.462 117.48 42.676-248.83-180.786-176.222 249.84-36.304 111.732-226.396 111.736 226.396 249.836 36.304-180.788 176.222 42.678 248.83-223.462-117.48z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["star-empty","rate","star","favorite","bookmark"],"grid":16},"attrs":[{}],"properties":{"order":2,"id":1,"prevSize":24,"code":59742,"name":"star-empty"},"setIdx":1,"setId":1,"iconIdx":47},{"icon":{"paths":["M1024 226.4c-37.6 16.8-78.2 28-120.6 33 43.4-26 76.6-67.2 92.4-116.2-40.6 24-85.6 41.6-133.4 51-38.4-40.8-93-66.2-153.4-66.2-116 0-210 94-210 210 0 16.4 1.8 32.4 5.4 47.8-174.6-8.8-329.4-92.4-433-219.6-18 31-28.4 67.2-28.4 105.6 0 72.8 37 137.2 93.4 174.8-34.4-1-66.8-10.6-95.2-26.2 0 0.8 0 1.8 0 2.6 0 101.8 72.4 186.8 168.6 206-17.6 4.8-36.2 7.4-55.4 7.4-13.6 0-26.6-1.4-39.6-3.8 26.8 83.4 104.4 144.2 196.2 146-72 56.4-162.4 90-261 90-17 0-33.6-1-50.2-3 93.2 59.8 203.6 94.4 322.2 94.4 386.4 0 597.8-320.2 597.8-597.8 0-9.2-0.2-18.2-0.6-27.2 41-29.4 76.6-66.4 104.8-108.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["twitter","brand","tweet","social"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59740,"name":"twitter"},"setIdx":1,"setId":1,"iconIdx":48},{"icon":{"paths":["M728.992 512c137.754-87.334 231.008-255.208 231.008-448 0-21.676-1.192-43.034-3.478-64h-889.042c-2.29 20.968-3.48 42.326-3.48 64 0 192.792 93.254 360.666 231.006 448-137.752 87.334-231.006 255.208-231.006 448 0 21.676 1.19 43.034 3.478 64h889.042c2.288-20.966 3.478-42.324 3.478-64 0.002-192.792-93.252-360.666-231.006-448zM160 960c0-186.912 80.162-345.414 224-397.708v-100.586c-143.838-52.29-224-210.792-224-397.706v0h704c0 186.914-80.162 345.416-224 397.706v100.586c143.838 52.294 224 210.796 224 397.708h-704zM619.626 669.594c-71.654-40.644-75.608-93.368-75.626-125.366v-64.228c0-31.994 3.804-84.914 75.744-125.664 38.504-22.364 71.808-56.348 97.048-98.336h-409.582c25.266 42.032 58.612 76.042 97.166 98.406 71.654 40.644 75.606 93.366 75.626 125.366v64.228c0 31.992-3.804 84.914-75.744 125.664-72.622 42.18-126.738 125.684-143.090 226.336h501.67c-16.364-100.708-70.53-184.248-143.212-226.406z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["hour-glass","loading","busy","wait"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":24,"code":59732,"name":"hour-glass"},"setIdx":1,"setId":1,"iconIdx":49},{"icon":{"paths":["M192 512c0-12.18 0.704-24.196 2.030-36.022l-184.98-60.104c-5.916 31.14-9.050 63.264-9.050 96.126 0 147.23 62.166 279.922 161.654 373.324l114.284-157.296c-52.124-56.926-83.938-132.758-83.938-216.028zM832 512c0 83.268-31.812 159.102-83.938 216.028l114.284 157.296c99.488-93.402 161.654-226.094 161.654-373.324 0-32.862-3.132-64.986-9.048-96.126l-184.98 60.104c1.324 11.828 2.028 23.842 2.028 36.022zM576 198.408c91.934 18.662 169.544 76.742 214.45 155.826l184.978-60.102c-73.196-155.42-222.24-268.060-399.428-290.156v194.432zM233.55 354.232c44.906-79.084 122.516-137.164 214.45-155.826v-194.43c-177.188 22.096-326.23 134.736-399.426 290.154l184.976 60.102zM644.556 803.328c-40.39 18.408-85.272 28.672-132.556 28.672s-92.166-10.264-132.554-28.67l-114.292 157.31c73.206 40.366 157.336 63.36 246.846 63.36s173.64-22.994 246.848-63.36l-114.292-157.312z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["spinner","loading","loading-wheel","busy","wait"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59731,"name":"spinner"},"setIdx":1,"setId":1,"iconIdx":50},{"icon":{"paths":["M658.744 749.256l-210.744-210.746v-282.51h128v229.49l173.256 173.254zM512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 896c-212.078 0-384-171.922-384-384s171.922-384 384-384c212.078 0 384 171.922 384 384s-171.922 384-384 384z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["clock","time","schedule"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59728,"name":"clock"},"setIdx":1,"setId":1,"iconIdx":51},{"icon":{"paths":["M128 320v640c0 35.2 28.8 64 64 64h576c35.2 0 64-28.8 64-64v-640h-704zM320 896h-64v-448h64v448zM448 896h-64v-448h64v448zM576 896h-64v-448h64v448zM704 896h-64v-448h64v448z","M848 128h-208v-80c0-26.4-21.6-48-48-48h-224c-26.4 0-48 21.6-48 48v80h-208c-26.4 0-48 21.6-48 48v80h832v-80c0-26.4-21.6-48-48-48zM576 128h-192v-63.198h192v63.198z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["bin","trashcan","remove","delete","recycle","dispose"],"grid":16},"attrs":[{},{}],"properties":{"order":1,"id":0,"name":"bin2","prevSize":24,"code":59650},"setIdx":1,"setId":1,"iconIdx":52},{"icon":{"paths":["M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 960.002c-62.958 0-122.872-13.012-177.23-36.452l233.148-262.29c5.206-5.858 8.082-13.422 8.082-21.26v-96c0-17.674-14.326-32-32-32-112.99 0-232.204-117.462-233.374-118.626-6-6.002-14.14-9.374-22.626-9.374h-128c-17.672 0-32 14.328-32 32v192c0 12.122 6.848 23.202 17.69 28.622l110.31 55.156v187.886c-116.052-80.956-192-215.432-192-367.664 0-68.714 15.49-133.806 43.138-192h116.862c8.488 0 16.626-3.372 22.628-9.372l128-128c6-6.002 9.372-14.14 9.372-22.628v-77.412c40.562-12.074 83.518-18.588 128-18.588 70.406 0 137.004 16.26 196.282 45.2-4.144 3.502-8.176 7.164-12.046 11.036-36.266 36.264-56.236 84.478-56.236 135.764s19.97 99.5 56.236 135.764c36.434 36.432 85.218 56.264 135.634 56.26 3.166 0 6.342-0.080 9.518-0.236 13.814 51.802 38.752 186.656-8.404 372.334-0.444 1.744-0.696 3.488-0.842 5.224-81.324 83.080-194.7 134.656-320.142 134.656z"],"attrs":[],"isMulticolor":false,"isMulticolor2":false,"tags":["earth","globe","language","web","internet","sphere","planet"],"defaultCode":59850,"grid":16},"attrs":[],"properties":{"ligatures":"earth, globe2","name":"earth","id":202,"order":91,"prevSize":24,"code":59850},"setIdx":1,"setId":1,"iconIdx":53},{"icon":{"paths":["M512.002 193.212v-65.212h128v-64c0-35.346-28.654-64-64.002-64h-191.998c-35.346 0-64 28.654-64 64v64h128v65.212c-214.798 16.338-384 195.802-384 414.788 0 229.75 186.25 416 416 416s416-186.25 416-416c0-218.984-169.202-398.448-384-414.788zM706.276 834.274c-60.442 60.44-140.798 93.726-226.274 93.726s-165.834-33.286-226.274-93.726c-60.44-60.44-93.726-140.8-93.726-226.274s33.286-165.834 93.726-226.274c58.040-58.038 134.448-91.018 216.114-93.548l-21.678 314.020c-1.86 26.29 12.464 37.802 31.836 37.802s33.698-11.512 31.836-37.802l-21.676-314.022c81.666 2.532 158.076 35.512 216.116 93.55 60.44 60.44 93.726 140.8 93.726 226.274s-33.286 165.834-93.726 226.274z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["stopwatch","time","speed","meter","chronometer"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":2,"prevSize":24,"code":59715,"name":"elapsed"},"setIdx":1,"setId":1,"iconIdx":54},{"icon":{"paths":["M522.2 438.8v175.6h290.4c-11.8 75.4-87.8 220.8-290.4 220.8-174.8 0-317.4-144.8-317.4-323.2s142.6-323.2 317.4-323.2c99.4 0 166 42.4 204 79l139-133.8c-89.2-83.6-204.8-134-343-134-283 0-512 229-512 512s229 512 512 512c295.4 0 491.6-207.8 491.6-500.2 0-33.6-3.6-59.2-8-84.8l-483.6-0.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["google","brand"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":24,"code":59707,"name":"google"},"setIdx":1,"setId":1,"iconIdx":55},{"icon":{"paths":["M592 448h-16v-192c0-105.87-86.13-192-192-192h-128c-105.87 0-192 86.13-192 192v192h-16c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h544c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48zM192 256c0-35.29 28.71-64 64-64h128c35.29 0 64 28.71 64 64v192h-256v-192z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["lock","secure","private","encrypted"],"grid":16},"attrs":[{}],"properties":{"order":2,"id":0,"prevSize":24,"code":59700,"name":"lock"},"setIdx":1,"setId":1,"iconIdx":56},{"icon":{"paths":["M0.35 512l-0.35-312.074 384-52.144v364.218zM448 138.482l511.872-74.482v448h-511.872zM959.998 576l-0.126 448-511.872-72.016v-375.984zM384 943.836l-383.688-52.594-0.020-315.242h383.708z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["windows8","brand","os"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":24,"code":59712,"name":"microsoft"},"setIdx":1,"setId":1,"iconIdx":57},{"icon":{"paths":["M128 128h320v768h-320zM576 128h320v768h-320z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["pause","player"],"grid":16},"attrs":[{}],"properties":{"order":2,"id":1,"prevSize":24,"code":59695,"name":"pause"},"setIdx":1,"setId":1,"iconIdx":58},{"icon":{"paths":["M192 128l640 384-640 384z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["play","player"],"grid":16},"attrs":[{}],"properties":{"order":3,"id":0,"prevSize":24,"code":59696,"name":"play"},"setIdx":1,"setId":1,"iconIdx":59},{"icon":{"paths":["M889.68 166.32c-93.608-102.216-228.154-166.32-377.68-166.32-282.77 0-512 229.23-512 512h96c0-229.75 186.25-416 416-416 123.020 0 233.542 53.418 309.696 138.306l-149.696 149.694h352v-352l-134.32 134.32z","M928 512c0 229.75-186.25 416-416 416-123.020 0-233.542-53.418-309.694-138.306l149.694-149.694h-352v352l134.32-134.32c93.608 102.216 228.154 166.32 377.68 166.32 282.77 0 512-229.23 512-512h-96z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["loop","repeat","player","reload","refresh","update","synchronize","arrows"],"grid":16},"attrs":[{},{}],"properties":{"order":49,"id":2,"prevSize":24,"code":59694,"name":"reset"},"setIdx":1,"setId":1,"iconIdx":60},{"icon":{"paths":["M933.79 610.25c-53.726-93.054-21.416-212.304 72.152-266.488l-100.626-174.292c-28.75 16.854-62.176 26.518-97.846 26.518-107.536 0-194.708-87.746-194.708-195.99h-201.258c0.266 33.41-8.074 67.282-25.958 98.252-53.724 93.056-173.156 124.702-266.862 70.758l-100.624 174.292c28.97 16.472 54.050 40.588 71.886 71.478 53.638 92.908 21.512 211.92-71.708 266.224l100.626 174.292c28.65-16.696 61.916-26.254 97.4-26.254 107.196 0 194.144 87.192 194.7 194.958h201.254c-0.086-33.074 8.272-66.57 25.966-97.218 53.636-92.906 172.776-124.594 266.414-71.012l100.626-174.29c-28.78-16.466-53.692-40.498-71.434-71.228zM512 719.332c-114.508 0-207.336-92.824-207.336-207.334 0-114.508 92.826-207.334 207.336-207.334 114.508 0 207.332 92.826 207.332 207.334-0.002 114.51-92.824 207.334-207.332 207.334z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["cog","gear","preferences","settings","generate","control","options"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":24,"code":59693,"name":"settings2"},"setIdx":1,"setId":1,"iconIdx":61},{"icon":{"paths":["M512 128c-247.424 0-448 200.576-448 448s200.576 448 448 448 448-200.576 448-448-200.576-448-448-448zM512 936c-198.824 0-360-161.178-360-360 0-198.824 161.176-360 360-360 198.822 0 360 161.176 360 360 0 198.822-161.178 360-360 360zM934.784 287.174c16.042-28.052 25.216-60.542 25.216-95.174 0-106.040-85.96-192-192-192-61.818 0-116.802 29.222-151.92 74.596 131.884 27.236 245.206 105.198 318.704 212.578v0zM407.92 74.596c-35.116-45.374-90.102-74.596-151.92-74.596-106.040 0-192 85.96-192 192 0 34.632 9.174 67.122 25.216 95.174 73.5-107.38 186.822-185.342 318.704-212.578z","M512 576v-256h-64v320h256v-64z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"tags":["alarm","time","clock"],"grid":16},"attrs":[{},{}],"properties":{"order":2,"id":1,"prevSize":24,"code":59716,"name":"timeout"},"setIdx":1,"setId":1,"iconIdx":62},{"icon":{"paths":["M768 64c105.87 0 192 86.13 192 192v192h-128v-192c0-35.29-28.71-64-64-64h-128c-35.29 0-64 28.71-64 64v192h16c26.4 0 48 21.6 48 48v480c0 26.4-21.6 48-48 48h-544c-26.4 0-48-21.6-48-48v-480c0-26.4 21.6-48 48-48h400v-192c0-105.87 86.13-192 192-192h128z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["unlocked","lock-open"],"grid":16},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":24,"code":59699,"name":"unlocked"},"setIdx":1,"setId":1,"iconIdx":63},{"icon":{"paths":["M409.6 204.8h-153.6c-28.314 0-51.2 22.886-51.2 51.2v153.6c0 28.262 22.886 51.2 51.2 51.2h153.6c28.314 0 51.2-22.938 51.2-51.2v-153.6c0-28.262-22.886-51.2-51.2-51.2zM768 204.8h-153.6c-28.314 0-51.2 22.886-51.2 51.2v153.6c0 28.262 22.886 51.2 51.2 51.2h153.6c28.314 0 51.2-22.938 51.2-51.2v-153.6c0-28.262-22.886-51.2-51.2-51.2zM409.6 563.2h-153.6c-28.314 0-51.2 22.886-51.2 51.2v153.6c0 28.262 22.886 51.2 51.2 51.2h153.6c28.314 0 51.2-22.938 51.2-51.2v-153.6c0-28.262-22.886-51.2-51.2-51.2zM768 563.2h-153.6c-28.314 0-51.2 22.886-51.2 51.2v153.6c0 28.262 22.886 51.2 51.2 51.2h153.6c28.314 0 51.2-22.938 51.2-51.2v-153.6c0-28.262-22.886-51.2-51.2-51.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["grid"],"grid":20},"attrs":[{}],"properties":{"order":1,"id":1,"prevSize":20,"code":59730,"name":"grid1"},"setIdx":1,"setId":1,"iconIdx":64},{"icon":{"paths":["M737.28 460.8h-296.96c-28.262 0-30.72 22.886-30.72 51.2s2.458 51.2 30.72 51.2h296.96c28.262 0 30.72-22.886 30.72-51.2s-2.458-51.2-30.72-51.2zM839.68 716.8h-399.36c-28.262 0-30.72 22.886-30.72 51.2s2.458 51.2 30.72 51.2h399.36c28.262 0 30.72-22.886 30.72-51.2s-2.458-51.2-30.72-51.2zM440.32 307.2h399.36c28.262 0 30.72-22.886 30.72-51.2s-2.458-51.2-30.72-51.2h-399.36c-28.262 0-30.72 22.886-30.72 51.2s2.458 51.2 30.72 51.2zM276.48 460.8h-92.16c-28.262 0-30.72 22.886-30.72 51.2s2.458 51.2 30.72 51.2h92.16c28.262 0 30.72-22.886 30.72-51.2s-2.458-51.2-30.72-51.2zM276.48 716.8h-92.16c-28.262 0-30.72 22.886-30.72 51.2s2.458 51.2 30.72 51.2h92.16c28.262 0 30.72-22.886 30.72-51.2s-2.458-51.2-30.72-51.2zM276.48 204.8h-92.16c-28.262 0-30.72 22.886-30.72 51.2s2.458 51.2 30.72 51.2h92.16c28.262 0 30.72-22.886 30.72-51.2s-2.458-51.2-30.72-51.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["list"],"grid":20},"attrs":[{}],"properties":{"order":1,"id":0,"name":"list","prevSize":20,"code":59726},"setIdx":1,"setId":1,"iconIdx":65},{"icon":{"paths":["M636.518 0c68.608 0 102.912 46.694 102.912 100.198 0 66.816-59.597 128.614-137.165 128.614-64.973 0-102.861-38.4-101.069-101.888 0-53.402 45.107-126.925 135.322-126.925zM425.421 1024c-54.17 0-93.85-33.382-55.962-180.429l62.157-260.71c10.803-41.677 12.595-58.419 0-58.419-16.23 0-86.477 28.774-128.102 57.19l-27.034-45.056c131.686-111.923 283.187-177.51 348.211-177.51 54.118 0 63.13 65.178 36.096 165.376l-71.219 274.022c-12.595 48.384-7.219 65.075 5.427 65.075 16.23 0 69.478-20.070 121.805-61.798l30.72 41.677c-128.102 130.406-268.032 180.582-322.099 180.582z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["info"],"grid":20},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":20,"code":59708,"name":"info"},"setIdx":1,"setId":1,"iconIdx":66},{"icon":{"paths":["M832 416h-320v64h-64v-96h384v-192h-32v96c0 17.664-14.336 32-32 32h-576c-17.696 0-32-14.336-32-32v-128c0-17.696 14.304-32 32-32h576c17.664 0 32 14.304 32 32h64v256h-32zM736 160h-512v32h512v-32zM544 832c0 35.328-28.672 64-64 64s-64-28.672-64-64v-320h128v320zM480 786.656c-17.696 0-32 14.336-32 32 0 17.696 14.304 32 32 32 17.664 0 32-14.304 32-32 0-17.664-14.336-32-32-32z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["paint","tool"],"grid":32},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":32,"code":59725,"name":"control-Color"},"setIdx":1,"setId":1,"iconIdx":67},{"icon":{"paths":["M1328 320c-8.832 0-16 7.168-16 16v640c0 8.832-7.168 16-16 16h-1248c-8.832 0-16-7.168-16-16v-640c0-8.832-7.168-16-16-16s-16 7.168-16 16v640c0 26.464 21.536 48 48 48h1248c26.464 0 48-21.536 48-48v-640c0-8.832-7.168-16-16-16zM1296 0h-1248c-26.464 0-48 21.536-48 48v192c0 8.832 7.168 16 16 16h1312c8.832 0 16-7.168 16-16v-192c0-26.464-21.536-48-48-48zM1312 224h-1280v-176c0-8.832 7.168-16 16-16h1248c8.832 0 16 7.168 16 16v176zM560 896c8.832 0 16-7.168 16-16v-512c0-8.832-7.168-16-16-16h-416c-8.832 0-16 7.168-16 16v512c0 8.832 7.168 16 16 16h416zM160 384h384v480h-384v-480zM720 480h480c8.832 0 16-7.168 16-16s-7.168-16-16-16h-480c-8.832 0-16 7.168-16 16s7.168 16 16 16zM720 640h480c8.832 0 16-7.168 16-16s-7.168-16-16-16h-480c-8.832 0-16 7.168-16 16s7.168 16 16 16zM720 800h480c8.832 0 16-7.168 16-16s-7.168-16-16-16h-480c-8.832 0-16 7.168-16 16s7.168 16 16 16zM96 128c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM224 128c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM352 128c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32z"],"attrs":[{}],"width":1344,"isMulticolor":false,"isMulticolor2":false,"tags":["browser","window","software","program"],"grid":32},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":32,"code":59701,"name":"browser"},"setIdx":1,"setId":1,"iconIdx":68},{"icon":{"paths":["M927.936 272.992l-68.288-68.288c-12.608-12.576-32.96-12.576-45.536 0l-409.44 409.44-194.752-196.16c-12.576-12.576-32.928-12.576-45.536 0l-68.288 68.288c-12.576 12.608-12.576 32.96 0 45.536l285.568 287.488c12.576 12.576 32.96 12.576 45.536 0l500.736-500.768c12.576-12.544 12.576-32.96 0-45.536z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["checkmark","tick","approve","submit"],"grid":32},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":32,"code":59714,"name":"checkmark"},"setIdx":1,"setId":1,"iconIdx":69},{"icon":{"paths":["M1020.192 401.824c-8.864-25.568-31.616-44.288-59.008-48.352l-266.432-39.616-115.808-240.448c-12.192-25.248-38.272-41.408-66.944-41.408s-54.752 16.16-66.944 41.408l-115.808 240.448-266.464 39.616c-27.36 4.064-50.112 22.784-58.944 48.352-8.8 25.632-2.144 53.856 17.184 73.12l195.264 194.944-45.28 270.432c-4.608 27.232 7.2 54.56 30.336 70.496 12.704 8.736 27.648 13.184 42.592 13.184 12.288 0 24.608-3.008 35.776-8.992l232.288-125.056 232.32 125.056c11.168 5.984 23.488 8.992 35.744 8.992 14.944 0 29.888-4.448 42.624-13.184 23.136-15.936 34.88-43.264 30.304-70.496l-45.312-270.432 195.328-194.944c19.296-19.296 25.92-47.52 17.184-73.12zM754.816 619.616c-16.384 16.32-23.808 39.328-20.064 61.888l45.312 270.432-232.32-124.992c-11.136-6.016-23.424-8.992-35.776-8.992-12.288 0-24.608 3.008-35.744 8.992l-232.32 124.992 45.312-270.432c3.776-22.56-3.648-45.568-20.032-61.888l-195.264-194.944 266.432-39.68c24.352-3.616 45.312-18.848 55.776-40.576l115.872-240.384 115.84 240.416c10.496 21.728 31.424 36.928 55.744 40.576l266.496 39.68-195.264 194.912z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["star","favorite"],"grid":32},"attrs":[{}],"properties":{"order":1,"id":0,"prevSize":32,"code":59706,"name":"control-Stars"},"setIdx":1,"setId":1,"iconIdx":70},{"icon":{"paths":["M66.337 575.491l276.668-171.531v-57.177l-331.627 207.614v42.189l331.627 207.614-0-57.177z","M957.663 575.49l-276.668-171.531v-57.177l331.627 207.614v42.189l-331.627 207.614 0-57.177z","M583.295 214.183l-200.825 621.623 53.007 17.527 200.837-621.623z"],"attrs":[{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["prerender"]},"attrs":[{},{},{}],"properties":{"order":114,"id":1,"name":"prerender","prevSize":32,"code":59724},"setIdx":1,"setId":1,"iconIdx":71},{"icon":{"paths":["M1024 512c0 282.77-229.23 512-512 512s-512-229.23-512-512c0-282.77 229.23-512 512-512s512 229.23 512 512z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["circle"]},"attrs":[{}],"properties":{"order":106,"id":0,"name":"circle","prevSize":32,"code":59729},"setIdx":1,"setId":1,"iconIdx":72},{"icon":{"paths":["M512 0c-15.36 0-25.6 10.24-25.6 25.6s10.24 25.6 25.6 25.6h128v870.4h-128c-15.36 0-25.6 10.24-25.6 25.6s10.24 25.6 25.6 25.6h307.2c15.36 0 25.6-10.24 25.6-25.6s-10.24-25.6-25.6-25.6h-128v-870.4h128c15.36 0 25.6-10.24 25.6-25.6s-10.24-25.6-25.6-25.6h-307.2zM51.2 204.8c-28.16 0-51.2 23.040-51.2 51.2v460.8c0 28.16 23.040 51.2 51.2 51.2h537.6v-51.2h-512c-15.36 0-25.6-10.24-25.6-25.6v-409.6c0-15.36 10.24-25.6 25.6-25.6h512v-51.2h-537.6zM742.4 204.8v51.2h204.8c15.36 0 25.6 10.24 25.6 25.6v409.6c0 15.36-10.24 25.6-25.6 25.6h-204.8v51.2h230.4c28.16 0 51.2-23.040 51.2-51.2v-460.8c0-28.16-23.040-51.2-51.2-51.2h-230.4z","M386.56 606.72c0 12.8-7.68 23.040-20.48 25.6-28.16 10.24-58.88 15.36-92.16 15.36-35.84 0-66.56-10.24-84.48-25.6s-25.6-38.4-25.6-66.56 10.24-51.2 25.6-66.56c17.92-17.92 46.080-23.040 84.48-23.040h69.12v-38.4c0-35.84-25.6-53.76-64-53.76-23.040 0-46.080 7.68-69.12 20.48-2.56 2.56-5.12 2.56-10.24 2.56-10.24 0-20.48-7.68-20.48-20.48 0-7.68 2.56-12.8 10.24-17.92 30.72-20.48 61.44-25.6 92.16-25.6 56.32 0 104.96 30.72 104.96 92.16v181.76zM345.6 501.76h-69.12c-61.44 0-69.12 28.16-69.12 53.76s7.68 56.32 69.12 56.32c23.040 0 46.080-2.56 69.12-10.24v-99.84z"],"attrs":[{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-Slug"]},"attrs":[{},{}],"properties":{"order":103,"id":0,"name":"control-Slug","prevSize":32,"code":59727},"setIdx":1,"setId":1,"iconIdx":73},{"icon":{"paths":["M295.954 822.751h-94.705c-47.353 0-88.786-41.434-88.786-88.786v-491.283c0-47.353 41.434-88.786 88.786-88.786h94.705v-59.191h-94.705c-82.867 0-147.977 65.11-147.977 147.977v491.283c0 82.867 65.11 147.977 147.977 147.977h94.705v-59.191z","M970.728 473.526c-82.867-171.653-201.249-378.821-272.277-378.821h-112.462v59.191h112.462c35.514 11.838 136.139 177.572 213.087 337.387-76.948 153.896-177.572 325.549-213.087 337.387h-112.462v59.191h112.462c71.029 0 183.491-207.168 272.277-384.74l5.919-11.838-5.919-17.757z","M266.358 337.341v260.462h59.191v-260.462z","M479.422 337.341v260.462h59.191v-260.462z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["Tags"]},"attrs":[{},{},{},{}],"properties":{"order":98,"id":0,"name":"type-Tags","prevSize":32,"code":59722},"setIdx":1,"setId":1,"iconIdx":74},{"icon":{"paths":["M512 102.4c-200.4 0-366.954 144.072-402.4 334.2-0.031 0.165-0.069 0.335-0.1 0.5-2.974 16.061-4.76 32.441-5.8 49.1-0.017 0.271-0.084 0.529-0.1 0.8 0.019 0.004 0.080-0.004 0.1 0-0.503 8.31-1.3 16.564-1.3 25 0 226.202 183.398 409.6 409.6 409.6 208.165 0 379.707-155.44 405.8-356.5 0.004-0.033-0.004-0.067 0-0.1 1.94-14.978 3.124-30.16 3.4-45.6 0.044-2.487 0.4-4.903 0.4-7.4 0-226.202-183.398-409.6-409.6-409.6zM512 153.6c185.461 0 337.902 140.924 356.4 321.5-35.181-21.812-84.232-39.9-151.6-39.9-85.35 0-140.891 41.606-194.6 81.9-49.152 36.864-95.55 71.7-163.8 71.7-86.067 0-135.862-54.67-175.9-98.6-9.001-9.901-17.11-17.483-25.4-25.3 23.131-175.603 172.981-311.3 354.9-311.3zM716.8 486.4c77.828 0 125.173 28.221 152.2 52.8-13.96 185.173-168.254 331.2-357 331.2-190.097 0-345.175-148.14-357.2-335.2 41.826 45.372 102.577 104.8 203.6 104.8 85.35 0 140.891-41.606 194.6-81.9 49.152-36.915 95.55-71.7 163.8-71.7z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["activity"]},"attrs":[{}],"properties":{"order":12,"id":36,"name":"activity, history, time","prevSize":32,"code":59652},"setIdx":1,"setId":1,"iconIdx":75},{"icon":{"paths":["M512 0c-35.392 0-64 28.608-64 64v384h-384c-35.392 0-64 28.608-64 64s28.608 64 64 64h384v384c0 35.392 28.608 64 64 64s64-28.608 64-64v-384h384c35.392 0 64-28.608 64-64s-28.608-64-64-64h-384v-384c0-35.392-28.608-64-64-64z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["add"]},"attrs":[{}],"properties":{"order":13,"id":35,"name":"add, plus","prevSize":32,"code":59653},"setIdx":1,"setId":1,"iconIdx":76},{"icon":{"paths":["M512 102.4c-226.202 0-409.6 183.398-409.6 409.6s183.398 409.6 409.6 409.6c226.202 0 409.6-183.398 409.6-409.6s-183.398-409.6-409.6-409.6zM512 153.6c197.632 0 358.4 160.819 358.4 358.4s-160.768 358.4-358.4 358.4c-197.632 0-358.4-160.819-358.4-358.4s160.768-358.4 358.4-358.4zM691.9 333c-12.893 0.002-25.782 4.882-35.5 14.6l-222.2 221.9-67.7-67.5c-19.19-19.294-51.085-19.215-70.3 0-19.15 19.15-19.15 51.050 0 70.2 0.198 0.2 26.198 26.681 52 53 12.95 13.209 25.761 26.372 35.2 36 4.719 4.814 8.607 8.755 11.2 11.4 1.296 1.322 2.293 2.281 2.9 2.9 0.279 0.282 0.488 0.486 0.6 0.6 0.001 0.001 7.591-7.429 14.6-14.3l-14.5 14.4 0.2 0.2v0.1c19.43 19.327 51.57 19.327 71 0v-0.1l258.1-257.6c19.546-19.447 19.521-51.885-0.1-71.3-9.731-9.679-22.607-14.502-35.5-14.5z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["check-circle"]},"attrs":[{}],"properties":{"order":14,"id":34,"name":"check-circle","prevSize":32,"code":59654},"setIdx":1,"setId":1,"iconIdx":77},{"icon":{"paths":["M512 1024c-282.778 0-512-229.222-512-512s229.222-512 512-512 512 229.222 512 512-229.222 512-512 512zM855.808 270.592c-19.2-19.2-50.278-19.2-69.478 0l-376.73 376.73-171.878-171.93c-19.2-19.2-50.278-19.2-69.478 0s-19.2 50.278 0 69.478c0 0 201.523 205.261 204.8 208.486 9.984 10.138 23.347 14.643 36.557 14.080 13.21 0.563 26.573-3.942 36.608-14.029 3.277-3.226 409.6-413.286 409.6-413.286 19.2-19.2 19.2-50.33 0-69.53z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["check-circle-filled"]},"attrs":[{}],"properties":{"order":27,"id":33,"name":"check-circle-filled","prevSize":32,"code":59655},"setIdx":1,"setId":1,"iconIdx":78},{"icon":{"paths":["M601.024 512l276.736 276.736c24.512 24.576 24.512 64.384 0 89.024-24.64 24.576-64.384 24.576-89.024 0l-276.736-276.736-276.736 276.736c-24.512 24.576-64.384 24.576-89.024 0-24.512-24.64-24.512-64.448 0-89.024l276.736-276.736-276.736-276.736c-24.512-24.576-24.512-64.384 0-89.024 24.64-24.576 64.512-24.576 89.024 0l276.736 276.736 276.736-276.736c24.64-24.576 64.384-24.576 89.024 0 24.512 24.64 24.512 64.448 0 89.024l-276.736 276.736z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["close"]},"attrs":[{}],"properties":{"order":28,"id":32,"name":"close","prevSize":32,"code":59656},"setIdx":1,"setId":1,"iconIdx":79},{"icon":{"paths":["M409.6 435.2h-153.6v51.2h153.6v-51.2zM409.6 332.8h-153.6v51.2h153.6v-51.2zM256 691.2h409.6v-51.2h-409.6v51.2zM409.6 230.4h-153.6v51.2h153.6v-51.2zM870.4 179.2h-51.2v-51.2c0-28.262-22.938-51.2-51.2-51.2h-614.4c-28.262 0-51.2 22.938-51.2 51.2v665.6c0 28.262 22.938 51.2 51.2 51.2h51.2v51.2c0 28.262 22.938 51.2 51.2 51.2h614.4c28.262 0 51.2-22.938 51.2-51.2v-665.6c0-28.262-22.938-51.2-51.2-51.2zM179.2 793.6c-14.157 0-25.6-11.443-25.6-25.6v-614.4c0-14.131 11.443-25.6 25.6-25.6h563.2c14.157 0 25.6 11.469 25.6 25.6v614.4c0 14.157-11.443 25.6-25.6 25.6h-563.2zM870.4 870.4c0 14.157-11.443 25.6-25.6 25.6h-563.2c-14.157 0-25.6-11.443-25.6-25.6v-25.6h512c28.262 0 51.2-22.938 51.2-51.2v-563.2h25.6c14.157 0 25.6 11.469 25.6 25.6v614.4zM614.4 230.4h-102.4c-28.262 0-51.2 22.938-51.2 51.2v153.6c0 28.262 22.938 51.2 51.2 51.2h102.4c28.262 0 51.2-22.938 51.2-51.2v-153.6c0-28.262-22.938-51.2-51.2-51.2zM614.4 435.2h-102.4v-153.6h102.4v153.6zM256 588.8h409.6v-51.2h-409.6v51.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["content"]},"attrs":[{}],"properties":{"order":37,"id":31,"name":"type-References","prevSize":32,"code":59657},"setIdx":1,"setId":1,"iconIdx":80},{"icon":{"paths":["M793.6 844.8c0 14.157-11.443 25.6-25.6 25.6h-665.6c-14.131 0-25.6-11.443-25.6-25.6v-665.6c0-14.157 11.469-25.6 25.6-25.6h665.6c14.157 0 25.6 11.443 25.6 25.6v102.4h51.2v-128c0-28.262-22.938-51.2-51.2-51.2h-716.8c-28.262 0-51.2 22.938-51.2 51.2v716.8c0 28.262 22.938 51.2 51.2 51.2h716.8c28.262 0 51.2-22.938 51.2-51.2v-281.6h-51.2v256zM991.078 237.747c-9.958-9.958-26.035-9.958-35.968 0l-391.91 391.91-238.31-238.31c-9.958-9.958-26.061-9.958-35.942 0-9.958 9.907-9.958 26.010 0 35.942l254.874 254.874c0.461 0.538 0.614 1.203 1.126 1.69 5.043 5.018 11.674 7.475 18.278 7.373 6.605 0.102 13.235-2.355 18.278-7.373 0.512-0.512 0.666-1.178 1.126-1.69l408.448-408.474c9.933-9.933 9.933-26.035 0-35.942z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-checkbox"]},"attrs":[{}],"properties":{"order":38,"id":30,"name":"control-Checkbox","prevSize":32,"code":59658},"setIdx":1,"setId":1,"iconIdx":81},{"icon":{"paths":["M51.2 0c-28.262 0-51.2 22.938-51.2 51.2v281.6c0 28.262 22.938 51.2 51.2 51.2h921.6c28.262 0 51.2-22.938 51.2-51.2v-281.6c0-28.262-22.938-51.2-51.2-51.2h-921.6zM76.8 51.2h512v281.6h-512c-14.157 0-25.6-11.443-25.6-25.6v-230.4c0-14.157 11.443-25.6 25.6-25.6zM640 51.2h307.2c14.157 0 25.6 11.443 25.6 25.6v230.4c0 14.157-11.443 25.6-25.6 25.6h-307.2v-281.6zM716.8 153.6c-0.41 0.358 89.139 102.938 89.6 102.4 0.512 0 89.6-95.36 89.6-102.4 0 0.384-172.16 0-179.2 0zM128 435.2c-42.394 0-76.8 34.406-76.8 76.8s34.406 76.8 76.8 76.8c42.394 0 76.8-34.406 76.8-76.8s-34.406-76.8-76.8-76.8zM128 486.4c14.157 0 25.6 11.443 25.6 25.6s-11.443 25.6-25.6 25.6c-14.157 0-25.6-11.443-25.6-25.6s11.443-25.6 25.6-25.6zM307.2 486.4c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h640c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-640zM128 640c-42.394 0-76.8 34.381-76.8 76.8s34.406 76.8 76.8 76.8c42.394 0 76.8-34.381 76.8-76.8s-34.406-76.8-76.8-76.8zM128 691.2c14.157 0 25.6 11.443 25.6 25.6s-11.443 25.6-25.6 25.6c-14.157 0-25.6-11.443-25.6-25.6s11.443-25.6 25.6-25.6zM307.2 691.2c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h640c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-640zM128 844.8c-42.394 0-76.8 34.381-76.8 76.8s34.406 76.8 76.8 76.8c42.394 0 76.8-34.381 76.8-76.8s-34.406-76.8-76.8-76.8zM128 896c14.157 0 25.6 11.443 25.6 25.6s-11.443 25.6-25.6 25.6c-14.157 0-25.6-11.443-25.6-25.6s11.443-25.6 25.6-25.6zM307.2 896c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h640c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-640z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-dropdown"]},"attrs":[{}],"properties":{"order":39,"id":29,"name":"control-Dropdown","prevSize":32,"code":59659},"setIdx":1,"setId":1,"iconIdx":82},{"icon":{"paths":["M512 0c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h128v870.4h-128c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h307.2c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-128v-870.4h128c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-307.2zM51.2 204.8c-28.262 0-51.2 22.938-51.2 51.2v460.8c0 28.262 22.938 51.2 51.2 51.2h537.6v-51.2h-512c-14.131 0-25.6-11.443-25.6-25.6v-409.6c0-14.157 11.469-25.6 25.6-25.6h512v-51.2h-537.6zM742.4 204.8v51.2h204.8c14.157 0 25.6 11.443 25.6 25.6v409.6c0 14.157-11.443 25.6-25.6 25.6h-204.8v51.2h230.4c28.262 0 51.2-22.938 51.2-51.2v-460.8c0-28.262-22.938-51.2-51.2-51.2h-230.4zM285.9 307c-0.589 0.051-1.161 0.048-1.75 0.15-8.243 0.051-16.396 4.474-20.85 13.050l-132.55 306.25c-6.656 12.749-2.866 28.981 8.5 36.2 11.341 7.219 25.97 2.749 32.6-10l27.65-63.85h170.5c0.512 0 0.914-0.224 1.4-0.25l27.45 64.050c6.63 12.749 21.136 17.269 32.4 10.050s15.005-23.451 8.4-36.2l-131.3-306.25c-4.454-8.576-12.432-12.973-20.65-13.050-0.614-0.102-1.211-0.099-1.8-0.15zM285.9 389.15l63.65 148.45h-127.9l64.25-148.45z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-input"]},"attrs":[{}],"properties":{"order":41,"id":28,"name":"control-Input","prevSize":32,"code":59660},"setIdx":1,"setId":1,"iconIdx":83},{"icon":{"paths":["M153.6 716.8c-84.787 0-153.6 68.813-153.6 153.6s68.813 153.6 153.6 153.6c84.787 0 153.6-68.813 153.6-153.6s-68.813-153.6-153.6-153.6zM153.6 972.8c-56.55 0-102.4-45.85-102.4-102.4s45.85-102.4 102.4-102.4c56.55 0 102.4 45.85 102.4 102.4s-45.85 102.4-102.4 102.4zM384 179.2h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6zM998.4 486.4h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6zM153.6 0c-84.787 0-153.6 68.787-153.6 153.6s68.813 153.6 153.6 153.6c84.787 0 153.6-68.787 153.6-153.6s-68.813-153.6-153.6-153.6zM153.6 256c-56.55 0-102.4-45.85-102.4-102.4s45.85-102.4 102.4-102.4c56.55 0 102.4 45.85 102.4 102.4s-45.85 102.4-102.4 102.4zM153.6 358.4c-84.787 0-153.6 68.787-153.6 153.6 0 84.787 68.813 153.6 153.6 153.6s153.6-68.813 153.6-153.6c0-84.813-68.813-153.6-153.6-153.6zM153.6 614.4c-56.55 0-102.4-45.85-102.4-102.4s45.85-102.4 102.4-102.4c56.55 0 102.4 45.85 102.4 102.4s-45.85 102.4-102.4 102.4zM153.6 102.4c-28.262 0-51.2 22.938-51.2 51.2s22.938 51.2 51.2 51.2c28.262 0 51.2-22.938 51.2-51.2s-22.938-51.2-51.2-51.2zM998.4 844.8h-614.4c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6h614.4c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-radio"]},"attrs":[{}],"properties":{"order":42,"id":27,"name":"control-Radio","prevSize":32,"code":59661},"setIdx":1,"setId":1,"iconIdx":84},{"icon":{"paths":["M0 0v204.8h76.8v76.8h51.2v-76.8h76.8v-204.8h-204.8zM819.2 0v204.8h204.8v-204.8h-204.8zM51.2 51.2h102.4v102.4h-102.4v-102.4zM870.4 51.2h102.4v102.4h-102.4v-102.4zM281.6 76.8v51.2h102.4v-51.2h-102.4zM486.4 76.8v51.2h102.4v-51.2h-102.4zM691.2 76.8v51.2h102.4v-51.2h-102.4zM333.25 204.8c-7.091-0.307-14.348 2.097-19.75 7.55l-74.75 74.75c-10.317 10.291-10.317 27.083 0 37.4s27.059 10.317 37.35 0l68.45-68.5h141.85v486.4h-50.7c-7.117-0.307-14.348 2.097-19.75 7.55l-23.6 23.55c-10.317 10.317-10.317 27.083 0 37.4 10.291 10.317 27.109 10.317 37.4 0l17.25-17.3h129.75l18.050 18c10.394 10.368 27.181 10.368 37.6 0 10.368-10.394 10.368-27.181 0-37.6l-24-24c-5.478-5.478-12.682-7.907-19.85-7.6h-50.95v-486.4h141.55l69.25 69.2c10.394 10.368 27.155 10.368 37.6 0 10.368-10.368 10.368-27.181 0-37.6l-75.2-75.2c-5.478-5.478-12.706-7.907-19.9-7.6h-357.65zM896 281.6v102.4h51.2v-102.4h-51.2zM76.8 384v102.4h51.2v-102.4h-51.2zM896 486.4v102.4h51.2v-102.4h-51.2zM76.8 588.8v102.4h51.2v-102.4h-51.2zM896 691.2v102.4h51.2v-102.4h-51.2zM76.8 793.6v25.6h-76.8v204.8h204.8v-76.8h76.8v-51.2h-76.8v-76.8h-76.8v-25.6h-51.2zM819.2 819.2v76.8h-25.6v51.2h25.6v76.8h204.8v-204.8h-204.8zM51.2 870.4h102.4v102.4h-102.4v-102.4zM870.4 870.4h102.4v102.4h-102.4v-102.4zM384 896v51.2h102.4v-51.2h-102.4zM588.8 896v51.2h102.4v-51.2h-102.4z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-textarea"]},"attrs":[{}],"properties":{"order":17,"id":26,"name":"control-TextArea","prevSize":32,"code":59662},"setIdx":1,"setId":1,"iconIdx":85},{"icon":{"paths":["M332.8 25.6c-127.258 0-230.4 103.142-230.4 230.4s103.142 230.4 230.4 230.4h358.4c127.258 0 230.4-103.142 230.4-230.4s-103.142-230.4-230.4-230.4h-358.4zM332.8 76.8h358.4c98.97 0 179.2 80.23 179.2 179.2s-80.23 179.2-179.2 179.2h-358.4c-98.97 0-179.2-80.23-179.2-179.2s80.23-179.2 179.2-179.2zM332.8 128c-70.707 0-128 57.293-128 128s57.293 128 128 128c70.707 0 128-57.293 128-128s-57.293-128-128-128zM332.8 179.2c42.419 0 76.8 34.381 76.8 76.8s-34.381 76.8-76.8 76.8c-42.419 0-76.8-34.381-76.8-76.8s34.381-76.8 76.8-76.8zM332.8 537.6c-127.258 0-230.4 103.142-230.4 230.4s103.142 230.4 230.4 230.4h358.4c127.258 0 230.4-103.142 230.4-230.4s-103.142-230.4-230.4-230.4h-358.4zM332.8 588.8h358.4c98.97 0 179.2 80.23 179.2 179.2s-80.23 179.2-179.2 179.2h-358.4c-98.97 0-179.2-80.23-179.2-179.2s80.23-179.2 179.2-179.2zM691.2 640c-70.707 0-128 57.293-128 128s57.293 128 128 128c70.707 0 128-57.293 128-128s-57.293-128-128-128zM691.2 691.2c42.419 0 76.8 34.381 76.8 76.8s-34.381 76.8-76.8 76.8c-42.419 0-76.8-34.381-76.8-76.8s34.381-76.8 76.8-76.8z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["control-toggle"]},"attrs":[{}],"properties":{"order":16,"id":25,"name":"control-Toggle","prevSize":32,"code":59663},"setIdx":1,"setId":1,"iconIdx":86},{"icon":{"paths":["M204.8 51.2c-56.525 0-102.4 45.875-102.4 102.4v512c0 56.525 45.875 102.4 102.4 102.4h409.6c56.525 0 102.4-45.875 102.4-102.4v-512c0-56.525-45.875-102.4-102.4-102.4h-409.6zM204.8 102.4h409.6c28.262 0 51.2 22.886 51.2 51.2v512c0 28.314-22.938 51.2-51.2 51.2h-409.6c-28.262 0-51.2-22.886-51.2-51.2v-512c0-28.314 22.938-51.2 51.2-51.2zM768 204.8v51.2c28.262 0 51.2 22.886 51.2 51.2v512c0 28.314-22.938 51.2-51.2 51.2h-409.6c-28.262 0-51.2-22.886-51.2-51.2h-51.2c0 56.525 45.875 102.4 102.4 102.4h409.6c56.525 0 102.4-45.875 102.4-102.4v-512c0-56.525-45.875-102.4-102.4-102.4z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["copy"]},"attrs":[{}],"properties":{"order":90,"id":24,"name":"copy","prevSize":32,"code":59664},"setIdx":1,"setId":1,"iconIdx":87},{"icon":{"paths":["M828.8 1024h-633.6c-105.6 0-195.2-89.6-195.2-195.2v-320c0-281.6 227.2-508.8 505.6-508.8 288 0 518.4 230.4 518.4 518.4v310.4c0 105.6-89.6 195.2-195.2 195.2zM505.6 64c-243.2 0-441.6 198.4-441.6 441.6v320c0 73.6 60.8 134.4 131.2 134.4h630.4c73.6 0 131.2-60.8 131.2-131.2v-310.4c3.2-249.6-201.6-454.4-451.2-454.4z","M512 668.8c-3.2 0-6.4 0-6.4 0-32-3.2-64-19.2-80-48l-192-278.4c-9.6-9.6-9.6-25.6-0-38.4 9.6-9.6 25.6-12.8 38.4-6.4l294.4 172.8c28.8 16 48 44.8 51.2 76.8s-6.4 64-28.8 89.6c-19.2 22.4-48 32-76.8 32zM364.8 428.8l108.8 160c6.4 9.6 19.2 19.2 32 19.2s25.6-3.2 35.2-12.8c9.6-9.6 12.8-22.4 9.6-35.2s-9.6-22.4-19.2-32l-166.4-99.2z","M678.4 364.8c-6.4 0-12.8-3.2-19.2-6.4-16-9.6-19.2-28.8-9.6-44.8l54.4-83.2c9.6-16 28.8-19.2 44.8-9.6 19.2 12.8 22.4 35.2 12.8 48l-54.4 83.2c-6.4 9.6-16 12.8-28.8 12.8z"],"attrs":[{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["dashboard"]},"attrs":[{},{},{}],"properties":{"order":26,"id":23,"name":"dashboard","prevSize":32,"code":59665},"setIdx":1,"setId":1,"iconIdx":88},{"icon":{"paths":["M597.35 819.2c14.131 0 25.6-11.469 25.6-25.6v-307.2c0-14.080-11.469-25.6-25.6-25.6s-25.6 11.52-25.6 25.6v307.2c0 14.131 11.418 25.6 25.6 25.6zM776.55 204.8h-153.6v-51.2c0-28.314-22.886-51.2-51.2-51.2h-102.4c-28.262 0-51.2 22.886-51.2 51.2v51.2h-153.6c-28.262 0-51.2 22.886-51.2 51.2v102.4c0 28.314 22.938 51.2 51.2 51.2v460.8c0 28.314 22.938 51.2 51.2 51.2h409.6c28.314 0 51.2-22.886 51.2-51.2v-460.8c28.314 0 51.2-22.886 51.2-51.2v-102.4c0-28.314-22.938-51.2-51.2-51.2zM469.35 153.6h102.4v51.2h-102.4v-51.2zM725.35 870.4h-409.6v-460.8h409.6v460.8zM776.55 358.4h-512v-102.4h512v102.4zM443.75 819.2c14.131 0 25.6-11.469 25.6-25.6v-307.2c0-14.080-11.469-25.6-25.6-25.6s-25.6 11.52-25.6 25.6v307.2c0 14.131 11.469 25.6 25.6 25.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["delete"]},"attrs":[{}],"properties":{"order":29,"id":22,"name":"delete, bin","prevSize":32,"code":59666},"setIdx":1,"setId":1,"iconIdx":89},{"icon":{"paths":["M832 128h-192v-64c0-35.392-28.608-64-64-64h-128c-35.328 0-64 28.608-64 64v64h-192c-35.328 0-64 28.608-64 64v128c0 35.392 28.672 64 64 64v512c0 35.392 28.672 64 64 64h512c35.392 0 64-28.608 64-64v-512c35.392 0 64-28.608 64-64v-128c0-35.392-28.608-64-64-64zM448 64h128v64h-128v-64zM448 800c0 17.664-14.336 32-32 32s-32-14.336-32-32v-320c0-17.6 14.336-32 32-32s32 14.4 32 32v320zM640 800c0 17.664-14.336 32-32 32s-32-14.336-32-32v-320c0-17.6 14.336-32 32-32s32 14.4 32 32v320zM832 320h-640v-128h640v128z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["delete-filled"]},"attrs":[{}],"properties":{"order":36,"id":21,"name":"delete-filled","prevSize":32,"code":59667},"setIdx":1,"setId":1,"iconIdx":90},{"icon":{"paths":["M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-343.4zM716.8 189.8l117.4 117.4h-117.4v-117.4zM332.8 460.8c-127.232 0-230.4 103.168-230.4 230.4s103.168 230.4 230.4 230.4c127.232 0 230.4-103.168 230.4-230.4s-103.168-230.4-230.4-230.4zM332.8 512c98.816 0 179.2 80.384 179.2 179.2s-80.384 179.2-179.2 179.2c-98.816 0-179.2-80.384-179.2-179.2s80.384-179.2 179.2-179.2zM227.2 665.6c-12.39 0-22.4 10.061-22.4 22.4v6.4c0 12.39 10.010 22.4 22.4 22.4h211.2c12.39 0 22.4-10.010 22.4-22.4v-6.4c0-12.39-10.061-22.4-22.4-22.4h-211.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["document-delete"]},"attrs":[{}],"properties":{"order":35,"id":20,"name":"document-delete","prevSize":32,"code":59668},"setIdx":1,"setId":1,"iconIdx":91},{"icon":{"paths":["M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-343.4zM716.8 189.8l117.4 117.4h-117.4v-117.4zM332.8 460.8c-127.232 0-230.4 103.168-230.4 230.4s103.168 230.4 230.4 230.4c127.232 0 230.4-103.168 230.4-230.4s-103.168-230.4-230.4-230.4zM332.8 512c39.934 0 76.475 13.533 106.3 35.7l-250.4 249c-21.807-29.683-35.1-65.924-35.1-105.5 0-98.816 80.384-179.2 179.2-179.2zM477 585.7c21.785 29.674 35 65.947 35 105.5 0 98.816-80.384 179.2-179.2 179.2-39.906 0-76.386-13.561-106.2-35.7l250.4-249z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["document-disable"]},"attrs":[{}],"properties":{"order":40,"id":19,"name":"document-disable","prevSize":32,"code":59669},"setIdx":1,"setId":1,"iconIdx":92},{"icon":{"paths":["M358.4 102.4c-28.314 0-51.2 22.886-51.2 51.2v256h51.2v-256h307.2v153.6c0 28.314 22.886 51.2 51.2 51.2h153.6v512h-358.4v51.2h358.4c28.314 0 51.2-22.886 51.2-51.2v-548.2l-219.8-219.8h-343.4zM716.8 189.8l117.4 117.4h-117.4v-117.4zM332.8 460.8l-230.4 256v51.2h102.4v153.6h256v-153.6h102.4v-51.2l-230.4-256zM332.8 537.3l161.5 179.5h-84.7v153.6h-153.6v-153.6h-84.7l161.5-179.5z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["document-publish"]},"attrs":[{}],"properties":{"order":44,"id":18,"name":"document-publish","prevSize":32,"code":59670},"setIdx":1,"setId":1,"iconIdx":93},{"icon":{"paths":["M665.6 51.2v102.4h102.4v-102.4h-102.4zM460.8 153.6h102.4v-102.4h-102.4v102.4zM460.8 358.4h102.4v-102.4h-102.4v102.4zM665.6 358.4h102.4v-102.4h-102.4v102.4zM665.6 563.2h102.4v-102.4h-102.4v102.4zM460.8 563.2h102.4v-102.4h-102.4v102.4zM460.8 768h102.4v-102.4h-102.4v102.4zM665.6 768h102.4v-102.4h-102.4v102.4zM665.6 972.8h102.4v-102.4h-102.4v102.4zM460.8 972.8h102.4v-102.4h-102.4v102.4zM256 153.6h102.4v-102.4h-102.4v102.4zM256 358.4h102.4v-102.4h-102.4v102.4zM256 563.2h102.4v-102.4h-102.4v102.4zM256 768h102.4v-102.4h-102.4v102.4zM256 972.8h102.4v-102.4h-102.4v102.4z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["drag"]},"attrs":[{}],"properties":{"order":43,"id":17,"name":"drag","prevSize":32,"code":59671},"setIdx":1,"setId":1,"iconIdx":94},{"icon":{"paths":["M921.6 281.958c0-70.707-171.878-128.154-384-128.154s-384 57.19-384 127.898c0 10.035 3.789 19.712 10.342 29.030 0-0.051 296.858 406.067 296.858 406.067v256l153.6-51.2v-204.8c0 0 298.752-408.166 299.725-409.702 0 0 7.475-16.64 7.475-25.139zM537.6 204.8c206.899 0 318.208 53.248 332.083 76.8-13.875 23.552-125.184 76.8-332.083 76.8s-318.208-53.248-332.083-76.8c13.875-23.552 125.184-76.8 332.083-76.8zM869.376 345.856v0 0zM573.030 686.592c-6.4 8.755-9.83 19.354-9.83 30.208v167.885l-51.2 17.050v-184.934c0-10.854-3.43-21.453-9.83-30.208l-228.147-312.115c68.762 21.709 161.382 35.123 263.578 35.123 102.298 0 195.021-13.414 263.834-35.174-0.102 0.051-0.205 0.051-0.307 0.102l-228.096 312.064z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["filter"]},"attrs":[{}],"properties":{"order":18,"id":16,"name":"filter","prevSize":32,"code":59672},"setIdx":1,"setId":1,"iconIdx":95},{"icon":{"paths":["M512 0c-282.88 0-512 229.248-512 512 0 226.24 146.688 418.112 350.080 485.76 25.6 4.8 35.008-11.008 35.008-24.64 0-12.16-0.448-44.352-0.64-87.040-142.464 30.912-172.48-68.672-172.48-68.672-23.296-59.136-56.96-74.88-56.96-74.88-46.4-31.744 3.584-31.104 3.584-31.104 51.392 3.584 78.4 52.736 78.4 52.736 45.696 78.272 119.872 55.68 149.12 42.56 4.608-33.088 17.792-55.68 32.448-68.48-113.728-12.8-233.216-56.832-233.216-252.992 0-55.872 19.84-101.568 52.672-137.408-5.76-12.928-23.040-64.96 4.48-135.488 0 0 42.88-13.76 140.8 52.48 40.96-11.392 84.48-17.024 128-17.28 43.52 0.256 87.040 5.888 128 17.28 97.28-66.24 140.16-52.48 140.16-52.48 27.52 70.528 10.24 122.56 5.12 135.488 32.64 35.84 52.48 81.536 52.48 137.408 0 196.672-119.68 240-233.6 252.608 17.92 15.36 34.56 46.72 34.56 94.72 0 68.48-0.64 123.52-0.64 140.16 0 13.44 8.96 29.44 35.2 24.32 204.864-67.136 351.424-259.136 351.424-485.056 0-282.752-229.248-512-512-512z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"tags":["brand","github"],"grid":0},"attrs":[{}],"properties":{"order":77,"id":0,"name":"github","prevSize":32,"code":59713},"setIdx":1,"setId":1,"iconIdx":96},{"icon":{"paths":["M512 512h-204.8v51.2h204.8v-51.2zM768 153.6h-51.2c0-28.314-22.886-51.2-51.2-51.2h-307.2c-28.314 0-51.2 22.886-51.2 51.2h-51.2c-28.314 0-51.2 22.886-51.2 51.2v665.6c0 28.314 22.886 51.2 51.2 51.2h512c28.314 0 51.2-22.886 51.2-51.2v-665.6c0-28.314-22.886-51.2-51.2-51.2zM358.4 153.6h307.2v51.2h-307.2v-51.2zM768 819.2c0 28.314-22.886 51.2-51.2 51.2h-409.6c-28.314 0-51.2-22.886-51.2-51.2v-563.2c0-28.314 22.886-51.2 51.2-51.2 0 28.314 22.886 51.2 51.2 51.2h307.2c28.314 0 51.2-22.886 51.2-51.2 28.314 0 51.2 22.886 51.2 51.2v563.2zM307.2 460.8h409.6v-51.2h-409.6v51.2zM307.2 665.6h409.6v-51.2h-409.6v51.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["help"]},"attrs":[{}],"properties":{"order":19,"id":15,"name":"help","prevSize":32,"code":59673},"setIdx":1,"setId":1,"iconIdx":97},{"icon":{"paths":["M512 0c-169.421 0-307.2 137.779-307.2 307.2 0 78.643 15.258 164.915 45.261 256.41 23.859 72.55 56.986 148.582 98.56 226.099 70.707 131.635 140.339 220.774 143.309 224.512 4.813 6.195 12.288 9.779 20.070 9.779 7.834 0 15.258-3.584 20.122-9.779 2.97-3.686 72.602-92.826 143.309-224.512 41.574-77.517 74.701-153.549 98.56-226.099 29.952-91.494 45.21-177.766 45.21-256.41 0-169.421-137.83-307.2-307.2-307.2zM630.682 764.672c-46.234 86.374-92.979 154.982-118.682 190.822-25.6-35.635-72.038-103.885-118.221-189.952-62.874-117.146-137.779-291.738-137.779-458.342 0-141.158 114.842-256 256-256s256 114.842 256 256c0 166.298-74.65 340.582-137.318 457.472zM512 153.6c-84.685 0-153.6 68.915-153.6 153.6s68.915 153.6 153.6 153.6 153.6-68.915 153.6-153.6-68.915-153.6-153.6-153.6zM512 409.6c-56.525 0-102.4-45.875-102.4-102.4 0-56.474 45.875-102.4 102.4-102.4 56.474 0 102.4 45.926 102.4 102.4 0 56.525-45.926 102.4-102.4 102.4z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["location"]},"attrs":[{}],"properties":{"order":25,"id":13,"name":"location, control-Map, type-Geolocation","prevSize":32,"code":59675},"setIdx":1,"setId":1,"iconIdx":98},{"icon":{"paths":["M512.273 83.782c-0.141 0.056-182.959 84.073-229.418 256.782-4.481 16.584 32.696 9.296 31.036 27.527-2.034 22.136-44.668 31.201-39.109 94.764 5.659 64.734 60.321 130.141 68.527 169.673v27.655c-0.497 8.54-4.566 31.715-18.018 43.036-7.378 6.19-17.322 8.421-30.436 6.782-18.205-2.275-25.449-14.468-28.345-24.309-4.753-16.218-0.322-35.123 10.345-44 10.724-8.924 12.17-24.842 3.236-35.564-8.934-10.712-24.858-12.161-35.582-3.218-25.995 21.64-36.887 61.52-26.491 97 9.815 33.392 36.197 55.884 70.6 60.182 4.903 0.609 9.566 0.909 14 0.909 26.623 0 44.661-10.175 55.582-19.455 32.866-27.97 35.449-74.593 35.636-79.818 0.009-0.309 0.018-0.618 0.018-0.927v-21.218h0.109v-1.418c0-12.351 10.008-22.364 22.382-22.364 11.944 0 21.609 9.346 22.273 21.109v202.491c-0.206 2.912-2.536 29.892-17.891 42.945-7.368 6.274-17.384 8.53-30.545 6.873-18.214-2.275-25.476-14.468-28.364-24.291-4.762-16.228-0.322-35.151 10.345-44.018 10.724-8.933 12.188-24.833 3.255-35.564-8.924-10.694-24.876-12.161-35.6-3.218-26.013 21.631-36.887 61.52-26.491 97 9.796 33.392 36.197 55.893 70.6 60.2 4.903 0.609 9.566 0.891 14 0.891 26.623 0 44.671-10.156 55.564-19.436 32.875-27.97 35.458-74.611 35.636-79.836 0.019-0.328 0.018-0.609 0.018-0.909v-225.636l0.127-0.055v-1c0-12.595 10.219-22.8 22.836-22.8 12.349 0 22.333 9.824 22.727 22.073v227.418c0 0.309-0 0.591 0.018 0.909 0.187 5.216 2.779 51.866 35.655 79.836 10.912 9.28 28.959 19.436 55.582 19.436 4.443 0 9.088-0.282 13.982-0.891 34.394-4.307 60.804-26.818 70.6-60.2 10.405-35.48-0.487-75.36-26.491-97-10.743-8.943-26.676-7.466-35.6 3.218-8.934 10.74-7.488 26.63 3.236 35.564 10.668 8.868 15.135 27.79 10.364 44.018-2.878 9.823-10.159 22.015-28.364 24.291-13.105 1.648-23.050-0.592-30.418-6.782-13.508-11.358-17.558-34.657-18.036-43v-201.818c0.297-12.093 10.14-21.818 22.327-21.818 12.374 0 22.4 10.003 22.4 22.364v1.418h0.073v21.218c0 0.318-0 0.628 0.018 0.927 0.178 5.216 2.779 51.848 35.655 79.818 10.912 9.28 28.941 19.455 55.564 19.455 4.434 0 9.107-0.292 14-0.891 34.394-4.298 60.786-26.818 70.582-60.2 10.405-35.48-0.487-75.351-26.491-97-10.743-8.933-26.667-7.476-35.582 3.236-8.943 10.722-7.488 26.622 3.236 35.545 10.668 8.877 15.117 27.8 10.345 44.018-2.878 9.842-10.159 22.025-28.364 24.291-13.086 1.648-23.050-0.583-30.418-6.764-13.508-11.368-17.549-34.675-18.018-43v-21.018c5.305-54.103 63.095-107.777 69.091-176.364 5.531-63.563-37.121-72.627-39.145-94.764-1.669-18.232 35.498-10.944 31.036-27.527-46.468-172.709-229.269-256.726-229.4-256.782z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["logo"]},"attrs":[{}],"properties":{"order":31,"id":12,"name":"logo","prevSize":32,"code":59676},"setIdx":1,"setId":1,"iconIdx":99},{"icon":{"paths":["M947.2 0h-870.4c-42.342 0-76.8 34.458-76.8 76.8v870.4c0 42.342 34.458 76.8 76.8 76.8h870.4c42.342 0 76.8-34.458 76.8-76.8v-870.4c0-42.342-34.458-76.8-76.8-76.8zM972.8 947.2c0 14.157-11.443 25.6-25.6 25.6h-870.4c-14.131 0-25.6-11.443-25.6-25.6v-870.4c0-14.131 11.469-25.6 25.6-25.6h870.4c14.157 0 25.6 11.469 25.6 25.6v870.4zM665.6 460.8c56.448 0 102.4-45.926 102.4-102.4s-45.952-102.4-102.4-102.4c-56.448 0-102.4 45.926-102.4 102.4s45.952 102.4 102.4 102.4zM665.6 307.2c28.211 0 51.2 22.989 51.2 51.2s-22.989 51.2-51.2 51.2c-28.211 0-51.2-22.989-51.2-51.2s22.989-51.2 51.2-51.2zM896 102.4h-768c-14.131 0-25.6 11.469-25.6 25.6v614.4c0 14.157 11.469 25.6 25.6 25.6h768c14.157 0 25.6-11.443 25.6-25.6v-614.4c0-14.131-11.443-25.6-25.6-25.6zM153.6 716.8v-118.246l164.301-184.858c4.198-4.787 9.728-7.373 15.462-7.475 5.734-0.051 11.29 2.458 15.642 7.040l283.238 303.539h-478.643zM870.4 716.8h-168.090l-315.853-338.432c-14.285-15.334-33.331-23.603-53.709-23.347-20.326 0.256-39.219 9.011-53.094 24.627l-126.054 141.798v-367.846h716.8v563.2z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["media"]},"attrs":[{}],"properties":{"order":30,"id":11,"name":"media, type-Assets, trigger-AssetChanged","prevSize":32,"code":59677},"setIdx":1,"setId":1,"iconIdx":100},{"icon":{"paths":["M128 384c-70.656 0-128 57.344-128 128s57.344 128 128 128c70.656 0 128-57.344 128-128s-57.344-128-128-128zM512 384c-70.656 0-128 57.344-128 128s57.344 128 128 128c70.656 0 128-57.344 128-128s-57.344-128-128-128zM896 384c-70.656 0-128 57.344-128 128s57.344 128 128 128c70.656 0 128-57.344 128-128s-57.344-128-128-128z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["more"]},"attrs":[{}],"properties":{"order":34,"id":10,"name":"more, dots","prevSize":32,"code":59678},"setIdx":1,"setId":1,"iconIdx":101},{"icon":{"paths":["M877.12 311.104l-66.304 66.368-228.224-228.224 66.368-66.368c25.216-25.152 66.048-25.152 91.264 0l136.896 137.024c25.216 25.216 25.216 65.984 0 91.2zM760.896 427.392l-386.176 386.112c-25.216 25.28-66.048 25.28-91.264 0l-136.96-136.896c-25.216-25.28-25.216-66.112 0-91.264l386.24-386.24 228.16 228.288zM64 896v-191.872l191.936 191.872h-191.936z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["pencil"]},"attrs":[{}],"properties":{"order":47,"id":9,"name":"pencil","prevSize":32,"code":59679},"setIdx":1,"setId":1,"iconIdx":102},{"icon":{"paths":["M892.083 131.917c-73.523-73.498-193.152-73.498-266.65 0l-157.184 157.107c-9.958 10.035-9.958 26.214 0 36.275 10.061 9.984 26.24 9.984 36.25 0l157.133-157.107c53.504-53.555 140.672-53.555 194.176 0 53.581 53.504 53.581 140.672 0 194.176l-186.138 186.163c-53.53 53.581-140.672 53.581-194.176 0-10.086-10.010-26.24-10.010-36.275 0-10.035 10.086-10.035 26.189 0 36.25 36.787 36.736 84.992 55.117 133.325 55.117s96.589-18.432 133.376-55.117l186.163-186.214c73.498-73.472 73.498-193.152 0-266.65zM519.45 698.726l-157.082 157.082c-53.504 53.555-140.672 53.555-194.176 0-53.581-53.504-53.581-140.672 0-194.176l186.138-186.163c53.53-53.581 140.672-53.581 194.176 0 10.086 9.984 26.189 9.984 36.275 0 10.035-10.086 10.035-26.214 0-36.25-73.549-73.498-193.203-73.498-266.701 0l-186.163 186.163c-73.498 73.574-73.498 193.203 0 266.701 36.787 36.71 85.043 55.117 133.325 55.117 48.333 0 96.538-18.406 133.325-55.117l157.133-157.133c10.010-10.010 10.010-26.189 0-36.224-10.010-9.984-26.189-9.984-36.25 0z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["reference"]},"attrs":[{}],"properties":{"order":45,"id":8,"name":"reference","prevSize":32,"code":59680},"setIdx":1,"setId":1,"iconIdx":103},{"icon":{"paths":["M800 1024h-576c-124.8 0-224-99.2-224-224v-300.8c0-124.8 99.2-224 224-224h576c124.8 0 224 99.2 224 224v300.8c0 124.8-99.2 224-224 224zM224 339.2c-89.6 0-160 70.4-160 160v300.8c0 89.6 70.4 160 160 160h576c89.6 0 160-70.4 160-160v-300.8c0-89.6-70.4-160-160-160h-576z","M828.8 201.6h-633.6c-19.2 0-32-12.8-32-32s12.8-32 32-32h630.4c19.2 0 32 12.8 32 32s-12.8 32-28.8 32z","M716.8 64h-409.6c-19.2 0-32-12.8-32-32s12.8-32 32-32h412.8c19.2 0 32 12.8 32 32s-16 32-35.2 32z","M800 416v64c0 48-38.4 83.2-83.2 83.2h-409.6c-44.8 3.2-83.2-35.2-83.2-83.2v-64h-54.4v64c0 76.8 64 140.8 140.8 140.8h406.4c76.8 0 140.8-64 140.8-140.8v-64h-57.6z"],"attrs":[{},{},{},{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["schemas"]},"attrs":[{},{},{},{}],"properties":{"order":46,"id":7,"name":"schemas","prevSize":32,"code":59681},"setIdx":1,"setId":1,"iconIdx":104},{"icon":{"paths":["M939.776 1003.776c-27.2 27.008-71.232 27.008-98.368 0l-168.96-168.96c-66.176 38.464-142.016 62.080-224 62.080-247.744 0-448.448-200.832-448.448-448.448 0-247.744 200.704-448.448 448.448-448.448 247.68 0 448.512 200.704 448.512 448.448 0 115.136-44.672 218.944-115.904 298.304l158.656 158.656c27.008 27.136 27.008 71.168 0.064 98.368zM448.448 128.128c-176.896 0-320.32 143.36-320.32 320.32s143.424 320.32 320.32 320.32c176.96 0 320.384-143.36 320.384-320.32s-143.488-320.32-320.384-320.32z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["search"]},"attrs":[{}],"properties":{"order":23,"id":6,"name":"search","prevSize":32,"code":59682},"setIdx":1,"setId":1,"iconIdx":105},{"icon":{"paths":["M1019.11 440.755c-1.946-13.747-14.438-23.398-28.16-21.888-16.947 1.843-34.253-0.589-50.048-7.091-52.25-21.504-77.261-81.459-55.757-133.709 6.605-15.846 16.947-29.85 30.208-40.602 10.803-8.653 12.698-24.294 4.352-35.354-28.902-37.99-62.797-71.706-100.838-100.045-10.701-8.090-25.805-6.451-34.662 3.661-28.8 33.254-75.546 44.262-116.198 27.546-40.704-16.742-66.099-57.498-63.206-101.453 0.845-13.338-8.755-25.19-21.99-27.008-47.002-6.605-94.797-6.605-142.054 0.077-13.722 1.946-23.398 14.387-21.862 28.211 1.843 16.896-0.614 34.202-7.168 49.997-21.504 52.25-81.408 77.21-133.632 55.706-15.821-6.502-29.85-16.947-40.602-30.157-8.653-10.752-24.32-12.698-35.379-4.301-37.99 28.851-71.68 62.694-100.045 100.762-8.090 10.701-6.451 25.83 3.635 34.637 33.28 28.902 44.288 75.597 27.546 116.301-16.742 40.653-57.498 66.048-101.427 63.155-13.363-0.845-25.19 8.755-26.982 21.99-6.63 47.002-6.63 94.822 0.102 142.080 1.946 13.696 14.387 23.322 28.16 21.811 16.896-1.818 34.202 0.691 50.022 7.168 52.224 21.53 77.21 81.459 55.706 133.734-6.502 15.795-16.947 29.773-30.157 40.525-10.803 8.73-12.698 24.346-4.352 35.354 28.877 38.042 62.822 71.731 100.813 100.122 1.741 1.357 3.661 2.355 5.606 3.2 9.933 4.045 21.709 1.536 29.082-6.938 28.826-33.178 75.571-44.262 116.275-27.52 40.653 16.742 66.048 57.498 63.13 101.453-0.819 13.338 8.755 25.165 22.067 27.059 47.002 6.579 94.72 6.554 142.029-0.102 13.645-1.971 23.347-14.464 21.811-28.237-1.843-16.947 0.691-34.253 7.194-50.048 21.504-52.25 81.459-77.21 133.658-55.68 15.795 6.528 29.85 16.947 40.55 30.157 8.704 10.803 24.346 12.698 35.405 4.326 37.99-28.902 71.654-62.746 100.096-100.813 7.987-10.675 6.4-25.805-3.712-34.662-33.254-28.826-44.288-75.571-27.546-116.224 16.742-40.73 57.498-66.099 101.453-63.232 13.338 0.922 25.139-8.678 27.008-21.965 6.554-47.002 6.502-94.771-0.128-142.003zM971.059 554.010c-56.141 5.274-105.702 41.114-127.642 94.464s-12.058 113.613 24.090 156.902c-17.69 21.478-37.453 41.318-58.854 59.315-12.749-11.213-27.392-20.352-43.238-26.854-78.259-32.282-168.243 5.197-200.499 83.584-6.502 15.718-10.291 32.563-11.29 49.536-27.853 2.56-55.859 2.637-83.61 0.077-5.274-56.090-41.114-105.677-94.464-127.616-53.35-21.99-113.613-11.981-156.928 24.064-21.504-17.69-41.318-37.453-59.29-58.88 11.213-12.723 20.352-27.392 26.906-43.136 32.205-78.387-5.274-168.294-83.584-200.55-15.821-6.502-32.589-10.342-49.613-11.366-2.534-27.853-2.586-55.859 0-83.558 56.090-5.299 105.626-41.088 127.565-94.438 21.965-53.402 12.058-113.638-24.090-156.902 17.69-21.555 37.478-41.395 58.88-59.341 12.749 11.213 27.392 20.352 43.213 26.854 78.285 32.256 168.218-5.248 200.474-83.558 6.528-15.795 10.342-32.589 11.366-49.613 27.853-2.509 55.808-2.56 83.558 0 5.299 56.090 41.139 105.6 94.49 127.59 53.35 21.939 113.638 12.006 156.902-24.090 21.504 17.741 41.293 37.453 59.29 58.854-11.213 12.8-20.352 27.392-26.854 43.213-32.256 78.31 5.248 168.294 83.507 200.499 15.846 6.502 32.691 10.342 49.638 11.392 2.56 27.853 2.611 55.808 0.077 83.558zM512 307.2c-113.101 0-204.8 91.699-204.8 204.8 0 113.126 91.699 204.826 204.8 204.826s204.8-91.699 204.8-204.826c0-113.101-91.699-204.8-204.8-204.8zM512 665.626c-84.813 0-153.6-68.813-153.6-153.626 0-84.838 68.787-153.6 153.6-153.6 84.838 0 153.6 68.762 153.6 153.6 0 84.813-68.762 153.626-153.6 153.626z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["settings"]},"attrs":[{}],"properties":{"order":22,"id":5,"name":"settings","prevSize":32,"code":59683},"setIdx":1,"setId":1,"iconIdx":106},{"icon":{"paths":["M77.005 102.605h128v332.8c0 14.131 11.418 25.6 25.6 25.6 14.106 0 25.6-11.469 25.6-25.6v-332.8h128c14.106 0 25.6-11.469 25.6-25.6 0-14.157-11.494-25.6-25.6-25.6h-307.2c-14.182 0-25.6 11.443-25.6 25.6 0 14.106 11.418 25.6 25.6 25.6zM947.405 716.979h-179.2v-102.4h179.2c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-204.8c-14.182 0-25.6 11.443-25.6 25.6v358.4c0 14.157 11.418 25.6 25.6 25.6 14.157 0 25.6-11.443 25.6-25.6v-179.2h179.2c14.157 0 25.6-11.443 25.6-25.6s-11.494-25.6-25.6-25.6zM965.094 58.47c-9.958-9.933-26.112-9.933-36.045 0l-870.605 870.579c-9.958 9.984-9.958 26.086 0 36.045 10.010 9.984 26.112 9.984 36.045 0l870.605-870.579c9.958-9.933 9.958-26.086 0-36.045z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["type-boolean"]},"attrs":[{}],"properties":{"order":21,"id":4,"name":"type-Boolean","prevSize":32,"code":59684},"setIdx":1,"setId":1,"iconIdx":107},{"icon":{"paths":["M947.2 102.4h-128v-25.6c0-14.131-11.469-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-512v-25.6c0-14.131-11.52-25.6-25.6-25.6s-25.6 11.469-25.6 25.6v25.6h-128c-42.342 0-76.8 34.458-76.8 76.8v716.8c0 42.342 34.458 76.8 76.8 76.8h870.4c42.342 0 76.8-34.458 76.8-76.8v-716.8c0-42.342-34.458-76.8-76.8-76.8zM972.8 896c0 14.131-11.469 25.6-25.6 25.6h-870.4c-14.080 0-25.6-11.469-25.6-25.6v-537.6h921.6v537.6zM972.8 307.2h-921.6v-128c0-14.080 11.52-25.6 25.6-25.6h128v76.8c0 14.080 11.52 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h512v76.8c0 14.080 11.469 25.6 25.6 25.6s25.6-11.52 25.6-25.6v-76.8h128c14.131 0 25.6 11.52 25.6 25.6v128zM332.8 512h51.2c14.080 0 25.6-11.52 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.52-25.6 25.6s11.52 25.6 25.6 25.6zM640 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 512h51.2c14.131 0 25.6-11.52 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.52-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 614.4h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 614.4h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 716.8h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 716.8h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM179.2 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM332.8 819.2h51.2c14.080 0 25.6-11.469 25.6-25.6s-11.52-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM486.4 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.080 0-25.6 11.469-25.6 25.6s11.52 25.6 25.6 25.6zM640 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6zM793.6 819.2h51.2c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-51.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["type-datetime"]},"attrs":[{}],"properties":{"order":24,"id":3,"name":"type-DateTime","prevSize":32,"code":59685},"setIdx":1,"setId":1,"iconIdx":108},{"icon":{"paths":["M179.2 256c0-28.262 22.938-51.2 51.2-51.2h25.6c14.157 0 25.6-11.443 25.6-25.6 0-14.131-11.443-25.6-25.6-25.6h-25.6c-56.55 0-102.4 45.85-102.4 102.4v179.2c0 28.262-22.938 51.2-51.2 51.2h-25.6c-14.157 0-25.6 11.469-25.6 25.6 0 14.157 11.443 25.6 25.6 25.6h25.6c28.262 0 51.2 22.938 51.2 51.2v179.2c0 56.55 45.85 102.4 102.4 102.4h25.6c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6h-25.6c-28.262 0-51.2-22.938-51.2-51.2v-179.2c0-30.746-13.85-58.061-35.328-76.8 21.478-18.765 35.328-46.029 35.328-76.8v-179.2zM972.8 486.4h-25.6c-28.262 0-51.2-22.938-51.2-51.2v-179.2c0-56.55-45.85-102.4-102.4-102.4h-25.6c-14.157 0-25.6 11.469-25.6 25.6 0 14.157 11.443 25.6 25.6 25.6h25.6c28.262 0 51.2 22.938 51.2 51.2v179.2c0 30.771 13.85 58.035 35.328 76.8-21.478 18.739-35.328 46.054-35.328 76.8v179.2c0 28.262-22.938 51.2-51.2 51.2h-25.6c-14.157 0-25.6 11.443-25.6 25.6s11.443 25.6 25.6 25.6h25.6c56.55 0 102.4-45.85 102.4-102.4v-179.2c0-28.262 22.938-51.2 51.2-51.2h25.6c14.157 0 25.6-11.443 25.6-25.6 0-14.131-11.443-25.6-25.6-25.6zM512 332.8c-14.157 0-25.6 11.469-25.6 25.6 0 14.157 11.443 25.6 25.6 25.6s25.6-11.443 25.6-25.6c0-14.131-11.443-25.6-25.6-25.6zM512 435.2c-14.157 0-25.6 11.469-25.6 25.6v204.8c0 14.157 11.443 25.6 25.6 25.6s25.6-11.443 25.6-25.6v-204.8c0-14.131-11.443-25.6-25.6-25.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["json"]},"attrs":[{}],"properties":{"order":20,"id":14,"name":"type-Json, json","prevSize":32,"code":59674},"setIdx":1,"setId":1,"iconIdx":109},{"icon":{"paths":["M256 665.6h-76.8v-332.8c0-14.131-11.469-25.6-25.6-25.6h-76.8c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h51.2v307.2h-76.8c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h204.8c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6zM614.4 307.2h-204.8c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h179.2v128h-179.2c-14.131 0-25.6 11.469-25.6 25.6v179.2c0 14.131 11.469 25.6 25.6 25.6h204.8c14.131 0 25.6-11.469 25.6-25.6s-11.469-25.6-25.6-25.6h-179.2v-128h179.2c14.131 0 25.6-11.469 25.6-25.6v-179.2c0-14.131-11.469-25.6-25.6-25.6zM972.8 307.2h-204.8c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h179.2v128h-179.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h179.2v128h-179.2c-14.131 0-25.6 11.469-25.6 25.6s11.469 25.6 25.6 25.6h204.8c14.131 0 25.6-11.469 25.6-25.6v-358.4c0-14.131-11.469-25.6-25.6-25.6z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["type-number"]},"attrs":[{}],"properties":{"order":32,"id":2,"name":"type-Number","prevSize":32,"code":59686},"setIdx":1,"setId":1,"iconIdx":110},{"icon":{"paths":["M870.4 921.6h-716.8c-14.131 0-25.6 11.443-25.6 25.6s11.469 25.6 25.6 25.6h716.8c14.157 0 25.6-11.443 25.6-25.6s-11.443-25.6-25.6-25.6zM194.688 817.152c13.030 5.555 28.083-0.461 33.613-13.44l125.030-291.712h317.338l125.005 291.712c4.173 9.677 13.568 15.488 23.526 15.488 3.405 0 6.81-0.64 10.112-2.048 13.005-5.606 18.995-20.659 13.44-33.638l-131.61-306.944c-0.051-0.051-0.051-0.154-0.102-0.205l-175.488-409.6c-4.045-9.472-13.312-15.565-23.552-15.565s-19.507 6.093-23.552 15.514l-175.488 409.6c-0.051 0.051-0.051 0.154-0.102 0.205l-131.61 306.97c-5.53 13.005 0.461 28.058 13.44 33.664zM512 141.773l136.704 319.027h-273.408l136.704-319.027z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["type-string"]},"attrs":[{}],"properties":{"order":48,"id":1,"name":"type-String","prevSize":32,"code":59687},"setIdx":1,"setId":1,"iconIdx":111},{"icon":{"paths":["M955.221 848c0-0.109 10.752 0 0 0-52.751-161.392-240.461-224-443.178-224-202.269 0-389.979 63.392-443.066 224-11.2-0.109 0-1.232 0 0 0 61.936 49.615 112 110.654 112h664.823c61.151 0 110.766-50.064 110.766-112zM290.399 288c0 123.648 99.231 336 221.645 336s221.645-212.352 221.645-336c0-123.648-99.231-224-221.645-224s-221.645 100.352-221.645 224z"],"attrs":[{}],"isMulticolor":false,"isMulticolor2":false,"grid":0,"tags":["user"]},"attrs":[{}],"properties":{"order":33,"id":0,"name":"user","prevSize":32,"code":59688},"setIdx":1,"setId":1,"iconIdx":112}],"height":1024,"metadata":{"name":"icomoon"},"preferences":{"showGlyphs":true,"showCodes":true,"showQuickUse":true,"showQuickUse2":true,"showSVGs":true,"fontPref":{"prefix":"icon-","metadata":{"fontFamily":"icomoon"},"metrics":{"emSize":1024,"baseline":6.25,"whitespace":50},"embed":false},"imagePref":{"prefix":"icon-","png":true,"useClassSelector":true,"color":0,"bgColor":16777215,"classSelector":".icon","name":"icomoon"},"historySize":100,"gridSize":16}} \ No newline at end of file diff --git a/src/Squidex/app/theme/icomoon/style.css b/src/Squidex/app/theme/icomoon/style.css index dcce358cf..c0382ae57 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?5u1xcq'); - src: url('fonts/icomoon.eot?5u1xcq#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?5u1xcq') format('truetype'), - url('fonts/icomoon.woff?5u1xcq') format('woff'), - url('fonts/icomoon.svg?5u1xcq#icomoon') format('svg'); + src: url('fonts/icomoon.eot?rs9se1'); + src: url('fonts/icomoon.eot?rs9se1#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?rs9se1') format('truetype'), + url('fonts/icomoon.woff?rs9se1') format('woff'), + url('fonts/icomoon.svg?rs9se1#icomoon') format('svg'); font-weight: normal; font-style: normal; } @@ -24,6 +24,36 @@ -moz-osx-font-smoothing: grayscale; } +.icon-arrow_back:before { + content: "\e96e"; +} +.icon-external-link:before { + content: "\e96d"; +} +.icon-minus-square:before { + content: "\e969"; +} +.icon-plus-square:before { + content: "\e968"; +} +.icon-drag2:before { + content: "\e961"; +} +.icon-comments:before { + content: "\e95f"; +} +.icon-backup:before { + content: "\e95b"; +} +.icon-support:before { + content: "\e95a"; +} +.icon-control-RichText:before { + content: "\e939"; +} +.icon-download:before { + content: "\e93e"; +} .icon-clone:before { content: "\e96a"; } @@ -117,33 +147,6 @@ .icon-rules:before { content: "\e947"; } -.icon-external-link:before { - content: "\e96d"; -} -.icon-minus-square:before { - content: "\e969"; -} -.icon-plus-square:before { - content: "\e968"; -} -.icon-drag2:before { - content: "\e961"; -} -.icon-comments:before { - content: "\e95f"; -} -.icon-backup:before { - content: "\e95b"; -} -.icon-support:before { - content: "\e95a"; -} -.icon-control-RichText:before { - content: "\e939"; -} -.icon-download:before { - content: "\e93e"; -} .icon-caret-bottom:before { content: "\e96b"; } diff --git a/src/Squidex/package-lock.json b/src/Squidex/package-lock.json index 066ee6d70..9298bb6d3 100644 --- a/src/Squidex/package-lock.json +++ b/src/Squidex/package-lock.json @@ -5,12 +5,12 @@ "requires": true, "dependencies": { "@angular-devkit/core": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.2.3.tgz", - "integrity": "sha512-NnN8O+97nJAxqD2zVTDlU8dSzrGCZmqYMDqDoRJJChYxAgmGwP4lhb+Jyi5D34tPxgKRTnjTOwC+G7D+WrXSDQ==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-7.3.0.tgz", + "integrity": "sha512-b0qtAUpgqLpWY8W6vWRv1aj6bXkZCP1rvywl8i8TbGMY67CWRcy5J3fNAMmjiZS+LJixFlIXYf4iOydglyJMfg==", "dev": true, "requires": { - "ajv": "6.6.2", + "ajv": "6.7.0", "chokidar": "2.0.4", "fast-json-stable-stringify": "2.0.0", "rxjs": "6.3.3", @@ -18,9 +18,9 @@ }, "dependencies": { "ajv": { - "version": "6.6.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz", - "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==", + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.7.0.tgz", + "integrity": "sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==", "dev": true, "requires": { "fast-deep-equal": "^2.0.1", @@ -382,6 +382,15 @@ "to-regex": "^3.0.2" } }, + "rxjs": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, "source-map": { "version": "0.7.3", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", @@ -400,34 +409,34 @@ } }, "@angular/animations": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.2.tgz", - "integrity": "sha512-St03YR3N4Rv0vLr0+3V0kmf/QNi9q0tOenAlHP+jG/YySPkkv8P3xRcGVU38ID4JQzRiShUD+k2r+oZGCQMNjw==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-7.2.3.tgz", + "integrity": "sha512-5WoiDnVS2OhGgJ1oepFNF2UcfR4sJj97KRnTmLWQ0S4N4WpXX83CoOQVXvXwfotyb8uNtl4zRi2NuvN/MIuFuA==", "requires": { "tslib": "^1.9.0" } }, "@angular/common": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.2.tgz", - "integrity": "sha512-43EcR3mbM+dKH4VE1EYS1HxSuEToxxv5XPktKqdzY95g8PBOxe11ifcXoYHgImd7YOWzcKoy0k6yQbX3o0cZ8g==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-7.2.3.tgz", + "integrity": "sha512-VZOTZdvkitaKEhkxL6daHxPcKqAFwNJm0U4NFB4LRP9KspsFTE60QFVB63o129PTIH9iOQ2D3HRKSRl4o78ZKg==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.2.tgz", - "integrity": "sha512-vjPreOVPca6HSuDmj7N1w5u8hwXdm98gEPo2wqQMVuJd6qvGEyLYE9FsHc0XCchyQEKSybAYl1dwsjZq2nNSvQ==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-7.2.3.tgz", + "integrity": "sha512-UM6n4MyZkR5+VVjlwhLH8IfqdWBkdFcF5at4ckJXOJ/gkIUq97irbis9pGj1b0TO7MAl8uhF4b68xe5lk8b49g==", "dev": true, "requires": { "tslib": "^1.9.0" } }, "@angular/compiler-cli": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.2.tgz", - "integrity": "sha512-ac62YlDescAaf0qPguyRkpzWCMNlwtsKObq80GKADP33Sxm0BxGt4+Wz6rolvUuWzCX8aZwJ0FA7ehKxdmdQoA==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-7.2.3.tgz", + "integrity": "sha512-31hcfTrU2GW66cvvaS629dNVPfiUrUWPncI28optvmKHBaH0mFqkdYNgabuslsXZV5AeidKMUJvR7GITjtvkQA==", "dev": true, "requires": { "canonical-path": "1.0.0", @@ -468,7 +477,7 @@ "dependencies": { "string-width": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, "requires": { @@ -516,7 +525,7 @@ }, "load-json-file": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", "dev": true, "requires": { @@ -699,49 +708,49 @@ } }, "@angular/core": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.2.tgz", - "integrity": "sha512-kQ0HxUYAPvly8b3aibTGbiodFnBBgo3asXAQuPgFjYYEqcKR1zZII7PQdaEF9kb9sfm/IKLKj4nd9fZ0gcgqZg==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-7.2.3.tgz", + "integrity": "sha512-6Ql+sJJnrsxh8O0/IgIP1GgT4eLOHk+dlBs7zBbjstmLuhaQdY+awO9WKoQow+TiD1Go7FW1J3vZ2PTWXKxqjQ==", "requires": { "tslib": "^1.9.0" } }, "@angular/forms": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.2.tgz", - "integrity": "sha512-IsvVuUnzIA2ryRmh7l42AANPZFSyNcwqZNtxbmRq2wm3Lfed64U0rsRWWNqipjz7QTxZ2SRdAlP+XDgzg8hvMQ==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-7.2.3.tgz", + "integrity": "sha512-mZpyonfSmRwSvM6efvwFwkLJkK6wHQrm7X4OhVVu3s9i7BI253eLDY7WIRXFvoxJ/5jWIIarVnd/9UA7GINZGw==", "requires": { "tslib": "^1.9.0" } }, "@angular/http": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.2.tgz", - "integrity": "sha512-+9dZgiVQStGUO3iJGxEWBkjDCARuVLIPk7QPl4Qntbz8Sd/kR7IBqXMM+74W7T5rlG6bunDxq6LuisvsjWCppw==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-7.2.3.tgz", + "integrity": "sha512-wzvBKbO/TcSR3U8AQbsGftH8x1OdAgVGHlfXQPmZL1KjIDHrM1VpnkSvgqIt8coG+4OPfWcNklUCrTdEGwqMqw==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.2.tgz", - "integrity": "sha512-eiaqHq26PVASx1kTngBDkFkXhaJzEjoGtc5I+wQUef8CUjq6ZViWz8tUgiiDPOWdqUKUacRZG4q6VR/6uwQj0A==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-7.2.3.tgz", + "integrity": "sha512-DH0Y2lgEgcrP1I/DUQB/krL7Ob7yL685fu4sRapW17SndTQa2pqSFMBVf+mN3FupTXp7nJHSvlIktzedIk04+g==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.2.tgz", - "integrity": "sha512-bw5PuzMzjKMecB4slG/btmvxgn4qFWhNmJVpf2pbtZW7NtZz3HlrqipYzMk9XrCUDGjtwy7O2Z71C3ujI748iw==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.3.tgz", + "integrity": "sha512-M8Kiz5FUhnFybJuk/mgOhBjVbRgKDC4bGWKWH9Z9SXBR2dS/FL3QOJsLIthQcWlHOzSoJdEoPBRhn0R4pyLBSw==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-server": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-7.2.2.tgz", - "integrity": "sha512-lV4CvU06sEaU9q+F11eT9tgC/gFfyK21LkUrLw2nP3mLPBEOx4zhW1R452grN5a/8OFlxZOoSlYWdTQI2QN5CA==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@angular/platform-server/-/platform-server-7.2.3.tgz", + "integrity": "sha512-RXTFuuTlvy02YOtjWsrs8q+wnmXNW1JHueEseb8cWrgJz46ezhjuW3vwquDv1PwO5KZD2wlamZcrlbkwsdyzZw==", "requires": { "domino": "^2.1.0", "tslib": "^1.9.0", @@ -749,9 +758,9 @@ } }, "@angular/router": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.2.tgz", - "integrity": "sha512-+cBC+JxbPdjk+Nyqq27PKkjfIdnc+H+xjMGrkO6dlAKhVMGxyNaYt5NUNugb8XJPsQ1XNXyzwTfZK6jcAGLw6w==", + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-7.2.3.tgz", + "integrity": "sha512-SH7H2I9WTj1puei4m4g5n0/Cp28HS14q4r8lOgW0gLWuT6Ls7MqH/nDjOMiW924iRR6zjQQs7G+WbhL1jmZc2A==", "requires": { "tslib": "^1.9.0" } @@ -909,16 +918,37 @@ } }, "@ngtools/webpack": { - "version": "7.2.3", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.2.3.tgz", - "integrity": "sha512-TbaCeE1mkruWzFGfAP1kSnwk4v5k0MQUxzy2reUvCfq80H8jYrqUuMZJa0VLPoEky5cYIy98Fe2Wz9xlEdx7sA==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-7.3.0.tgz", + "integrity": "sha512-U/By0Jlwy7nYwrGNtFirTg1aAsEHBL/9DhfFxPI0iu27FWiMttROuN6hmKbbnOmpbiYAVl5qTy3WXPXUIJjG1A==", "dev": true, "requires": { - "@angular-devkit/core": "7.2.3", + "@angular-devkit/core": "7.3.0", "enhanced-resolve": "4.1.0", "rxjs": "6.3.3", - "tree-kill": "1.2.0", - "webpack-sources": "1.2.0" + "tree-kill": "1.2.1", + "webpack-sources": "1.3.0" + }, + "dependencies": { + "rxjs": { + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "webpack-sources": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.3.0.tgz", + "integrity": "sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==", + "dev": true, + "requires": { + "source-list-map": "^2.0.0", + "source-map": "~0.6.1" + } + } } }, "@types/core-js": { @@ -928,9 +958,9 @@ "dev": true }, "@types/jasmine": { - "version": "3.3.7", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.7.tgz", - "integrity": "sha512-TuXyEBYWWrjBZAC4h3YY5NcrgC9HaLO5FogvkY5FOfAyjrk3wWABoH/3p7ooFfA8BHjc2BeQCDvvQBLb+9q1rA==", + "version": "3.3.8", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.3.8.tgz", + "integrity": "sha512-BaOFpaddRVV8qykJoWHrHtamml880oh0+DIZWbtJgx0pu+KhDF1gER5hSfCIfzyMrbjMuYFnLUfyo1l0JUVU3Q==", "dev": true }, "@types/json5": { @@ -952,9 +982,9 @@ "dev": true }, "@types/node": { - "version": "10.12.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.18.tgz", - "integrity": "sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==", + "version": "10.12.21", + "resolved": "https://registry.npmjs.org/@types/node/-/node-10.12.21.tgz", + "integrity": "sha512-CBgLNk4o3XMnqMc0rhb6lc77IwShMEglz05deDcn2lQxyXEZivfwgYJu7SMha9V5XcrP6qZuevTHV/QrN2vjKQ==", "dev": true }, "@types/prop-types": { @@ -970,9 +1000,9 @@ "dev": true }, "@types/react": { - "version": "16.7.20", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.7.20.tgz", - "integrity": "sha512-Qd5RWkwl6SL7R2XzLk/cicjVQm1Mhc6HqXY5Ei4pWd1Vi8Fkbd5O0sA398x8fRSTPAuHdDYD9nrWmJMYTJI0vQ==", + "version": "16.8.1", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.1.tgz", + "integrity": "sha512-tD1ETKJcuhANOejRc/p7OgQ16DKnbGi0M3LccelKlPnUCDp2a5koVxZFoRN9HN+A+m84HB5VGN7I+r3nNhS3PA==", "dev": true, "requires": { "@types/prop-types": "*", @@ -3707,9 +3737,9 @@ } }, "csstype": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.1.tgz", - "integrity": "sha512-wv7IRqCGsL7WGKB8gPvrl+++HlFM9kxAM6jL1EXNPNTshEJYilMkbfS2SnuHha77uosp/YVK0wAp2jmlBzn1tg==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.2.tgz", + "integrity": "sha512-Rl7PvTae0pflc1YtxtKbiSqq20Ts6vpIYOD5WBafl4y123DyHUeLrRdQP66sQW8/6gmX8jrYJLXwNeMqYVJcow==", "dev": true }, "currently-unhandled": { @@ -5487,12 +5517,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5512,7 +5544,8 @@ "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", @@ -5660,6 +5693,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -8359,9 +8393,9 @@ } }, "karma-htmlfile-reporter": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/karma-htmlfile-reporter/-/karma-htmlfile-reporter-0.3.7.tgz", - "integrity": "sha512-1Ryh11QJinRGf3BTUOYaPsjVtz8tK87grhOQCtdq8bt7z0sYd1lxTwC6QmH+aQS7T2pe/qfdoDdFF/Vo/96dRA==", + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/karma-htmlfile-reporter/-/karma-htmlfile-reporter-0.3.8.tgz", + "integrity": "sha512-Hd4c/vqPXYjdNYXeDJRMMq2DMMxPxqOR+TPeiLz2qbqO0qCCQMeXwFGhNDFr+GsvYhcOyn7maTbWusUFchS/4A==", "dev": true, "requires": { "xmlbuilder": "^10.0.0" @@ -13206,9 +13240,9 @@ } }, "tree-kill": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz", - "integrity": "sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz", + "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==", "dev": true }, "trim-newlines": { diff --git a/src/Squidex/package.json b/src/Squidex/package.json index a31645225..ba12d0ca3 100644 --- a/src/Squidex/package.json +++ b/src/Squidex/package.json @@ -15,15 +15,15 @@ "build:clean": "rimraf wwwroot/build" }, "dependencies": { - "@angular/animations": "7.2.2", - "@angular/common": "7.2.2", - "@angular/core": "7.2.2", - "@angular/forms": "7.2.2", - "@angular/http": "7.2.2", - "@angular/platform-browser": "7.2.2", - "@angular/platform-browser-dynamic": "7.2.2", - "@angular/platform-server": "7.2.2", - "@angular/router": "7.2.2", + "@angular/animations": "7.2.3", + "@angular/common": "7.2.3", + "@angular/core": "7.2.3", + "@angular/forms": "7.2.3", + "@angular/http": "7.2.3", + "@angular/platform-browser": "7.2.3", + "@angular/platform-browser-dynamic": "7.2.3", + "@angular/platform-server": "7.2.3", + "@angular/router": "7.2.3", "angular2-chartjs": "0.5.1", "babel-polyfill": "6.26.0", "bootstrap": "4.2.1", @@ -47,15 +47,15 @@ "zone.js": "0.8.29" }, "devDependencies": { - "@angular/compiler": "7.2.2", - "@angular/compiler-cli": "7.2.2", - "@ngtools/webpack": "7.2.3", + "@angular/compiler": "7.2.3", + "@angular/compiler-cli": "7.2.3", + "@ngtools/webpack": "7.3.0", "@types/core-js": "2.5.0", - "@types/jasmine": "3.3.7", + "@types/jasmine": "3.3.8", "@types/marked": "0.6.0", "@types/mousetrap": "1.6", - "@types/node": "10.12.18", - "@types/react": "16.7.20", + "@types/node": "10.12.21", + "@types/react": "16.8.1", "@types/react-dom": "16.0.11", "@types/sortablejs": "1.7.2", "angular-router-loader": "0.8.5", @@ -75,7 +75,7 @@ "karma-chrome-launcher": "2.2.0", "karma-cli": "2.0.0", "karma-coverage-istanbul-reporter": "2.0.4", - "karma-htmlfile-reporter": "0.3.7", + "karma-htmlfile-reporter": "0.3.8", "karma-jasmine": "2.0.1", "karma-jasmine-html-reporter": "1.4.0", "karma-mocha-reporter": "2.2.5", diff --git a/src/Squidex/wwwroot/theme.html b/src/Squidex/wwwroot/theme.html index 068f9a5c8..2c1c0357a 100644 --- a/src/Squidex/wwwroot/theme.html +++ b/src/Squidex/wwwroot/theme.html @@ -51,7 +51,7 @@
      @@ -83,7 +83,7 @@
      @@ -222,62 +222,62 @@

      -
      +
      - -
      -
      +
      - -
      -
      +
      - -
      -
      +
      - -
      -
      +
      - -
      -
      +
      -
      +
      -
      +
      @@ -324,7 +324,7 @@
      -
      +
      -
      +

      Tabs

      @@ -884,7 +884,7 @@

      Badges

      -
      +
      Primary Secondary Success @@ -917,7 +917,7 @@

      Basic

      -
      +
      @@ -1162,7 +1162,7 @@
      Support card subtitle
      - Card image + Card image

      Some quick example text to build on the card title and make up the bulk of the card's content.

      @@ -1191,10 +1191,10 @@

      Modals

      -
      -
      +
      +
      -
      +

      @@ -1257,7 +1257,7 @@
      - +

      @@ -1302,7 +1302,7 @@
      - +

      @@ -1351,7 +1351,7 @@
      - +

      diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/EventSynchronization/AssertHelper.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/EventSynchronization/AssertHelper.cs index 073a73677..b2a07c0d6 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/EventSynchronization/AssertHelper.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/EventSynchronization/AssertHelper.cs @@ -8,7 +8,6 @@ using System.Collections.Generic; using System.Linq; using FluentAssertions; -using FluentAssertions.Equivalency; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Orleans; @@ -35,7 +34,7 @@ namespace Squidex.Domain.Apps.Core.Operations.EventSynchronization { lhs.Should().BeOfType(rhs.GetType()); - ((object)lhs).Should().BeEquivalentTo(rhs, o => o.IncludingAllRuntimeProperties().Excluding((IMemberInfo x) => x.SelectedMemberPath == "Properties.IsFrozen")); + ((object)lhs).Should().BeEquivalentTo(rhs, o => o.IncludingAllRuntimeProperties().Excluding(x => x.SelectedMemberPath == "Properties.IsFrozen")); } public static void ShouldBeSameEventType(this IEvent lhs, IEvent rhs) 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 a65e5cad1..8a8f266ab 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs @@ -35,7 +35,6 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules private readonly string actionDescription = "MyDescription"; private readonly Guid ruleId = Guid.NewGuid(); private readonly NamedId appId = NamedId.Of(Guid.NewGuid(), "my-app"); - private readonly NamedId schemaId = NamedId.Of(Guid.NewGuid(), "my-schema"); private readonly TypeNameRegistry typeNameRegistry = new TypeNameRegistry(); private readonly RuleService sut; diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj b/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj index 7de203167..0b7954368 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj +++ b/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj @@ -2,7 +2,7 @@ Exe netcoreapp2.2 - 2.1.1 + 2.2.0 Squidex.Domain.Apps.Core 7.3 diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentGrainTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentGrainTests.cs index 3fc380a2c..cac8a1954 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentGrainTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentGrainTests.cs @@ -79,7 +79,7 @@ namespace Squidex.Domain.Apps.Entities.Contents Change = "", Create = "", Delete = "", - Update = "", + Update = "" }; var schemaDef = 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 67f0203af..8c4f8c40b 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 @@ -2,7 +2,7 @@ Exe netcoreapp2.2 - 2.1.1 + 2.2.0 Squidex.Domain.Apps.Entities 7.3 diff --git a/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj b/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj index 7e52cf91e..f68f83cf1 100644 --- a/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj +++ b/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj @@ -2,7 +2,7 @@ Exe netcoreapp2.2 - 2.1.1 + 2.2.0 Squidex.Domain.Users diff --git a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj index acc8be42c..fcc86b631 100644 --- a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj +++ b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj @@ -2,7 +2,7 @@ Exe netcoreapp2.2 - 2.1.1 + 2.2.0 Squidex.Infrastructure 7.3 diff --git a/tests/Squidex.Tests/Squidex.Tests.csproj b/tests/Squidex.Tests/Squidex.Tests.csproj index 8f6b4e0df..6fef6eceb 100644 --- a/tests/Squidex.Tests/Squidex.Tests.csproj +++ b/tests/Squidex.Tests/Squidex.Tests.csproj @@ -2,7 +2,7 @@ Exe netcoreapp2.2 - 2.1.1 + 2.2.0 Squidex $(NoWarn);NU1605 7.3 diff --git a/tools/Migrate_00/Migrate_00.csproj b/tools/Migrate_00/Migrate_00.csproj index dd3d5eb4a..9c13dd95d 100644 --- a/tools/Migrate_00/Migrate_00.csproj +++ b/tools/Migrate_00/Migrate_00.csproj @@ -2,7 +2,7 @@ Exe netcoreapp2.2 - 2.1.1 + 2.2.0 7.3