From a706ad5757ec4cc7fba4d0231da6213d8827a16e Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Thu, 22 Mar 2018 14:19:09 +0100 Subject: [PATCH 1/7] Backup started. --- src/Squidex.Domain.Apps.Backup/BackupGrain.cs | 242 ++++++++++++++++++ .../EventStreamWriter.cs | 80 ++++++ .../IBackupArchiveLocation.cs | 13 + .../IBackupGrain.cs | 24 ++ src/Squidex.Domain.Apps.Backup/IBackupJob.cs | 25 ++ .../Squidex.Domain.Apps.Backup.csproj | 22 ++ .../State/BackupState.cs | 18 ++ .../State/BackupStateJob.cs | 31 +++ .../Apps/AppGrain.cs | 2 +- .../Assets/AssetCommandMiddleware.cs | 12 +- .../Backup/BackupGrain.cs | 242 ++++++++++++++++++ .../Backup/EventStreamWriter.cs | 79 ++++++ .../Backup/IBackupArchiveLocation.cs | 20 ++ .../Backup/IBackupGrain.cs | 24 ++ .../Backup/IBackupJob.cs | 23 ++ .../Backup/State/BackupState.cs | 18 ++ .../Backup/State/BackupStateJob.cs | 28 ++ .../Backup/TempFolderBackupArchiveLocation.cs | 44 ++++ .../Contents/ContentGrain.cs | 2 +- .../Contents/IContentScheduleItem.cs | 22 ++ .../State/ContentStateScheduleItem.cs | 26 ++ .../Rules/RuleGrain.cs | 2 +- .../Schemas/SchemaGrain.cs | 2 +- .../SquidexDomainObjectGrain.cs | 31 +++ .../SquidexEntities.cs | 2 +- .../Contents/ContentScheduleItemRemoved.cs | 18 ++ .../Assets/AzureBlobAssetStore.cs | 23 +- .../Assets/GoogleCloudAssetStore.cs | 19 +- .../Assets/FolderAssetStore.cs | 18 +- .../Assets/IAssetStore.cs | 11 +- .../Apps/AppLanguagesController.cs | 4 +- .../Controllers/Backup/BackupController.cs | 105 ++++++++ .../Controllers/Backup/Models/BackupJobDto.cs | 38 +++ .../Assets/AssetCommandMiddlewareTests.cs | 13 +- .../AssetUserPictureStoreTests.cs | 9 +- .../Assets/AssetStoreTests.cs | 12 +- 36 files changed, 1243 insertions(+), 61 deletions(-) create mode 100644 src/Squidex.Domain.Apps.Backup/BackupGrain.cs create mode 100644 src/Squidex.Domain.Apps.Backup/EventStreamWriter.cs create mode 100644 src/Squidex.Domain.Apps.Backup/IBackupArchiveLocation.cs create mode 100644 src/Squidex.Domain.Apps.Backup/IBackupGrain.cs create mode 100644 src/Squidex.Domain.Apps.Backup/IBackupJob.cs create mode 100644 src/Squidex.Domain.Apps.Backup/Squidex.Domain.Apps.Backup.csproj create mode 100644 src/Squidex.Domain.Apps.Backup/State/BackupState.cs create mode 100644 src/Squidex.Domain.Apps.Backup/State/BackupStateJob.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Backup/EventStreamWriter.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Backup/IBackupArchiveLocation.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Backup/IBackupGrain.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Backup/IBackupJob.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Backup/State/BackupState.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Backup/State/BackupStateJob.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Backup/TempFolderBackupArchiveLocation.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Contents/IContentScheduleItem.cs create mode 100644 src/Squidex.Domain.Apps.Entities/Contents/State/ContentStateScheduleItem.cs create mode 100644 src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrain.cs create mode 100644 src/Squidex.Domain.Apps.Events/Contents/ContentScheduleItemRemoved.cs create mode 100644 src/Squidex/Areas/Api/Controllers/Backup/BackupController.cs create mode 100644 src/Squidex/Areas/Api/Controllers/Backup/Models/BackupJobDto.cs diff --git a/src/Squidex.Domain.Apps.Backup/BackupGrain.cs b/src/Squidex.Domain.Apps.Backup/BackupGrain.cs new file mode 100644 index 000000000..7390cf21f --- /dev/null +++ b/src/Squidex.Domain.Apps.Backup/BackupGrain.cs @@ -0,0 +1,242 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using NodaTime; +using Orleans; +using Orleans.Concurrency; +using Squidex.Domain.Apps.Backup.State; +using Squidex.Domain.Apps.Events.Assets; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Assets; +using Squidex.Infrastructure.EventSourcing; +using Squidex.Infrastructure.Log; +using Squidex.Infrastructure.Orleans; +using Squidex.Infrastructure.States; + +namespace Squidex.Domain.Apps.Backup +{ + [Reentrant] + public sealed class BackupGrain : Grain, IBackupGrain + { + private const int MaxBackups = 10; + private readonly IClock clock; + private readonly IAssetStore assetStore; + private readonly IEventDataFormatter eventDataFormatter; + private readonly ISemanticLog log; + private readonly IEventStore eventStore; + private readonly IBackupArchiveLocation backupArchiveLocation; + private readonly IStore store; + private CancellationTokenSource currentTask; + private BackupStateJob currentJob; + private Guid appId; + private BackupState state; + private IPersistence persistence; + + public BackupGrain( + IAssetStore assetStore, + IBackupArchiveLocation backupArchiveLocation, + IClock clock, + IEventStore eventStore, + IEventDataFormatter eventDataFormatter, + ISemanticLog log, + IStore store) + { + Guard.NotNull(assetStore, nameof(assetStore)); + Guard.NotNull(backupArchiveLocation, nameof(backupArchiveLocation)); + Guard.NotNull(clock, nameof(clock)); + Guard.NotNull(eventStore, nameof(eventStore)); + Guard.NotNull(eventDataFormatter, nameof(eventDataFormatter)); + Guard.NotNull(store, nameof(store)); + Guard.NotNull(log, nameof(log)); + + this.assetStore = assetStore; + this.backupArchiveLocation = backupArchiveLocation; + this.clock = clock; + this.eventStore = eventStore; + this.eventDataFormatter = eventDataFormatter; + this.store = store; + this.log = log; + } + + public override Task OnActivateAsync() + { + return OnActivateAsync(this.GetPrimaryKey()); + } + + public async Task OnActivateAsync(Guid appId) + { + this.appId = appId; + + persistence = store.WithSnapshots(GetType(), appId, s => state = s); + + await ReadAsync(); + await CleanupAsync(); + } + + private async Task ReadAsync() + { + await persistence.ReadAsync(); + } + + private async Task WriteAsync() + { + await persistence.WriteSnapshotAsync(state); + } + + private async Task CleanupAsync() + { + var hasUpdated = false; + + foreach (var job in state.Jobs) + { + if (!job.Stopped.HasValue) + { + await CleanupAsync(job); + + job.Stopped = clock.GetCurrentInstant(); + job.Failed = true; + + hasUpdated = true; + } + } + + if (hasUpdated) + { + await WriteAsync(); + } + } + + private async Task CleanupAsync(BackupStateJob job) + { + await backupArchiveLocation.DeleteArchiveAsync(job.Id); + } + + public async Task StartNewAsync() + { + if (currentTask != null) + { + throw new DomainException("Another backup process is already running."); + } + + if (state.Jobs.Count >= MaxBackups) + { + throw new DomainException($"You cannot have more than {MaxBackups} backups."); + } + + var job = new BackupStateJob { Id = Guid.NewGuid(), Started = clock.GetCurrentInstant() }; + + currentTask = new CancellationTokenSource(); + currentJob = job; + + state.Jobs.Add(job); + + await WriteAsync(); + + try + { + using (var stream = await backupArchiveLocation.OpenStreamAsync(job.Id)) + { + using (var writer = new EventStreamWriter(stream)) + { + await eventStore.QueryAsync(async @event => + { + var eventData = @event.Data; + + if (eventData.Type == nameof(AssetCreated) || + eventData.Type == nameof(AssetUpdated)) + { + var parsedEvent = eventDataFormatter.Parse(eventData); + + var assetVersion = 0L; + var assetId = Guid.Empty; + + if (parsedEvent.Payload is AssetCreated assetCreated) + { + assetId = assetCreated.AssetId; + assetVersion = assetCreated.FileVersion; + } + + if (parsedEvent.Payload is AssetUpdated asetUpdated) + { + assetId = asetUpdated.AssetId; + assetVersion = asetUpdated.FileVersion; + } + + await writer.WriteEventAsync(eventData, async attachmentStream => + { + await assetStore.DownloadAsync(assetId.ToString(), assetVersion, null, attachmentStream); + }); + } + else + { + await writer.WriteEventAsync(eventData); + } + }, "AppId", appId, null, currentTask.Token); + } + + stream.Position = 0; + + currentTask.Token.ThrowIfCancellationRequested(); + + await assetStore.UploadAsync(job.Id.ToString(), 0, null, stream); + + currentTask.Token.ThrowIfCancellationRequested(); + } + } + catch + { + job.Failed = true; + } + finally + { + job.Stopped = clock.GetCurrentInstant(); + + await WriteAsync(); + + currentTask = null; + currentJob = null; + } + } + + public async Task DeleteAsync(Guid id) + { + var job = state.Jobs.FirstOrDefault(x => x.Id == id); + + if (job == null) + { + throw new DomainObjectNotFoundException(id.ToString(), typeof(IBackupJob)); + } + + if (currentJob == job) + { + currentTask?.Cancel(); + } + else + { + state.Jobs.Remove(job); + + await WriteAsync(); + await CleanupAsync(job); + } + } + + public Task>> GetStateAsync() + { + return Task.FromResult(new J>(state.Jobs.OfType().ToList())); + } + + private bool IsRunning() + { + return state.Jobs.Any(x => !x.Stopped.HasValue); + } + } +} diff --git a/src/Squidex.Domain.Apps.Backup/EventStreamWriter.cs b/src/Squidex.Domain.Apps.Backup/EventStreamWriter.cs new file mode 100644 index 000000000..210132ddc --- /dev/null +++ b/src/Squidex.Domain.Apps.Backup/EventStreamWriter.cs @@ -0,0 +1,80 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.IO; +using System.IO.Compression; +using System.Threading.Tasks; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Squidex.Infrastructure; +using Squidex.Infrastructure.EventSourcing; + +namespace Squidex.Domain.Apps.Backup +{ + public sealed class EventStreamWriter : DisposableObjectBase + { + private const int MaxItemsPerFolder = 1000; + private readonly StreamWriter streamWriter; + private readonly ZipArchive archive; + private int writtenEvents; + private int writtenAttachments; + + public EventStreamWriter(Stream stream) + { + archive = new ZipArchive(stream, ZipArchiveMode.Update, true); + } + + public async Task WriteEventAsync(EventData eventData, Func attachment = null) + { + var eventObject = + new JObject( + new JProperty("type", eventData.Type), + new JProperty("payload", eventData.Payload), + new JProperty("metadata", eventData.Metadata)); + + var eventFolder = writtenEvents / MaxItemsPerFolder; + var eventPath = $"events/{eventFolder}/{writtenEvents}.json"; + var eventEntry = archive.GetEntry(eventPath) ?? archive.CreateEntry(eventPath); + + using (var stream = eventEntry.Open()) + { + using (var textWriter = new StreamWriter(stream)) + { + using (var jsonWriter = new JsonTextWriter(textWriter)) + { + await eventObject.WriteToAsync(jsonWriter); + } + } + } + + writtenEvents++; + + if (attachment != null) + { + var attachmentFolder = writtenAttachments / MaxItemsPerFolder; + var attachmentPath = $"attachments/{attachmentFolder}/{writtenEvents}.blob"; + var attachmentEntry = archive.GetEntry(attachmentPath) ?? archive.CreateEntry(attachmentPath); + + using (var stream = eventEntry.Open()) + { + await attachment(stream); + } + + writtenAttachments++; + } + } + + protected override void DisposeObject(bool disposing) + { + if (disposing) + { + archive.Dispose(); + } + } + } +} diff --git a/src/Squidex.Domain.Apps.Backup/IBackupArchiveLocation.cs b/src/Squidex.Domain.Apps.Backup/IBackupArchiveLocation.cs new file mode 100644 index 000000000..300abbbe9 --- /dev/null +++ b/src/Squidex.Domain.Apps.Backup/IBackupArchiveLocation.cs @@ -0,0 +1,13 @@ +using System; +using System.IO; +using System.Threading.Tasks; + +namespace Squidex.Domain.Apps.Backup +{ + public interface IBackupArchiveLocation + { + Task OpenStreamAsync(Guid backupId); + + Task DeleteArchiveAsync(Guid backupId); + } +} diff --git a/src/Squidex.Domain.Apps.Backup/IBackupGrain.cs b/src/Squidex.Domain.Apps.Backup/IBackupGrain.cs new file mode 100644 index 000000000..1c982f853 --- /dev/null +++ b/src/Squidex.Domain.Apps.Backup/IBackupGrain.cs @@ -0,0 +1,24 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Orleans; +using Squidex.Infrastructure.Orleans; + +namespace Squidex.Domain.Apps.Backup +{ + public interface IBackupGrain : IGrainWithGuidKey + { + Task StartNewAsync(); + + Task DeleteAsync(Guid id); + + Task>> GetStateAsync(); + } +} diff --git a/src/Squidex.Domain.Apps.Backup/IBackupJob.cs b/src/Squidex.Domain.Apps.Backup/IBackupJob.cs new file mode 100644 index 000000000..53a93f9b8 --- /dev/null +++ b/src/Squidex.Domain.Apps.Backup/IBackupJob.cs @@ -0,0 +1,25 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using NodaTime; + +namespace Squidex.Domain.Apps.Backup +{ + public interface IBackupJob + { + Guid Id { get; } + + Instant Started { get; } + + Instant? Stopped { get; } + + bool Failed { get; } + + string DownloadPath { get; } + } +} diff --git a/src/Squidex.Domain.Apps.Backup/Squidex.Domain.Apps.Backup.csproj b/src/Squidex.Domain.Apps.Backup/Squidex.Domain.Apps.Backup.csproj new file mode 100644 index 000000000..cbe70395d --- /dev/null +++ b/src/Squidex.Domain.Apps.Backup/Squidex.Domain.Apps.Backup.csproj @@ -0,0 +1,22 @@ + + + netstandard2.0 + + + + + + + + + + + + + + ..\..\Squidex.ruleset + + + + + diff --git a/src/Squidex.Domain.Apps.Backup/State/BackupState.cs b/src/Squidex.Domain.Apps.Backup/State/BackupState.cs new file mode 100644 index 000000000..e6000eea7 --- /dev/null +++ b/src/Squidex.Domain.Apps.Backup/State/BackupState.cs @@ -0,0 +1,18 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using Newtonsoft.Json; + +namespace Squidex.Domain.Apps.Backup.State +{ + public sealed class BackupState + { + [JsonProperty] + public List Jobs { get; set; } = new List(); + } +} diff --git a/src/Squidex.Domain.Apps.Backup/State/BackupStateJob.cs b/src/Squidex.Domain.Apps.Backup/State/BackupStateJob.cs new file mode 100644 index 000000000..410709f13 --- /dev/null +++ b/src/Squidex.Domain.Apps.Backup/State/BackupStateJob.cs @@ -0,0 +1,31 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Newtonsoft.Json; +using NodaTime; + +namespace Squidex.Domain.Apps.Backup.State +{ + public sealed class BackupStateJob : IBackupJob + { + [JsonProperty] + public Guid Id { get; set; } + + [JsonProperty] + public Instant Started { get; set; } + + [JsonProperty] + public Instant? Stopped { get; set; } + + [JsonProperty] + public string DownloadPath { get; set; } + + [JsonProperty] + public bool Failed { get; set; } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs b/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs index f1c779aae..2f8d229e4 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/AppGrain.cs @@ -25,7 +25,7 @@ using Squidex.Shared.Users; namespace Squidex.Domain.Apps.Entities.Apps { - public class AppGrain : DomainObjectGrain, IAppGrain + public class AppGrain : SquidexDomainObjectGrain, IAppGrain { private readonly InitialPatterns initialPatterns; private readonly IAppProvider appProvider; diff --git a/src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs b/src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs index a50f1196d..bb349d793 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/AssetCommandMiddleware.cs @@ -41,18 +41,18 @@ namespace Squidex.Domain.Apps.Entities.Assets { createAsset.ImageInfo = await assetThumbnailGenerator.GetImageInfoAsync(createAsset.File.OpenRead()); - await assetStore.UploadTemporaryAsync(context.ContextId.ToString(), createAsset.File.OpenRead()); + await assetStore.UploadAsync(context.ContextId.ToString(), createAsset.File.OpenRead()); try { var result = await ExecuteCommandAsync(createAsset) as AssetSavedResult; context.Complete(EntityCreatedResult.Create(createAsset.AssetId, result.Version)); - await assetStore.CopyTemporaryAsync(context.ContextId.ToString(), createAsset.AssetId.ToString(), result.FileVersion, null); + await assetStore.CopyAsync(context.ContextId.ToString(), createAsset.AssetId.ToString(), result.FileVersion, null); } finally { - await assetStore.DeleteTemporaryAsync(context.ContextId.ToString()); + await assetStore.DeleteAsync(context.ContextId.ToString()); } break; @@ -62,18 +62,18 @@ namespace Squidex.Domain.Apps.Entities.Assets { updateAsset.ImageInfo = await assetThumbnailGenerator.GetImageInfoAsync(updateAsset.File.OpenRead()); - await assetStore.UploadTemporaryAsync(context.ContextId.ToString(), updateAsset.File.OpenRead()); + await assetStore.UploadAsync(context.ContextId.ToString(), updateAsset.File.OpenRead()); try { var result = await ExecuteCommandAsync(updateAsset) as AssetSavedResult; context.Complete(result); - await assetStore.CopyTemporaryAsync(context.ContextId.ToString(), updateAsset.AssetId.ToString(), result.FileVersion, null); + await assetStore.CopyAsync(context.ContextId.ToString(), updateAsset.AssetId.ToString(), result.FileVersion, null); } finally { - await assetStore.DeleteTemporaryAsync(context.ContextId.ToString()); + await assetStore.DeleteAsync(context.ContextId.ToString()); } break; diff --git a/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs b/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs new file mode 100644 index 000000000..2596d4647 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs @@ -0,0 +1,242 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading; +using System.Threading.Tasks; +using NodaTime; +using Orleans; +using Orleans.Concurrency; +using Squidex.Domain.Apps.Entities.Backup.State; +using Squidex.Domain.Apps.Events.Assets; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Assets; +using Squidex.Infrastructure.EventSourcing; +using Squidex.Infrastructure.Log; +using Squidex.Infrastructure.Orleans; +using Squidex.Infrastructure.States; + +namespace Squidex.Domain.Apps.Entities.Backup +{ + [Reentrant] + public sealed class BackupGrain : Grain, IBackupGrain + { + private const int MaxBackups = 10; + private readonly IClock clock; + private readonly IAssetStore assetStore; + private readonly IEventDataFormatter eventDataFormatter; + private readonly ISemanticLog log; + private readonly IEventStore eventStore; + private readonly IBackupArchiveLocation backupArchiveLocation; + private readonly IStore store; + private CancellationTokenSource currentTask; + private BackupStateJob currentJob; + private Guid appId; + private BackupState state; + private IPersistence persistence; + + public BackupGrain( + IAssetStore assetStore, + IBackupArchiveLocation backupArchiveLocation, + IClock clock, + IEventStore eventStore, + IEventDataFormatter eventDataFormatter, + ISemanticLog log, + IStore store) + { + Guard.NotNull(assetStore, nameof(assetStore)); + Guard.NotNull(backupArchiveLocation, nameof(backupArchiveLocation)); + Guard.NotNull(clock, nameof(clock)); + Guard.NotNull(eventStore, nameof(eventStore)); + Guard.NotNull(eventDataFormatter, nameof(eventDataFormatter)); + Guard.NotNull(store, nameof(store)); + Guard.NotNull(log, nameof(log)); + + this.assetStore = assetStore; + this.backupArchiveLocation = backupArchiveLocation; + this.clock = clock; + this.eventStore = eventStore; + this.eventDataFormatter = eventDataFormatter; + this.store = store; + this.log = log; + } + + public override Task OnActivateAsync() + { + return OnActivateAsync(this.GetPrimaryKey()); + } + + public async Task OnActivateAsync(Guid appId) + { + this.appId = appId; + + persistence = store.WithSnapshots(GetType(), appId, s => state = s); + + await ReadAsync(); + await CleanupAsync(); + } + + private async Task ReadAsync() + { + await persistence.ReadAsync(); + } + + private async Task WriteAsync() + { + await persistence.WriteSnapshotAsync(state); + } + + private async Task CleanupAsync() + { + var hasUpdated = false; + + foreach (var job in state.Jobs) + { + if (!job.Stopped.HasValue) + { + await CleanupAsync(job); + + job.Stopped = clock.GetCurrentInstant(); + job.Failed = true; + + hasUpdated = true; + } + } + + if (hasUpdated) + { + await WriteAsync(); + } + } + + private async Task CleanupAsync(BackupStateJob job) + { + await backupArchiveLocation.DeleteArchiveAsync(job.Id); + } + + public async Task StartNewAsync() + { + if (currentTask != null) + { + throw new DomainException("Another backup process is already running."); + } + + if (state.Jobs.Count >= MaxBackups) + { + throw new DomainException($"You cannot have more than {MaxBackups} backups."); + } + + var job = new BackupStateJob { Id = Guid.NewGuid(), Started = clock.GetCurrentInstant() }; + + currentTask = new CancellationTokenSource(); + currentJob = job; + + state.Jobs.Add(job); + + await WriteAsync(); + + try + { + using (var stream = await backupArchiveLocation.OpenStreamAsync(job.Id)) + { + using (var writer = new EventStreamWriter(stream)) + { + await eventStore.QueryAsync(async @event => + { + var eventData = @event.Data; + + if (eventData.Type == nameof(AssetCreated) || + eventData.Type == nameof(AssetUpdated)) + { + var parsedEvent = eventDataFormatter.Parse(eventData); + + var assetVersion = 0L; + var assetId = Guid.Empty; + + if (parsedEvent.Payload is AssetCreated assetCreated) + { + assetId = assetCreated.AssetId; + assetVersion = assetCreated.FileVersion; + } + + if (parsedEvent.Payload is AssetUpdated asetUpdated) + { + assetId = asetUpdated.AssetId; + assetVersion = asetUpdated.FileVersion; + } + + await writer.WriteEventAsync(eventData, async attachmentStream => + { + await assetStore.DownloadAsync(assetId.ToString(), assetVersion, null, attachmentStream); + }); + } + else + { + await writer.WriteEventAsync(eventData); + } + }, "AppId", appId, null, currentTask.Token); + } + + stream.Position = 0; + + currentTask.Token.ThrowIfCancellationRequested(); + + await assetStore.UploadAsync(job.Id.ToString(), 0, null, stream, currentTask.Token); + + currentTask.Token.ThrowIfCancellationRequested(); + } + } + catch + { + job.Failed = true; + } + finally + { + job.Stopped = clock.GetCurrentInstant(); + + await WriteAsync(); + + currentTask = null; + currentJob = null; + } + } + + public async Task DeleteAsync(Guid id) + { + var job = state.Jobs.FirstOrDefault(x => x.Id == id); + + if (job == null) + { + throw new DomainObjectNotFoundException(id.ToString(), typeof(IBackupJob)); + } + + if (currentJob == job) + { + currentTask?.Cancel(); + } + else + { + state.Jobs.Remove(job); + + await WriteAsync(); + await CleanupAsync(job); + } + } + + public Task>> GetStateAsync() + { + return Task.FromResult(new J>(state.Jobs.OfType().ToList())); + } + + private bool IsRunning() + { + return state.Jobs.Any(x => !x.Stopped.HasValue); + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Backup/EventStreamWriter.cs b/src/Squidex.Domain.Apps.Entities/Backup/EventStreamWriter.cs new file mode 100644 index 000000000..a6a8e29c2 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Backup/EventStreamWriter.cs @@ -0,0 +1,79 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.IO; +using System.IO.Compression; +using System.Threading.Tasks; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; +using Squidex.Infrastructure; +using Squidex.Infrastructure.EventSourcing; + +namespace Squidex.Domain.Apps.Entities.Backup +{ + public sealed class EventStreamWriter : DisposableObjectBase + { + private const int MaxItemsPerFolder = 1000; + private readonly ZipArchive archive; + private int writtenEvents; + private int writtenAttachments; + + public EventStreamWriter(Stream stream) + { + archive = new ZipArchive(stream, ZipArchiveMode.Update, true); + } + + public async Task WriteEventAsync(EventData eventData, Func attachment = null) + { + var eventObject = + new JObject( + new JProperty("type", eventData.Type), + new JProperty("payload", eventData.Payload), + new JProperty("metadata", eventData.Metadata)); + + var eventFolder = writtenEvents / MaxItemsPerFolder; + var eventPath = $"events/{eventFolder}/{writtenEvents}.json"; + var eventEntry = archive.GetEntry(eventPath) ?? archive.CreateEntry(eventPath); + + using (var stream = eventEntry.Open()) + { + using (var textWriter = new StreamWriter(stream)) + { + using (var jsonWriter = new JsonTextWriter(textWriter)) + { + await eventObject.WriteToAsync(jsonWriter); + } + } + } + + writtenEvents++; + + if (attachment != null) + { + var attachmentFolder = writtenAttachments / MaxItemsPerFolder; + var attachmentPath = $"attachments/{attachmentFolder}/{writtenEvents}.blob"; + var attachmentEntry = archive.GetEntry(attachmentPath) ?? archive.CreateEntry(attachmentPath); + + using (var stream = eventEntry.Open()) + { + await attachment(stream); + } + + writtenAttachments++; + } + } + + protected override void DisposeObject(bool disposing) + { + if (disposing) + { + archive.Dispose(); + } + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Backup/IBackupArchiveLocation.cs b/src/Squidex.Domain.Apps.Entities/Backup/IBackupArchiveLocation.cs new file mode 100644 index 000000000..298372a9c --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Backup/IBackupArchiveLocation.cs @@ -0,0 +1,20 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.IO; +using System.Threading.Tasks; + +namespace Squidex.Domain.Apps.Entities.Backup +{ + public interface IBackupArchiveLocation + { + Task OpenStreamAsync(Guid backupId); + + Task DeleteArchiveAsync(Guid backupId); + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Backup/IBackupGrain.cs b/src/Squidex.Domain.Apps.Entities/Backup/IBackupGrain.cs new file mode 100644 index 000000000..3a2736204 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Backup/IBackupGrain.cs @@ -0,0 +1,24 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using Orleans; +using Squidex.Infrastructure.Orleans; + +namespace Squidex.Domain.Apps.Entities.Backup +{ + public interface IBackupGrain : IGrainWithGuidKey + { + Task StartNewAsync(); + + Task DeleteAsync(Guid id); + + Task>> GetStateAsync(); + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Backup/IBackupJob.cs b/src/Squidex.Domain.Apps.Entities/Backup/IBackupJob.cs new file mode 100644 index 000000000..472c0e295 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Backup/IBackupJob.cs @@ -0,0 +1,23 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using NodaTime; + +namespace Squidex.Domain.Apps.Entities.Backup +{ + public interface IBackupJob + { + Guid Id { get; } + + Instant Started { get; } + + Instant? Stopped { get; } + + bool Failed { get; } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Backup/State/BackupState.cs b/src/Squidex.Domain.Apps.Entities/Backup/State/BackupState.cs new file mode 100644 index 000000000..5729030d5 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Backup/State/BackupState.cs @@ -0,0 +1,18 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.Collections.Generic; +using Newtonsoft.Json; + +namespace Squidex.Domain.Apps.Entities.Backup.State +{ + public sealed class BackupState + { + [JsonProperty] + public List Jobs { get; set; } = new List(); + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Backup/State/BackupStateJob.cs b/src/Squidex.Domain.Apps.Entities/Backup/State/BackupStateJob.cs new file mode 100644 index 000000000..771843464 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Backup/State/BackupStateJob.cs @@ -0,0 +1,28 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Newtonsoft.Json; +using NodaTime; + +namespace Squidex.Domain.Apps.Entities.Backup.State +{ + public sealed class BackupStateJob : IBackupJob + { + [JsonProperty] + public Guid Id { get; set; } + + [JsonProperty] + public Instant Started { get; set; } + + [JsonProperty] + public Instant? Stopped { get; set; } + + [JsonProperty] + public bool Failed { get; set; } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Backup/TempFolderBackupArchiveLocation.cs b/src/Squidex.Domain.Apps.Entities/Backup/TempFolderBackupArchiveLocation.cs new file mode 100644 index 000000000..faa099b4b --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Backup/TempFolderBackupArchiveLocation.cs @@ -0,0 +1,44 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.IO; +using System.Threading.Tasks; +using Squidex.Infrastructure.Tasks; + +namespace Squidex.Domain.Apps.Entities.Backup +{ + public sealed class TempFolderBackupArchiveLocation : IBackupArchiveLocation + { + public Task OpenStreamAsync(Guid backupId) + { + var tempFile = GetTempFile(backupId); + + return Task.FromResult(new FileStream(tempFile, FileMode.Open, FileAccess.ReadWrite)); + } + + public Task DeleteArchiveAsync(Guid backupId) + { + var tempFile = GetTempFile(backupId); + + try + { + File.Delete(tempFile); + } + catch (IOException) + { + } + + return TaskHelper.Done; + } + + private static string GetTempFile(Guid backupId) + { + return Path.Combine(Path.GetTempPath(), backupId.ToString()); + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentGrain.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentGrain.cs index 97334f087..0c060bfdc 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentGrain.cs @@ -24,7 +24,7 @@ using Squidex.Infrastructure.States; namespace Squidex.Domain.Apps.Entities.Contents { - public class ContentGrain : DomainObjectGrain, IContentGrain + public class ContentGrain : SquidexDomainObjectGrain, IContentGrain { private readonly IAppProvider appProvider; private readonly IAssetRepository assetRepository; diff --git a/src/Squidex.Domain.Apps.Entities/Contents/IContentScheduleItem.cs b/src/Squidex.Domain.Apps.Entities/Contents/IContentScheduleItem.cs new file mode 100644 index 000000000..0cd2e4257 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/IContentScheduleItem.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using NodaTime; +using Squidex.Domain.Apps.Core.Contents; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Entities.Contents +{ + public interface IContentScheduleItem + { + Status ScheduledTo { get; } + + Instant ScheduledAt { get; } + + RefToken ScheduledBy { get; } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Contents/State/ContentStateScheduleItem.cs b/src/Squidex.Domain.Apps.Entities/Contents/State/ContentStateScheduleItem.cs new file mode 100644 index 000000000..a73f6f0a4 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/Contents/State/ContentStateScheduleItem.cs @@ -0,0 +1,26 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Newtonsoft.Json; +using NodaTime; +using Squidex.Domain.Apps.Core.Contents; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Entities.Contents.State +{ + public sealed class ContentStateScheduleItem : IContentScheduleItem + { + [JsonProperty] + public Instant ScheduledAt { get; set; } + + [JsonProperty] + public RefToken ScheduledBy { get; set; } + + [JsonProperty] + public Status ScheduledTo { get; set; } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/Rules/RuleGrain.cs b/src/Squidex.Domain.Apps.Entities/Rules/RuleGrain.cs index ba316f6a2..7bc1bf8a2 100644 --- a/src/Squidex.Domain.Apps.Entities/Rules/RuleGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Rules/RuleGrain.cs @@ -21,7 +21,7 @@ using Squidex.Infrastructure.States; namespace Squidex.Domain.Apps.Entities.Rules { - public sealed class RuleGrain : DomainObjectGrain, IRuleGrain + public sealed class RuleGrain : SquidexDomainObjectGrain, IRuleGrain { private readonly IAppProvider appProvider; diff --git a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs index baf1ef9ec..db9d92be5 100644 --- a/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Schemas/SchemaGrain.cs @@ -24,7 +24,7 @@ using Squidex.Infrastructure.States; namespace Squidex.Domain.Apps.Entities.Schemas { - public class SchemaGrain : DomainObjectGrain, ISchemaGrain + public class SchemaGrain : SquidexDomainObjectGrain, ISchemaGrain { private readonly IAppProvider appProvider; private readonly FieldRegistry registry; diff --git a/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrain.cs b/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrain.cs new file mode 100644 index 000000000..9808cedb4 --- /dev/null +++ b/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrain.cs @@ -0,0 +1,31 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Squidex.Domain.Apps.Events; +using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure.EventSourcing; +using Squidex.Infrastructure.States; + +namespace Squidex.Domain.Apps.Entities +{ + public abstract class SquidexDomainObjectGrain : DomainObjectGrain where T : IDomainState, new() + { + protected SquidexDomainObjectGrain(IStore store) + : base(store) + { + } + + public override void RaiseEvent(Envelope @event) + { + if (@event.Payload is AppEvent appEvent) + { + @event.SetAppId(appEvent.AppId.Id); + } + } + } +} diff --git a/src/Squidex.Domain.Apps.Entities/SquidexEntities.cs b/src/Squidex.Domain.Apps.Entities/SquidexEntities.cs index c65786a8d..8d82fce42 100644 --- a/src/Squidex.Domain.Apps.Entities/SquidexEntities.cs +++ b/src/Squidex.Domain.Apps.Entities/SquidexEntities.cs @@ -9,7 +9,7 @@ using System.Reflection; namespace Squidex.Domain.Apps.Entities { - public sealed class SquidexEntities + public static class SquidexEntities { public static readonly Assembly Assembly = typeof(SquidexEntities).Assembly; } diff --git a/src/Squidex.Domain.Apps.Events/Contents/ContentScheduleItemRemoved.cs b/src/Squidex.Domain.Apps.Events/Contents/ContentScheduleItemRemoved.cs new file mode 100644 index 000000000..315972adf --- /dev/null +++ b/src/Squidex.Domain.Apps.Events/Contents/ContentScheduleItemRemoved.cs @@ -0,0 +1,18 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Squidex.Infrastructure.EventSourcing; + +namespace Squidex.Domain.Apps.Events.Contents +{ + [EventType(nameof(ContentStatusChanged))] + public sealed class ContentScheduleItemRemoved : ContentEvent + { + public Guid ScheduleItemId { get; set; } + } +} diff --git a/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs b/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs index 258a37ae2..e19b9af8a 100644 --- a/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs +++ b/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs @@ -7,6 +7,7 @@ using System; using System.IO; +using System.Threading; using System.Threading.Tasks; using Microsoft.WindowsAzure.Storage; using Microsoft.WindowsAzure.Storage.Blob; @@ -56,7 +57,7 @@ namespace Squidex.Infrastructure.Assets return new Uri(blobContainer.StorageUri.PrimaryUri, $"/{containerName}/{blobName}").ToString(); } - public async Task CopyTemporaryAsync(string name, string id, long version, string suffix) + public async Task CopyAsync(string name, string id, long version, string suffix, CancellationToken ct = default(CancellationToken)) { var blobName = GetObjectName(id, version, suffix); var blobRef = blobContainer.GetBlobReference(blobName); @@ -65,12 +66,14 @@ namespace Squidex.Infrastructure.Assets try { - await blobRef.StartCopyAsync(tempBlob.Uri); + await blobRef.StartCopyAsync(tempBlob.Uri, null, null, null, null, ct); while (blobRef.CopyState.Status == CopyStatus.Pending) { + ct.ThrowIfCancellationRequested(); + await Task.Delay(50); - await blobRef.FetchAttributesAsync(); + await blobRef.FetchAttributesAsync(null, null, null, ct); } if (blobRef.CopyState.Status != CopyStatus.Success) @@ -84,14 +87,14 @@ namespace Squidex.Infrastructure.Assets } } - public async Task DownloadAsync(string id, long version, string suffix, Stream stream) + public async Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken)) { var blobName = GetObjectName(id, version, suffix); var blobRef = blobContainer.GetBlockBlobReference(blobName); try { - await blobRef.DownloadToStreamAsync(stream); + await blobRef.DownloadToStreamAsync(stream, null, null, null, ct); } catch (StorageException ex) when (ex.RequestInformation.HttpStatusCode == 404) { @@ -99,7 +102,7 @@ namespace Squidex.Infrastructure.Assets } } - public async Task UploadAsync(string id, long version, string suffix, Stream stream) + public async Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken)) { var blobName = GetObjectName(id, version, suffix); var blobRef = blobContainer.GetBlockBlobReference(blobName); @@ -107,18 +110,18 @@ namespace Squidex.Infrastructure.Assets blobRef.Metadata[AssetVersion] = version.ToString(); blobRef.Metadata[AssetId] = id; - await blobRef.UploadFromStreamAsync(stream); + await blobRef.UploadFromStreamAsync(stream, null, null, null, ct); await blobRef.SetMetadataAsync(); } - public async Task UploadTemporaryAsync(string name, Stream stream) + public async Task UploadAsync(string name, Stream stream, CancellationToken ct = default(CancellationToken)) { var tempBlob = blobContainer.GetBlockBlobReference(name); - await tempBlob.UploadFromStreamAsync(stream); + await tempBlob.UploadFromStreamAsync(stream, null, null, null, ct); } - public async Task DeleteTemporaryAsync(string name) + public async Task DeleteAsync(string name) { var tempBlob = blobContainer.GetBlockBlobReference(name); diff --git a/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs b/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs index ec1bad1c7..8df8c6094 100644 --- a/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs +++ b/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs @@ -9,6 +9,7 @@ using System; using System.IO; using System.Linq; using System.Net; +using System.Threading; using System.Threading.Tasks; using Google; using Google.Cloud.Storage.V1; @@ -48,25 +49,25 @@ namespace Squidex.Infrastructure.Assets return $"https://storage.cloud.google.com/{bucketName}/{objectName}"; } - public Task UploadTemporaryAsync(string name, Stream stream) + public Task UploadAsync(string name, Stream stream, CancellationToken ct = default(CancellationToken)) { - return storageClient.UploadObjectAsync(bucketName, name, "application/octet-stream", stream); + return storageClient.UploadObjectAsync(bucketName, name, "application/octet-stream", stream, cancellationToken: ct); } - public async Task UploadAsync(string id, long version, string suffix, Stream stream) + public async Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken)) { var objectName = GetObjectName(id, version, suffix); - await storageClient.UploadObjectAsync(bucketName, objectName, "application/octet-stream", stream); + await storageClient.UploadObjectAsync(bucketName, objectName, "application/octet-stream", stream, cancellationToken: ct); } - public async Task CopyTemporaryAsync(string name, string id, long version, string suffix) + public async Task CopyAsync(string name, string id, long version, string suffix, CancellationToken ct = default(CancellationToken)) { var objectName = GetObjectName(id, version, suffix); try { - await storageClient.CopyObjectAsync(bucketName, name, bucketName, objectName); + await storageClient.CopyObjectAsync(bucketName, name, bucketName, objectName, cancellationToken: ct); } catch (GoogleApiException ex) when (ex.HttpStatusCode == HttpStatusCode.NotFound) { @@ -74,13 +75,13 @@ namespace Squidex.Infrastructure.Assets } } - public async Task DownloadAsync(string id, long version, string suffix, Stream stream) + public async Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken)) { var objectName = GetObjectName(id, version, suffix); try { - await storageClient.DownloadObjectAsync(bucketName, objectName, stream); + await storageClient.DownloadObjectAsync(bucketName, objectName, stream, cancellationToken: ct); } catch (GoogleApiException ex) when (ex.HttpStatusCode == HttpStatusCode.NotFound) { @@ -88,7 +89,7 @@ namespace Squidex.Infrastructure.Assets } } - public async Task DeleteTemporaryAsync(string name) + public async Task DeleteAsync(string name) { try { diff --git a/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs b/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs index 396bffbc7..d908cbf24 100644 --- a/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs +++ b/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs @@ -7,6 +7,7 @@ using System.IO; using System.Linq; +using System.Threading; using System.Threading.Tasks; using Squidex.Infrastructure.Log; using Squidex.Infrastructure.Tasks; @@ -15,6 +16,7 @@ namespace Squidex.Infrastructure.Assets { public sealed class FolderAssetStore : IAssetStore, IInitializable { + private const int BufferSize = 81920; private readonly ISemanticLog log; private readonly DirectoryInfo directory; @@ -57,27 +59,27 @@ namespace Squidex.Infrastructure.Assets return file.FullName; } - public async Task UploadTemporaryAsync(string name, Stream stream) + public async Task UploadAsync(string name, Stream stream, CancellationToken ct = default(CancellationToken)) { var file = GetFile(name); using (var fileStream = file.OpenWrite()) { - await stream.CopyToAsync(fileStream); + await stream.CopyToAsync(fileStream, BufferSize, ct); } } - public async Task UploadAsync(string id, long version, string suffix, Stream stream) + public async Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken)) { var file = GetFile(id, version, suffix); using (var fileStream = file.OpenWrite()) { - await stream.CopyToAsync(fileStream); + await stream.CopyToAsync(fileStream, BufferSize, ct); } } - public async Task DownloadAsync(string id, long version, string suffix, Stream stream) + public async Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken)) { var file = GetFile(id, version, suffix); @@ -85,7 +87,7 @@ namespace Squidex.Infrastructure.Assets { using (var fileStream = file.OpenRead()) { - await fileStream.CopyToAsync(stream); + await fileStream.CopyToAsync(stream, BufferSize, ct); } } catch (FileNotFoundException ex) @@ -94,7 +96,7 @@ namespace Squidex.Infrastructure.Assets } } - public Task CopyTemporaryAsync(string name, string id, long version, string suffix) + public Task CopyAsync(string name, string id, long version, string suffix, CancellationToken ct = default(CancellationToken)) { try { @@ -110,7 +112,7 @@ namespace Squidex.Infrastructure.Assets } } - public Task DeleteTemporaryAsync(string name) + public Task DeleteAsync(string name) { try { diff --git a/src/Squidex.Infrastructure/Assets/IAssetStore.cs b/src/Squidex.Infrastructure/Assets/IAssetStore.cs index 4c2ab9358..9e8cd3bcd 100644 --- a/src/Squidex.Infrastructure/Assets/IAssetStore.cs +++ b/src/Squidex.Infrastructure/Assets/IAssetStore.cs @@ -6,6 +6,7 @@ // ========================================================================== using System.IO; +using System.Threading; using System.Threading.Tasks; namespace Squidex.Infrastructure.Assets @@ -14,14 +15,14 @@ namespace Squidex.Infrastructure.Assets { string GenerateSourceUrl(string id, long version, string suffix); - Task CopyTemporaryAsync(string name, string id, long version, string suffix); + Task CopyAsync(string name, string id, long version, string suffix, CancellationToken ct = default(CancellationToken)); - Task DownloadAsync(string id, long version, string suffix, Stream stream); + Task DownloadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken)); - Task UploadTemporaryAsync(string name, Stream stream); + Task UploadAsync(string name, Stream stream, CancellationToken ct = default(CancellationToken)); - Task UploadAsync(string id, long version, string suffix, Stream stream); + Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken)); - Task DeleteTemporaryAsync(string name); + Task DeleteAsync(string name); } } \ No newline at end of file diff --git a/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs b/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs index 53dff0972..cd89c8035 100644 --- a/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs +++ b/src/Squidex/Areas/Api/Controllers/Apps/AppLanguagesController.cs @@ -98,7 +98,7 @@ namespace Squidex.Areas.Api.Controllers.Apps /// /// 204 => Language updated. /// 400 => Language object is invalid. - /// 404 => App not found. + /// 404 => Language or app not found. /// [MustBeAppEditor] [HttpPut] @@ -118,7 +118,7 @@ namespace Squidex.Areas.Api.Controllers.Apps /// The language to delete from the app. /// /// 204 => Language deleted. - /// 404 => App not found. + /// 404 => Language or app not found. /// [MustBeAppEditor] [HttpDelete] diff --git a/src/Squidex/Areas/Api/Controllers/Backup/BackupController.cs b/src/Squidex/Areas/Api/Controllers/Backup/BackupController.cs new file mode 100644 index 000000000..4cb34a669 --- /dev/null +++ b/src/Squidex/Areas/Api/Controllers/Backup/BackupController.cs @@ -0,0 +1,105 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using NSwag.Annotations; +using Orleans; +using Squidex.Areas.Api.Controllers.Backup.Models; +using Squidex.Domain.Apps.Entities.Backup; +using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure.Reflection; +using Squidex.Pipeline; + +namespace Squidex.Areas.Api.Controllers.Backup +{ + /// + /// Manages backups for app. + /// + [ApiAuthorize] + [ApiExceptionFilter] + [AppApi] + [MustBeAppOwner] + [SwaggerTag(nameof(Backup))] + public class BackupController : ApiController + { + private readonly IGrainFactory grainFactory; + + public BackupController(ICommandBus commandBus, IGrainFactory grainFactory) + : base(commandBus) + { + this.grainFactory = grainFactory; + } + + /// + /// Get all backup jobs. + /// + /// The name of the app. + /// + /// 200 => Backups returned. + /// 404 => App not found. + /// + [HttpGet] + [Route("apps/{app}/backups/")] + [ProducesResponseType(typeof(List), 200)] + [ApiCosts(0)] + public async Task GetJobs(string app) + { + var backupGrain = grainFactory.GetGrain(App.Id); + + var jobs = await backupGrain.GetStateAsync(); + + return Ok(jobs.Value.Select(x => SimpleMapper.Map(x, new BackupJobDto())).ToList()); + } + + /// + /// Start a new backup. + /// + /// The name of the app. + /// + /// 204 => Backup started. + /// 404 => App not found. + /// + [HttpPost] + [Route("apps/{app}/backups/")] + [ProducesResponseType(typeof(List), 200)] + [ApiCosts(0)] + public async Task PostBackup(string app) + { + var backupGrain = grainFactory.GetGrain(App.Id); + + await backupGrain.StartNewAsync(); + + return NoContent(); + } + + /// + /// Delete a backup. + /// + /// The name of the app. + /// The id of the backup to delete. + /// + /// 204 => Backup started. + /// 404 => Backup or app not found. + /// + [HttpPost] + [Route("apps/{app}/backups/{id}")] + [ProducesResponseType(typeof(List), 200)] + [ApiCosts(0)] + public async Task PostBackup(string app, Guid id) + { + var backupGrain = grainFactory.GetGrain(App.Id); + + await backupGrain.StartNewAsync(); + + return NoContent(); + } + } +} diff --git a/src/Squidex/Areas/Api/Controllers/Backup/Models/BackupJobDto.cs b/src/Squidex/Areas/Api/Controllers/Backup/Models/BackupJobDto.cs new file mode 100644 index 000000000..a7dd12f07 --- /dev/null +++ b/src/Squidex/Areas/Api/Controllers/Backup/Models/BackupJobDto.cs @@ -0,0 +1,38 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.ComponentModel.DataAnnotations; +using NodaTime; + +namespace Squidex.Areas.Api.Controllers.Backup.Models +{ + public sealed class BackupJobDto + { + /// + /// The id of the backup job. + /// + [Required] + public Guid Id { get; set; } + + /// + /// The time when the job has been started. + /// + [Required] + public Instant Started { get; set; } + + /// + /// The time when the job has been stopped. + /// + public Instant? Stopped { get; } + + /// + /// Indicates if the job has failed. + /// + public bool Failed { get; } + } +} diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs index 6882a0450..cf87d3020 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs @@ -7,6 +7,7 @@ using System; using System.IO; +using System.Threading; using System.Threading.Tasks; using FakeItEasy; using Orleans; @@ -89,21 +90,21 @@ namespace Squidex.Domain.Apps.Entities.Assets private void SetupStore(long version, Guid commitId) { - A.CallTo(() => assetStore.UploadTemporaryAsync(commitId.ToString(), stream)) + A.CallTo(() => assetStore.UploadAsync(commitId.ToString(), stream, CancellationToken.None)) .Returns(TaskHelper.Done); - A.CallTo(() => assetStore.CopyTemporaryAsync(commitId.ToString(), assetId.ToString(), version, null)) + A.CallTo(() => assetStore.CopyAsync(commitId.ToString(), assetId.ToString(), version, null, CancellationToken.None)) .Returns(TaskHelper.Done); - A.CallTo(() => assetStore.DeleteTemporaryAsync(commitId.ToString())) + A.CallTo(() => assetStore.DeleteAsync(commitId.ToString())) .Returns(TaskHelper.Done); } private void AssertAssetHasBeenUploaded(long version, Guid commitId) { - A.CallTo(() => assetStore.UploadTemporaryAsync(commitId.ToString(), stream)) + A.CallTo(() => assetStore.UploadAsync(commitId.ToString(), stream, CancellationToken.None)) .MustHaveHappened(); - A.CallTo(() => assetStore.CopyTemporaryAsync(commitId.ToString(), assetId.ToString(), version, null)) + A.CallTo(() => assetStore.CopyAsync(commitId.ToString(), assetId.ToString(), version, null, CancellationToken.None)) .MustHaveHappened(); - A.CallTo(() => assetStore.DeleteTemporaryAsync(commitId.ToString())) + A.CallTo(() => assetStore.DeleteAsync(commitId.ToString())) .MustHaveHappened(); } diff --git a/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs b/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs index 396a3efde..c5d169050 100644 --- a/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs +++ b/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs @@ -7,6 +7,7 @@ using System; using System.IO; +using System.Threading; using System.Threading.Tasks; using FakeItEasy; using Squidex.Infrastructure.Assets; @@ -33,18 +34,18 @@ namespace Squidex.Domain.Users { var stream = new MemoryStream(); - A.CallTo(() => assetStore.UploadAsync(userId, 0, "picture", stream)) + A.CallTo(() => assetStore.UploadAsync(userId, 0, "picture", stream, CancellationToken.None)) .Returns(TaskHelper.Done); await sut.UploadAsync(userId, stream); - A.CallTo(() => assetStore.UploadAsync(userId, 0, "picture", stream)).MustHaveHappened(); + A.CallTo(() => assetStore.UploadAsync(userId, 0, "picture", stream, CancellationToken.None)).MustHaveHappened(); } [Fact] public async Task Should_invoke_asset_store_to_download_picture() { - A.CallTo(() => assetStore.DownloadAsync(userId, 0, "picture", A.Ignored)) + A.CallTo(() => assetStore.DownloadAsync(userId, 0, "picture", A.Ignored, CancellationToken.None)) .Invokes(async (string id, long version, string suffix, Stream stream) => { await stream.WriteAsync(new byte[] { 1, 2, 3, 4 }, 0, 4); @@ -55,7 +56,7 @@ namespace Squidex.Domain.Users Assert.Equal(0, result.Position); Assert.Equal(4, result.Length); - A.CallTo(() => assetStore.DownloadAsync(userId, 0, "picture", A.Ignored)).MustHaveHappened(); + A.CallTo(() => assetStore.DownloadAsync(userId, 0, "picture", A.Ignored, CancellationToken.None)).MustHaveHappened(); } } } diff --git a/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs index 64316f5b5..657331efc 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs @@ -43,7 +43,7 @@ namespace Squidex.Infrastructure.Assets { ((IInitializable)Sut).Initialize(); - return Assert.ThrowsAsync(() => Sut.CopyTemporaryAsync(Id(), Id(), 1, null)); + return Assert.ThrowsAsync(() => Sut.CopyAsync(Id(), Id(), 1, null)); } [Fact] @@ -73,8 +73,8 @@ namespace Squidex.Infrastructure.Assets var assetId = Id(); var assetData = new MemoryStream(new byte[] { 0x1, 0x2, 0x3, 0x4 }); - await Sut.UploadTemporaryAsync(tempId, assetData); - await Sut.CopyTemporaryAsync(tempId, assetId, 1, "suffix"); + await Sut.UploadAsync(tempId, assetData); + await Sut.CopyAsync(tempId, assetId, 1, "suffix"); var readData = new MemoryStream(); @@ -92,9 +92,9 @@ namespace Squidex.Infrastructure.Assets var assetData = new MemoryStream(new byte[] { 0x1, 0x2, 0x3, 0x4 }); - await Sut.UploadTemporaryAsync(tempId, assetData); - await Sut.DeleteTemporaryAsync(tempId); - await Sut.DeleteTemporaryAsync(tempId); + await Sut.UploadAsync(tempId, assetData); + await Sut.DeleteAsync(tempId); + await Sut.DeleteAsync(tempId); } private static string Id() From ab4bc05cd99f88453eaae2064ecc02fdb06e092f Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Thu, 22 Mar 2018 17:45:11 +0100 Subject: [PATCH 2/7] Download Endpoint and UI page --- .../Backup/BackupGrain.cs | 7 +- .../Backup/IBackupGrain.cs | 2 +- .../Backup/State/BackupState.cs | 2 +- .../Backup/TempFolderBackupArchiveLocation.cs | 2 +- .../SquidexDomainObjectGrain.cs | 2 + .../Contents/ContentScheduleItemRemoved.cs | 18 ----- .../States/MongoSnapshotStore.cs | 2 +- src/Squidex.Infrastructure/States/Store.cs | 4 +- .../States/StoreExtensions.cs | 12 +-- .../Assets/AssetContentController.cs | 16 ++-- .../Controllers/Backup/BackupController.cs | 34 +++++++-- src/Squidex/Config/Domain/EntitiesServices.cs | 4 + src/Squidex/Config/Domain/StoreServices.cs | 5 ++ .../app/features/settings/declarations.ts | 1 + src/Squidex/app/features/settings/module.ts | 6 ++ .../pages/backups/backups-page.component.html | 34 +++++++++ .../pages/backups/backups-page.component.scss | 2 + .../pages/backups/backups-page.component.ts | 49 ++++++++++++ .../settings/settings-area.component.html | 8 +- src/Squidex/app/shared/declarations-base.ts | 1 + src/Squidex/app/shared/module.ts | 2 + .../app/shared/services/backups.service.ts | 76 +++++++++++++++++++ 22 files changed, 241 insertions(+), 48 deletions(-) delete mode 100644 src/Squidex.Domain.Apps.Events/Contents/ContentScheduleItemRemoved.cs create mode 100644 src/Squidex/app/features/settings/pages/backups/backups-page.component.html create mode 100644 src/Squidex/app/features/settings/pages/backups/backups-page.component.scss create mode 100644 src/Squidex/app/features/settings/pages/backups/backups-page.component.ts create mode 100644 src/Squidex/app/shared/services/backups.service.ts diff --git a/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs b/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs index 2596d4647..3ea5d0ad3 100644 --- a/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs @@ -14,6 +14,7 @@ using NodaTime; using Orleans; using Orleans.Concurrency; using Squidex.Domain.Apps.Entities.Backup.State; +using Squidex.Domain.Apps.Events; using Squidex.Domain.Apps.Events.Assets; using Squidex.Infrastructure; using Squidex.Infrastructure.Assets; @@ -38,7 +39,7 @@ namespace Squidex.Domain.Apps.Entities.Backup private CancellationTokenSource currentTask; private BackupStateJob currentJob; private Guid appId; - private BackupState state; + private BackupState state = new BackupState(); private IPersistence persistence; public BackupGrain( @@ -120,7 +121,7 @@ namespace Squidex.Domain.Apps.Entities.Backup await backupArchiveLocation.DeleteArchiveAsync(job.Id); } - public async Task StartNewAsync() + public async Task RunAsync() { if (currentTask != null) { @@ -180,7 +181,7 @@ namespace Squidex.Domain.Apps.Entities.Backup { await writer.WriteEventAsync(eventData); } - }, "AppId", appId, null, currentTask.Token); + }, SquidexHeaders.AppId, appId.ToString(), null, currentTask.Token); } stream.Position = 0; diff --git a/src/Squidex.Domain.Apps.Entities/Backup/IBackupGrain.cs b/src/Squidex.Domain.Apps.Entities/Backup/IBackupGrain.cs index 3a2736204..21f66e2ff 100644 --- a/src/Squidex.Domain.Apps.Entities/Backup/IBackupGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Backup/IBackupGrain.cs @@ -15,7 +15,7 @@ namespace Squidex.Domain.Apps.Entities.Backup { public interface IBackupGrain : IGrainWithGuidKey { - Task StartNewAsync(); + Task RunAsync(); Task DeleteAsync(Guid id); diff --git a/src/Squidex.Domain.Apps.Entities/Backup/State/BackupState.cs b/src/Squidex.Domain.Apps.Entities/Backup/State/BackupState.cs index 5729030d5..e75eef133 100644 --- a/src/Squidex.Domain.Apps.Entities/Backup/State/BackupState.cs +++ b/src/Squidex.Domain.Apps.Entities/Backup/State/BackupState.cs @@ -13,6 +13,6 @@ namespace Squidex.Domain.Apps.Entities.Backup.State public sealed class BackupState { [JsonProperty] - public List Jobs { get; set; } = new List(); + public List Jobs { get; } = new List(); } } diff --git a/src/Squidex.Domain.Apps.Entities/Backup/TempFolderBackupArchiveLocation.cs b/src/Squidex.Domain.Apps.Entities/Backup/TempFolderBackupArchiveLocation.cs index faa099b4b..b710a46ac 100644 --- a/src/Squidex.Domain.Apps.Entities/Backup/TempFolderBackupArchiveLocation.cs +++ b/src/Squidex.Domain.Apps.Entities/Backup/TempFolderBackupArchiveLocation.cs @@ -18,7 +18,7 @@ namespace Squidex.Domain.Apps.Entities.Backup { var tempFile = GetTempFile(backupId); - return Task.FromResult(new FileStream(tempFile, FileMode.Open, FileAccess.ReadWrite)); + return Task.FromResult(new FileStream(tempFile, FileMode.Create, FileAccess.ReadWrite)); } public Task DeleteArchiveAsync(Guid backupId) diff --git a/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrain.cs b/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrain.cs index 9808cedb4..b3fd6f7d8 100644 --- a/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/SquidexDomainObjectGrain.cs @@ -26,6 +26,8 @@ namespace Squidex.Domain.Apps.Entities { @event.SetAppId(appEvent.AppId.Id); } + + base.RaiseEvent(@event); } } } diff --git a/src/Squidex.Domain.Apps.Events/Contents/ContentScheduleItemRemoved.cs b/src/Squidex.Domain.Apps.Events/Contents/ContentScheduleItemRemoved.cs deleted file mode 100644 index 315972adf..000000000 --- a/src/Squidex.Domain.Apps.Events/Contents/ContentScheduleItemRemoved.cs +++ /dev/null @@ -1,18 +0,0 @@ -// ========================================================================== -// Squidex Headless CMS -// ========================================================================== -// Copyright (c) Squidex UG (haftungsbeschraenkt) -// All rights reserved. Licensed under the MIT license. -// ========================================================================== - -using System; -using Squidex.Infrastructure.EventSourcing; - -namespace Squidex.Domain.Apps.Events.Contents -{ - [EventType(nameof(ContentStatusChanged))] - public sealed class ContentScheduleItemRemoved : ContentEvent - { - public Guid ScheduleItemId { get; set; } - } -} diff --git a/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs b/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs index c90506746..19f641f38 100644 --- a/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs +++ b/src/Squidex.Infrastructure.MongoDb/States/MongoSnapshotStore.cs @@ -32,7 +32,7 @@ namespace Squidex.Infrastructure.States public async Task<(T Value, long Version)> ReadAsync(TKey key) { var existing = - await Collection.Find(x => Equals(x.Id, key)) + await Collection.Find(x => x.Id.Equals(key)) .FirstOrDefaultAsync(); if (existing != null) diff --git a/src/Squidex.Infrastructure/States/Store.cs b/src/Squidex.Infrastructure/States/Store.cs index a3d6b1bc6..3a010d3ed 100644 --- a/src/Squidex.Infrastructure/States/Store.cs +++ b/src/Squidex.Infrastructure/States/Store.cs @@ -32,12 +32,12 @@ namespace Squidex.Infrastructure.States public IPersistence WithSnapshots(Type owner, TKey key, Func applySnapshot) { - return CreatePersistence(owner, key, PersistenceMode.Snapshots, applySnapshot, null); + return CreatePersistence(owner, key, PersistenceMode.Snapshots, applySnapshot, null); } public IPersistence WithSnapshotsAndEventSourcing(Type owner, TKey key, Func applySnapshot, Func, Task> applyEvent) { - return CreatePersistence(owner, key, PersistenceMode.SnapshotsAndEventSourcing, applySnapshot, applyEvent); + return CreatePersistence(owner, key, PersistenceMode.SnapshotsAndEventSourcing, applySnapshot, applyEvent); } public IPersistence WithEventSourcing(Type owner, TKey key, Func, Task> applyEvent) diff --git a/src/Squidex.Infrastructure/States/StoreExtensions.cs b/src/Squidex.Infrastructure/States/StoreExtensions.cs index 3cee24593..1164807ad 100644 --- a/src/Squidex.Infrastructure/States/StoreExtensions.cs +++ b/src/Squidex.Infrastructure/States/StoreExtensions.cs @@ -21,12 +21,12 @@ namespace Squidex.Infrastructure.States public static IPersistence WithSnapshots(this IStore store, TKey key, Func applySnapshot) { - return store.WithSnapshots(typeof(TOwner), key, applySnapshot); + return store.WithSnapshots(typeof(TOwner), key, applySnapshot); } public static IPersistence WithSnapshotsAndEventSourcing(this IStore store, TKey key, Func applySnapshot, Func, Task> applyEvent) { - return store.WithSnapshotsAndEventSourcing(typeof(TOwner), key, applySnapshot, applyEvent); + return store.WithSnapshotsAndEventSourcing(typeof(TOwner), key, applySnapshot, applyEvent); } public static IPersistence WithEventSourcing(this IStore store, Type owner, TKey key, Action> applyEvent) @@ -36,12 +36,12 @@ namespace Squidex.Infrastructure.States public static IPersistence WithSnapshots(this IStore store, Type owner, TKey key, Action applySnapshot) { - return store.WithSnapshots(owner, key, applySnapshot.ToAsync()); + return store.WithSnapshots(owner, key, applySnapshot.ToAsync()); } public static IPersistence WithSnapshotsAndEventSourcing(this IStore store, Type owner, TKey key, Action applySnapshot, Action> applyEvent) { - return store.WithSnapshotsAndEventSourcing(owner, key, applySnapshot.ToAsync(), applyEvent.ToAsync()); + return store.WithSnapshotsAndEventSourcing(owner, key, applySnapshot.ToAsync(), applyEvent.ToAsync()); } public static IPersistence WithEventSourcing(this IStore store, TKey key, Action> applyEvent) @@ -51,12 +51,12 @@ namespace Squidex.Infrastructure.States public static IPersistence WithSnapshots(this IStore store, TKey key, Action applySnapshot) { - return store.WithSnapshots(typeof(TOwner), key, applySnapshot.ToAsync()); + return store.WithSnapshots(typeof(TOwner), key, applySnapshot.ToAsync()); } public static IPersistence WithSnapshotsAndEventSourcing(this IStore store, TKey key, Action applySnapshot, Action> applyEvent) { - return store.WithSnapshotsAndEventSourcing(typeof(TOwner), key, applySnapshot.ToAsync(), applyEvent.ToAsync()); + return store.WithSnapshotsAndEventSourcing(typeof(TOwner), key, applySnapshot.ToAsync(), applyEvent.ToAsync()); } } } diff --git a/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs index f0e4c4d03..9e1ec9fdd 100644 --- a/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs +++ b/src/Squidex/Areas/Api/Controllers/Assets/AssetContentController.cs @@ -27,18 +27,18 @@ namespace Squidex.Areas.Api.Controllers.Assets [SwaggerTag(nameof(Assets))] public sealed class AssetContentController : ApiController { - private readonly IAssetStore assetStorage; + private readonly IAssetStore assetStore; private readonly IAssetRepository assetRepository; private readonly IAssetThumbnailGenerator assetThumbnailGenerator; public AssetContentController( ICommandBus commandBus, - IAssetStore assetStorage, + IAssetStore assetStore, IAssetRepository assetRepository, IAssetThumbnailGenerator assetThumbnailGenerator) : base(commandBus) { - this.assetStorage = assetStorage; + this.assetStore = assetStore; this.assetRepository = assetRepository; this.assetThumbnailGenerator = assetThumbnailGenerator; } @@ -53,7 +53,7 @@ namespace Squidex.Areas.Api.Controllers.Assets /// The target height of the asset, if it is an image. /// The resize mode when the width and height is defined. /// - /// 200 => Asset found and content or (resize) image returned. + /// 200 => Asset found and content or (resized) image returned. /// 404 => Asset or app not found. /// [HttpGet] @@ -79,7 +79,7 @@ namespace Squidex.Areas.Api.Controllers.Assets try { - await assetStorage.DownloadAsync(assetId, entity.FileVersion, assetSuffix, bodyStream); + await assetStore.DownloadAsync(assetId, entity.FileVersion, assetSuffix, bodyStream); } catch (AssetNotFoundException) { @@ -87,13 +87,13 @@ namespace Squidex.Areas.Api.Controllers.Assets { using (var destinationStream = GetTempStream()) { - await assetStorage.DownloadAsync(assetId, entity.FileVersion, null, sourceStream); + await assetStore.DownloadAsync(assetId, entity.FileVersion, null, sourceStream); sourceStream.Position = 0; await assetThumbnailGenerator.CreateThumbnailAsync(sourceStream, destinationStream, width, height, mode); destinationStream.Position = 0; - await assetStorage.UploadAsync(assetId, entity.FileVersion, assetSuffix, destinationStream); + await assetStore.UploadAsync(assetId, entity.FileVersion, assetSuffix, destinationStream); destinationStream.Position = 0; await destinationStream.CopyToAsync(bodyStream); @@ -103,7 +103,7 @@ namespace Squidex.Areas.Api.Controllers.Assets } else { - await assetStorage.DownloadAsync(assetId, entity.FileVersion, null, bodyStream); + await assetStore.DownloadAsync(assetId, entity.FileVersion, null, bodyStream); } }); } diff --git a/src/Squidex/Areas/Api/Controllers/Backup/BackupController.cs b/src/Squidex/Areas/Api/Controllers/Backup/BackupController.cs index 4cb34a669..f4991ceec 100644 --- a/src/Squidex/Areas/Api/Controllers/Backup/BackupController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backup/BackupController.cs @@ -14,8 +14,10 @@ using NSwag.Annotations; using Orleans; using Squidex.Areas.Api.Controllers.Backup.Models; using Squidex.Domain.Apps.Entities.Backup; +using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Reflection; +using Squidex.Infrastructure.Tasks; using Squidex.Pipeline; namespace Squidex.Areas.Api.Controllers.Backup @@ -31,11 +33,13 @@ namespace Squidex.Areas.Api.Controllers.Backup public class BackupController : ApiController { private readonly IGrainFactory grainFactory; + private readonly IAssetStore assetStore; - public BackupController(ICommandBus commandBus, IGrainFactory grainFactory) + public BackupController(ICommandBus commandBus, IGrainFactory grainFactory, IAssetStore assetStore) : base(commandBus) { this.grainFactory = grainFactory; + this.assetStore = assetStore; } /// @@ -71,15 +75,33 @@ namespace Squidex.Areas.Api.Controllers.Backup [Route("apps/{app}/backups/")] [ProducesResponseType(typeof(List), 200)] [ApiCosts(0)] - public async Task PostBackup(string app) + public IActionResult PostBackup(string app) { var backupGrain = grainFactory.GetGrain(App.Id); - await backupGrain.StartNewAsync(); + backupGrain.RunAsync().Forget(); return NoContent(); } + /// + /// Get the backup content. + /// + /// The name of the app. + /// The id of the asset. + /// + /// 200 => Backup found and content returned. + /// 404 => Backup or app not found. + /// + [HttpGet] + [Route("apps/{app}/backups/{id}")] + [ProducesResponseType(200)] + [ApiCosts(0.5)] + public IActionResult GetBackupContent(string app, Guid id) + { + return new FileCallbackResult("application/zip", "Backup.zip", bodyStream => assetStore.DownloadAsync(id.ToString(), 0, null, bodyStream)); + } + /// /// Delete a backup. /// @@ -89,15 +111,15 @@ namespace Squidex.Areas.Api.Controllers.Backup /// 204 => Backup started. /// 404 => Backup or app not found. /// - [HttpPost] + [HttpDelete] [Route("apps/{app}/backups/{id}")] [ProducesResponseType(typeof(List), 200)] [ApiCosts(0)] - public async Task PostBackup(string app, Guid id) + public async Task DeleteBackup(string app, Guid id) { var backupGrain = grainFactory.GetGrain(App.Id); - await backupGrain.StartNewAsync(); + await backupGrain.DeleteAsync(id); return NoContent(); } diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs index cabc20e5c..158c3afdf 100644 --- a/src/Squidex/Config/Domain/EntitiesServices.cs +++ b/src/Squidex/Config/Domain/EntitiesServices.cs @@ -19,6 +19,7 @@ using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Apps.Commands; using Squidex.Domain.Apps.Entities.Apps.Templates; using Squidex.Domain.Apps.Entities.Assets; +using Squidex.Domain.Apps.Entities.Backup; using Squidex.Domain.Apps.Entities.Contents; using Squidex.Domain.Apps.Entities.Contents.Commands; using Squidex.Domain.Apps.Entities.Contents.Edm; @@ -50,6 +51,9 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .As(); + services.AddSingletonAs() + .As(); + services.AddSingletonAs() .As(); diff --git a/src/Squidex/Config/Domain/StoreServices.cs b/src/Squidex/Config/Domain/StoreServices.cs index 537b06688..f4f8e56ba 100644 --- a/src/Squidex/Config/Domain/StoreServices.cs +++ b/src/Squidex/Config/Domain/StoreServices.cs @@ -18,6 +18,7 @@ using Squidex.Domain.Apps.Entities.Apps.Repositories; using Squidex.Domain.Apps.Entities.Apps.State; using Squidex.Domain.Apps.Entities.Assets.Repositories; using Squidex.Domain.Apps.Entities.Assets.State; +using Squidex.Domain.Apps.Entities.Backup.State; using Squidex.Domain.Apps.Entities.Contents.Repositories; using Squidex.Domain.Apps.Entities.Contents.State; using Squidex.Domain.Apps.Entities.History; @@ -69,6 +70,10 @@ namespace Squidex.Config.Domain .As() .As(); + services.AddSingletonAs(c => new MongoSnapshotStore(mongoDatabase, c.GetRequiredService())) + .As>() + .As(); + services.AddSingletonAs(c => new MongoSnapshotStore(mongoDatabase, c.GetRequiredService())) .As>() .As(); diff --git a/src/Squidex/app/features/settings/declarations.ts b/src/Squidex/app/features/settings/declarations.ts index f9932b668..66917745d 100644 --- a/src/Squidex/app/features/settings/declarations.ts +++ b/src/Squidex/app/features/settings/declarations.ts @@ -5,6 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ +export * from './pages/backups/backups-page.component'; export * from './pages/clients/client.component'; export * from './pages/clients/clients-page.component'; export * from './pages/contributors/contributors-page.component'; diff --git a/src/Squidex/app/features/settings/module.ts b/src/Squidex/app/features/settings/module.ts index 519f86b39..40b5ccd3c 100644 --- a/src/Squidex/app/features/settings/module.ts +++ b/src/Squidex/app/features/settings/module.ts @@ -17,6 +17,7 @@ import { } from 'shared'; import { + BackupsPageComponent, ClientComponent, ClientsPageComponent, ContributorsPageComponent, @@ -45,6 +46,10 @@ const routes: Routes = [ path: 'more', component: MorePageComponent }, + { + path: 'backups', + component: BackupsPageComponent + }, { path: 'clients', component: ClientsPageComponent, @@ -137,6 +142,7 @@ const routes: Routes = [ RouterModule.forChild(routes) ], declarations: [ + BackupsPageComponent, ClientComponent, ClientsPageComponent, ContributorsPageComponent, 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 new file mode 100644 index 000000000..fdeb85a57 --- /dev/null +++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html @@ -0,0 +1,34 @@ + + + +
+
+
+ +
+ +

Backups

+
+ + + + +
+ +
+
+ + + + + + + + + +
{{backup.started | sqxFullDateTime }}
+
+
+ \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.scss b/src/Squidex/app/features/settings/pages/backups/backups-page.component.scss new file mode 100644 index 000000000..fbb752506 --- /dev/null +++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.scss @@ -0,0 +1,2 @@ +@import '_vars'; +@import '_mixins'; \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts b/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts new file mode 100644 index 000000000..851cacb5f --- /dev/null +++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.ts @@ -0,0 +1,49 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { Component } from '@angular/core'; +import { Observable } from 'rxjs'; + +import { AppContext, BackupsService } from 'shared'; + +@Component({ + selector: 'sqx-backups-page', + styleUrls: ['./backups-page.component.scss'], + templateUrl: './backups-page.component.html', + providers: [ + AppContext + ] +}) +export class BackupsPageComponent { + public backups = + Observable.timer(0, 5000) + .switchMap(t => this.backupsService.getBackups(this.ctx.appName)); + + constructor(public readonly ctx: AppContext, + private readonly backupsService: BackupsService + ) { + } + + public startBackup() { + this.backupsService.postBackup(this.ctx.appName) + .subscribe(() => { + this.ctx.notifyInfo('Backup started.'); + }, error => { + this.ctx.notifyError(error); + }); + } + + public deleteBackup(id: string) { + this.backupsService.deleteBackup(this.ctx.appName, id) + .subscribe(() => { + this.ctx.notifyInfo('Backup deleting.'); + }, error => { + this.ctx.notifyError(error); + }); + } +} + diff --git a/src/Squidex/app/features/settings/settings-area.component.html b/src/Squidex/app/features/settings/settings-area.component.html index 0f5a96935..7b3900ea5 100644 --- a/src/Squidex/app/features/settings/settings-area.component.html +++ b/src/Squidex/app/features/settings/settings-area.component.html @@ -14,6 +14,12 @@
    +
  • + + Backups + + +
  • Clients @@ -40,7 +46,7 @@
  • - Update Plan + Subscription
    • diff --git a/src/Squidex/app/shared/declarations-base.ts b/src/Squidex/app/shared/declarations-base.ts index 709716be5..772dd87be 100644 --- a/src/Squidex/app/shared/declarations-base.ts +++ b/src/Squidex/app/shared/declarations-base.ts @@ -25,6 +25,7 @@ export * from './services/apps-store.service'; export * from './services/apps.service'; export * from './services/assets.service'; export * from './services/auth.service'; +export * from './services/backups.service'; export * from './services/contents.service'; export * from './services/event-consumers.service'; export * from './services/graphql.service'; diff --git a/src/Squidex/app/shared/module.ts b/src/Squidex/app/shared/module.ts index 5291dc978..aa11176e0 100644 --- a/src/Squidex/app/shared/module.ts +++ b/src/Squidex/app/shared/module.ts @@ -26,6 +26,7 @@ import { AssetUrlPipe, AuthInterceptor, AuthService, + BackupsService, ContentsService, EventConsumersService, FileIconPipe, @@ -127,6 +128,7 @@ export class SqxSharedModule { AppsStoreService, AssetsService, AuthService, + BackupsService, ContentsService, EventConsumersService, GraphQlService, diff --git a/src/Squidex/app/shared/services/backups.service.ts b/src/Squidex/app/shared/services/backups.service.ts new file mode 100644 index 000000000..bc102e195 --- /dev/null +++ b/src/Squidex/app/shared/services/backups.service.ts @@ -0,0 +1,76 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { HttpClient } from '@angular/common/http'; +import { Injectable } from '@angular/core'; +import { Observable } from 'rxjs'; + +import 'framework/angular/http-extensions'; + +import { + AnalyticsService, + ApiUrlConfig, + DateTime +} from 'framework'; + +export class BackupDto { + constructor( + public readonly id: string, + public readonly isFailed: string, + public readonly started: DateTime, + public readonly stopped: DateTime | null + ) { + } +} + +@Injectable() +export class BackupsService { + constructor( + private readonly http: HttpClient, + private readonly apiUrl: ApiUrlConfig, + private readonly analytics: AnalyticsService + ) { + } + + public getBackups(appName: string): Observable { + const url = this.apiUrl.buildUrl(`api/apps/${appName}/backups`); + + return this.http.get(url) + .map(response => { + const items: any[] = response; + + return items.map(item => { + return new BackupDto( + item.id, + item.isFailed, + DateTime.parseISO_UTC(item.stopped), + item.stopped ? DateTime.parseISO_UTC(item.stopped) : null); + }); + }) + .pretifyError('Failed to load backups.'); + } + + public postBackup(appName: string): Observable { + const url = this.apiUrl.buildUrl(`api/apps/${appName}/backups`); + + return this.http.post(url, {}) + .do(() => { + this.analytics.trackEvent('Backup', 'Started', appName); + }) + .pretifyError('Failed to start backup.'); + } + + public deleteBackup(appName: string, id: string): Observable { + const url = this.apiUrl.buildUrl(`api/apps/${appName}/backups/${id}`); + + return this.http.delete(url) + .do(() => { + this.analytics.trackEvent('Backup', 'Deleted', appName); + }) + .pretifyError('Failed to delete backup.'); + } +} \ No newline at end of file From c47f999749ad1614408f207392c17baa861be178 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Fri, 23 Mar 2018 19:01:54 +0100 Subject: [PATCH 3/7] Backup tests. --- .../Backups/BackupsContentController.cs | 55 + .../BackupsController.cs} | 31 +- .../Models/BackupJobDto.cs | 19 +- .../pages/backups/backups-page.component.html | 70 +- .../pages/backups/backups-page.component.scss | 28 +- .../pages/backups/backups-page.component.ts | 52 +- .../shared/services/backups.service.spec.ts | 101 ++ .../app/shared/services/backups.service.ts | 14 +- src/Squidex/app/theme/_common.scss | 29 + src/Squidex/app/theme/_mixins.scss | 15 + .../app/theme/icomoon/demo-files/demo.css | 2 +- src/Squidex/app/theme/icomoon/demo.html | 828 +++++---- .../app/theme/icomoon/fonts/icomoon.eot | Bin 23508 -> 24188 bytes .../app/theme/icomoon/fonts/icomoon.svg | 3 + .../app/theme/icomoon/fonts/icomoon.ttf | Bin 23344 -> 24024 bytes .../app/theme/icomoon/fonts/icomoon.woff | Bin 23420 -> 24100 bytes src/Squidex/app/theme/icomoon/selection.json | 1473 +++++++++-------- src/Squidex/app/theme/icomoon/style.css | 136 +- 18 files changed, 1757 insertions(+), 1099 deletions(-) create mode 100644 src/Squidex/Areas/Api/Controllers/Backups/BackupsContentController.cs rename src/Squidex/Areas/Api/Controllers/{Backup/BackupController.cs => Backups/BackupsController.cs} (73%) rename src/Squidex/Areas/Api/Controllers/{Backup => Backups}/Models/BackupJobDto.cs (68%) create mode 100644 src/Squidex/app/shared/services/backups.service.spec.ts diff --git a/src/Squidex/Areas/Api/Controllers/Backups/BackupsContentController.cs b/src/Squidex/Areas/Api/Controllers/Backups/BackupsContentController.cs new file mode 100644 index 000000000..b30d59f88 --- /dev/null +++ b/src/Squidex/Areas/Api/Controllers/Backups/BackupsContentController.cs @@ -0,0 +1,55 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Microsoft.AspNetCore.Mvc; +using NSwag.Annotations; +using Squidex.Infrastructure.Assets; +using Squidex.Infrastructure.Commands; +using Squidex.Pipeline; + +namespace Squidex.Areas.Api.Controllers.Backups +{ + /// + /// Manages backups for app. + /// + [ApiAuthorize] + [ApiExceptionFilter] + [AppApi] + [SwaggerTag(nameof(Backups))] + public class BackupsContentController : ApiController + { + private readonly IAssetStore assetStore; + + public BackupsContentController(ICommandBus commandBus, IAssetStore assetStore) + : base(commandBus) + { + this.assetStore = assetStore; + } + + /// + /// Get the backup content. + /// + /// The name of the app. + /// The id of the asset. + /// + /// 200 => Backup found and content returned. + /// 404 => Backup or app not found. + /// + [HttpGet] + [Route("apps/{app}/backups/{id}")] + [ProducesResponseType(200)] + [ApiCosts(0)] + public IActionResult GetBackupContent(string app, Guid id) + { + return new FileCallbackResult("application/zip", "Backup.zip", bodyStream => + { + return assetStore.DownloadAsync(id.ToString(), 0, null, bodyStream); + }); + } + } +} diff --git a/src/Squidex/Areas/Api/Controllers/Backup/BackupController.cs b/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs similarity index 73% rename from src/Squidex/Areas/Api/Controllers/Backup/BackupController.cs rename to src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs index f4991ceec..4ee26d183 100644 --- a/src/Squidex/Areas/Api/Controllers/Backup/BackupController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/BackupsController.cs @@ -12,15 +12,14 @@ using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using NSwag.Annotations; using Orleans; -using Squidex.Areas.Api.Controllers.Backup.Models; +using Squidex.Areas.Api.Controllers.Backups.Models; using Squidex.Domain.Apps.Entities.Backup; -using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.Reflection; using Squidex.Infrastructure.Tasks; using Squidex.Pipeline; -namespace Squidex.Areas.Api.Controllers.Backup +namespace Squidex.Areas.Api.Controllers.Backups { /// /// Manages backups for app. @@ -29,17 +28,15 @@ namespace Squidex.Areas.Api.Controllers.Backup [ApiExceptionFilter] [AppApi] [MustBeAppOwner] - [SwaggerTag(nameof(Backup))] - public class BackupController : ApiController + [SwaggerTag(nameof(Backups))] + public class BackupsController : ApiController { private readonly IGrainFactory grainFactory; - private readonly IAssetStore assetStore; - public BackupController(ICommandBus commandBus, IGrainFactory grainFactory, IAssetStore assetStore) + public BackupsController(ICommandBus commandBus, IGrainFactory grainFactory) : base(commandBus) { this.grainFactory = grainFactory; - this.assetStore = assetStore; } /// @@ -84,24 +81,6 @@ namespace Squidex.Areas.Api.Controllers.Backup return NoContent(); } - /// - /// Get the backup content. - /// - /// The name of the app. - /// The id of the asset. - /// - /// 200 => Backup found and content returned. - /// 404 => Backup or app not found. - /// - [HttpGet] - [Route("apps/{app}/backups/{id}")] - [ProducesResponseType(200)] - [ApiCosts(0.5)] - public IActionResult GetBackupContent(string app, Guid id) - { - return new FileCallbackResult("application/zip", "Backup.zip", bodyStream => assetStore.DownloadAsync(id.ToString(), 0, null, bodyStream)); - } - /// /// Delete a backup. /// diff --git a/src/Squidex/Areas/Api/Controllers/Backup/Models/BackupJobDto.cs b/src/Squidex/Areas/Api/Controllers/Backups/Models/BackupJobDto.cs similarity index 68% rename from src/Squidex/Areas/Api/Controllers/Backup/Models/BackupJobDto.cs rename to src/Squidex/Areas/Api/Controllers/Backups/Models/BackupJobDto.cs index a7dd12f07..87ca7fefc 100644 --- a/src/Squidex/Areas/Api/Controllers/Backup/Models/BackupJobDto.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/Models/BackupJobDto.cs @@ -6,33 +6,40 @@ // ========================================================================== using System; -using System.ComponentModel.DataAnnotations; using NodaTime; -namespace Squidex.Areas.Api.Controllers.Backup.Models +namespace Squidex.Areas.Api.Controllers.Backups.Models { public sealed class BackupJobDto { /// /// The id of the backup job. /// - [Required] public Guid Id { get; set; } /// /// The time when the job has been started. /// - [Required] public Instant Started { get; set; } /// /// The time when the job has been stopped. /// - public Instant? Stopped { get; } + public Instant? Stopped { get; set; } + + /// + /// The number of handled events. + /// + public int HandledEvents { get; set; } + + /// + /// The number of handled assets. + /// + public int HandledAssets { get; set; } /// /// Indicates if the job has failed. /// - public bool Failed { get; } + public bool IsFailed { get; set; } } } 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 fdeb85a57..766a8807c 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 @@ -1,10 +1,10 @@ - +
    -
    @@ -19,16 +19,62 @@
    - - - - - - - - - -
    {{backup.started | sqxFullDateTime }}
    +
    + Your have reached the maximum number of backups: 10. +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    + +
    +
    +
    +
    Started:
    +
    Stopped:
    +
    +
    +
    + {{backup.started.toISOString()}} +
    +
    + {{backup.stopped.toISOString()}} +
    +
    +
    +
    Progress:
    +
    Download:
    +
    +
    +
    + + {{backup.handledEvents}} + , + + {{backup.handledAssets}} + +
    + +
    +
    + +
    +
    +
    \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.scss b/src/Squidex/app/features/settings/pages/backups/backups-page.component.scss index fbb752506..57b091787 100644 --- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.scss +++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.scss @@ -1,2 +1,28 @@ @import '_vars'; -@import '_mixins'; \ No newline at end of file +@import '_mixins'; + +$cicle-size: 2.8rem; + +.backup-status { + & { + @include circle($cicle-size); + line-height: $cicle-size; + text-align: center; + font-size: .4 * $cicle-size; + font-weight: normal; + background: $color-border; + color: $color-dark-foreground; + } + + &-pending { + color: inherit; + } + + &-failed { + background: $color-theme-error; + } + + &-success { + background: $color-theme-green; + } +} \ No newline at end of file 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 851cacb5f..512485668 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,10 +5,17 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component } from '@angular/core'; -import { Observable } from 'rxjs'; +import { Component, OnInit, OnDestroy } from '@angular/core'; +import { Observable, Subscription } from 'rxjs'; -import { AppContext, BackupsService } from 'shared'; +import { + ApiUrlConfig, + AppContext, + BackupDto, + BackupsService, + DateTime, + ImmutableArray +} from 'shared'; @Component({ selector: 'sqx-backups-page', @@ -18,32 +25,57 @@ import { AppContext, BackupsService } from 'shared'; AppContext ] }) -export class BackupsPageComponent { - public backups = - Observable.timer(0, 5000) - .switchMap(t => this.backupsService.getBackups(this.ctx.appName)); +export class BackupsPageComponent implements OnInit, OnDestroy { + private loadSubscription: Subscription; - constructor(public readonly ctx: AppContext, + public backups = ImmutableArray.empty(); + + constructor( + public readonly ctx: AppContext, + private readonly apiUrl: ApiUrlConfig, private readonly backupsService: BackupsService ) { } + public ngOnDestroy() { + this.loadSubscription.unsubscribe(); + } + + public ngOnInit() { + this.loadSubscription = + Observable.timer(0, 5000) + .switchMap(t => this.backupsService.getBackups(this.ctx.appName)) + .subscribe(dtos => { + this.backups = ImmutableArray.of(dtos); + }); + } + public startBackup() { this.backupsService.postBackup(this.ctx.appName) .subscribe(() => { + const backup = new BackupDto('', DateTime.now(), null, 0, 0, false); + + this.backups = this.backups.pushFront(backup); + this.ctx.notifyInfo('Backup started.'); }, error => { this.ctx.notifyError(error); }); } - public deleteBackup(id: string) { - this.backupsService.deleteBackup(this.ctx.appName, id) + public deleteBackup(backup: BackupDto) { + this.backupsService.deleteBackup(this.ctx.appName, backup.id) .subscribe(() => { + this.backups = this.backups.filter(x => x.id !== backup.id); + this.ctx.notifyInfo('Backup deleting.'); }, error => { this.ctx.notifyError(error); }); } + + public getDownloadUrl(backup: BackupDto) { + return this.apiUrl.buildUrl(`api/apps/${this.ctx.appName}/backups/${backup.id}`); + } } diff --git a/src/Squidex/app/shared/services/backups.service.spec.ts b/src/Squidex/app/shared/services/backups.service.spec.ts new file mode 100644 index 000000000..37d65c638 --- /dev/null +++ b/src/Squidex/app/shared/services/backups.service.spec.ts @@ -0,0 +1,101 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing'; +import { inject, TestBed } from '@angular/core/testing'; + +import { + AnalyticsService, + ApiUrlConfig, + BackupDto, + BackupsService, + DateTime +} from './../'; + +describe('BackupsService', () => { + beforeEach(() => { + TestBed.configureTestingModule({ + imports: [ + HttpClientTestingModule + ], + providers: [ + BackupsService, + { provide: ApiUrlConfig, useValue: new ApiUrlConfig('http://service/p/') }, + { provide: AnalyticsService, useValue: new AnalyticsService() } + ] + }); + }); + + afterEach(inject([HttpTestingController], (httpMock: HttpTestingController) => { + httpMock.verify(); + })); + + it('should make get request to get backups', + inject([BackupsService, HttpTestingController], (backupsService: BackupsService, httpMock: HttpTestingController) => { + + let backups: BackupDto[] | null = null; + + backupsService.getBackups('my-app').subscribe(result => { + backups = result; + }); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/backups'); + + expect(req.request.method).toEqual('GET'); + expect(req.request.headers.get('If-Match')).toBeNull(); + + req.flush([ + { + id: '1', + started: '2017-02-03', + stopped: '2017-02-04', + handledEvents: 13, + handledAssets: 17, + isFailed: false + }, + { + id: '2', + started: '2018-02-03', + stopped: null, + handledEvents: 23, + handledAssets: 27, + isFailed: true + } + ]); + + expect(backups).toEqual([ + new BackupDto('1', DateTime.parseISO_UTC('2017-02-03'), DateTime.parseISO_UTC('2017-02-04'), 13, 17, false), + new BackupDto('2', DateTime.parseISO_UTC('2018-02-03'), null, 23, 27, true) + ]); + })); + + it('should make post request to start backup', + inject([BackupsService, HttpTestingController], (backupsService: BackupsService, httpMock: HttpTestingController) => { + + backupsService.postBackup('my-app').subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/backups'); + + expect(req.request.method).toEqual('POST'); + expect(req.request.headers.get('If-Match')).toBeNull(); + + req.flush({}); + })); + + it('should make delete request to remove language', + inject([BackupsService, HttpTestingController], (backupsService: BackupsService, httpMock: HttpTestingController) => { + + backupsService.deleteBackup('my-app', '1').subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/backups/1'); + + expect(req.request.method).toEqual('DELETE'); + expect(req.request.headers.get('If-Match')).toBeNull(); + + req.flush({}); + })); +}); \ No newline at end of file diff --git a/src/Squidex/app/shared/services/backups.service.ts b/src/Squidex/app/shared/services/backups.service.ts index bc102e195..c29cd3097 100644 --- a/src/Squidex/app/shared/services/backups.service.ts +++ b/src/Squidex/app/shared/services/backups.service.ts @@ -20,9 +20,11 @@ import { export class BackupDto { constructor( public readonly id: string, - public readonly isFailed: string, public readonly started: DateTime, - public readonly stopped: DateTime | null + public readonly stopped: DateTime | null, + public readonly handledEvents: number, + public readonly handledAssets: number, + public readonly isFailed: boolean ) { } } @@ -46,9 +48,11 @@ export class BackupsService { return items.map(item => { return new BackupDto( item.id, - item.isFailed, - DateTime.parseISO_UTC(item.stopped), - item.stopped ? DateTime.parseISO_UTC(item.stopped) : null); + DateTime.parseISO_UTC(item.started), + item.stopped ? DateTime.parseISO_UTC(item.stopped) : null, + item.handledEvents, + item.handledAssets, + item.isFailed); }); }) .pretifyError('Failed to load backups.'); diff --git a/src/Squidex/app/theme/_common.scss b/src/Squidex/app/theme/_common.scss index 305d44b2e..e70241300 100644 --- a/src/Squidex/app/theme/_common.scss +++ b/src/Squidex/app/theme/_common.scss @@ -158,3 +158,32 @@ body { background: $color-dark-foreground; } } + +// +// Animations +// +.spin { + @include animation(spin 3s infinite linear); +} + +@include keyframes (spin) { + 20% { + @include rotate(0deg); + } + + 30% { + @include rotate(180deg); + } + + 70% { + @include rotate(180deg); + } + + 80% { + @include rotate(360deg); + } + + 100% { + @include rotate(360deg); + } +} \ No newline at end of file diff --git a/src/Squidex/app/theme/_mixins.scss b/src/Squidex/app/theme/_mixins.scss index 703ba9059..2f0ef6776 100644 --- a/src/Squidex/app/theme/_mixins.scss +++ b/src/Squidex/app/theme/_mixins.scss @@ -293,6 +293,21 @@ border-radius: $radius $radius 0 0; } +@mixin keyframes($name) { + @-webkit-keyframes #{$name} { + @content; + } + @-moz-keyframes #{$name} { + @content; + } + @keyframes #{$name} { + @content; + } + @-ms-keyframes #{$name} { + @content; + } +} + @mixin animation($animation...) { -webkit-animation: $animation; -moz-animation: $animation; diff --git a/src/Squidex/app/theme/icomoon/demo-files/demo.css b/src/Squidex/app/theme/icomoon/demo-files/demo.css index 5f7c0c6a0..06c37496a 100644 --- a/src/Squidex/app/theme/icomoon/demo-files/demo.css +++ b/src/Squidex/app/theme/icomoon/demo-files/demo.css @@ -147,7 +147,7 @@ p { font-size: 16px; } .fs1 { - font-size: 32px; + font-size: 28px; } .fs2 { font-size: 32px; diff --git a/src/Squidex/app/theme/icomoon/demo.html b/src/Squidex/app/theme/icomoon/demo.html index 7c15756ba..f478fc691 100644 --- a/src/Squidex/app/theme/icomoon/demo.html +++ b/src/Squidex/app/theme/icomoon/demo.html @@ -9,10 +9,26 @@
    -

    Font Name: icomoon (Glyphs: 86)

    +

    Font Name: icomoon (Glyphs: 89)

    Grid Size: 14

    +
    +
    + + + + icon-exclamation +
    +
    + + +
    +
    + liga: + +
    +
    @@ -431,17 +447,17 @@
    -

    Grid Size: Unknown

    +

    Grid Size: 16

    - + - icon-circle + icon-hour-glass
    - - + +
    liga: @@ -450,14 +466,14 @@
    - + - icon-action-Fastly + icon-spinner
    - - + +
    liga: @@ -466,14 +482,14 @@
    - + - icon-control-Slug + icon-clock
    - - + +
    liga: @@ -482,14 +498,14 @@
    - + - icon-action-Algolia + icon-bin2
    - - + +
    liga: @@ -498,30 +514,30 @@
    - + - icon-type-Tags + icon-earth
    - - + +
    liga: - +
    - + - icon-activity + icon-elapsed
    - - + +
    liga: @@ -530,14 +546,14 @@
    - + - icon-history + icon-google
    - - + +
    liga: @@ -546,14 +562,14 @@
    - + - icon-time + icon-lock
    - - + +
    liga: @@ -562,14 +578,14 @@
    - + - icon-add + icon-microsoft
    - - + +
    liga: @@ -578,14 +594,14 @@
    - + - icon-plus + icon-action-AzureQueue
    - - + +
    liga: @@ -594,14 +610,14 @@
    - + - icon-check-circle + icon-pause
    - - + +
    liga: @@ -610,14 +626,14 @@
    - + - icon-check-circle-filled + icon-play
    - - + +
    liga: @@ -626,14 +642,14 @@
    - + - icon-close + icon-reset
    - - + +
    liga: @@ -642,14 +658,14 @@
    - + - icon-type-References + icon-settings2
    - - + +
    liga: @@ -658,14 +674,14 @@
    - + - icon-control-Checkbox + icon-timeout
    - - + +
    liga: @@ -674,14 +690,14 @@
    - + - icon-control-Dropdown + icon-unlocked
    - - + +
    liga: @@ -690,14 +706,14 @@
    - + - icon-control-Input + icon-caret-up
    - - + +
    liga: @@ -706,14 +722,14 @@
    - + - icon-control-Radio + icon-contents
    - - + +
    liga: @@ -722,14 +738,14 @@
    - + - icon-control-TextArea + icon-trigger-ContentChanged
    - - + +
    liga: @@ -738,14 +754,14 @@
    - + - icon-control-Toggle + icon-control-Date
    - - + +
    liga: @@ -754,14 +770,14 @@
    - + - icon-copy + icon-control-DateTime
    - - + +
    liga: @@ -770,14 +786,14 @@
    - + - icon-dashboard + icon-control-Markdown
    - - + +
    liga: @@ -786,14 +802,14 @@
    - + - icon-delete + icon-grid
    - - + +
    liga: @@ -802,14 +818,14 @@
    - + - icon-bin + icon-list
    - - + +
    liga: @@ -818,14 +834,14 @@
    - + - icon-delete-filled + icon-user-o
    - - + +
    liga: @@ -834,14 +850,14 @@
    - + - icon-document-delete + icon-rules
    - - + +
    liga: @@ -850,449 +866,657 @@
    - + - icon-document-disable + icon-action-Webhook
    - - + +
    liga:
    -
    +
    +
    +

    Grid Size: Unknown

    +
    - + - icon-document-publish + icon-circle
    - - + +
    liga:
    -
    +
    - + - icon-drag + icon-action-Fastly
    - - + +
    liga:
    -
    +
    - + - icon-filter + icon-control-Slug
    - - -
    + + +
    liga:
    -
    +
    - + - icon-github + icon-action-Algolia
    - - + +
    liga:
    -
    +
    - + - icon-help + icon-type-Tags
    - - + +
    liga:
    -
    +
    - + - icon-location + icon-activity
    - - + +
    liga:
    -
    +
    - + - icon-control-Map + icon-history
    - - + +
    liga:
    -
    +
    - + - icon-type-Geolocation + icon-time
    - - + +
    liga:
    -
    +
    -
    - - + +
    liga:
    -
    +
    - + - icon-media + icon-plus
    - - + +
    liga:
    -
    +
    - + - icon-type-Assets + icon-check-circle
    - - + +
    liga:
    -
    +
    - + - icon-trigger-AssetChanged + icon-check-circle-filled
    - - + +
    liga:
    -
    +
    +
    + + + + icon-close +
    +
    + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-type-References +
    +
    + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-control-Checkbox +
    +
    + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-control-Dropdown +
    +
    + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-control-Input +
    +
    + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-control-Radio +
    +
    + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-control-TextArea +
    +
    + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-control-Toggle +
    +
    + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-copy +
    +
    + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-dashboard +
    +
    + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-delete +
    +
    + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-bin +
    +
    + + +
    +
    + liga: + +
    +
    +
    +
    + + + + icon-delete-filled +
    +
    + + +
    +
    + liga: + +
    +
    +
    - + - icon-more + icon-document-delete
    - - + +
    liga:
    -
    +
    - + - icon-dots + icon-document-disable
    - - + +
    liga:
    -
    +
    - + - icon-pencil + icon-document-publish
    - - + +
    liga:
    -
    +
    - + - icon-reference + icon-drag
    - - + +
    liga:
    -
    +
    - + - icon-schemas + icon-filter
    - - + +
    liga:
    -
    +
    - + - icon-search + icon-github
    - - + +
    liga:
    -
    +
    - + - icon-settings + icon-help
    - - + +
    liga:
    -
    +
    - + - icon-type-Boolean + icon-location
    - - + +
    liga:
    -
    +
    - + - icon-type-DateTime + icon-control-Map
    - - + +
    liga:
    -
    +
    - + - icon-type-Json + icon-type-Geolocation
    - - + +
    liga:
    -
    +
    - + - icon-json + icon-logo
    - - + +
    liga:
    -
    +
    - + - icon-type-Number + icon-media
    - - + +
    liga:
    -
    +
    - + - icon-type-String + icon-type-Assets
    - - + +
    liga:
    -
    +
    - + - icon-user + icon-trigger-AssetChanged
    - - + +
    liga:
    -
    -
    -

    Grid Size: 16

    - + - icon-clock + icon-more
    - - + +
    liga: @@ -1301,14 +1525,14 @@
    - + - icon-bin2 + icon-dots
    - - + +
    liga: @@ -1317,30 +1541,30 @@
    - + - icon-earth + icon-pencil
    - - + +
    liga: - +
    - + - icon-elapsed + icon-reference
    - - + +
    liga: @@ -1349,14 +1573,14 @@
    - + - icon-google + icon-schemas
    - - + +
    liga: @@ -1365,14 +1589,14 @@
    - + - icon-lock + icon-search
    - - + +
    liga: @@ -1381,14 +1605,14 @@
    - + - icon-microsoft + icon-settings
    - - + +
    liga: @@ -1397,14 +1621,14 @@
    - + - icon-action-AzureQueue + icon-type-Boolean
    - - + +
    liga: @@ -1413,14 +1637,14 @@
    - + - icon-pause + icon-type-DateTime
    - - + +
    liga: @@ -1429,14 +1653,14 @@
    - + - icon-play + icon-type-Json
    - - + +
    liga: @@ -1445,14 +1669,14 @@
    - + - icon-reset + icon-json
    - - + +
    liga: @@ -1461,14 +1685,14 @@
    - + - icon-settings2 + icon-type-Number
    - - + +
    liga: @@ -1477,14 +1701,14 @@
    - + - icon-timeout + icon-type-String
    - - + +
    liga: @@ -1493,14 +1717,14 @@
    - + - icon-unlocked + icon-user
    - - + +
    liga: diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.eot b/src/Squidex/app/theme/icomoon/fonts/icomoon.eot index 7c4a0852df4f7ee8d0183e33ed900f4d99f3d989..35876bd23931066db23f2432c379bfb7720cbe35 100644 GIT binary patch delta 956 zcmZvbO-$2Z7{{Nd-3JR~?bzCFncFCnHS2(V*tII#Tx=9nJSam%MO;AHL0|zAiP4OM z@#00?$@p>eqDKr!g2}{#A6Jc^i802TAMt=55QlF!4IWI|KK=in=Y5<1FMXdc;Mx+J z&K(DMH85*Z45@5u>ulzXZ5{xY$bDjHG*@^Vee-hm@uuPv<<40EybRE{l0TUnZnS;+ z0?>bf%qe+dSSTaes9#^VIX^lzedt=_N21@8HB+a@hjLHd?>+z=&657oXl}XyQ+Nd6 z7)x~1SZ?&>)xDOVL`TW|#lraH6wsst1NZbk&@?_Q4dW&3Eq%j)@iKdWDb2a4wu40@ zz4B_Rhzvk#H9)S%doVo>Ca zq>(V0t!Orx(TaiQ>d2Nj*`|!RXfW0{NM2uXLTsaE+Qf;V&nq?58x4zC#C6zJ5Eeb5 z&`2`1vvOM~?An=1j)X!UD(lw*0nI<5p4YVV>I9Z8jh3V{>Q-fWP?7>S!sF@mc=$#@ zk_Kg2bw`~^OC!dtJsrvI@mROZUAKI_qsO{j=XQ0+;@c~=u7hoc$yG)BC#5==dnu3VTqY$ABUK7qoB=Qy80rdgu;}^LE;bx=zqF z&0!1ATw(a?!^WasovefLEHK>H8Qq^@IF9PB>>-801>Kp`vc2@C*4AulkV$@rdV~I5 zc=7s~e!i-;bhl5%fw|9pLukz47;G(d_22hgkea2ev>KiduL6?E0Xz)6z67Y!gQNDj I$dOz48{81gVE_OC delta 264 zcmeyfhw;jGMz$-_3=9U*6WPpIdJ{5TCOVW0?qOhH0O5q>+{A+0y0^|vJRwtGBv#bQ zz`!_xfgv;|BQ-Haa2G>114GywpgOY*pa3TmE6|{D6(CU o?pGK+*(b`JF=}&5R5Ih_&(Yg>*J)*GtpiFj0&&#lT``9k0nUw0X8-^I diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg index 01a5dc3f0..c0c8c92b6 100644 --- a/src/Squidex/app/theme/icomoon/fonts/icomoon.svg +++ b/src/Squidex/app/theme/icomoon/fonts/icomoon.svg @@ -90,6 +90,9 @@ + + + diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf b/src/Squidex/app/theme/icomoon/fonts/icomoon.ttf index e3d88cfb9de1ee561d7a7d302ee9bb0acecd17ad..6cf153b3f0308df8daf73acb0a1d83a11b3a82bc 100644 GIT binary patch delta 966 zcmZvbO-$2Z7{{NdWsGHW?Z&#X;5NF+nsvZF=vtHwCku))ViXin5f_B*z{dhhL=!U( zhM0IkIT^n$p7dfuf)X)l@L=?6qN0g0#+%U-dhlcTcGKX&rtQ<;|9RiH{r}VV{xZIP zghfCAFv1+r5I)!!iZa%1%S2fv*XfaoO#W^7%_{)hPIx?}rwD87?Z{0OW{+OCekA;!%qfgdjqJ%hcfR`o zaH5|KSe?ks=AnSc0Zx*aK*MBaV)WVp!wDRxKgDvnnah|KP@y0Czk=oK&ZN#NL%e^N2X6i+i4~1q@scyD`C1-akH4_T)|IUAZo@0}2i;bq|c7E{T)Sws_~*W6MR+EB1@ugUiA1 NzDW^1)c)&BifH83E++P4oZ& diff --git a/src/Squidex/app/theme/icomoon/fonts/icomoon.woff b/src/Squidex/app/theme/icomoon/fonts/icomoon.woff index c86b41b0fd09988d8ba9288de06f59e2f1429957..933d1f532fba041a409567869ffe845bf2d5a740 100644 GIT binary patch delta 1008 zcmZuwOH30%7@mKZQW~1>mhScuY|FOLO}D&Sx4R-OHa4J0(I_DDPJ`MWcm+sAqA3UC z#fw@G8XxiCNsmn+7)&;JFnTi4sHpK^yb+BD^x&g7(}H+#v)}&nee=(3zArPs7UA9s zaA%IRwIM+G8LmdYV7Q3 zti4C5cZ1-m@?buFDtQv2zUR0{A*e8~e@t_j$->mpF zHaUv>4iDVLO)CV?93MW8C+F~w2L~~)Dqt4+Cz9i*uyzhFyhw24km2Xl!F4#)!P)c1ym(0`$WA908gntu^vR9$m{S#xKwWfeW@Ny;Pn(*c8Bmb8o+XiuG}a& zUA}3tj#{V_r+qG`WGvT}EJFr1QR|ejT41i^I&2ZCr6+tlccMr%mIo>Mr!9e=`(`JyYHv)Y6f2+Kvo zAQz%g!^Hr?L4hlp=dFdvc)A{ZE>tY5dGaC&^ z^0q|JZ!5o_FiewQQWVMG#4wchFWXS8R>c{#f-OgBTwYN1U)c$hA79%`)2RmNKQm{}mz#&S&M62pI4Ao>Es z^Hd_=jtc`zM9Hmp_0YR&YrCT(OynCXCnp-AS8Fd8w`+E=SB0V6wcb(C#b5&M$$mZY Y$b3QaNZrzpz+&J>;bsrz9`>!mAN`@xwg3PC delta 348 zcmZ3ohw;xgMv-!VH#Y`G1|W#8Vc-VS29pKjgeNP+u}st!so#^Fn^?fWz?cD)$^qfq zy0^}yCl-Umt^oNQP%Mz1Q<(-7yTiZ`8Uw;bVnwYPsfj5J4B-|)HD(|zxQih>11Ja- z1L|i`0bx!i*657fk_w>M6o@^H8NRwgIXU^sKy`i*e}Ia%f$+TN9cH2vi+2kj2b=axxENH)GJ`8H~!Ty#jvx z6E+`U)D7C)8Wzkf-q1n{}d+87I$<-X^|I dD@$t~P?8adqZlI?#6Suem_XsSxjtqoBLEg;Rqp@* diff --git a/src/Squidex/app/theme/icomoon/selection.json b/src/Squidex/app/theme/icomoon/selection.json index 78de63192..ffd6836a1 100644 --- a/src/Squidex/app/theme/icomoon/selection.json +++ b/src/Squidex/app/theme/icomoon/selection.json @@ -1,6 +1,36 @@ { "IcoMoonType": "selection", "icons": [ + { + "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": 0, + "setId": 3, + "iconIdx": 0 + }, { "icon": { "paths": [ @@ -24,10 +54,10 @@ "order": 107, "id": 210, "name": "action-ElasticSearch", - "prevSize": 32, + "prevSize": 28, "code": 59730 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, "iconIdx": 0 }, @@ -53,13 +83,13 @@ "properties": { "order": 1, "id": 0, - "prevSize": 32, + "prevSize": 28, "code": 59725, "name": "action-Slack" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 57 + "iconIdx": 1 }, { "icon": { @@ -83,12 +113,12 @@ "order": 99, "id": 209, "name": "orleans", - "prevSize": 32, + "prevSize": 28, "code": 59723 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 58 + "iconIdx": 2 }, { "icon": { @@ -115,12 +145,12 @@ "order": 97, "id": 208, "name": "document-lock", - "prevSize": 32, + "prevSize": 28, "code": 59721 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 59 + "iconIdx": 3 }, { "icon": { @@ -147,12 +177,12 @@ "order": 96, "id": 207, "name": "document-unpublish", - "prevSize": 32, + "prevSize": 28, "code": 59711 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 60 + "iconIdx": 4 }, { "icon": { @@ -176,13 +206,13 @@ "properties": { "order": 1, "id": 1, - "prevSize": 32, + "prevSize": 28, "code": 59648, "name": "angle-down" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 61 + "iconIdx": 5 }, { "icon": { @@ -206,13 +236,13 @@ "properties": { "order": 2, "id": 0, - "prevSize": 32, + "prevSize": 28, "code": 59649, "name": "angle-left" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 62 + "iconIdx": 6 }, { "icon": { @@ -236,13 +266,13 @@ "properties": { "order": 67, "id": 0, - "prevSize": 32, + "prevSize": 28, "code": 59697, "name": "angle-right" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 63 + "iconIdx": 7 }, { "icon": { @@ -266,13 +296,13 @@ "properties": { "order": 2, "id": 2, - "prevSize": 32, + "prevSize": 28, "code": 59651, "name": "angle-up" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 64 + "iconIdx": 8 }, { "icon": { @@ -308,12 +338,12 @@ "order": 94, "id": 206, "name": "api", - "prevSize": 32, + "prevSize": 28, "code": 59717 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 65 + "iconIdx": 9 }, { "icon": { @@ -343,12 +373,12 @@ "order": 95, "id": 205, "name": "assets", - "prevSize": 32, + "prevSize": 28, "code": 59720 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 66 + "iconIdx": 10 }, { "icon": { @@ -372,13 +402,13 @@ "properties": { "order": 1, "id": 0, - "prevSize": 32, + "prevSize": 28, "code": 59709, "name": "bug" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 67 + "iconIdx": 11 }, { "icon": { @@ -402,13 +432,13 @@ "properties": { "order": 4, "id": 4, - "prevSize": 32, + "prevSize": 28, "code": 59692, "name": "caret-down" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 68 + "iconIdx": 12 }, { "icon": { @@ -432,13 +462,13 @@ "properties": { "order": 2, "id": 6, - "prevSize": 32, + "prevSize": 28, "code": 59690, "name": "caret-left" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 69 + "iconIdx": 13 }, { "icon": { @@ -462,13 +492,13 @@ "properties": { "order": 1, "id": 7, - "prevSize": 32, + "prevSize": 28, "code": 59689, "name": "caret-right" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 70 + "iconIdx": 14 }, { "icon": { @@ -492,13 +522,13 @@ "properties": { "order": 3, "id": 5, - "prevSize": 32, + "prevSize": 28, "code": 59691, "name": "caret-up" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 71 + "iconIdx": 15 }, { "icon": { @@ -531,12 +561,12 @@ "order": 93, "id": 204, "name": "contents, trigger-ContentChanged", - "prevSize": 32, + "prevSize": 28, "code": 59718 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 72 + "iconIdx": 16 }, { "icon": { @@ -560,12 +590,12 @@ "order": 71, "id": 42, "name": "control-Date", - "prevSize": 32, + "prevSize": 28, "code": 59702 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 73 + "iconIdx": 17 }, { "icon": { @@ -589,12 +619,12 @@ "order": 70, "id": 41, "name": "control-DateTime", - "prevSize": 32, + "prevSize": 28, "code": 59703 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 74 + "iconIdx": 18 }, { "icon": { @@ -618,12 +648,12 @@ "order": 72, "id": 43, "name": "control-Markdown", - "prevSize": 32, + "prevSize": 28, "code": 59704 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 75 + "iconIdx": 19 }, { "icon": { @@ -645,12 +675,12 @@ "name": "grid", "id": 14, "order": 83, - "prevSize": 32, + "prevSize": 28, "code": 61450 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 76 + "iconIdx": 20 }, { "icon": { @@ -674,12 +704,12 @@ "name": "list", "id": 178, "order": 89, - "prevSize": 32, + "prevSize": 28, "code": 61641 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 77 + "iconIdx": 21 }, { "icon": { @@ -703,12 +733,12 @@ "order": 64, "id": 38, "name": "user-o", - "prevSize": 32, + "prevSize": 28, "code": 59698 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 78 + "iconIdx": 22 }, { "icon": { @@ -753,423 +783,507 @@ "order": 92, "id": 203, "name": "rules, action-Webhook", - "prevSize": 32, + "prevSize": 28, "code": 59719 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 79 + "iconIdx": 23 }, { "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" + "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, - "grid": 0, "tags": [ - "circle" - ] + "hour-glass", + "loading", + "busy", + "wait" + ], + "grid": 16 }, "attrs": [ {} ], "properties": { - "order": 106, - "id": 0, - "name": "circle", + "order": 1, + "id": 1, "prevSize": 32, - "code": 59729 + "code": 59732, + "name": "hour-glass" }, - "setIdx": 0, - "setId": 1, - "iconIdx": 1 + "setIdx": 1, + "setId": 2, + "iconIdx": 0 }, { "icon": { "paths": [ - "M341.758 30.332v55.545h25.806v83.195c-193.056 37.236-336.992 205.942-337.132 408.544l-0 0.016c-0 229.687 184.814 415.885 412.793 415.885l-0-0c227.979 0 412.793-186.198 412.793-415.885l-0 0c-0.125-202.629-144.065-371.351-334.545-408.173l-2.587-0.416v-83.165h25.809v-55.545h-202.936zM454.729 369.689c102.973 5.539 185.923 86.823 194.885 189.491v6.763h-23.479v23.589h23.485v6.447c-8.918 102.72-91.882 184.055-194.891 189.594v-23.144h-23.444v23.078c-104.989-6.154-188.976-91.042-194.458-196.868h23.297v-23.589h-23.172c6.225-105.086 89.86-189.163 194.333-195.295v23.195h23.444v-23.261zM535.132 467.312l-78.775 73.035c-3.893-1.564-8.405-2.478-13.126-2.494l-0.006-0c-20.265 0-36.693 16.551-36.693 36.967l-0 0c0 20.417 16.428 36.967 36.693 36.967h-0c20.265 0 36.693-16.551 36.693-36.967l0-0c-0.010-3.753-0.574-7.37-1.613-10.776l0.069 0.262 71.128-80.156-14.369-16.838z" + "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": [ {} ], - "width": 886, "isMulticolor": false, "isMulticolor2": false, - "grid": 0, "tags": [ - "action-Fastly" - ] + "spinner", + "loading", + "loading-wheel", + "busy", + "wait" + ], + "grid": 16 }, "attrs": [ {} ], "properties": { - "order": 102, - "id": 1, - "name": "action-Fastly", + "order": 1, + "id": 0, "prevSize": 32, - "code": 59726 + "code": 59731, + "name": "spinner" }, - "setIdx": 0, - "setId": 1, - "iconIdx": 2 + "setIdx": 1, + "setId": 2, + "iconIdx": 1 }, { "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" + "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, - "grid": 0, "tags": [ - "control-Slug" - ] + "clock", + "time", + "schedule" + ], + "grid": 16 }, "attrs": [ - {}, {} ], "properties": { - "order": 103, + "order": 1, "id": 0, - "name": "control-Slug", "prevSize": 32, - "code": 59727 + "code": 59728, + "name": "clock" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 3 + "iconIdx": 67 }, { "icon": { "paths": [ - "M512 26.947c-267.728 0-485.053 217.059-485.053 485.053s217.069 485.053 485.053 485.053c267.983 0 485.053-217.314 485.053-485.308s-217.069-484.797-485.053-484.797zM512 853.496c-188.747 0-341.745-152.988-341.745-341.752 0-188.745 152.998-341.733 341.745-341.733 188.765 0 341.745 152.988 341.745 341.733 0 188.763-152.98 341.752-341.745 341.752zM512 240.522v254.585c0 7.443 7.957 12.405 14.654 8.939l225.774-117.231c5.042-2.659 6.844-8.986 3.96-13.901-46.936-82.204-133.855-138.576-234.205-142.298z" + "M128 320v640c0 35.2 28.8 64 64 64h576c35.2 0 64-28.8 64-64v-640h-704zM320 896h-64v-448h64v448zM448 896h-64v-448h64v448zM576 896h-64v-448h64v448zM704 896h-64v-448h64v448z", + "M848 128h-208v-80c0-26.4-21.6-48-48-48h-224c-26.4 0-48 21.6-48 48v80h-208c-26.4 0-48 21.6-48 48v80h832v-80c0-26.4-21.6-48-48-48zM576 128h-192v-63.198h192v63.198z" ], "attrs": [ + {}, {} ], "isMulticolor": false, "isMulticolor2": false, - "grid": 0, "tags": [ - "algolia-mark-white" - ] + "bin", + "trashcan", + "remove", + "delete", + "recycle", + "dispose" + ], + "grid": 16 }, "attrs": [ + {}, {} ], "properties": { - "order": 101, - "id": 1, - "name": "action-Algolia", + "order": 1, + "id": 0, + "name": "bin2", "prevSize": 32, - "code": 59724 + "code": 59650 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 4 + "iconIdx": 68 }, { "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.462h-59.191z", - "M479.422 337.341v260.462h59.191v-260.462h-59.191z" - ], - "attrs": [ - { - "fill": "rgb(193, 198, 200)" - }, - { - "fill": "rgb(193, 198, 200)" - }, - { - "fill": "rgb(193, 198, 200)" - }, - { - "fill": "rgb(193, 198, 200)" - } + "M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 960.002c-62.958 0-122.872-13.012-177.23-36.452l233.148-262.29c5.206-5.858 8.082-13.422 8.082-21.26v-96c0-17.674-14.326-32-32-32-112.99 0-232.204-117.462-233.374-118.626-6-6.002-14.14-9.374-22.626-9.374h-128c-17.672 0-32 14.328-32 32v192c0 12.122 6.848 23.202 17.69 28.622l110.31 55.156v187.886c-116.052-80.956-192-215.432-192-367.664 0-68.714 15.49-133.806 43.138-192h116.862c8.488 0 16.626-3.372 22.628-9.372l128-128c6-6.002 9.372-14.14 9.372-22.628v-77.412c40.562-12.074 83.518-18.588 128-18.588 70.406 0 137.004 16.26 196.282 45.2-4.144 3.502-8.176 7.164-12.046 11.036-36.266 36.264-56.236 84.478-56.236 135.764s19.97 99.5 56.236 135.764c36.434 36.432 85.218 56.264 135.634 56.26 3.166 0 6.342-0.080 9.518-0.236 13.814 51.802 38.752 186.656-8.404 372.334-0.444 1.744-0.696 3.488-0.842 5.224-81.324 83.080-194.7 134.656-320.142 134.656z" ], + "attrs": [], "isMulticolor": false, "isMulticolor2": false, - "grid": 0, "tags": [ - "Tags" - ] + "earth", + "globe", + "language", + "web", + "internet", + "sphere", + "planet" + ], + "defaultCode": 59850, + "grid": 16 }, - "attrs": [ - { - "fill": "rgb(193, 198, 200)" - }, - { - "fill": "rgb(193, 198, 200)" - }, - { - "fill": "rgb(193, 198, 200)" - }, - { - "fill": "rgb(193, 198, 200)" - } - ], + "attrs": [], "properties": { - "order": 98, - "id": 0, - "name": "type-Tags", + "ligatures": "earth, globe2", + "name": "earth", + "id": 202, + "order": 91, "prevSize": 32, - "code": 59722 + "code": 59850 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 5 + "iconIdx": 69 }, { "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" + "M512.002 193.212v-65.212h128v-64c0-35.346-28.654-64-64.002-64h-191.998c-35.346 0-64 28.654-64 64v64h128v65.212c-214.798 16.338-384 195.802-384 414.788 0 229.75 186.25 416 416 416s416-186.25 416-416c0-218.984-169.202-398.448-384-414.788zM706.276 834.274c-60.442 60.44-140.798 93.726-226.274 93.726s-165.834-33.286-226.274-93.726c-60.44-60.44-93.726-140.8-93.726-226.274s33.286-165.834 93.726-226.274c58.040-58.038 134.448-91.018 216.114-93.548l-21.678 314.020c-1.86 26.29 12.464 37.802 31.836 37.802s33.698-11.512 31.836-37.802l-21.676-314.022c81.666 2.532 158.076 35.512 216.116 93.55 60.44 60.44 93.726 140.8 93.726 226.274s-33.286 165.834-93.726 226.274z" ], "attrs": [ {} ], "isMulticolor": false, "isMulticolor2": false, - "grid": 0, "tags": [ - "activity" - ] + "stopwatch", + "time", + "speed", + "meter", + "chronometer" + ], + "grid": 16 }, "attrs": [ {} ], "properties": { - "order": 12, - "id": 36, - "name": "activity, history, time", + "order": 1, + "id": 2, "prevSize": 32, - "code": 59652 + "code": 59715, + "name": "elapsed" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 6 + "iconIdx": 70 }, { "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" + "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, - "grid": 0, "tags": [ - "add" - ] + "google", + "brand" + ], + "grid": 16 }, "attrs": [ {} ], "properties": { - "order": 13, - "id": 35, - "name": "add, plus", + "order": 1, + "id": 0, "prevSize": 32, - "code": 59653 + "code": 59707, + "name": "google" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 7 + "iconIdx": 71 }, { "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" + "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, - "grid": 0, "tags": [ - "check-circle" - ] + "lock", + "secure", + "private", + "encrypted" + ], + "grid": 16 }, "attrs": [ {} ], "properties": { - "order": 14, - "id": 34, - "name": "check-circle", + "order": 2, + "id": 0, "prevSize": 32, - "code": 59654 + "code": 59700, + "name": "lock" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 8 + "iconIdx": 72 }, { "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" + "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, - "grid": 0, "tags": [ - "check-circle-filled" - ] + "windows8", + "brand", + "os" + ], + "grid": 16 }, "attrs": [ {} ], "properties": { - "order": 27, - "id": 33, - "name": "check-circle-filled", + "order": 1, + "id": 1, "prevSize": 32, - "code": 59655 + "code": 59712, + "name": "microsoft, action-AzureQueue" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 9 + "iconIdx": 73 }, { "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" + "M128 128h320v768h-320zM576 128h320v768h-320z" ], "attrs": [ {} ], "isMulticolor": false, "isMulticolor2": false, - "grid": 0, "tags": [ - "close" - ] + "pause", + "player" + ], + "grid": 16 }, "attrs": [ {} ], "properties": { - "order": 28, - "id": 32, - "name": "close", + "order": 2, + "id": 1, "prevSize": 32, - "code": 59656 + "code": 59695, + "name": "pause" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 10 + "iconIdx": 74 }, { "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" + "M192 128l640 384-640 384z" ], "attrs": [ {} ], "isMulticolor": false, "isMulticolor2": false, - "grid": 0, "tags": [ - "content" - ] + "play", + "player" + ], + "grid": 16 }, "attrs": [ {} ], "properties": { - "order": 37, - "id": 31, - "name": "type-References", + "order": 3, + "id": 0, "prevSize": 32, - "code": 59657 + "code": 59696, + "name": "play" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 11 + "iconIdx": 75 }, { "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" + "M889.68 166.32c-93.608-102.216-228.154-166.32-377.68-166.32-282.77 0-512 229.23-512 512h96c0-229.75 186.25-416 416-416 123.020 0 233.542 53.418 309.696 138.306l-149.696 149.694h352v-352l-134.32 134.32z", + "M928 512c0 229.75-186.25 416-416 416-123.020 0-233.542-53.418-309.694-138.306l149.694-149.694h-352v352l134.32-134.32c93.608 102.216 228.154 166.32 377.68 166.32 282.77 0 512-229.23 512-512h-96z" ], "attrs": [ + {}, {} ], "isMulticolor": false, "isMulticolor2": false, - "grid": 0, "tags": [ - "control-checkbox" - ] + "loop", + "repeat", + "player", + "reload", + "refresh", + "update", + "synchronize", + "arrows" + ], + "grid": 16 }, "attrs": [ + {}, {} ], "properties": { - "order": 38, - "id": 30, - "name": "control-Checkbox", + "order": 49, + "id": 2, "prevSize": 32, - "code": 59658 + "code": 59694, + "name": "reset" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 12 + "iconIdx": 76 }, { "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" + "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, - "grid": 0, "tags": [ - "control-dropdown" - ] + "cog", + "gear", + "preferences", + "settings", + "generate", + "control", + "options" + ], + "grid": 16 }, "attrs": [ {} ], "properties": { - "order": 39, - "id": 29, - "name": "control-Dropdown", + "order": 1, + "id": 1, "prevSize": 32, - "code": 59659 + "code": 59693, + "name": "settings2" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 13 + "iconIdx": 77 }, { "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" + "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": 32, + "code": 59716, + "name": "timeout" + }, + "setIdx": 2, + "setId": 1, + "iconIdx": 78 + }, + { + "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": 32, + "code": 59699, + "name": "unlocked" + }, + "setIdx": 2, + "setId": 1, + "iconIdx": 79 + }, + { + "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": [ {} @@ -1178,85 +1292,89 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "control-input" + "circle" ] }, "attrs": [ {} ], "properties": { - "order": 41, - "id": 28, - "name": "control-Input", + "order": 106, + "id": 0, + "name": "circle", "prevSize": 32, - "code": 59660 + "code": 59729 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 14 + "iconIdx": 24 }, { "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" + "M341.758 30.332v55.545h25.806v83.195c-193.056 37.236-336.992 205.942-337.132 408.544l-0 0.016c-0 229.687 184.814 415.885 412.793 415.885l-0-0c227.979 0 412.793-186.198 412.793-415.885l-0 0c-0.125-202.629-144.065-371.351-334.545-408.173l-2.587-0.416v-83.165h25.809v-55.545h-202.936zM454.729 369.689c102.973 5.539 185.923 86.823 194.885 189.491v6.763h-23.479v23.589h23.485v6.447c-8.918 102.72-91.882 184.055-194.891 189.594v-23.144h-23.444v23.078c-104.989-6.154-188.976-91.042-194.458-196.868h23.297v-23.589h-23.172c6.225-105.086 89.86-189.163 194.333-195.295v23.195h23.444v-23.261zM535.132 467.312l-78.775 73.035c-3.893-1.564-8.405-2.478-13.126-2.494l-0.006-0c-20.265 0-36.693 16.551-36.693 36.967l-0 0c0 20.417 16.428 36.967 36.693 36.967h-0c20.265 0 36.693-16.551 36.693-36.967l0-0c-0.010-3.753-0.574-7.37-1.613-10.776l0.069 0.262 71.128-80.156-14.369-16.838z" ], "attrs": [ {} ], + "width": 886, "isMulticolor": false, "isMulticolor2": false, "grid": 0, "tags": [ - "control-radio" + "action-Fastly" ] }, "attrs": [ {} ], "properties": { - "order": 42, - "id": 27, - "name": "control-Radio", + "order": 102, + "id": 1, + "name": "action-Fastly", "prevSize": 32, - "code": 59661 + "code": 59726 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 15 + "iconIdx": 25 }, { "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" + "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-textarea" + "control-Slug" ] }, "attrs": [ + {}, {} ], "properties": { - "order": 17, - "id": 26, - "name": "control-TextArea", + "order": 103, + "id": 0, + "name": "control-Slug", "prevSize": 32, - "code": 59662 + "code": 59727 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 16 + "iconIdx": 26 }, { "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" + "M512 26.947c-267.728 0-485.053 217.059-485.053 485.053s217.069 485.053 485.053 485.053c267.983 0 485.053-217.314 485.053-485.308s-217.069-484.797-485.053-484.797zM512 853.496c-188.747 0-341.745-152.988-341.745-341.752 0-188.745 152.998-341.733 341.745-341.733 188.765 0 341.745 152.988 341.745 341.733 0 188.763-152.98 341.752-341.745 341.752zM512 240.522v254.585c0 7.443 7.957 12.405 14.654 8.939l225.774-117.231c5.042-2.659 6.844-8.986 3.96-13.901-46.936-82.204-133.855-138.576-234.205-142.298z" ], "attrs": [ {} @@ -1265,91 +1383,110 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "control-toggle" + "algolia-mark-white" ] }, "attrs": [ {} ], "properties": { - "order": 16, - "id": 25, - "name": "control-Toggle", + "order": 101, + "id": 1, + "name": "action-Algolia", "prevSize": 32, - "code": 59663 + "code": 59724 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 17 + "iconIdx": 27 }, { "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" + "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.462h-59.191z", + "M479.422 337.341v260.462h59.191v-260.462h-59.191z" ], "attrs": [ - {} + { + "fill": "rgb(193, 198, 200)" + }, + { + "fill": "rgb(193, 198, 200)" + }, + { + "fill": "rgb(193, 198, 200)" + }, + { + "fill": "rgb(193, 198, 200)" + } ], "isMulticolor": false, "isMulticolor2": false, "grid": 0, "tags": [ - "copy" + "Tags" ] }, "attrs": [ - {} + { + "fill": "rgb(193, 198, 200)" + }, + { + "fill": "rgb(193, 198, 200)" + }, + { + "fill": "rgb(193, 198, 200)" + }, + { + "fill": "rgb(193, 198, 200)" + } ], "properties": { - "order": 90, - "id": 24, - "name": "copy", + "order": 98, + "id": 0, + "name": "type-Tags", "prevSize": 32, - "code": 59664 + "code": 59722 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 18 + "iconIdx": 28 }, { "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" + "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": [ - "dashboard" + "activity" ] }, "attrs": [ - {}, - {}, {} ], "properties": { - "order": 26, - "id": 23, - "name": "dashboard", + "order": 12, + "id": 36, + "name": "activity, history, time", "prevSize": 32, - "code": 59665 + "code": 59652 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 19 + "iconIdx": 29 }, { "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" + "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": [ {} @@ -1358,27 +1495,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "delete" + "add" ] }, "attrs": [ {} ], "properties": { - "order": 29, - "id": 22, - "name": "delete, bin", + "order": 13, + "id": 35, + "name": "add, plus", "prevSize": 32, - "code": 59666 + "code": 59653 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 20 + "iconIdx": 30 }, { "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" + "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": [ {} @@ -1387,27 +1524,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "delete-filled" + "check-circle" ] }, "attrs": [ {} ], "properties": { - "order": 36, - "id": 21, - "name": "delete-filled", + "order": 14, + "id": 34, + "name": "check-circle", "prevSize": 32, - "code": 59667 + "code": 59654 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 21 + "iconIdx": 31 }, { "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" + "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": [ {} @@ -1416,27 +1553,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "document-delete" + "check-circle-filled" ] }, "attrs": [ {} ], "properties": { - "order": 35, - "id": 20, - "name": "document-delete", + "order": 27, + "id": 33, + "name": "check-circle-filled", "prevSize": 32, - "code": 59668 + "code": 59655 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 22 + "iconIdx": 32 }, { "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" + "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": [ {} @@ -1445,27 +1582,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "document-disable" + "close" ] }, "attrs": [ {} ], "properties": { - "order": 40, - "id": 19, - "name": "document-disable", + "order": 28, + "id": 32, + "name": "close", "prevSize": 32, - "code": 59669 + "code": 59656 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 23 + "iconIdx": 33 }, { "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" + "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": [ {} @@ -1474,27 +1611,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "document-publish" + "content" ] }, "attrs": [ {} ], "properties": { - "order": 44, - "id": 18, - "name": "document-publish", + "order": 37, + "id": 31, + "name": "type-References", "prevSize": 32, - "code": 59670 + "code": 59657 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 24 + "iconIdx": 34 }, { "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" + "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": [ {} @@ -1503,27 +1640,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "drag" + "control-checkbox" ] }, "attrs": [ {} ], "properties": { - "order": 43, - "id": 17, - "name": "drag", + "order": 38, + "id": 30, + "name": "control-Checkbox", "prevSize": 32, - "code": 59671 + "code": 59658 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 25 + "iconIdx": 35 }, { "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" + "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": [ {} @@ -1532,57 +1669,56 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "filter" + "control-dropdown" ] }, "attrs": [ {} ], "properties": { - "order": 18, - "id": 16, - "name": "filter", + "order": 39, + "id": 29, + "name": "control-Dropdown", "prevSize": 32, - "code": 59672 + "code": 59659 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 26 + "iconIdx": 36 }, { "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" + "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": [ - "brand", - "github" - ], - "grid": 0 + "control-input" + ] }, "attrs": [ {} ], "properties": { - "order": 77, - "id": 0, - "name": "github", + "order": 41, + "id": 28, + "name": "control-Input", "prevSize": 32, - "code": 59713 + "code": 59660 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 27 + "iconIdx": 37 }, { "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" + "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": [ {} @@ -1591,27 +1727,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "help" + "control-radio" ] }, "attrs": [ {} ], "properties": { - "order": 19, - "id": 15, - "name": "help", + "order": 42, + "id": 27, + "name": "control-Radio", "prevSize": 32, - "code": 59673 + "code": 59661 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 28 + "iconIdx": 38 }, { "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" + "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": [ {} @@ -1620,27 +1756,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "location" + "control-textarea" ] }, "attrs": [ {} ], "properties": { - "order": 25, - "id": 13, - "name": "location, control-Map, type-Geolocation", + "order": 17, + "id": 26, + "name": "control-TextArea", "prevSize": 32, - "code": 59675 + "code": 59662 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 29 + "iconIdx": 39 }, { "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" + "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": [ {} @@ -1649,27 +1785,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "logo" + "control-toggle" ] }, "attrs": [ {} ], "properties": { - "order": 31, - "id": 12, - "name": "logo", + "order": 16, + "id": 25, + "name": "control-Toggle", "prevSize": 32, - "code": 59676 + "code": 59663 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 30 + "iconIdx": 40 }, { "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" + "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": [ {} @@ -1678,56 +1814,62 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "media" + "copy" ] }, "attrs": [ {} ], "properties": { - "order": 30, - "id": 11, - "name": "media, type-Assets, trigger-AssetChanged", + "order": 90, + "id": 24, + "name": "copy", "prevSize": 32, - "code": 59677 + "code": 59664 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 31 + "iconIdx": 41 }, { "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" + "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": [ - "more" + "dashboard" ] }, "attrs": [ + {}, + {}, {} ], "properties": { - "order": 34, - "id": 10, - "name": "more, dots", + "order": 26, + "id": 23, + "name": "dashboard", "prevSize": 32, - "code": 59678 + "code": 59665 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 32 + "iconIdx": 42 }, { "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" + "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": [ {} @@ -1736,27 +1878,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "pencil" + "delete" ] }, "attrs": [ {} ], "properties": { - "order": 47, - "id": 9, - "name": "pencil", + "order": 29, + "id": 22, + "name": "delete, bin", "prevSize": 32, - "code": 59679 + "code": 59666 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 33 + "iconIdx": 43 }, { "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" + "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": [ {} @@ -1765,65 +1907,56 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "reference" + "delete-filled" ] }, "attrs": [ {} ], "properties": { - "order": 45, - "id": 8, - "name": "reference", + "order": 36, + "id": 21, + "name": "delete-filled", "prevSize": 32, - "code": 59680 + "code": 59667 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 34 + "iconIdx": 44 }, { "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" + "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": [ - "schemas" + "document-delete" ] }, "attrs": [ - {}, - {}, - {}, {} ], "properties": { - "order": 46, - "id": 7, - "name": "schemas", + "order": 35, + "id": 20, + "name": "document-delete", "prevSize": 32, - "code": 59681 + "code": 59668 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 35 + "iconIdx": 45 }, { "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" + "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": [ {} @@ -1832,27 +1965,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "search" + "document-disable" ] }, "attrs": [ {} ], "properties": { - "order": 23, - "id": 6, - "name": "search", + "order": 40, + "id": 19, + "name": "document-disable", "prevSize": 32, - "code": 59682 + "code": 59669 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 36 + "iconIdx": 46 }, { "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" + "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": [ {} @@ -1861,27 +1994,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "settings" + "document-publish" ] }, "attrs": [ {} ], "properties": { - "order": 22, - "id": 5, - "name": "settings", + "order": 44, + "id": 18, + "name": "document-publish", "prevSize": 32, - "code": 59683 + "code": 59670 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 37 + "iconIdx": 47 }, { "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" + "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": [ {} @@ -1890,27 +2023,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "type-boolean" + "drag" ] }, "attrs": [ {} ], "properties": { - "order": 21, - "id": 4, - "name": "type-Boolean", + "order": 43, + "id": 17, + "name": "drag", "prevSize": 32, - "code": 59684 + "code": 59671 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 38 + "iconIdx": 48 }, { "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" + "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": [ {} @@ -1919,56 +2052,57 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "type-datetime" + "filter" ] }, "attrs": [ {} ], "properties": { - "order": 24, - "id": 3, - "name": "type-DateTime", + "order": 18, + "id": 16, + "name": "filter", "prevSize": 32, - "code": 59685 + "code": 59672 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 39 + "iconIdx": 49 }, { "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" + "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, - "grid": 0, "tags": [ - "json" - ] + "brand", + "github" + ], + "grid": 0 }, "attrs": [ {} ], "properties": { - "order": 20, - "id": 14, - "name": "type-Json, json", + "order": 77, + "id": 0, + "name": "github", "prevSize": 32, - "code": 59674 + "code": 59713 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 40 + "iconIdx": 50 }, { "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" + "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": [ {} @@ -1977,27 +2111,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "type-number" + "help" ] }, "attrs": [ {} ], "properties": { - "order": 32, - "id": 2, - "name": "type-Number", + "order": 19, + "id": 15, + "name": "help", "prevSize": 32, - "code": 59686 + "code": 59673 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 41 + "iconIdx": 51 }, { "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" + "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": [ {} @@ -2006,27 +2140,27 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "type-string" + "location" ] }, "attrs": [ {} ], "properties": { - "order": 48, - "id": 1, - "name": "type-String", + "order": 25, + "id": 13, + "name": "location, control-Map, type-Geolocation", "prevSize": 32, - "code": 59687 + "code": 59675 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 42 + "iconIdx": 52 }, { "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" + "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": [ {} @@ -2035,447 +2169,408 @@ "isMulticolor2": false, "grid": 0, "tags": [ - "user" + "logo" ] }, "attrs": [ {} ], "properties": { - "order": 33, - "id": 0, - "name": "user", + "order": 31, + "id": 12, + "name": "logo", "prevSize": 32, - "code": 59688 + "code": 59676 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 43 + "iconIdx": 53 }, { "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" + "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": [ - "clock", - "time", - "schedule" - ], - "grid": 16 + "media" + ] }, "attrs": [ {} ], "properties": { - "order": 1, - "id": 0, + "order": 30, + "id": 11, + "name": "media, type-Assets, trigger-AssetChanged", "prevSize": 32, - "code": 59728, - "name": "clock" + "code": 59677 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 44 + "iconIdx": 54 }, { "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" + "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": [ - "bin", - "trashcan", - "remove", - "delete", - "recycle", - "dispose" - ], - "grid": 16 + "more" + ] }, "attrs": [ - {}, {} ], "properties": { - "order": 1, - "id": 0, - "name": "bin2", + "order": 34, + "id": 10, + "name": "more, dots", "prevSize": 32, - "code": 59650 + "code": 59678 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 45 + "iconIdx": 55 }, { "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" + "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": [ + {} ], - "attrs": [], "isMulticolor": false, "isMulticolor2": false, - "tags": [ - "earth", - "globe", - "language", - "web", - "internet", - "sphere", - "planet" - ], - "defaultCode": 59850, - "grid": 16 + "grid": 0, + "tags": [ + "pencil" + ] }, - "attrs": [], + "attrs": [ + {} + ], "properties": { - "ligatures": "earth, globe2", - "name": "earth", - "id": 202, - "order": 91, + "order": 47, + "id": 9, + "name": "pencil", "prevSize": 32, - "code": 59850 + "code": 59679 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 46 + "iconIdx": 56 }, { "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" + "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": [ - "stopwatch", - "time", - "speed", - "meter", - "chronometer" - ], - "grid": 16 + "reference" + ] }, "attrs": [ {} ], "properties": { - "order": 1, - "id": 2, + "order": 45, + "id": 8, + "name": "reference", "prevSize": 32, - "code": 59715, - "name": "elapsed" + "code": 59680 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 47 + "iconIdx": 57 }, { "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" + "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": [ - "google", - "brand" - ], - "grid": 16 + "schemas" + ] }, "attrs": [ + {}, + {}, + {}, {} ], "properties": { - "order": 1, - "id": 0, + "order": 46, + "id": 7, + "name": "schemas", "prevSize": 32, - "code": 59707, - "name": "google" + "code": 59681 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 48 + "iconIdx": 58 }, { "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" + "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": [ - "lock", - "secure", - "private", - "encrypted" - ], - "grid": 16 + "search" + ] }, "attrs": [ {} ], "properties": { - "order": 2, - "id": 0, + "order": 23, + "id": 6, + "name": "search", "prevSize": 32, - "code": 59700, - "name": "lock" + "code": 59682 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 49 + "iconIdx": 59 }, { "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" + "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": [ - "windows8", - "brand", - "os" - ], - "grid": 16 + "settings" + ] }, "attrs": [ {} ], "properties": { - "order": 1, - "id": 1, + "order": 22, + "id": 5, + "name": "settings", "prevSize": 32, - "code": 59712, - "name": "microsoft, action-AzureQueue" + "code": 59683 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 50 + "iconIdx": 60 }, { "icon": { "paths": [ - "M128 128h320v768h-320zM576 128h320v768h-320z" + "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": [ - "pause", - "player" - ], - "grid": 16 + "type-boolean" + ] }, "attrs": [ {} ], "properties": { - "order": 2, - "id": 1, + "order": 21, + "id": 4, + "name": "type-Boolean", "prevSize": 32, - "code": 59695, - "name": "pause" + "code": 59684 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 51 + "iconIdx": 61 }, { "icon": { "paths": [ - "M192 128l640 384-640 384z" + "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": [ - "play", - "player" - ], - "grid": 16 + "type-datetime" + ] }, "attrs": [ {} ], "properties": { - "order": 3, - "id": 0, + "order": 24, + "id": 3, + "name": "type-DateTime", "prevSize": 32, - "code": 59696, - "name": "play" + "code": 59685 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 52 + "iconIdx": 62 }, { "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" + "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": [ - "loop", - "repeat", - "player", - "reload", - "refresh", - "update", - "synchronize", - "arrows" - ], - "grid": 16 + "json" + ] }, "attrs": [ - {}, {} ], "properties": { - "order": 49, - "id": 2, + "order": 20, + "id": 14, + "name": "type-Json, json", "prevSize": 32, - "code": 59694, - "name": "reset" + "code": 59674 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 53 + "iconIdx": 63 }, { "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" + "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": [ - "cog", - "gear", - "preferences", - "settings", - "generate", - "control", - "options" - ], - "grid": 16 + "type-number" + ] }, "attrs": [ {} ], "properties": { - "order": 1, - "id": 1, + "order": 32, + "id": 2, + "name": "type-Number", "prevSize": 32, - "code": 59693, - "name": "settings2" + "code": 59686 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 54 + "iconIdx": 64 }, { "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" + "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": [ - "alarm", - "time", - "clock" - ], - "grid": 16 + "type-string" + ] }, "attrs": [ - {}, {} ], "properties": { - "order": 2, + "order": 48, "id": 1, + "name": "type-String", "prevSize": 32, - "code": 59716, - "name": "timeout" + "code": 59687 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 55 + "iconIdx": 65 }, { "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" + "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": [ - "unlocked", - "lock-open" - ], - "grid": 16 + "user" + ] }, "attrs": [ {} ], "properties": { - "order": 1, - "id": 1, + "order": 33, + "id": 0, + "name": "user", "prevSize": 32, - "code": 59699, - "name": "unlocked" + "code": 59688 }, - "setIdx": 0, + "setIdx": 2, "setId": 1, - "iconIdx": 56 + "iconIdx": 66 }, { "icon": { @@ -2506,7 +2601,7 @@ "code": 59701, "name": "browser" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, "iconIdx": 80 }, @@ -2538,7 +2633,7 @@ "code": 59714, "name": "checkmark" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, "iconIdx": 81 }, @@ -2568,7 +2663,7 @@ "code": 59706, "name": "control-Stars" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, "iconIdx": 82 }, @@ -2597,7 +2692,7 @@ "code": 59705, "name": "control-RichText" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, "iconIdx": 83 }, @@ -2626,7 +2721,7 @@ "code": 59710, "name": "download" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, "iconIdx": 84 }, @@ -2655,7 +2750,7 @@ "code": 59708, "name": "info" }, - "setIdx": 0, + "setIdx": 2, "setId": 1, "iconIdx": 85 } diff --git a/src/Squidex/app/theme/icomoon/style.css b/src/Squidex/app/theme/icomoon/style.css index cf7db2554..11a2660b9 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?asl9vj'); - src: url('fonts/icomoon.eot?asl9vj#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?asl9vj') format('truetype'), - url('fonts/icomoon.woff?asl9vj') format('woff'), - url('fonts/icomoon.svg?asl9vj#icomoon') format('svg'); + src: url('fonts/icomoon.eot?y97utm'); + src: url('fonts/icomoon.eot?y97utm#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?y97utm') format('truetype'), + url('fonts/icomoon.woff?y97utm') format('woff'), + url('fonts/icomoon.svg?y97utm#icomoon') format('svg'); font-weight: normal; font-style: normal; } @@ -24,6 +24,9 @@ -moz-osx-font-smoothing: grayscale; } +.icon-exclamation:before { + content: "\e955"; +} .icon-action-ElasticSearch:before { content: "\e952"; } @@ -102,6 +105,87 @@ .icon-action-Webhook:before { content: "\e947"; } +.icon-hour-glass:before { + content: "\e954"; +} +.icon-spinner:before { + content: "\e953"; +} +.icon-clock:before { + content: "\e950"; +} +.icon-bin2:before { + content: "\e902"; +} +.icon-earth:before { + content: "\e9ca"; +} +.icon-elapsed:before { + content: "\e943"; +} +.icon-google:before { + content: "\e93b"; +} +.icon-lock:before { + content: "\e934"; +} +.icon-microsoft:before { + content: "\e940"; +} +.icon-action-AzureQueue:before { + content: "\e940"; +} +.icon-pause:before { + content: "\e92f"; +} +.icon-play:before { + content: "\e930"; +} +.icon-reset:before { + content: "\e92e"; +} +.icon-settings2:before { + content: "\e92d"; +} +.icon-timeout:before { + content: "\e944"; +} +.icon-unlocked:before { + content: "\e933"; +} +.icon-caret-up:before { + content: "\e92b"; +} +.icon-contents:before { + content: "\e946"; +} +.icon-trigger-ContentChanged:before { + content: "\e946"; +} +.icon-control-Date:before { + content: "\e936"; +} +.icon-control-DateTime:before { + content: "\e937"; +} +.icon-control-Markdown:before { + content: "\e938"; +} +.icon-grid:before { + content: "\f00a"; +} +.icon-list:before { + content: "\f0c9"; +} +.icon-user-o:before { + content: "\e932"; +} +.icon-rules:before { + content: "\e947"; +} +.icon-action-Webhook:before { + content: "\e947"; +} .icon-circle:before { content: "\e951"; } @@ -262,48 +346,6 @@ .icon-user:before { content: "\e928"; } -.icon-clock:before { - content: "\e950"; -} -.icon-bin2:before { - content: "\e902"; -} -.icon-earth:before { - content: "\e9ca"; -} -.icon-elapsed:before { - content: "\e943"; -} -.icon-google:before { - content: "\e93b"; -} -.icon-lock:before { - content: "\e934"; -} -.icon-microsoft:before { - content: "\e940"; -} -.icon-action-AzureQueue:before { - content: "\e940"; -} -.icon-pause:before { - content: "\e92f"; -} -.icon-play:before { - content: "\e930"; -} -.icon-reset:before { - content: "\e92e"; -} -.icon-settings2:before { - content: "\e92d"; -} -.icon-timeout:before { - content: "\e944"; -} -.icon-unlocked:before { - content: "\e933"; -} .icon-browser:before { content: "\e935"; } From 96ab297ff03923c3e5e3e28ffa7882f20cd7c17e Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Fri, 23 Mar 2018 22:08:21 +0100 Subject: [PATCH 4/7] Some tests fixed. --- .../Apps/LanguagesConfig.cs | 1 - .../Rules/Rule.cs | 7 ++ .../Apps/State/AppState.cs | 5 +- .../Assets/AssetGrain.cs | 2 +- .../Backup/BackupGrain.cs | 70 ++++++++++++++----- .../Backup/IBackupJob.cs | 6 +- .../Backup/State/BackupStateJob.cs | 8 ++- .../Assets/AzureBlobAssetStore.cs | 15 ++-- .../Assets/GoogleCloudAssetStore.cs | 15 ++++ .../Assets/FolderAssetStore.cs | 22 +++--- .../Assets/IAssetStore.cs | 2 + ...ntroller.cs => BackupContentController.cs} | 5 +- src/Squidex/Config/Domain/EntitiesServices.cs | 3 + .../pages/backups/backups-page.component.html | 36 +++++----- .../pages/backups/backups-page.component.scss | 3 +- .../pages/backups/backups-page.component.ts | 9 +++ .../framework/angular/date-time.pipes.spec.ts | 4 +- .../app/framework/utils/duration.spec.ts | 8 +-- src/Squidex/app/framework/utils/duration.ts | 14 +++- tests/RunCoverage.ps1 | 2 +- .../HandleRules/RuleEventFormatterTests.cs | 47 +++++++++++++ .../HandleRules/RuleServiceTests.cs | 6 +- .../Assets/AssetStoreTests.cs | 16 ++++- tools/Migrate_01/MigrationPath.cs | 8 ++- .../Migrations/ConvertEventStoreAppId.cs | 54 ++++++++++++++ 25 files changed, 295 insertions(+), 73 deletions(-) rename src/Squidex/Areas/Api/Controllers/Backups/{BackupsContentController.cs => BackupContentController.cs} (90%) create mode 100644 tools/Migrate_01/Migrations/ConvertEventStoreAppId.cs diff --git a/src/Squidex.Domain.Apps.Core.Model/Apps/LanguagesConfig.cs b/src/Squidex.Domain.Apps.Core.Model/Apps/LanguagesConfig.cs index be1dbe7f9..3dd412601 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Apps/LanguagesConfig.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Apps/LanguagesConfig.cs @@ -17,7 +17,6 @@ namespace Squidex.Domain.Apps.Core.Apps { public sealed class LanguagesConfig : IFieldPartitioning { - public static readonly LanguagesConfig Empty = new LanguagesConfig(ImmutableDictionary.Empty, null, false); public static readonly LanguagesConfig English = Build(Language.EN); private readonly ImmutableDictionary languages; diff --git a/src/Squidex.Domain.Apps.Core.Model/Rules/Rule.cs b/src/Squidex.Domain.Apps.Core.Model/Rules/Rule.cs index be7bed2ca..e0f3b3618 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Rules/Rule.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Rules/Rule.cs @@ -38,7 +38,10 @@ namespace Squidex.Domain.Apps.Core.Rules Guard.NotNull(action, nameof(action)); this.trigger = trigger; + this.trigger.Freeze(); + this.action = action; + this.action.Freeze(); } [Pure] @@ -69,6 +72,8 @@ namespace Squidex.Domain.Apps.Core.Rules throw new ArgumentException("New trigger has another type.", nameof(newTrigger)); } + newTrigger.Freeze(); + return Clone(clone => { clone.trigger = newTrigger; @@ -85,6 +90,8 @@ namespace Squidex.Domain.Apps.Core.Rules throw new ArgumentException("New action has another type.", nameof(newAction)); } + newAction.Freeze(); + return Clone(clone => { clone.action = newAction; diff --git a/src/Squidex.Domain.Apps.Entities/Apps/State/AppState.cs b/src/Squidex.Domain.Apps.Entities/Apps/State/AppState.cs index 27a09f421..4662de274 100644 --- a/src/Squidex.Domain.Apps.Entities/Apps/State/AppState.cs +++ b/src/Squidex.Domain.Apps.Entities/Apps/State/AppState.cs @@ -9,7 +9,6 @@ using Newtonsoft.Json; using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Events; using Squidex.Domain.Apps.Events.Apps; -using Squidex.Infrastructure; using Squidex.Infrastructure.Dispatching; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Reflection; @@ -19,8 +18,6 @@ namespace Squidex.Domain.Apps.Entities.Apps.State public class AppState : DomainObjectState, IAppEntity { - private static readonly LanguagesConfig English = LanguagesConfig.Build(Language.EN); - [JsonProperty] public string Name { get; set; } @@ -37,7 +34,7 @@ namespace Squidex.Domain.Apps.Entities.Apps.State public AppContributors Contributors { get; set; } = AppContributors.Empty; [JsonProperty] - public LanguagesConfig LanguagesConfig { get; set; } = English; + public LanguagesConfig LanguagesConfig { get; set; } = LanguagesConfig.English; [JsonProperty] public bool IsArchived { get; set; } diff --git a/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs b/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs index cf7b15ff0..e44af49bf 100644 --- a/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs @@ -21,7 +21,7 @@ using Squidex.Infrastructure.States; namespace Squidex.Domain.Apps.Entities.Assets { - public class AssetGrain : DomainObjectGrain, IAssetGrain + public class AssetGrain : SquidexDomainObjectGrain, IAssetGrain { public AssetGrain(IStore store) : base(store) diff --git a/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs b/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs index 3ea5d0ad3..483c292a7 100644 --- a/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs @@ -29,6 +29,7 @@ namespace Squidex.Domain.Apps.Entities.Backup public sealed class BackupGrain : Grain, IBackupGrain { private const int MaxBackups = 10; + private static readonly Duration UpdateDuration = Duration.FromSeconds(1); private readonly IClock clock; private readonly IAssetStore assetStore; private readonly IEventDataFormatter eventDataFormatter; @@ -95,8 +96,6 @@ namespace Squidex.Domain.Apps.Entities.Backup private async Task CleanupAsync() { - var hasUpdated = false; - foreach (var job in state.Jobs) { if (!job.Stopped.HasValue) @@ -104,21 +103,38 @@ namespace Squidex.Domain.Apps.Entities.Backup await CleanupAsync(job); job.Stopped = clock.GetCurrentInstant(); - job.Failed = true; + job.IsFailed = true; - hasUpdated = true; + await WriteAsync(); } } - - if (hasUpdated) - { - await WriteAsync(); - } } private async Task CleanupAsync(BackupStateJob job) { - await backupArchiveLocation.DeleteArchiveAsync(job.Id); + try + { + await backupArchiveLocation.DeleteArchiveAsync(job.Id); + } + catch (Exception ex) + { + log.LogError(ex, w => w + .WriteProperty("action", "deleteArchive") + .WriteProperty("status", "failed") + .WriteProperty("backupId", job.Id.ToString())); + } + + try + { + await assetStore.DeleteAsync(job.Id.ToString(), 0, null); + } + catch (Exception ex) + { + log.LogError(ex, w => w + .WriteProperty("action", "deleteBackup") + .WriteProperty("status", "failed") + .WriteProperty("backupId", job.Id.ToString())); + } } public async Task RunAsync() @@ -138,7 +154,9 @@ namespace Squidex.Domain.Apps.Entities.Backup currentTask = new CancellationTokenSource(); currentJob = job; - state.Jobs.Add(job); + var lastTimestamp = job.Started; + + state.Jobs.Insert(0, job); await WriteAsync(); @@ -152,8 +170,8 @@ namespace Squidex.Domain.Apps.Entities.Backup { var eventData = @event.Data; - if (eventData.Type == nameof(AssetCreated) || - eventData.Type == nameof(AssetUpdated)) + if (eventData.Type == "AssetCreatedEvent" || + eventData.Type == "AssetUpdatedEvent") { var parsedEvent = eventDataFormatter.Parse(eventData); @@ -176,11 +194,24 @@ namespace Squidex.Domain.Apps.Entities.Backup { await assetStore.DownloadAsync(assetId.ToString(), assetVersion, null, attachmentStream); }); + + job.HandledAssets++; } else { await writer.WriteEventAsync(eventData); } + + job.HandledEvents++; + + var now = clock.GetCurrentInstant(); + + if ((now - lastTimestamp) >= UpdateDuration) + { + lastTimestamp = now; + + await WriteAsync(); + } }, SquidexHeaders.AppId, appId.ToString(), null, currentTask.Token); } @@ -189,16 +220,21 @@ namespace Squidex.Domain.Apps.Entities.Backup currentTask.Token.ThrowIfCancellationRequested(); await assetStore.UploadAsync(job.Id.ToString(), 0, null, stream, currentTask.Token); - - currentTask.Token.ThrowIfCancellationRequested(); } } - catch + catch (Exception ex) { - job.Failed = true; + log.LogError(ex, w => w + .WriteProperty("action", "makeBackup") + .WriteProperty("status", "failed") + .WriteProperty("backupId", job.Id.ToString())); + + job.IsFailed = true; } finally { + await CleanupAsync(job); + job.Stopped = clock.GetCurrentInstant(); await WriteAsync(); diff --git a/src/Squidex.Domain.Apps.Entities/Backup/IBackupJob.cs b/src/Squidex.Domain.Apps.Entities/Backup/IBackupJob.cs index 472c0e295..4142fd5e0 100644 --- a/src/Squidex.Domain.Apps.Entities/Backup/IBackupJob.cs +++ b/src/Squidex.Domain.Apps.Entities/Backup/IBackupJob.cs @@ -18,6 +18,10 @@ namespace Squidex.Domain.Apps.Entities.Backup Instant? Stopped { get; } - bool Failed { get; } + int HandledEvents { get; } + + int HandledAssets { get; } + + bool IsFailed { get; } } } diff --git a/src/Squidex.Domain.Apps.Entities/Backup/State/BackupStateJob.cs b/src/Squidex.Domain.Apps.Entities/Backup/State/BackupStateJob.cs index 771843464..58c5d37b4 100644 --- a/src/Squidex.Domain.Apps.Entities/Backup/State/BackupStateJob.cs +++ b/src/Squidex.Domain.Apps.Entities/Backup/State/BackupStateJob.cs @@ -23,6 +23,12 @@ namespace Squidex.Domain.Apps.Entities.Backup.State public Instant? Stopped { get; set; } [JsonProperty] - public bool Failed { get; set; } + public int HandledEvents { get; set; } + + [JsonProperty] + public int HandledAssets { get; set; } + + [JsonProperty] + public bool IsFailed { get; set; } } } diff --git a/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs b/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs index e19b9af8a..c5f841510 100644 --- a/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs +++ b/src/Squidex.Infrastructure.Azure/Assets/AzureBlobAssetStore.cs @@ -114,18 +114,25 @@ namespace Squidex.Infrastructure.Assets await blobRef.SetMetadataAsync(); } - public async Task UploadAsync(string name, Stream stream, CancellationToken ct = default(CancellationToken)) + public Task UploadAsync(string name, Stream stream, CancellationToken ct = default(CancellationToken)) { var tempBlob = blobContainer.GetBlockBlobReference(name); - await tempBlob.UploadFromStreamAsync(stream, null, null, null, ct); + return tempBlob.UploadFromStreamAsync(stream, null, null, null, ct); } - public async Task DeleteAsync(string name) + public Task DeleteAsync(string name) { var tempBlob = blobContainer.GetBlockBlobReference(name); - await tempBlob.DeleteIfExistsAsync(); + return tempBlob.DeleteIfExistsAsync(); + } + + public Task DeleteAsync(string id, long version, string suffix) + { + var tempBlob = blobContainer.GetBlockBlobReference(GetObjectName(id, version, suffix)); + + return tempBlob.DeleteIfExistsAsync(); } private string GetObjectName(string id, long version, string suffix) diff --git a/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs b/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs index 8df8c6094..5af2be27a 100644 --- a/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs +++ b/src/Squidex.Infrastructure.GoogleCloud/Assets/GoogleCloudAssetStore.cs @@ -104,6 +104,21 @@ namespace Squidex.Infrastructure.Assets } } + public async Task DeleteAsync(string id, long version, string suffix) + { + try + { + await storageClient.DeleteObjectAsync(bucketName, GetObjectName(id, version, suffix)); + } + catch (GoogleApiException ex) + { + if (ex.HttpStatusCode != HttpStatusCode.NotFound) + { + throw; + } + } + } + private string GetObjectName(string id, long version, string suffix) { Guard.NotNullOrEmpty(id, nameof(id)); diff --git a/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs b/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs index d908cbf24..6ff9d8598 100644 --- a/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs +++ b/src/Squidex.Infrastructure/Assets/FolderAssetStore.cs @@ -112,20 +112,22 @@ namespace Squidex.Infrastructure.Assets } } + public Task DeleteAsync(string id, long version, string suffix) + { + var file = GetFile(id, version, suffix); + + file.Delete(); + + return TaskHelper.Done; + } + public Task DeleteAsync(string name) { - try - { - var file = GetFile(name); + var file = GetFile(name); - file.Delete(); + file.Delete(); - return TaskHelper.Done; - } - catch (FileNotFoundException ex) - { - throw new AssetNotFoundException($"Asset {name} not found.", ex); - } + return TaskHelper.Done; } private FileInfo GetFile(string id, long version, string suffix) diff --git a/src/Squidex.Infrastructure/Assets/IAssetStore.cs b/src/Squidex.Infrastructure/Assets/IAssetStore.cs index 9e8cd3bcd..7a4d2cdbc 100644 --- a/src/Squidex.Infrastructure/Assets/IAssetStore.cs +++ b/src/Squidex.Infrastructure/Assets/IAssetStore.cs @@ -24,5 +24,7 @@ namespace Squidex.Infrastructure.Assets Task UploadAsync(string id, long version, string suffix, Stream stream, CancellationToken ct = default(CancellationToken)); Task DeleteAsync(string name); + + Task DeleteAsync(string id, long version, string suffix); } } \ No newline at end of file diff --git a/src/Squidex/Areas/Api/Controllers/Backups/BackupsContentController.cs b/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs similarity index 90% rename from src/Squidex/Areas/Api/Controllers/Backups/BackupsContentController.cs rename to src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs index b30d59f88..0db366eef 100644 --- a/src/Squidex/Areas/Api/Controllers/Backups/BackupsContentController.cs +++ b/src/Squidex/Areas/Api/Controllers/Backups/BackupContentController.cs @@ -17,15 +17,14 @@ namespace Squidex.Areas.Api.Controllers.Backups /// /// Manages backups for app. /// - [ApiAuthorize] [ApiExceptionFilter] [AppApi] [SwaggerTag(nameof(Backups))] - public class BackupsContentController : ApiController + public class BackupContentController : ApiController { private readonly IAssetStore assetStore; - public BackupsContentController(ICommandBus commandBus, IAssetStore assetStore) + public BackupContentController(ICommandBus commandBus, IAssetStore assetStore) : base(commandBus) { this.assetStore = assetStore; diff --git a/src/Squidex/Config/Domain/EntitiesServices.cs b/src/Squidex/Config/Domain/EntitiesServices.cs index 158c3afdf..ad0389c07 100644 --- a/src/Squidex/Config/Domain/EntitiesServices.cs +++ b/src/Squidex/Config/Domain/EntitiesServices.cs @@ -161,6 +161,9 @@ namespace Squidex.Config.Domain services.AddTransientAs() .As(); + services.AddTransientAs() + .As(); + services.AddTransientAs() .As(); 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 766a8807c..6c7c35bf8 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 @@ -1,10 +1,10 @@ - +
    -
    @@ -23,10 +23,10 @@ Your have reached the maximum number of backups: 10.
    -
    -
    +
    +
    -
    +
    @@ -37,32 +37,34 @@
    -
    Started:
    -
    Stopped:
    +
    + Started: +
    +
    + Duration: +
    -
    +
    {{backup.started.toISOString()}}
    - {{backup.stopped.toISOString()}} + {{getDuration(backup) | sqxDuration}}
    -
    -
    Progress:
    -
    Download:
    -
    - {{backup.handledEvents}} + Events: {{backup.handledEvents | sqxKNumber}} , - {{backup.handledAssets}} + Assets: {{backup.handledAssets | sqxKNumber}}
    -
    - + diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.scss b/src/Squidex/app/features/settings/pages/backups/backups-page.component.scss index 57b091787..80a10e112 100644 --- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.scss +++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.scss @@ -6,12 +6,13 @@ $cicle-size: 2.8rem; .backup-status { & { @include circle($cicle-size); - line-height: $cicle-size; + line-height: $cicle-size + .1rem; text-align: center; font-size: .4 * $cicle-size; font-weight: normal; background: $color-border; color: $color-dark-foreground; + vertical-align: middle; } &-pending { 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 512485668..42a069426 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 @@ -14,6 +14,7 @@ import { BackupDto, BackupsService, DateTime, + Duration, ImmutableArray } from 'shared'; @@ -77,5 +78,13 @@ export class BackupsPageComponent implements OnInit, OnDestroy { public getDownloadUrl(backup: BackupDto) { return this.apiUrl.buildUrl(`api/apps/${this.ctx.appName}/backups/${backup.id}`); } + + public getDuration(backup: BackupDto) { + return Duration.create(backup.started, backup.stopped!); + } + + public trackBy(index: number, item: BackupDto) { + return item.id; + } } diff --git a/src/Squidex/app/framework/angular/date-time.pipes.spec.ts b/src/Squidex/app/framework/angular/date-time.pipes.spec.ts index c01bb8fec..276685d44 100644 --- a/src/Squidex/app/framework/angular/date-time.pipes.spec.ts +++ b/src/Squidex/app/framework/angular/date-time.pipes.spec.ts @@ -23,12 +23,12 @@ const dateTime = DateTime.parse('2013-10-03T12:13:14.125', DateTime.iso8601()); describe('DurationPipe', () => { it('should format to standard duration string', () => { - const duration = Duration.create(dateTime, dateTime.addMinutes(10).addDays(13)); + const duration = Duration.create(dateTime, dateTime.addMinutes(10).addDays(13).addSeconds(10)); const pipe = new DurationPipe(); const actual = pipe.transform(duration); - const expected = '312:10h'; + const expected = '312:10:10'; expect(actual).toBe(expected); }); diff --git a/src/Squidex/app/framework/utils/duration.spec.ts b/src/Squidex/app/framework/utils/duration.spec.ts index c71f25329..d5168fae0 100644 --- a/src/Squidex/app/framework/utils/duration.spec.ts +++ b/src/Squidex/app/framework/utils/duration.spec.ts @@ -28,24 +28,24 @@ describe('Duration', () => { it('should print to string correctly', () => { const s = DateTime.today(); - const d = s.addHours(1).addMinutes(30).addSeconds(60); + const d = s.addHours(12).addMinutes(30).addSeconds(60); const duration = Duration.create(s, d); const actual = duration.toString(); - const expected = '1:31h'; + const expected = '12:31:00'; expect(actual).toBe(expected); }); it('should print to string correctly for one digit minutes', () => { const s = DateTime.today(); - const d = s.addHours(1).addMinutes(1).addSeconds(60); + const d = s.addHours(1).addMinutes(2).addSeconds(5); const duration = Duration.create(s, d); const actual = duration.toString(); - const expected = '1:02h'; + const expected = '01:02:05'; expect(actual).toBe(expected); }); diff --git a/src/Squidex/app/framework/utils/duration.ts b/src/Squidex/app/framework/utils/duration.ts index 7369d65b0..558bb2ca1 100644 --- a/src/Squidex/app/framework/utils/duration.ts +++ b/src/Squidex/app/framework/utils/duration.ts @@ -25,12 +25,24 @@ export class Duration { public toString(): string { const duration = moment.duration(this.value); + let hoursString = Math.floor(duration.asHours()).toString(); + + if (hoursString.length === 1) { + hoursString = `0${hoursString}`; + } + let minutesString = duration.minutes().toString(); if (minutesString.length === 1) { minutesString = `0${minutesString}`; } - return Math.floor(duration.asHours()) + ':' + minutesString + 'h'; + let secondsString = duration.seconds().toString(); + + if (secondsString.length === 1) { + secondsString = `0${secondsString}`; + } + + return `${hoursString}:${minutesString}:${secondsString}`; } } \ No newline at end of file diff --git a/tests/RunCoverage.ps1 b/tests/RunCoverage.ps1 index 9705b059d..6affb6d9e 100644 --- a/tests/RunCoverage.ps1 +++ b/tests/RunCoverage.ps1 @@ -47,7 +47,7 @@ if ($all -Or $appsEntities) { -register:user ` -target:"C:\Program Files\dotnet\dotnet.exe" ` -targetargs:"test $folderWorking\Squidex.Domain.Apps.Entities.Tests\Squidex.Domain.Apps.Entities.Tests.csproj" ` - -filter:"+[Squidex.Domain.Apps.Entities*]*" ` + -filter:"+[Squidex.Domain.Apps.Entities*]* -[Squidex.Domain.Apps.Entities*]*CodeGen*" ` -skipautoprops ` -output:"$folderWorking\$folderReports\Entities.xml" ` -oldStyle diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs index 6a6e6028e..c8addbb71 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleEventFormatterTests.cs @@ -37,6 +37,36 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules Assert.True(result is JObject); } + [Fact] + public void Should_create_route_data() + { + var appId = Guid.NewGuid(); + + var @event = new ContentCreated + { + AppId = new NamedId(appId, "my-app") + }; + + var result = sut.ToRouteData(AsEnvelope(@event)); + + Assert.True(result is JObject); + } + + [Fact] + public void Should_create_route_data_from_event() + { + var appId = Guid.NewGuid(); + + var @event = new ContentCreated + { + AppId = new NamedId(appId, "my-app") + }; + + var result = sut.ToRouteData(AsEnvelope(@event), "MyEventName"); + + Assert.Equal("MyEventName", result["type"]); + } + [Fact] public void Should_replace_app_information_from_event() { @@ -165,6 +195,23 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules Assert.Equal("Berlin", result); } + [Fact] + public void Should_return_plain_value_when_found_from_update_event() + { + var @event = new ContentUpdated + { + Data = + new NamedContentData() + .AddField("city", + new ContentFieldData() + .AddValue("iv", "Berlin")) + }; + + var result = sut.FormatString("$CONTENT_DATA.city.iv", AsEnvelope(@event)); + + Assert.Equal("Berlin", result); + } + [Fact] public void Should_return_undefined_when_null() { 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 9f18d94e5..57122aa8c 100644 --- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs +++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/HandleRules/RuleServiceTests.cs @@ -77,7 +77,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules } [Fact] - public void Should_not_create_trigger_if_no_trigger_handler_registered() + public void Should_not_create_job_if_no_trigger_handler_registered() { var ruleConfig = new Rule(new InvalidTrigger(), new WebhookAction()); var ruleEnvelope = Envelope.Create(new ContentCreated()); @@ -88,7 +88,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules } [Fact] - public void Should_not_create_trigger_if_no_action_handler_registered() + public void Should_not_create_job_if_no_action_handler_registered() { var ruleConfig = new Rule(new ContentChangedTrigger(), new InvalidAction()); var ruleEnvelope = Envelope.Create(new ContentCreated()); @@ -101,7 +101,7 @@ namespace Squidex.Domain.Apps.Core.Operations.HandleRules [Fact] public void Should_not_create_if_not_triggered() { - var ruleConfig = new Rule(new ContentChangedTrigger(), new InvalidAction()); + var ruleConfig = new Rule(new ContentChangedTrigger(), new WebhookAction()); var ruleEnvelope = Envelope.Create(new ContentCreated()); A.CallTo(() => ruleTriggerHandler.Triggers(A>.Ignored, ruleConfig.Trigger)) diff --git a/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs b/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs index 657331efc..f8f0923d8 100644 --- a/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs +++ b/tests/Squidex.Infrastructure.Tests/Assets/AssetStoreTests.cs @@ -84,7 +84,7 @@ namespace Squidex.Infrastructure.Assets } [Fact] - public async Task Should_ignore_when_deleting_twice() + public async Task Should_ignore_when_deleting_twice_by_name() { ((IInitializable)Sut).Initialize(); @@ -97,6 +97,20 @@ namespace Squidex.Infrastructure.Assets await Sut.DeleteAsync(tempId); } + [Fact] + public async Task Should_ignore_when_deleting_twice_by_id() + { + ((IInitializable)Sut).Initialize(); + + var tempId = Id(); + + var assetData = new MemoryStream(new byte[] { 0x1, 0x2, 0x3, 0x4 }); + + await Sut.UploadAsync(tempId, 0, null, assetData); + await Sut.DeleteAsync(tempId, 0, null); + await Sut.DeleteAsync(tempId, 0, null); + } + private static string Id() { return Guid.NewGuid().ToString(); diff --git a/tools/Migrate_01/MigrationPath.cs b/tools/Migrate_01/MigrationPath.cs index b408df447..ff7efb52d 100644 --- a/tools/Migrate_01/MigrationPath.cs +++ b/tools/Migrate_01/MigrationPath.cs @@ -15,7 +15,7 @@ namespace Migrate_01 { public sealed class MigrationPath : IMigrationPath { - private const int CurrentVersion = 6; + private const int CurrentVersion = 7; private readonly IServiceProvider serviceProvider; public MigrationPath(IServiceProvider serviceProvider) @@ -38,6 +38,12 @@ namespace Migrate_01 migrations.Add(serviceProvider.GetRequiredService()); } + // Version 7: Introduces AppId for backups. + else if (version < 7) + { + migrations.Add(serviceProvider.GetRequiredService()); + } + // Version 5: Fixes the broken command architecture and requires a rebuild of all snapshots. if (version < 5) { diff --git a/tools/Migrate_01/Migrations/ConvertEventStoreAppId.cs b/tools/Migrate_01/Migrations/ConvertEventStoreAppId.cs new file mode 100644 index 000000000..ad10f77d0 --- /dev/null +++ b/tools/Migrate_01/Migrations/ConvertEventStoreAppId.cs @@ -0,0 +1,54 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Threading.Tasks; +using MongoDB.Bson; +using MongoDB.Driver; +using Newtonsoft.Json.Linq; +using Squidex.Domain.Apps.Events; +using Squidex.Infrastructure; +using Squidex.Infrastructure.EventSourcing; +using Squidex.Infrastructure.Migrations; + +namespace Migrate_01.Migrations +{ + public sealed class ConvertEventStoreAppId : IMigration + { + private readonly IEventStore eventStore; + + public ConvertEventStoreAppId(IEventStore eventStore) + { + this.eventStore = eventStore; + } + + public async Task UpdateAsync() + { + if (eventStore is MongoEventStore mongoEventStore) + { + var collection = mongoEventStore.RawCollection; + + var filter = Builders.Filter; + + await collection.Find(new BsonDocument()).ForEachAsync(async commit => + { + foreach (BsonDocument @event in commit["Events"].AsBsonArray) + { + var data = JObject.Parse(@event["Payload"].AsString); + + if (data.TryGetValue("appId", out var appId)) + { + @event["Metadata"][SquidexHeaders.AppId] = NamedId.Parse(appId.ToString(), Guid.TryParse).Id.ToString(); + } + } + + await collection.ReplaceOneAsync(filter.Eq("_id", commit["_id"].AsString), commit); + }); + } + } + } +} From b21b1ccefcfb61216e8c6ff841d368d4383302ff Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sat, 24 Mar 2018 12:40:39 +0100 Subject: [PATCH 5/7] Tests fixed --- .../Contents/ContentQueryServiceTests.cs | 224 ++++++++++++++++++ .../AssetUserPictureStoreTests.cs | 5 +- 2 files changed, 228 insertions(+), 1 deletion(-) create mode 100644 tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs new file mode 100644 index 000000000..38a364b07 --- /dev/null +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs @@ -0,0 +1,224 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Claims; +using System.Threading.Tasks; +using FakeItEasy; +using Microsoft.OData.UriParser; +using Squidex.Domain.Apps.Core.Contents; +using Squidex.Domain.Apps.Core.Scripting; +using Squidex.Domain.Apps.Entities.Apps; +using Squidex.Domain.Apps.Entities.Contents.Edm; +using Squidex.Domain.Apps.Entities.Contents.Repositories; +using Squidex.Domain.Apps.Entities.Schemas; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Security; +using Xunit; + +namespace Squidex.Domain.Apps.Entities.Contents +{ + public class ContentQueryServiceTests + { + private readonly IContentRepository contentRepository = A.Fake(); + private readonly IScriptEngine scriptEngine = A.Fake(); + private readonly ISchemaEntity schema = A.Fake(); + private readonly IContentEntity content = A.Fake(); + private readonly IAppEntity app = A.Fake(); + private readonly IAppProvider appProvider = A.Fake(); + private readonly Guid appId = Guid.NewGuid(); + private readonly Guid schemaId = Guid.NewGuid(); + private readonly Guid contentId = Guid.NewGuid(); + private readonly string appName = "my-app"; + private readonly NamedContentData contentData = new NamedContentData(); + private readonly NamedContentData contentTransformed = new NamedContentData(); + private readonly ClaimsPrincipal user; + private readonly ClaimsIdentity identity = new ClaimsIdentity(); + private readonly EdmModelBuilder modelBuilder = A.Fake(); + private readonly ContentQueryService sut; + + public ContentQueryServiceTests() + { + user = new ClaimsPrincipal(identity); + + A.CallTo(() => app.Id).Returns(appId); + A.CallTo(() => app.Name).Returns(appName); + + A.CallTo(() => content.Id).Returns(contentId); + A.CallTo(() => content.Data).Returns(contentData); + A.CallTo(() => content.Status).Returns(Status.Published); + + sut = new ContentQueryService(contentRepository, appProvider, scriptEngine, modelBuilder); + } + + [Fact] + public async Task Should_return_schema_from_id_if_string_is_guid() + { + A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId, false)) + .Returns(schema); + + var result = await sut.FindSchemaAsync(app, schemaId.ToString()); + + Assert.Equal(schema, result); + } + + [Fact] + public async Task Should_return_schema_from_name_if_string_not_guid() + { + A.CallTo(() => appProvider.GetSchemaAsync(appId, "my-schema")) + .Returns(schema); + + var result = await sut.FindSchemaAsync(app, "my-schema"); + + Assert.Equal(schema, result); + } + + [Fact] + public async Task Should_throw_if_schema_not_found() + { + A.CallTo(() => appProvider.GetSchemaAsync(appId, "my-schema")) + .Returns((ISchemaEntity)null); + + await Assert.ThrowsAsync(() => sut.FindSchemaAsync(app, "my-schema")); + } + + [Fact] + public async Task Should_return_content_from_repository_and_transform() + { + A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId, false)) + .Returns(schema); + A.CallTo(() => contentRepository.FindContentAsync(app, schema, contentId)) + .Returns(content); + + A.CallTo(() => schema.ScriptQuery) + .Returns(""); + + A.CallTo(() => scriptEngine.Transform(A.That.Matches(x => x.User == user && x.ContentId == contentId && ReferenceEquals(x.Data, contentData)), "")) + .Returns(contentTransformed); + + var result = await sut.FindContentAsync(app, schemaId.ToString(), user, contentId); + + Assert.Equal(schema, result.Schema); + + Assert.Equal(contentTransformed, result.Content.Data); + Assert.Equal(content.Id, result.Content.Id); + } + + [Fact] + public async Task Should_throw_if_content_to_find_does_not_exist() + { + A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId, false)) + .Returns(schema); + + A.CallTo(() => contentRepository.FindContentAsync(app, schema, contentId)) + .Returns((IContentEntity)null); + + await Assert.ThrowsAsync(async () => await sut.FindContentAsync(app, schemaId.ToString(), user, contentId)); + } + + [Fact] + public async Task Should_return_contents_with_ids_from_repository_and_transform() + { + await TestManyIdRequest(true, false, new HashSet { Guid.NewGuid() }, Status.Draft, Status.Published); + } + + [Fact] + public async Task Should_return_non_archived_contents_from_repository_and_transform() + { + await TestManyRequest(true, false, Status.Draft, Status.Published); + } + + [Fact] + public async Task Should_return_archived_contents_from_repository_and_transform() + { + await TestManyRequest(true, true, Status.Archived); + } + + [Fact] + public async Task Should_return_draft_contents_from_repository_and_transform() + { + await TestManyRequest(false, false, Status.Published); + } + + [Fact] + public async Task Should_return_draft_contents_from_repository_and_transform_when_requesting_archive_as_non_frontend() + { + await TestManyRequest(false, true, Status.Published); + } + + private async Task TestManyRequest(bool isFrontend, bool archive, params Status[] status) + { + SetupClaims(isFrontend); + + SetupFakeWithOdataQuery(status); + SetupFakeWithScripting(); + + var result = await sut.QueryAsync(app, schemaId.ToString(), user, archive, string.Empty); + + Assert.Equal(schema, result.Schema); + + Assert.Equal(contentData, result.Contents[0].Data); + Assert.Equal(content.Id, result.Contents[0].Id); + + Assert.Equal(123, result.Contents.Total); + } + + private async Task TestManyIdRequest(bool isFrontend, bool archive, HashSet ids, params Status[] status) + { + SetupClaims(isFrontend); + + SetupFakeWithIdQuery(status, ids); + SetupFakeWithScripting(); + + var result = await sut.QueryAsync(app, schemaId.ToString(), user, archive, ids); + + Assert.Equal(schema, result.Schema); + + Assert.Equal(contentData, result.Contents[0].Data); + Assert.Equal(content.Id, result.Contents[0].Id); + + Assert.Equal(123, result.Contents.Total); + } + + private void SetupClaims(bool isFrontend) + { + if (isFrontend) + { + identity.AddClaim(new Claim(OpenIdClaims.ClientId, "squidex-frontend")); + } + } + + private void SetupFakeWithIdQuery(Status[] status, HashSet ids) + { + A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId, false)) + .Returns(schema); + + A.CallTo(() => contentRepository.QueryAsync(app, schema, A.That.IsSameSequenceAs(status), ids)) + .Returns(ResultList.Create(Enumerable.Repeat(content, 1), 123)); + } + + private void SetupFakeWithOdataQuery(Status[] status) + { + A.CallTo(() => appProvider.GetSchemaAsync(appId, schemaId, false)) + .Returns(schema); + + A.CallTo(() => contentRepository.QueryAsync(app, schema, A.That.IsSameSequenceAs(status), A.Ignored)) + .Returns(ResultList.Create(Enumerable.Repeat(content, 1), 123)); + } + + private void SetupFakeWithScripting() + { + A.CallTo(() => schema.ScriptQuery) + .Returns(""); + + A.CallTo(() => scriptEngine.Transform(A.That.Matches(x => x.User == user && x.ContentId == contentId && ReferenceEquals(x.Data, contentData)), "")) + .Returns(contentTransformed); + } + } +} \ No newline at end of file diff --git a/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs b/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs index c5d169050..699f742fa 100644 --- a/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs +++ b/tests/Squidex.Domain.Users.Tests/AssetUserPictureStoreTests.cs @@ -10,6 +10,7 @@ using System.IO; using System.Threading; using System.Threading.Tasks; using FakeItEasy; +using FakeItEasy.Core; using Squidex.Infrastructure.Assets; using Squidex.Infrastructure.Tasks; using Xunit; @@ -46,8 +47,10 @@ namespace Squidex.Domain.Users public async Task Should_invoke_asset_store_to_download_picture() { A.CallTo(() => assetStore.DownloadAsync(userId, 0, "picture", A.Ignored, CancellationToken.None)) - .Invokes(async (string id, long version, string suffix, Stream stream) => + .Invokes(async (IFakeObjectCall call) => { + var stream = call.GetArgument(3); + await stream.WriteAsync(new byte[] { 1, 2, 3, 4 }, 0, 4); }); From b164795983bb89f6048e29e4f028d2d299ab09f9 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sat, 24 Mar 2018 13:28:07 +0100 Subject: [PATCH 6/7] MIgration improved. --- .../Backup/BackupGrain.cs | 25 +++++---- .../pages/backups/backups-page.component.ts | 8 +-- .../Migrations/ConvertEventStore.cs | 31 +++++++---- .../Migrations/ConvertEventStoreAppId.cs | 51 +++++++++++++++++-- 4 files changed, 85 insertions(+), 30 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs b/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs index 483c292a7..a612e945c 100644 --- a/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs +++ b/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs @@ -100,9 +100,11 @@ namespace Squidex.Domain.Apps.Entities.Backup { if (!job.Stopped.HasValue) { - await CleanupAsync(job); - job.Stopped = clock.GetCurrentInstant(); + + await CleanupArchiveAsync(job); + await CleanupBackupAsync(job); + job.IsFailed = true; await WriteAsync(); @@ -110,28 +112,31 @@ namespace Squidex.Domain.Apps.Entities.Backup } } - private async Task CleanupAsync(BackupStateJob job) + private async Task CleanupBackupAsync(BackupStateJob job) { try { - await backupArchiveLocation.DeleteArchiveAsync(job.Id); + await assetStore.DeleteAsync(job.Id.ToString(), 0, null); } catch (Exception ex) { log.LogError(ex, w => w - .WriteProperty("action", "deleteArchive") + .WriteProperty("action", "deleteBackup") .WriteProperty("status", "failed") .WriteProperty("backupId", job.Id.ToString())); } + } + private async Task CleanupArchiveAsync(BackupStateJob job) + { try { - await assetStore.DeleteAsync(job.Id.ToString(), 0, null); + await backupArchiveLocation.DeleteArchiveAsync(job.Id); } catch (Exception ex) { log.LogError(ex, w => w - .WriteProperty("action", "deleteBackup") + .WriteProperty("action", "deleteArchive") .WriteProperty("status", "failed") .WriteProperty("backupId", job.Id.ToString())); } @@ -233,7 +238,7 @@ namespace Squidex.Domain.Apps.Entities.Backup } finally { - await CleanupAsync(job); + await CleanupArchiveAsync(job); job.Stopped = clock.GetCurrentInstant(); @@ -259,10 +264,12 @@ namespace Squidex.Domain.Apps.Entities.Backup } else { + await CleanupArchiveAsync(job); + await CleanupBackupAsync(job); + state.Jobs.Remove(job); await WriteAsync(); - await CleanupAsync(job); } } 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 42a069426..440302408 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 @@ -44,7 +44,7 @@ export class BackupsPageComponent implements OnInit, OnDestroy { public ngOnInit() { this.loadSubscription = - Observable.timer(0, 5000) + Observable.timer(0, 2000) .switchMap(t => this.backupsService.getBackups(this.ctx.appName)) .subscribe(dtos => { this.backups = ImmutableArray.of(dtos); @@ -54,10 +54,6 @@ export class BackupsPageComponent implements OnInit, OnDestroy { public startBackup() { this.backupsService.postBackup(this.ctx.appName) .subscribe(() => { - const backup = new BackupDto('', DateTime.now(), null, 0, 0, false); - - this.backups = this.backups.pushFront(backup); - this.ctx.notifyInfo('Backup started.'); }, error => { this.ctx.notifyError(error); @@ -67,8 +63,6 @@ export class BackupsPageComponent implements OnInit, OnDestroy { public deleteBackup(backup: BackupDto) { this.backupsService.deleteBackup(this.ctx.appName, backup.id) .subscribe(() => { - this.backups = this.backups.filter(x => x.id !== backup.id); - this.ctx.notifyInfo('Backup deleting.'); }, error => { this.ctx.notifyError(error); diff --git a/tools/Migrate_01/Migrations/ConvertEventStore.cs b/tools/Migrate_01/Migrations/ConvertEventStore.cs index 20c74e8ab..37c6a476d 100644 --- a/tools/Migrate_01/Migrations/ConvertEventStore.cs +++ b/tools/Migrate_01/Migrations/ConvertEventStore.cs @@ -5,13 +5,11 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== -using System; +using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; using Newtonsoft.Json.Linq; -using Squidex.Domain.Apps.Events; -using Squidex.Infrastructure; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Migrations; using Squidex.Infrastructure.MongoDb; @@ -35,24 +33,37 @@ namespace Migrate_01.Migrations var filter = Builders.Filter; + var writesBatches = new List>(); + + async Task WriteAsync(WriteModel model, bool force) + { + if (model != null) + { + writesBatches.Add(model); + } + + if (writesBatches.Count == 1000 || (force && writesBatches.Count > 0)) + { + await collection.BulkWriteAsync(writesBatches); + + writesBatches.Clear(); + } + } + await collection.Find(new BsonDocument()).ForEachAsync(async commit => { foreach (BsonDocument @event in commit["Events"].AsBsonArray) { var meta = JObject.Parse(@event["Metadata"].AsString); - var data = JObject.Parse(@event["Payload"].AsString); - - if (data.TryGetValue("appId", out var appId)) - { - meta[SquidexHeaders.AppId] = NamedId.Parse(appId.ToString(), Guid.TryParse).Id; - } @event.Remove("EventId"); @event["Metadata"] = meta.ToBson(); } - await collection.ReplaceOneAsync(filter.Eq("_id", commit["_id"].AsString), commit); + await WriteAsync(new ReplaceOneModel(filter.Eq("_id", commit["_id"].AsString), commit), false); }); + + await WriteAsync(null, true); } } } diff --git a/tools/Migrate_01/Migrations/ConvertEventStoreAppId.cs b/tools/Migrate_01/Migrations/ConvertEventStoreAppId.cs index ad10f77d0..e1ee4b7e0 100644 --- a/tools/Migrate_01/Migrations/ConvertEventStoreAppId.cs +++ b/tools/Migrate_01/Migrations/ConvertEventStoreAppId.cs @@ -6,6 +6,7 @@ // ========================================================================== using System; +using System.Collections.Generic; using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver; @@ -32,22 +33,64 @@ namespace Migrate_01.Migrations { var collection = mongoEventStore.RawCollection; - var filter = Builders.Filter; + var filterer = Builders.Filter; + var updater = Builders.Update; + + var writesBatches = new List>(); + + async Task WriteAsync(WriteModel model, bool force) + { + if (model != null) + { + writesBatches.Add(model); + } + + if (writesBatches.Count == 1000 || (force && writesBatches.Count > 0)) + { + await collection.BulkWriteAsync(writesBatches); + + writesBatches.Clear(); + } + } await collection.Find(new BsonDocument()).ForEachAsync(async commit => { + UpdateDefinition update = null; + + var index = 0; + foreach (BsonDocument @event in commit["Events"].AsBsonArray) { var data = JObject.Parse(@event["Payload"].AsString); - if (data.TryGetValue("appId", out var appId)) + if (data.TryGetValue("appId", out var appIdValue)) { - @event["Metadata"][SquidexHeaders.AppId] = NamedId.Parse(appId.ToString(), Guid.TryParse).Id.ToString(); + var appId = NamedId.Parse(appIdValue.ToString(), Guid.TryParse).Id.ToString(); + + var eventUpdate = updater.Set($"Events.{index}.Metadata.{SquidexHeaders.AppId}", appId); + + if (update != null) + { + update = updater.Combine(update, eventUpdate); + } + else + { + update = eventUpdate; + } } + + index++; } - await collection.ReplaceOneAsync(filter.Eq("_id", commit["_id"].AsString), commit); + if (update != null) + { + var write = new UpdateOneModel(filterer.Eq("_id", commit["_id"].AsString), update); + + await WriteAsync(write, false); + } }); + + await WriteAsync(null, true); } } } From 19647d3501fb6fd769927d79100b11383fa46109 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sat, 24 Mar 2018 13:51:41 +0100 Subject: [PATCH 7/7] Warning fixed --- .../settings/pages/backups/backups-page.component.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 440302408..52c52b4c9 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 @@ -13,7 +13,6 @@ import { AppContext, BackupDto, BackupsService, - DateTime, Duration, ImmutableArray } from 'shared'; @@ -54,7 +53,7 @@ export class BackupsPageComponent implements OnInit, OnDestroy { public startBackup() { this.backupsService.postBackup(this.ctx.appName) .subscribe(() => { - this.ctx.notifyInfo('Backup started.'); + this.ctx.notifyInfo('Backup started, it can take several minutes to complete.'); }, error => { this.ctx.notifyError(error); }); @@ -63,7 +62,7 @@ export class BackupsPageComponent implements OnInit, OnDestroy { public deleteBackup(backup: BackupDto) { this.backupsService.deleteBackup(this.ctx.appName, backup.id) .subscribe(() => { - this.ctx.notifyInfo('Backup deleting.'); + this.ctx.notifyInfo('Backup is about to be deleted.'); }, error => { this.ctx.notifyError(error); });