diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetEntity.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetEntity.cs index abbc6be88..f0d9eaa82 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetEntity.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetEntity.cs @@ -10,17 +10,12 @@ using System.Collections.Generic; using MongoDB.Bson; using MongoDB.Bson.Serialization.Attributes; using NodaTime; -using Squidex.Domain.Apps.Core.ValidateContent; using Squidex.Domain.Apps.Entities.Assets; using Squidex.Infrastructure; namespace Squidex.Domain.Apps.Entities.MongoDb.Assets { - public sealed class MongoAssetEntity : - IAssetEntity, - IUpdateableEntityWithVersion, - IUpdateableEntityWithCreatedBy, - IUpdateableEntityWithLastModifiedBy + public sealed class MongoAssetEntity : IAssetEntity { [BsonId] [BsonElement("_id")] @@ -32,6 +27,10 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets [BsonRepresentation(BsonType.String)] public Guid IndexedAppId { get; set; } + [BsonIgnoreIfDefault] + [BsonElement("pi")] + public Guid ParentId { get; set; } + [BsonRequired] [BsonElement("ct")] public Instant Created { get; set; } @@ -100,7 +99,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets [BsonElement("dl")] public bool IsDeleted { get; set; } - Guid IAssetInfo.AssetId + public Guid AssetId { get { return Id; } } diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderEntity.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderEntity.cs new file mode 100644 index 000000000..74d5d8ed3 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderEntity.cs @@ -0,0 +1,65 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using MongoDB.Bson; +using MongoDB.Bson.Serialization.Attributes; +using NodaTime; +using Squidex.Domain.Apps.Entities.Assets; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Entities.MongoDb.Assets +{ + public sealed class MongoAssetFolderEntity : IAssetFolderEntity + { + [BsonId] + [BsonElement("_id")] + [BsonRepresentation(BsonType.String)] + public Guid Id { get; set; } + + [BsonRequired] + [BsonElement("_ai")] + [BsonRepresentation(BsonType.String)] + public Guid IndexedAppId { get; set; } + + [BsonRequired] + [BsonElement("pi")] + public Guid ParentId { get; set; } + + [BsonRequired] + [BsonElement("ct")] + public Instant Created { get; set; } + + [BsonRequired] + [BsonElement("mt")] + public Instant LastModified { get; set; } + + [BsonRequired] + [BsonElement("ai")] + public NamedId AppId { get; set; } + + [BsonRequired] + [BsonElement("fn")] + public string FolderName { get; set; } + + [BsonRequired] + [BsonElement("vs")] + public long Version { get; set; } + + [BsonRequired] + [BsonElement("cb")] + public RefToken CreatedBy { get; set; } + + [BsonRequired] + [BsonElement("mb")] + public RefToken LastModifiedBy { get; set; } + + [BsonRequired] + [BsonElement("dl")] + public bool IsDeleted { get; set; } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderRepository.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderRepository.cs new file mode 100644 index 000000000..b34286e93 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderRepository.cs @@ -0,0 +1,74 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Threading; +using System.Threading.Tasks; +using MongoDB.Driver; +using Squidex.Domain.Apps.Entities.Assets; +using Squidex.Domain.Apps.Entities.Assets.Repositories; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Log; +using Squidex.Infrastructure.MongoDb; + +namespace Squidex.Domain.Apps.Entities.MongoDb.Assets +{ + public sealed partial class MongoAssetFolderRepository : MongoRepositoryBase, IAssetFolderRepository + { + public MongoAssetFolderRepository(IMongoDatabase database) + : base(database) + { + } + + protected override string CollectionName() + { + return "States_AssetFolders"; + } + + protected override Task SetupCollectionAsync(IMongoCollection collection, CancellationToken ct = default) + { + return collection.Indexes.CreateManyAsync(new[] + { + new CreateIndexModel( + Index + .Ascending(x => x.IndexedAppId) + .Ascending(x => x.IsDeleted) + .Ascending(x => x.ParentId)) + }, ct); + } + + public async Task> QueryAsync(Guid appId, Guid parentId) + { + using (Profiler.TraceMethod("QueryAsyncByQuery")) + { + var assetFolders = + await Collection + .Find(x => x.IndexedAppId == appId && !x.IsDeleted && x.ParentId == parentId).SortBy(x => x.FolderName) + .ToListAsync(); + + return ResultList.Create(assetFolders.Count, assetFolders); + } + } + + public async Task FindAssetFolderAsync(Guid id) + { + using (Profiler.TraceMethod()) + { + var assetFolderEntity = + await Collection.Find(x => x.Id == id) + .FirstOrDefaultAsync(); + + if (assetFolderEntity?.IsDeleted == true) + { + return null; + } + + return assetFolderEntity; + } + } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderRepository_SnapshotStore.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderRepository_SnapshotStore.cs new file mode 100644 index 000000000..629203307 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetFolderRepository_SnapshotStore.cs @@ -0,0 +1,75 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Threading; +using System.Threading.Tasks; +using MongoDB.Bson; +using MongoDB.Driver; +using Squidex.Domain.Apps.Entities.Assets.State; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Log; +using Squidex.Infrastructure.MongoDb; +using Squidex.Infrastructure.Reflection; +using Squidex.Infrastructure.States; + +namespace Squidex.Domain.Apps.Entities.MongoDb.Assets +{ + public sealed partial class MongoAssetFolderRepository : ISnapshotStore + { + async Task<(AssetFolderState Value, long Version)> ISnapshotStore.ReadAsync(Guid key) + { + using (Profiler.TraceMethod()) + { + var existing = + await Collection.Find(x => x.Id == key) + .FirstOrDefaultAsync(); + + if (existing != null) + { + return (Map(existing), existing.Version); + } + + return (null!, EtagVersion.NotFound); + } + } + + async Task ISnapshotStore.WriteAsync(Guid key, AssetFolderState value, long oldVersion, long newVersion) + { + using (Profiler.TraceMethod()) + { + var entity = SimpleMapper.Map(value, new MongoAssetFolderEntity()); + + entity.Version = newVersion; + entity.IndexedAppId = value.AppId.Id; + + await Collection.ReplaceOneAsync(x => x.Id == key && x.Version == oldVersion, entity, Upsert); + } + } + + async Task ISnapshotStore.ReadAllAsync(Func callback, CancellationToken ct) + { + using (Profiler.TraceMethod()) + { + await Collection.Find(new BsonDocument(), options: Batching.Options).ForEachPipelineAsync(x => callback(Map(x), x.Version), ct); + } + } + + async Task ISnapshotStore.RemoveAsync(Guid key) + { + using (Profiler.TraceMethod()) + { + await Collection.DeleteOneAsync(x => x.Id == key); + } + } + + private static AssetFolderState Map(MongoAssetFolderEntity existing) + { + return SimpleMapper.Map(existing, new AssetFolderState()); + } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs index 536eaee23..6017edfc7 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/MongoAssetRepository.cs @@ -41,6 +41,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets Index .Ascending(x => x.IndexedAppId) .Ascending(x => x.IsDeleted) + .Ascending(x => x.ParentId) .Ascending(x => x.Tags) .Descending(x => x.LastModified)), new CreateIndexModel( @@ -51,7 +52,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets }, ct); } - public async Task> QueryAsync(Guid appId, ClrQuery query) + public async Task> QueryAsync(Guid appId, Guid? parentId, ClrQuery query) { using (Profiler.TraceMethod("QueryAsyncByQuery")) { @@ -59,19 +60,19 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets { query = query.AdjustToModel(); - var filter = query.BuildFilter(appId); + var filter = query.BuildFilter(appId, parentId); - var contentCount = Collection.Find(filter).CountDocumentsAsync(); - var contentItems = + var assetCount = Collection.Find(filter).CountDocumentsAsync(); + var assetItems = Collection.Find(filter) .AssetTake(query) .AssetSkip(query) .AssetSort(query) .ToListAsync(); - await Task.WhenAll(contentItems, contentCount); + await Task.WhenAll(assetItems, assetCount); - return ResultList.Create(contentCount.Result, contentItems.Result); + return ResultList.Create(assetCount.Result, assetItems.Result); } catch (MongoQueryException ex) { @@ -123,26 +124,16 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets } } - public async Task FindAssetAsync(Guid id, bool allowDeleted = false) + public async Task FindAssetAsync(Guid id) { using (Profiler.TraceMethod()) { var assetEntity = - await Collection.Find(x => x.Id == id) + await Collection.Find(x => x.Id == id && !x.IsDeleted) .FirstOrDefaultAsync(); - if (assetEntity?.IsDeleted == true && !allowDeleted) - { - return null; - } - return assetEntity; } } - - public Task RemoveAsync(Guid key) - { - return Collection.DeleteOneAsync(x => x.Id == key); - } } } diff --git a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/Visitors/FindExtensions.cs b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/Visitors/FindExtensions.cs index c5f057d86..26eca0f75 100644 --- a/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/Visitors/FindExtensions.cs +++ b/backend/src/Squidex.Domain.Apps.Entities.MongoDb/Assets/Visitors/FindExtensions.cs @@ -19,6 +19,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets.Visitors public static class FindExtensions { private static readonly FilterDefinitionBuilder Filter = Builders.Filter; + private static readonly SortDefinitionBuilder Sorting = Builders.Sort; public static ClrQuery AdjustToModel(this ClrQuery query) { @@ -52,7 +53,7 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets.Visitors return cursor.Skip(query); } - public static FilterDefinition BuildFilter(this ClrQuery query, Guid appId) + public static FilterDefinition BuildFilter(this ClrQuery query, Guid appId, Guid? parentId) { var filters = new List> { @@ -60,6 +61,21 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Assets.Visitors Filter.Eq(x => x.IsDeleted, false) }; + if (parentId.HasValue) + { + if (parentId == Guid.Empty) + { + filters.Add( + Filter.Or( + Filter.Exists(x => x.ParentId, false), + Filter.Eq(x => x.ParentId, Guid.Empty))); + } + else + { + filters.Add(Filter.Eq(x => x.ParentId, parentId.Value)); + } + } + var (filter, last) = query.BuildFilter(false); if (filter != null) diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetChangedTriggerHandler.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetChangedTriggerHandler.cs index 7af666c55..c3fec9472 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetChangedTriggerHandler.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetChangedTriggerHandler.cs @@ -34,6 +34,11 @@ namespace Squidex.Domain.Apps.Entities.Assets protected override async Task CreateEnrichedEventAsync(Envelope @event) { + if (@event.Payload is AssetMoved) + { + return null; + } + var result = new EnrichedAssetEvent(); var asset = await assetLoader.GetAsync(@event.Payload.AssetId, @event.Headers.EventStreamNumber()); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetEntity.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetEntity.cs index 150e53b78..9424d8c57 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetEntity.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetEntity.cs @@ -18,7 +18,7 @@ namespace Squidex.Domain.Apps.Entities.Assets public Guid Id { get; set; } - public Guid AssetId { get; set; } + public Guid ParentId { get; set; } public Instant Created { get; set; } @@ -34,12 +34,12 @@ namespace Squidex.Domain.Apps.Entities.Assets public long Version { get; set; } - public string MimeType { get; set; } - public string FileName { get; set; } public string FileHash { get; set; } + public string MimeType { get; set; } + public string Slug { get; set; } public long FileSize { get; set; } @@ -53,5 +53,10 @@ namespace Squidex.Domain.Apps.Entities.Assets public int? PixelWidth { get; set; } public int? PixelHeight { get; set; } + + public Guid AssetId + { + get { return Id; } + } } } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetFolderGrain.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetFolderGrain.cs new file mode 100644 index 000000000..49525def9 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetFolderGrain.cs @@ -0,0 +1,130 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Threading.Tasks; +using Squidex.Domain.Apps.Entities.Assets.Commands; +using Squidex.Domain.Apps.Entities.Assets.Guards; +using Squidex.Domain.Apps.Entities.Assets.State; +using Squidex.Domain.Apps.Events; +using Squidex.Domain.Apps.Events.Assets; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure.EventSourcing; +using Squidex.Infrastructure.Log; +using Squidex.Infrastructure.Orleans; +using Squidex.Infrastructure.Reflection; +using Squidex.Infrastructure.States; + +namespace Squidex.Domain.Apps.Entities.Assets +{ + public sealed class AssetFolderGrain : DomainObjectGrain, IAssetFolderGrain + { + private static readonly TimeSpan Lifetime = TimeSpan.FromMinutes(5); + private readonly IAssetQueryService assetQuery; + + public AssetFolderGrain(IStore store, IAssetQueryService assetQuery, IActivationLimit limit, ISemanticLog log) + : base(store, log) + { + Guard.NotNull(assetQuery); + + this.assetQuery = assetQuery; + + limit?.SetLimit(5000, Lifetime); + } + + protected override Task OnActivateAsync(Guid key) + { + TryDelayDeactivation(Lifetime); + + return base.OnActivateAsync(key); + } + + protected override Task ExecuteAsync(IAggregateCommand command) + { + VerifyNotDeleted(); + + switch (command) + { + case CreateAssetFolder createAssetFolder: + return CreateReturnAsync(createAssetFolder, async c => + { + await GuardAssetFolder.CanCreate(c, assetQuery); + + Create(c); + + return Snapshot; + }); + case MoveAssetFolder moveAssetFolder: + return UpdateReturnAsync(moveAssetFolder, async c => + { + await GuardAssetFolder.CanMove(c, assetQuery, Snapshot.Id, Snapshot.ParentId); + + Move(c); + + return Snapshot; + }); + case RenameAssetFolder renameAssetFolder: + return UpdateReturn(renameAssetFolder, c => + { + GuardAssetFolder.CanRename(c, Snapshot.FolderName); + + Rename(c); + + return Snapshot; + }); + case DeleteAssetFolder deleteAssetFolder: + return Update(deleteAssetFolder, c => + { + GuardAssetFolder.CanDelete(c); + + Delete(c); + }); + default: + throw new NotSupportedException(); + } + } + + public void Create(CreateAssetFolder command) + { + RaiseEvent(SimpleMapper.Map(command, new AssetFolderCreated())); + } + + public void Move(MoveAssetFolder command) + { + RaiseEvent(SimpleMapper.Map(command, new AssetFolderMoved())); + } + + public void Rename(RenameAssetFolder command) + { + RaiseEvent(SimpleMapper.Map(command, new AssetFolderRenamed())); + } + + public void Delete(DeleteAssetFolder command) + { + RaiseEvent(SimpleMapper.Map(command, new AssetFolderDeleted())); + } + + private void RaiseEvent(AppEvent @event) + { + if (@event.AppId == null) + { + @event.AppId = Snapshot.AppId; + } + + RaiseEvent(Envelope.Create(@event)); + } + + private void VerifyNotDeleted() + { + if (Snapshot.IsDeleted) + { + throw new DomainException("Asset folder has already been deleted"); + } + } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs index 7b31dbfcc..6a625423e 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetGrain.cs @@ -28,14 +28,18 @@ namespace Squidex.Domain.Apps.Entities.Assets { private static readonly TimeSpan Lifetime = TimeSpan.FromMinutes(5); private readonly ITagService tagService; + private readonly IAssetQueryService assetQuery; - public AssetGrain(IStore store, ITagService tagService, IActivationLimit limit, ISemanticLog log) + public AssetGrain(IStore store, ITagService tagService, IAssetQueryService assetQuery, IActivationLimit limit, ISemanticLog log) : base(store, log) { Guard.NotNull(tagService); + Guard.NotNull(assetQuery); this.tagService = tagService; + this.assetQuery = assetQuery; + limit?.SetLimit(5000, Lifetime); } @@ -55,7 +59,7 @@ namespace Squidex.Domain.Apps.Entities.Assets case CreateAsset createAsset: return CreateReturnAsync(createAsset, async c => { - GuardAsset.CanCreate(c); + await GuardAsset.CanCreate(c, assetQuery); var tagIds = await NormalizeTagsAsync(c.AppId.Id, c.Tags); @@ -75,12 +79,21 @@ namespace Squidex.Domain.Apps.Entities.Assets case AnnotateAsset annotateAsset: return UpdateReturnAsync(annotateAsset, async c => { - GuardAsset.CanAnnotate(c, Snapshot.FileName, Snapshot.Slug); + GuardAsset.CanAnnotate(c, Snapshot.FileName!, Snapshot.Slug); var tagIds = await NormalizeTagsAsync(Snapshot.AppId.Id, c.Tags); Annotate(c, tagIds); + return Snapshot; + }); + case MoveAsset moveAsset: + return UpdateReturnAsync(moveAsset, async c => + { + await GuardAsset.CanMove(c, assetQuery, Snapshot.ParentId); + + Move(c); + return Snapshot; }); case DeleteAsset deleteAsset: @@ -152,6 +165,11 @@ namespace Squidex.Domain.Apps.Entities.Assets RaiseEvent(@event); } + public void Move(MoveAsset command) + { + RaiseEvent(SimpleMapper.Map(command, new AssetMoved())); + } + public void Delete(DeleteAsset command) { RaiseEvent(SimpleMapper.Map(command, new AssetDeleted { DeletedSize = Snapshot.TotalSize })); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/BackupAssets.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/BackupAssets.cs index aa572fa9c..85971681c 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/BackupAssets.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/BackupAssets.cs @@ -24,6 +24,7 @@ namespace Squidex.Domain.Apps.Entities.Assets { private const string TagsFile = "AssetTags.json"; private readonly HashSet assetIds = new HashSet(); + private readonly HashSet assetFolderIds = new HashSet(); private readonly IAssetStore assetStore; private readonly ITagService tagService; @@ -62,6 +63,9 @@ namespace Squidex.Domain.Apps.Entities.Assets { switch (@event.Payload) { + case AssetFolderCreated assetFolderCreated: + assetFolderIds.Add(assetFolderCreated.AssetFolderId); + break; case AssetCreated assetCreated: await ReadAssetAsync(assetCreated.AssetId, assetCreated.FileVersion, reader); break; @@ -78,6 +82,7 @@ namespace Squidex.Domain.Apps.Entities.Assets await RestoreTagsAsync(appId, reader); await RebuildManyAsync(assetIds, RebuildAsync); + await RebuildManyAsync(assetFolderIds, RebuildAsync); } private async Task RestoreTagsAsync(Guid appId, BackupReader reader) diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/AssetFolderCommand.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/AssetFolderCommand.cs new file mode 100644 index 000000000..8d3999c25 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/AssetFolderCommand.cs @@ -0,0 +1,22 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Squidex.Infrastructure.Commands; + +namespace Squidex.Domain.Apps.Entities.Assets.Commands +{ + public abstract class AssetFolderCommand : SquidexCommand, IAggregateCommand + { + public Guid AssetFolderId { get; set; } + + Guid IAggregateCommand.AggregateId + { + get { return AssetFolderId; } + } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/CreateAsset.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/CreateAsset.cs index 8e869ba40..2dcab921d 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/CreateAsset.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/CreateAsset.cs @@ -15,6 +15,8 @@ namespace Squidex.Domain.Apps.Entities.Assets.Commands { public NamedId AppId { get; set; } + public Guid ParentId { get; set; } + public HashSet Tags { get; set; } public CreateAsset() diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/CreateAssetFolder.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/CreateAssetFolder.cs new file mode 100644 index 000000000..8ca8d412c --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/CreateAssetFolder.cs @@ -0,0 +1,26 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Entities.Assets.Commands +{ + public sealed class CreateAssetFolder : AssetFolderCommand, IAppCommand + { + public NamedId AppId { get; set; } + + public string FolderName { get; set; } + + public Guid ParentId { get; set; } + + public CreateAssetFolder() + { + AssetFolderId = Guid.NewGuid(); + } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/DeleteAssetFolder.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/DeleteAssetFolder.cs new file mode 100644 index 000000000..9d5077c6d --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/DeleteAssetFolder.cs @@ -0,0 +1,13 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Domain.Apps.Entities.Assets.Commands +{ + public sealed class DeleteAssetFolder : AssetFolderCommand + { + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/MoveAsset.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/MoveAsset.cs new file mode 100644 index 000000000..05a16b5fb --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/MoveAsset.cs @@ -0,0 +1,16 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; + +namespace Squidex.Domain.Apps.Entities.Assets.Commands +{ + public sealed class MoveAsset : AssetCommand + { + public Guid ParentId { get; set; } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/MoveAssetFolder.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/MoveAssetFolder.cs new file mode 100644 index 000000000..45d16672d --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/MoveAssetFolder.cs @@ -0,0 +1,16 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; + +namespace Squidex.Domain.Apps.Entities.Assets.Commands +{ + public sealed class MoveAssetFolder : AssetFolderCommand + { + public Guid ParentId { get; set; } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/RenameAssetFolder.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/RenameAssetFolder.cs new file mode 100644 index 000000000..86e289692 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Commands/RenameAssetFolder.cs @@ -0,0 +1,14 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +namespace Squidex.Domain.Apps.Entities.Assets.Commands +{ + public sealed class RenameAssetFolder : AssetFolderCommand + { + public string FolderName { get; set; } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAsset.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAsset.cs index 0a0a7188a..edc0ba2c5 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAsset.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAsset.cs @@ -5,6 +5,8 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; +using System.Threading.Tasks; using Squidex.Domain.Apps.Entities.Assets.Commands; using Squidex.Infrastructure; using Squidex.Infrastructure.Validation; @@ -28,9 +30,31 @@ namespace Squidex.Domain.Apps.Entities.Assets.Guards }); } - public static void CanCreate(CreateAsset command) + public static Task CanCreate(CreateAsset command, IAssetQueryService assetQuery) { Guard.NotNull(command); + + return Validate.It(() => "Cannot upload asset.", async e => + { + await CheckPathAsync(command.ParentId, assetQuery, e); + }); + } + + public static Task CanMove(MoveAsset command, IAssetQueryService assetQuery, Guid oldParentId) + { + Guard.NotNull(command); + + return Validate.It(() => "Cannot move asset.", async e => + { + if (command.ParentId == oldParentId) + { + e("Asset is already part of this folder.", nameof(command.ParentId)); + } + else + { + await CheckPathAsync(command.ParentId, assetQuery, e); + } + }); } public static void CanUpdate(UpdateAsset command) @@ -42,5 +66,18 @@ namespace Squidex.Domain.Apps.Entities.Assets.Guards { Guard.NotNull(command); } + + private static async Task CheckPathAsync(Guid parentId, IAssetQueryService assetQuery, AddValidation e) + { + if (parentId != default) + { + var path = await assetQuery.FindAssetFolderAsync(parentId); + + if (path.Count == 0) + { + e("Asset folder does not exist.", nameof(MoveAsset.ParentId)); + } + } + } } } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAssetFolder.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAssetFolder.cs new file mode 100644 index 000000000..111eb1b85 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Guards/GuardAssetFolder.cs @@ -0,0 +1,95 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Threading.Tasks; +using Squidex.Domain.Apps.Entities.Assets.Commands; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Validation; + +namespace Squidex.Domain.Apps.Entities.Assets.Guards +{ + public static class GuardAssetFolder + { + public static Task CanCreate(CreateAssetFolder command, IAssetQueryService assetQuery) + { + Guard.NotNull(command); + + return Validate.It(() => "Cannot upload asset.", async e => + { + if (string.IsNullOrWhiteSpace(command.FolderName)) + { + e(Not.Defined("Folder name"), nameof(command.FolderName)); + } + + await CheckPathAsync(command.ParentId, assetQuery, Guid.Empty, e); + }); + } + + public static void CanRename(RenameAssetFolder command, string olderFolderName) + { + Guard.NotNull(command); + + Validate.It(() => "Cannot rename asset.", e => + { + if (string.IsNullOrWhiteSpace(command.FolderName)) + { + e(Not.Defined("Folder name"), nameof(command.FolderName)); + } + else if (string.Equals(command.FolderName, olderFolderName)) + { + e(Not.New("Asset folder", "name"), nameof(command.FolderName)); + } + }); + } + + public static Task CanMove(MoveAssetFolder command, IAssetQueryService assetQuery, Guid id, Guid oldParentId) + { + Guard.NotNull(command); + + return Validate.It(() => "Cannot move asset.", async e => + { + if (command.ParentId == oldParentId) + { + e("Asset folder is already part of this folder.", nameof(command.ParentId)); + } + else + { + await CheckPathAsync(command.ParentId, assetQuery, id, e); + } + }); + } + + public static void CanDelete(DeleteAssetFolder command) + { + Guard.NotNull(command); + } + + private static async Task CheckPathAsync(Guid parentId, IAssetQueryService assetQuery, Guid id, AddValidation e) + { + if (parentId != default) + { + var path = await assetQuery.FindAssetFolderAsync(parentId); + + if (path.Count == 0) + { + e("Asset folder does not exist.", nameof(MoveAssetFolder.ParentId)); + } + else if (id != default) + { + var indexOfThis = path.IndexOf(x => x.Id == id); + var indexOfParent = path.IndexOf(x => x.Id == parentId); + + if (indexOfThis >= 0 && indexOfParent > indexOfThis) + { + e("Cannot add folder to its own child.", nameof(MoveAssetFolder.ParentId)); + } + } + } + } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetEntity.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetEntity.cs index 02890b87e..df6da0cc5 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetEntity.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetEntity.cs @@ -21,6 +21,8 @@ namespace Squidex.Domain.Apps.Entities.Assets { NamedId AppId { get; } + Guid ParentId { get; } + string MimeType { get; } long FileVersion { get; } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetFolderEntity.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetFolderEntity.cs new file mode 100644 index 000000000..83f9cf768 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetFolderEntity.cs @@ -0,0 +1,21 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Entities.Assets +{ + public interface IAssetFolderEntity : IEntity, IEntityWithVersion + { + NamedId AppId { get; set; } + + string FolderName { get; set; } + + Guid ParentId { get; set; } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetFolderGrain.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetFolderGrain.cs new file mode 100644 index 000000000..924c52ae2 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetFolderGrain.cs @@ -0,0 +1,15 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Squidex.Infrastructure.Commands; + +namespace Squidex.Domain.Apps.Entities.Assets +{ + public interface IAssetFolderGrain : IDomainObjectGrain + { + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetQueryService.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetQueryService.cs index dc94e0293..6db84de4d 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetQueryService.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/IAssetQueryService.cs @@ -16,7 +16,11 @@ namespace Squidex.Domain.Apps.Entities.Assets { Task> QueryByHashAsync(Context context, Guid appId, string hash); - Task> QueryAsync(Context context, Q query); + Task> QueryAsync(Context context, Guid? parentId, Q query); + + Task> QueryAssetFoldersAsync(Context context, Guid parentId); + + Task> FindAssetFolderAsync(Guid id); Task FindAssetAsync(Context context, Guid id); } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryService.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryService.cs index 098b5a516..09fec1034 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryService.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Queries/AssetQueryService.cs @@ -7,6 +7,7 @@ using System; using System.Collections.Generic; +using System.Linq; using System.Threading.Tasks; using Squidex.Domain.Apps.Entities.Assets.Repositories; using Squidex.Infrastructure; @@ -17,19 +18,23 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries { private readonly IAssetEnricher assetEnricher; private readonly IAssetRepository assetRepository; + private readonly IAssetFolderRepository assetFolderRepository; private readonly AssetQueryParser queryParser; public AssetQueryService( IAssetEnricher assetEnricher, IAssetRepository assetRepository, + IAssetFolderRepository assetFolderRepository, AssetQueryParser queryParser) { Guard.NotNull(assetEnricher); Guard.NotNull(assetRepository); + Guard.NotNull(assetFolderRepository); Guard.NotNull(queryParser); this.assetEnricher = assetEnricher; this.assetRepository = assetRepository; + this.assetFolderRepository = assetFolderRepository; this.queryParser = queryParser; } @@ -45,6 +50,35 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries return null; } + public async Task> FindAssetFolderAsync(Guid id) + { + var result = new List(); + + while (id != default) + { + var folder = await assetFolderRepository.FindAssetFolderAsync(id); + + if (folder == null || result.Any(x => x.Id == folder.Id)) + { + result.Clear(); + break; + } + + result.Insert(0, folder); + + id = folder.ParentId; + } + + return result; + } + + public async Task> QueryAssetFoldersAsync(Context context, Guid parentId) + { + var assetFolders = await assetFolderRepository.QueryAsync(context.App.Id, parentId); + + return assetFolders; + } + public async Task> QueryByHashAsync(Context context, Guid appId, string hash) { Guard.NotNull(hash); @@ -54,7 +88,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries return await assetEnricher.EnrichAsync(assets, context); } - public async Task> QueryAsync(Context context, Q query) + public async Task> QueryAsync(Context context, Guid? parentId, Q query) { Guard.NotNull(context); Guard.NotNull(query); @@ -67,7 +101,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries } else { - assets = await QueryByQueryAsync(context, query); + assets = await QueryByQueryAsync(context, parentId, query); } var enriched = await assetEnricher.EnrichAsync(assets, context); @@ -75,11 +109,11 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries return ResultList.Create(assets.Total, enriched); } - private async Task> QueryByQueryAsync(Context context, Q query) + private async Task> QueryByQueryAsync(Context context, Guid? parentId, Q query) { var parsedQuery = queryParser.ParseQuery(context, query); - return await assetRepository.QueryAsync(context.App.Id, parsedQuery); + return await assetRepository.QueryAsync(context.App.Id, parentId, parsedQuery); } private async Task> QueryByIdsAsync(Context context, Q query) diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Repositories/IAssetFolderRepository.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Repositories/IAssetFolderRepository.cs new file mode 100644 index 000000000..f1bdac3cc --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Repositories/IAssetFolderRepository.cs @@ -0,0 +1,20 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Threading.Tasks; +using Squidex.Infrastructure; + +namespace Squidex.Domain.Apps.Entities.Assets.Repositories +{ + public interface IAssetFolderRepository + { + Task> QueryAsync(Guid appId, Guid parentId); + + Task FindAssetFolderAsync(Guid id); + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/Repositories/IAssetRepository.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/Repositories/IAssetRepository.cs index 11a45e228..cc6f19bf7 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/Repositories/IAssetRepository.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/Repositories/IAssetRepository.cs @@ -17,14 +17,12 @@ namespace Squidex.Domain.Apps.Entities.Assets.Repositories { Task> QueryByHashAsync(Guid appId, string hash); - Task> QueryAsync(Guid appId, ClrQuery query); + Task> QueryAsync(Guid appId, Guid? parentId, ClrQuery query); Task> QueryAsync(Guid appId, HashSet ids); - Task FindAssetAsync(Guid id, bool allowDeleted = false); + Task FindAssetAsync(Guid id); Task FindAssetBySlugAsync(Guid appId, string slug); - - Task RemoveAsync(Guid appId); } } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/State/AssetFolderState.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/State/AssetFolderState.cs new file mode 100644 index 000000000..6d6ce90cc --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/State/AssetFolderState.cs @@ -0,0 +1,72 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Runtime.Serialization; +using Squidex.Domain.Apps.Events.Assets; +using Squidex.Infrastructure; +using Squidex.Infrastructure.EventSourcing; +using Squidex.Infrastructure.Reflection; + +#pragma warning disable IDE0060 // Remove unused parameter + +namespace Squidex.Domain.Apps.Entities.Assets.State +{ + public class AssetFolderState : DomainObjectState, IAssetFolderEntity + { + [DataMember] + public NamedId AppId { get; set; } + + [DataMember] + public string FolderName { get; set; } + + [DataMember] + public bool IsDeleted { get; set; } + + [DataMember] + public Guid ParentId { get; set; } + + public void ApplyEvent(IEvent @event) + { + switch (@event) + { + case AssetFolderCreated e: + { + SimpleMapper.Map(e, this); + + break; + } + + case AssetFolderRenamed e: + { + SimpleMapper.Map(e, this); + + break; + } + + case AssetFolderMoved e: + { + ParentId = e.ParentId; + + break; + } + + case AssetFolderDeleted _: + { + IsDeleted = true; + + break; + } + } + } + + public override AssetFolderState Apply(Envelope @event) + { + return Clone().Update(@event, (e, s) => s.ApplyEvent(e)); + } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs index f3c9834f4..e271c75fc 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Assets/State/AssetState.cs @@ -8,7 +8,6 @@ using System; using System.Collections.Generic; using System.Runtime.Serialization; -using Squidex.Domain.Apps.Core.ValidateContent; using Squidex.Domain.Apps.Events.Assets; using Squidex.Infrastructure; using Squidex.Infrastructure.EventSourcing; @@ -23,6 +22,9 @@ namespace Squidex.Domain.Apps.Entities.Assets.State [DataMember] public NamedId AppId { get; set; } + [DataMember] + public Guid ParentId { get; set; } + [DataMember] public string FileName { get; set; } @@ -59,7 +61,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.State [DataMember] public HashSet Tags { get; set; } - Guid IAssetInfo.AssetId + public Guid AssetId { get { return Id; } } @@ -117,6 +119,13 @@ namespace Squidex.Domain.Apps.Entities.Assets.State break; } + case AssetMoved e: + { + ParentId = e.ParentId; + + break; + } + case AssetDeleted _: { IsDeleted = true; diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetGraphType.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetGraphType.cs index 6dde0c175..0ef994ec0 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetGraphType.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/AssetGraphType.cs @@ -111,7 +111,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types { Name = "fileType", ResolvedType = AllTypes.NonNullString, - Resolver = Resolve(x => x.FileName.FileType()), + Resolver = Resolve(x => x.FileName!.FileType()), Description = "The file type." }); diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs index 356bd8bbc..74d69825c 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/ContentEnricher.cs @@ -322,7 +322,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries return EmptyAssets; } - var assets = await assetQuery.QueryAsync(context.Clone().WithNoAssetEnrichment(true), Q.Empty.WithIds(ids)); + var assets = await assetQuery.QueryAsync(context.Clone().WithNoAssetEnrichment(true), null, Q.Empty.WithIds(ids)); return assets.ToLookup(x => x.Id); } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/QueryExecutionContext.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/QueryExecutionContext.cs index 68aa7ec73..22e9398dd 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/QueryExecutionContext.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Contents/Queries/QueryExecutionContext.cs @@ -75,7 +75,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries public virtual async Task> QueryAssetsAsync(string query) { - var assets = await assetQuery.QueryAsync(context, Q.Empty.WithODataQuery(query)); + var assets = await assetQuery.QueryAsync(context, null, Q.Empty.WithODataQuery(query)); foreach (var asset in assets) { @@ -105,7 +105,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries if (notLoadedAssets.Count > 0) { - var assets = await assetQuery.QueryAsync(context, Q.Empty.WithIds(notLoadedAssets)); + var assets = await assetQuery.QueryAsync(context, null, Q.Empty.WithIds(notLoadedAssets)); foreach (var asset in assets) { diff --git a/backend/src/Squidex.Domain.Apps.Entities/IEntity.cs b/backend/src/Squidex.Domain.Apps.Entities/IEntity.cs index 45ec90994..f58de4d60 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/IEntity.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/IEntity.cs @@ -12,7 +12,7 @@ namespace Squidex.Domain.Apps.Entities { public interface IEntity { - Guid Id { get; } + Guid Id { get; } Instant Created { get; } diff --git a/backend/src/Squidex.Domain.Apps.Events/Assets/AssetCreated.cs b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetCreated.cs index ef7173832..7698c12b5 100644 --- a/backend/src/Squidex.Domain.Apps.Events/Assets/AssetCreated.cs +++ b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetCreated.cs @@ -5,6 +5,7 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; using System.Collections.Generic; using Squidex.Infrastructure.EventSourcing; @@ -13,6 +14,8 @@ namespace Squidex.Domain.Apps.Events.Assets [EventType(nameof(AssetCreated))] public sealed class AssetCreated : AssetEvent { + public Guid ParentId { get; set; } + public string FileName { get; set; } public string FileHash { get; set; } diff --git a/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderCreated.cs b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderCreated.cs new file mode 100644 index 000000000..228dc54dd --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderCreated.cs @@ -0,0 +1,20 @@ +// ========================================================================== +// 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.Assets +{ + [EventType(nameof(AssetFolderCreated))] + public sealed class AssetFolderCreated : AssetFolderEvent + { + public Guid ParentId { get; set; } + + public string FolderName { get; set; } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderDeleted.cs b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderDeleted.cs new file mode 100644 index 000000000..ff6014106 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderDeleted.cs @@ -0,0 +1,16 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Squidex.Infrastructure.EventSourcing; + +namespace Squidex.Domain.Apps.Events.Assets +{ + [EventType(nameof(AssetFolderDeleted))] + public sealed class AssetFolderDeleted : AssetFolderEvent + { + } +} diff --git a/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderEvent.cs b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderEvent.cs new file mode 100644 index 000000000..7fc7c5fa6 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderEvent.cs @@ -0,0 +1,16 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; + +namespace Squidex.Domain.Apps.Events.Assets +{ + public abstract class AssetFolderEvent : AppEvent + { + public Guid AssetFolderId { get; set; } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderMoved.cs b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderMoved.cs new file mode 100644 index 000000000..c225ba6e5 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderMoved.cs @@ -0,0 +1,18 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Squidex.Infrastructure.EventSourcing; + +namespace Squidex.Domain.Apps.Events.Assets +{ + [EventType(nameof(AssetFolderMoved))] + public sealed class AssetFolderMoved : AssetFolderEvent + { + public Guid ParentId { get; set; } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderRenamed.cs b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderRenamed.cs new file mode 100644 index 000000000..8016098b1 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetFolderRenamed.cs @@ -0,0 +1,17 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using Squidex.Infrastructure.EventSourcing; + +namespace Squidex.Domain.Apps.Events.Assets +{ + [EventType(nameof(AssetFolderRenamed))] + public sealed class AssetFolderRenamed : AssetFolderEvent + { + public string FolderName { get; set; } + } +} diff --git a/backend/src/Squidex.Domain.Apps.Events/Assets/AssetMoved.cs b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetMoved.cs new file mode 100644 index 000000000..9a1ab2cc9 --- /dev/null +++ b/backend/src/Squidex.Domain.Apps.Events/Assets/AssetMoved.cs @@ -0,0 +1,18 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Squidex.Infrastructure.EventSourcing; + +namespace Squidex.Domain.Apps.Events.Assets +{ + [EventType(nameof(AssetMoved))] + public sealed class AssetMoved : AssetEvent + { + public Guid ParentId { get; set; } + } +} diff --git a/backend/src/Squidex.Infrastructure/CollectionExtensions.cs b/backend/src/Squidex.Infrastructure/CollectionExtensions.cs index a714fdb38..5a459b8c5 100644 --- a/backend/src/Squidex.Infrastructure/CollectionExtensions.cs +++ b/backend/src/Squidex.Infrastructure/CollectionExtensions.cs @@ -33,6 +33,23 @@ namespace Squidex.Infrastructure return input.GroupBy(x => x).Where(x => x.Count() > 1).Select(x => x.Key); } + public static int IndexOf(this IEnumerable input, Func predicate) + { + var i = 0; + + foreach (var item in input) + { + if (predicate(item)) + { + return i; + } + + i++; + } + + return -1; + } + public static IEnumerable Duplicates(this IEnumerable input, Func selector) { return input.GroupBy(selector).Where(x => x.Count() > 1).Select(x => x.Key); diff --git a/backend/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs b/backend/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs index 4ce50f255..51e24437e 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Apps/AppsController.cs @@ -89,7 +89,7 @@ namespace Squidex.Areas.Api.Controllers.Apps /// /// Create a new app. /// - /// The app object that needs to be added to squidex. + /// The app object that needs to be added to Squidex. /// /// 201 => App created. /// 400 => App request not valid. diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetFoldersController.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetFoldersController.cs new file mode 100644 index 000000000..5a2cf28cb --- /dev/null +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetFoldersController.cs @@ -0,0 +1,168 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Net.Http.Headers; +using Squidex.Areas.Api.Controllers.Assets.Models; +using Squidex.Domain.Apps.Entities.Assets; +using Squidex.Domain.Apps.Entities.Assets.Commands; +using Squidex.Infrastructure.Commands; +using Squidex.Shared; +using Squidex.Web; + +namespace Squidex.Areas.Api.Controllers.Assets +{ + /// + /// Uploads and retrieves assets. + /// + [ApiExplorerSettings(GroupName = nameof(Assets))] + public sealed class AssetFoldersController : ApiController + { + private readonly IAssetQueryService assetQuery; + + public AssetFoldersController(ICommandBus commandBus, IAssetQueryService assetQuery) + : base(commandBus) + { + this.assetQuery = assetQuery; + } + + /// + /// Get asset folders. + /// + /// The name of the app. + /// The optional parent folder id. + /// + /// 200 => Asset folders returned. + /// 404 => App not found. + /// + /// + /// Get all asset folders for the app. + /// + [HttpGet] + [Route("apps/{app}/assets/folders", Order = -1)] + [ProducesResponseType(typeof(AssetsDto), 200)] + [ApiPermission(Permissions.AppAssetsRead)] + [ApiCosts(1)] + public async Task GetAssetFolders(string app, [FromQuery] Guid parentId) + { + var assetFolders = await assetQuery.QueryAssetFoldersAsync(Context, parentId); + + var response = Deferred.Response(() => + { + return AssetFoldersDto.FromAssets(assetFolders, this, app); + }); + + Response.Headers[HeaderNames.ETag] = assetFolders.ToEtag(); + + return Ok(response); + } + + /// + /// Upload a new asset. + /// + /// The name of the app. + /// The asset folder object that needs to be added to the App. + /// + /// 201 => Asset folder created. + /// 404 => App not found. + /// + [HttpPost] + [Route("apps/{app}/assets/folders", Order = -1)] + [ProducesResponseType(typeof(AssetDto), 201)] + [AssetRequestSizeLimit] + [ApiPermission(Permissions.AppAssetsUpdate)] + [ApiCosts(1)] + public async Task PostAssetFolder(string app, [FromBody] CreateAssetFolderDto request) + { + var command = request.ToCommand(); + + var response = await InvokeCommandAsync(app, command); + + return Ok(response); + } + + /// + /// Updates the asset folder. + /// + /// The name of the app. + /// The id of the asset folder. + /// The asset folder object that needs to updated. + /// + /// 200 => Asset folder updated. + /// 400 => Asset folder name not valid. + /// 404 => Asset or app not found. + /// + [HttpPut] + [Route("apps/{app}/assets/folders/{id}/", Order = -1)] + [ProducesResponseType(typeof(AssetDto), 200)] + [AssetRequestSizeLimit] + [ApiPermission(Permissions.AppAssetsUpdate)] + [ApiCosts(1)] + public async Task PutAssetFolder(string app, Guid id, [FromBody] RenameAssetFolderDto request) + { + var command = request.ToCommand(id); + + var response = await InvokeCommandAsync(app, command); + + return Ok(response); + } + + /// + /// Moves the asset folder. + /// + /// The name of the app. + /// The id of the asset folder. + /// The asset folder object that needs to updated. + /// + /// 200 => Asset folder moved. + /// 404 => Asset or app not found. + /// + [HttpPut] + [Route("apps/{app}/assets/folders/{id}/parent", Order = -1)] + [ProducesResponseType(typeof(AssetDto), 200)] + [AssetRequestSizeLimit] + [ApiPermission(Permissions.AppAssetsUpdate)] + [ApiCosts(1)] + public async Task PutAssetFolderParent(string app, Guid id, [FromBody] MoveAssetItemDto request) + { + var command = request.ToFolderCommand(id); + + var response = await InvokeCommandAsync(app, command); + + return Ok(response); + } + + /// + /// Delete an asset folder. + /// + /// The name of the app. + /// The id of the asset folder to delete. + /// + /// 204 => Asset folder deleted. + /// 404 => Asset or app not found. + /// + [HttpDelete] + [Route("apps/{app}/assets/folders/{id}/", Order = -1)] + [ApiPermission(Permissions.AppAssetsUpdate)] + [ApiCosts(1)] + public async Task DeleteAssetFolder(string app, Guid id) + { + await CommandBus.PublishAsync(new DeleteAssetFolder { AssetFolderId = id }); + + return NoContent(); + } + + private async Task InvokeCommandAsync(string app, ICommand command) + { + var context = await CommandBus.PublishAsync(command); + + return AssetFolderDto.FromAssetFolder(context.Result(), this, app); + } + } +} diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs index 7a7feca6e..4e4254bf9 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/AssetsController.cs @@ -89,6 +89,7 @@ namespace Squidex.Areas.Api.Controllers.Assets /// Get assets. /// /// The name of the app. + /// The optional parent folder id. /// The optional asset ids. /// The optional json query. /// @@ -103,9 +104,9 @@ namespace Squidex.Areas.Api.Controllers.Assets [ProducesResponseType(typeof(AssetsDto), 200)] [ApiPermission(Permissions.AppAssetsRead)] [ApiCosts(1)] - public async Task GetAssets(string app, [FromQuery] string? ids = null, [FromQuery] string? q = null) + public async Task GetAssets(string app, [FromQuery] Guid? parentId, [FromQuery] string? ids = null, [FromQuery] string? q = null) { - var assets = await assetQuery.QueryAsync(Context, + var assets = await assetQuery.QueryAsync(Context, parentId, Q.Empty .WithIds(ids) .WithJsonQuery(q) @@ -168,6 +169,7 @@ namespace Squidex.Areas.Api.Controllers.Assets /// Upload a new asset. /// /// The name of the app. + /// The optional parent folder id. /// The file to upload. /// /// 201 => Asset created. @@ -183,11 +185,11 @@ namespace Squidex.Areas.Api.Controllers.Assets [AssetRequestSizeLimit] [ApiPermission(Permissions.AppAssetsCreate)] [ApiCosts(1)] - public async Task PostAsset(string app, [OpenApiIgnore] List file) + public async Task PostAsset(string app, [FromQuery] Guid parentId, [OpenApiIgnore] List file) { var assetFile = await CheckAssetFileAsync(file); - var command = new CreateAsset { File = assetFile }; + var command = new CreateAsset { File = assetFile, ParentId = parentId }; var response = await InvokeCommandAsync(app, command); @@ -250,6 +252,31 @@ namespace Squidex.Areas.Api.Controllers.Assets return Ok(response); } + /// + /// Moves the asset. + /// + /// The name of the app. + /// The id of the asset. + /// The asset object that needs to updated. + /// + /// 200 => Asset moved. + /// 404 => Asset or app not found. + /// + [HttpPut] + [Route("apps/{app}/assets/{id}/parent")] + [ProducesResponseType(typeof(AssetDto), 200)] + [AssetRequestSizeLimit] + [ApiPermission(Permissions.AppAssetsUpdate)] + [ApiCosts(1)] + public async Task PutAssetParent(string app, Guid id, [FromBody] MoveAssetItemDto request) + { + var command = request.ToCommand(id); + + var response = await InvokeCommandAsync(app, command); + + return Ok(response); + } + /// /// Delete an asset. /// diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs index cb3494226..b93767441 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetDto.cs @@ -25,6 +25,11 @@ namespace Squidex.Areas.Api.Controllers.Assets.Models /// public Guid Id { get; set; } + /// + /// The id of the parent folder. Empty for files without parent. + /// + public Guid ParentId { get; set; } + /// /// The file name. /// @@ -141,6 +146,8 @@ namespace Squidex.Areas.Api.Controllers.Assets.Models { response.AddPutLink("update", controller.Url(x => nameof(x.PutAsset), values)); response.AddPutLink("upload", controller.Url(x => nameof(x.PutAssetContent), values)); + + response.AddPutLink("move", controller.Url(x => nameof(x.PutAssetParent), values)); } if (controller.HasPermission(Permissions.AppAssetsDelete)) diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFolderDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFolderDto.cs new file mode 100644 index 000000000..810824973 --- /dev/null +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFolderDto.cs @@ -0,0 +1,69 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.ComponentModel.DataAnnotations; +using Newtonsoft.Json; +using Squidex.Domain.Apps.Entities.Assets; +using Squidex.Infrastructure.Reflection; +using Squidex.Shared; +using Squidex.Web; + +namespace Squidex.Areas.Api.Controllers.Assets.Models +{ + public sealed class AssetFolderDto : Resource + { + /// + /// The id of the asset. + /// + public Guid Id { get; set; } + + /// + /// The id of the parent folder. Empty for files without parent. + /// + public Guid ParentId { get; set; } + + /// + /// The folder name. + /// + [Required] + public string FolderName { get; set; } + + /// + /// The version of the asset folder. + /// + public long Version { get; set; } + + public static AssetFolderDto FromAssetFolder(IAssetFolderEntity asset, ApiController controller, string app) + { + var response = SimpleMapper.Map(asset, new AssetFolderDto()); + + return CreateLinks(response, controller, app); + } + + private static AssetFolderDto CreateLinks(AssetFolderDto response, ApiController controller, string app) + { + var values = new { app, id = response.Id }; + + response.AddSelfLink(controller.Url(x => nameof(x.GetAsset), values)); + + if (controller.HasPermission(Permissions.AppAssetsUpdate)) + { + response.AddPutLink("update", controller.Url(x => nameof(x.PutAssetFolder), values)); + + response.AddPutLink("move", controller.Url(x => nameof(x.PutAssetFolderParent), values)); + } + + if (controller.HasPermission(Permissions.AppAssetsUpdate)) + { + response.AddDeleteLink("delete", controller.Url(x => nameof(x.DeleteAssetFolder), values)); + } + + return response; + } + } +} diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFoldersDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFoldersDto.cs new file mode 100644 index 000000000..264296dd4 --- /dev/null +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/AssetFoldersDto.cs @@ -0,0 +1,55 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschränkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System.ComponentModel.DataAnnotations; +using System.Linq; +using Squidex.Domain.Apps.Entities.Assets; +using Squidex.Infrastructure; +using Squidex.Shared; +using Squidex.Web; + +namespace Squidex.Areas.Api.Controllers.Assets.Models +{ + public sealed class AssetFoldersDto : Resource + { + /// + /// The total number of assets. + /// + public long Total { get; set; } + + /// + /// The assets folders. + /// + [Required] + public AssetFolderDto[] Items { get; set; } + + public static AssetFoldersDto FromAssets(IResultList assetFolders, ApiController controller, string app) + { + var response = new AssetFoldersDto + { + Total = assetFolders.Total, + Items = assetFolders.Select(x => AssetFolderDto.FromAssetFolder(x, controller, app)).ToArray() + }; + + return CreateLinks(response, controller, app); + } + + private static AssetFoldersDto CreateLinks(AssetFoldersDto response, ApiController controller, string app) + { + var values = new { app }; + + response.AddSelfLink(controller.Url(x => nameof(x.GetAssetFolders), values)); + + if (controller.HasPermission(Permissions.AppAssetsUpdate)) + { + response.AddPostLink("create", controller.Url(x => nameof(x.PostAssetFolder), values)); + } + + return response; + } + } +} diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/CreateAssetFolderDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/CreateAssetFolderDto.cs new file mode 100644 index 000000000..1b2154b43 --- /dev/null +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/CreateAssetFolderDto.cs @@ -0,0 +1,33 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Entities.Assets.Commands; +using Squidex.Infrastructure.Reflection; + +namespace Squidex.Areas.Api.Controllers.Assets.Models +{ + public sealed class CreateAssetFolderDto + { + /// + /// The name of the folder. + /// + [Required] + public string FolderName { get; set; } + + /// + /// The id of the parent folder. + /// + public Guid ParentId { get; set; } + + public CreateAssetFolder ToCommand() + { + return SimpleMapper.Map(this, new CreateAssetFolder()); + } + } +} diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/MoveAssetItemDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/MoveAssetItemDto.cs new file mode 100644 index 000000000..7053d9d53 --- /dev/null +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/MoveAssetItemDto.cs @@ -0,0 +1,30 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using Squidex.Domain.Apps.Entities.Assets.Commands; + +namespace Squidex.Areas.Api.Controllers.Assets.Models +{ + public sealed class MoveAssetItemDto + { + /// + /// The parent folder id. + /// + public Guid ParentId { get; set; } + + public MoveAsset ToCommand(Guid id) + { + return new MoveAsset { AssetId = id, ParentId = ParentId }; + } + + public MoveAssetFolder ToFolderCommand(Guid id) + { + return new MoveAssetFolder { AssetFolderId = id, ParentId = ParentId }; + } + } +} diff --git a/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/RenameAssetFolderDto.cs b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/RenameAssetFolderDto.cs new file mode 100644 index 000000000..c0b4568e9 --- /dev/null +++ b/backend/src/Squidex/Areas/Api/Controllers/Assets/Models/RenameAssetFolderDto.cs @@ -0,0 +1,28 @@ +// ========================================================================== +// Squidex Headless CMS +// ========================================================================== +// Copyright (c) Squidex UG (haftungsbeschraenkt) +// All rights reserved. Licensed under the MIT license. +// ========================================================================== + +using System; +using System.ComponentModel.DataAnnotations; +using Squidex.Domain.Apps.Entities.Assets.Commands; +using Squidex.Infrastructure.Reflection; + +namespace Squidex.Areas.Api.Controllers.Assets.Models +{ + public sealed class RenameAssetFolderDto + { + /// + /// The name of the folder. + /// + [Required] + public string FolderName { get; set; } + + public RenameAssetFolder ToCommand(Guid id) + { + return SimpleMapper.Map(this, new RenameAssetFolder { AssetFolderId = id }); + } + } +} diff --git a/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml b/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml index 2760c2247..d28c046c3 100644 --- a/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml +++ b/backend/src/Squidex/Areas/IdentityServer/Views/_Layout.cshtml @@ -19,7 +19,7 @@
- + @RenderBody()
diff --git a/backend/src/Squidex/Config/Domain/CommandsServices.cs b/backend/src/Squidex/Config/Domain/CommandsServices.cs index 36fc54e74..e93168e9a 100644 --- a/backend/src/Squidex/Config/Domain/CommandsServices.cs +++ b/backend/src/Squidex/Config/Domain/CommandsServices.cs @@ -13,6 +13,7 @@ using Squidex.Domain.Apps.Entities.Apps.Indexes; using Squidex.Domain.Apps.Entities.Apps.Invitation; using Squidex.Domain.Apps.Entities.Apps.Templates; using Squidex.Domain.Apps.Entities.Assets; +using Squidex.Domain.Apps.Entities.Assets.Commands; using Squidex.Domain.Apps.Entities.Comments; using Squidex.Domain.Apps.Entities.Comments.Commands; using Squidex.Domain.Apps.Entities.Contents; @@ -83,6 +84,9 @@ namespace Squidex.Config.Domain services.AddSingletonAs() .As(); + services.AddSingletonAs>() + .As(); + services.AddSingletonAs>() .As(); diff --git a/backend/src/Squidex/Config/Domain/StoreServices.cs b/backend/src/Squidex/Config/Domain/StoreServices.cs index c216fd390..783788626 100644 --- a/backend/src/Squidex/Config/Domain/StoreServices.cs +++ b/backend/src/Squidex/Config/Domain/StoreServices.cs @@ -100,6 +100,10 @@ namespace Squidex.Config.Domain .As() .As>(); + services.AddSingletonAs() + .As() + .As>(); + services.AddSingletonAs(c => new MongoContentRepository( c.GetRequiredService().GetDatabase(mongoContentDatabaseName), c.GetRequiredService(), diff --git a/backend/src/Squidex/wwwroot/images/add-app.png b/backend/src/Squidex/wwwroot/images/add-app.png deleted file mode 100644 index 605f0a4c4..000000000 Binary files a/backend/src/Squidex/wwwroot/images/add-app.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/add-app.svg b/backend/src/Squidex/wwwroot/images/add-app.svg new file mode 100644 index 000000000..44b50c081 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/add-app.svg @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/add-blog.png b/backend/src/Squidex/wwwroot/images/add-blog.png deleted file mode 100644 index 764e65cf1..000000000 Binary files a/backend/src/Squidex/wwwroot/images/add-blog.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/add-blog.svg b/backend/src/Squidex/wwwroot/images/add-blog.svg new file mode 100644 index 000000000..cecf13fa4 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/add-blog.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/add-identity.png b/backend/src/Squidex/wwwroot/images/add-identity.png deleted file mode 100644 index 910ed1c77..000000000 Binary files a/backend/src/Squidex/wwwroot/images/add-identity.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/add-identity.svg b/backend/src/Squidex/wwwroot/images/add-identity.svg new file mode 100644 index 000000000..30968a735 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/add-identity.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/add-profile.png b/backend/src/Squidex/wwwroot/images/add-profile.png deleted file mode 100644 index 9aec8b7e1..000000000 Binary files a/backend/src/Squidex/wwwroot/images/add-profile.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/add-profile.svg b/backend/src/Squidex/wwwroot/images/add-profile.svg new file mode 100644 index 000000000..e9b78a32b --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/add-profile.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/asset_doc.png b/backend/src/Squidex/wwwroot/images/asset_doc.png deleted file mode 100644 index 08fb7de74..000000000 Binary files a/backend/src/Squidex/wwwroot/images/asset_doc.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/asset_doc.svg b/backend/src/Squidex/wwwroot/images/asset_doc.svg new file mode 100644 index 000000000..3bbd3a67b --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/asset_doc.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/asset_docx.png b/backend/src/Squidex/wwwroot/images/asset_docx.png deleted file mode 100644 index 5a31c92da..000000000 Binary files a/backend/src/Squidex/wwwroot/images/asset_docx.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/asset_docx.svg b/backend/src/Squidex/wwwroot/images/asset_docx.svg new file mode 100644 index 000000000..3bbd3a67b --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/asset_docx.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/asset_generic.png b/backend/src/Squidex/wwwroot/images/asset_generic.png deleted file mode 100644 index 576117903..000000000 Binary files a/backend/src/Squidex/wwwroot/images/asset_generic.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/asset_generic.svg b/backend/src/Squidex/wwwroot/images/asset_generic.svg new file mode 100644 index 000000000..555a98085 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/asset_generic.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/asset_pdf.png b/backend/src/Squidex/wwwroot/images/asset_pdf.png deleted file mode 100644 index 1aa38c9f1..000000000 Binary files a/backend/src/Squidex/wwwroot/images/asset_pdf.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/asset_pdf.svg b/backend/src/Squidex/wwwroot/images/asset_pdf.svg new file mode 100644 index 000000000..919d5d670 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/asset_pdf.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/asset_ppt.png b/backend/src/Squidex/wwwroot/images/asset_ppt.png deleted file mode 100644 index c2c7b7e62..000000000 Binary files a/backend/src/Squidex/wwwroot/images/asset_ppt.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/asset_ppt.svg b/backend/src/Squidex/wwwroot/images/asset_ppt.svg new file mode 100644 index 000000000..53ab946db --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/asset_ppt.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/asset_pptx.png b/backend/src/Squidex/wwwroot/images/asset_pptx.png deleted file mode 100644 index 1d4832111..000000000 Binary files a/backend/src/Squidex/wwwroot/images/asset_pptx.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/asset_pptx.svg b/backend/src/Squidex/wwwroot/images/asset_pptx.svg new file mode 100644 index 000000000..53ab946db --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/asset_pptx.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/asset_video.png b/backend/src/Squidex/wwwroot/images/asset_video.png deleted file mode 100644 index 0889275a0..000000000 Binary files a/backend/src/Squidex/wwwroot/images/asset_video.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/asset_video.svg b/backend/src/Squidex/wwwroot/images/asset_video.svg new file mode 100644 index 000000000..3c7971ba5 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/asset_video.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/asset_xls.png b/backend/src/Squidex/wwwroot/images/asset_xls.png deleted file mode 100644 index 3e7849d3e..000000000 Binary files a/backend/src/Squidex/wwwroot/images/asset_xls.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/asset_xls.svg b/backend/src/Squidex/wwwroot/images/asset_xls.svg new file mode 100644 index 000000000..9a08f88b1 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/asset_xls.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/asset_xlsx.png b/backend/src/Squidex/wwwroot/images/asset_xlsx.png deleted file mode 100644 index d28ad0789..000000000 Binary files a/backend/src/Squidex/wwwroot/images/asset_xlsx.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/asset_xlsx.svg b/backend/src/Squidex/wwwroot/images/asset_xlsx.svg new file mode 100644 index 000000000..9a08f88b1 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/asset_xlsx.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/dashboard-api.png b/backend/src/Squidex/wwwroot/images/dashboard-api.png deleted file mode 100644 index a269ef52b..000000000 Binary files a/backend/src/Squidex/wwwroot/images/dashboard-api.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/dashboard-api.svg b/backend/src/Squidex/wwwroot/images/dashboard-api.svg new file mode 100644 index 000000000..379e76891 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/dashboard-api.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/dashboard-feedback.png b/backend/src/Squidex/wwwroot/images/dashboard-feedback.png deleted file mode 100644 index 5665d765d..000000000 Binary files a/backend/src/Squidex/wwwroot/images/dashboard-feedback.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/dashboard-github.png b/backend/src/Squidex/wwwroot/images/dashboard-github.png deleted file mode 100644 index aca7fa679..000000000 Binary files a/backend/src/Squidex/wwwroot/images/dashboard-github.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/dashboard-github.svg b/backend/src/Squidex/wwwroot/images/dashboard-github.svg new file mode 100644 index 000000000..8e0c9e334 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/dashboard-github.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/dashboard-schema.png b/backend/src/Squidex/wwwroot/images/dashboard-schema.png deleted file mode 100644 index 77162cbb4..000000000 Binary files a/backend/src/Squidex/wwwroot/images/dashboard-schema.png and /dev/null differ diff --git a/backend/src/Squidex/wwwroot/images/dashboard-schema.svg b/backend/src/Squidex/wwwroot/images/dashboard-schema.svg new file mode 100644 index 000000000..3bd7aaff7 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/dashboard-schema.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/dashboard_feedback.svg b/backend/src/Squidex/wwwroot/images/dashboard_feedback.svg new file mode 100644 index 000000000..920b7fb2d --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/dashboard_feedback.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/dashboard_schema.svg b/backend/src/Squidex/wwwroot/images/dashboard_schema.svg new file mode 100644 index 000000000..3bd7aaff7 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/dashboard_schema.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/folder.svg b/backend/src/Squidex/wwwroot/images/folder.svg new file mode 100644 index 000000000..3ad7e240d --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/folder.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/backend/src/Squidex/wwwroot/images/logo.svg b/backend/src/Squidex/wwwroot/images/logo.svg new file mode 100644 index 000000000..c5f97d149 --- /dev/null +++ b/backend/src/Squidex/wwwroot/images/logo.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetChangedTriggerHandlerTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetChangedTriggerHandlerTests.cs index ba32701fc..17a119beb 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetChangedTriggerHandlerTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetChangedTriggerHandlerTests.cs @@ -62,6 +62,16 @@ namespace Squidex.Domain.Apps.Entities.Assets Assert.Equal(type, result!.Type); } + [Fact] + public async Task Should_skip_moved_event() + { + var envelope = Envelope.Create(new AssetMoved()); + + var result = await sut.CreateEnrichedEventAsync(envelope); + + Assert.Null(result); + } + [Fact] public void Should_not_trigger_precheck_when_event_type_not_correct() { diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs index efa873db6..38caa4e0e 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetCommandMiddlewareTests.cs @@ -58,7 +58,7 @@ namespace Squidex.Domain.Apps.Entities.Assets { file = new AssetFile("my-image.png", "image/png", 1024, () => stream); - asset = new AssetGrain(Store, tagService, A.Fake(), A.Dummy()); + asset = new AssetGrain(Store, tagService, assetQuery, A.Fake(), A.Dummy()); asset.ActivateAsync(Id).Wait(); A.CallTo(() => contextProvider.Context) diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetFolderGrainTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetFolderGrainTests.cs new file mode 100644 index 000000000..0d44399d7 --- /dev/null +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetFolderGrainTests.cs @@ -0,0 +1,171 @@ +// ========================================================================== +// 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.Threading.Tasks; +using FakeItEasy; +using Squidex.Domain.Apps.Entities.Assets.Commands; +using Squidex.Domain.Apps.Entities.Assets.State; +using Squidex.Domain.Apps.Entities.TestHelpers; +using Squidex.Domain.Apps.Events.Assets; +using Squidex.Infrastructure; +using Squidex.Infrastructure.Commands; +using Squidex.Infrastructure.Log; +using Squidex.Infrastructure.Orleans; +using Xunit; + +namespace Squidex.Domain.Apps.Entities.Assets +{ + public class AssetFolderGrainTests : HandlerTestBase + { + private readonly IAssetQueryService assetQuery = A.Fake(); + private readonly IActivationLimit limit = A.Fake(); + private readonly Guid parentId = Guid.NewGuid(); + private readonly Guid assetFolderId = Guid.NewGuid(); + private readonly AssetFolderGrain sut; + + protected override Guid Id + { + get { return assetFolderId; } + } + + public AssetFolderGrainTests() + { + A.CallTo(() => assetQuery.FindAssetFolderAsync(parentId)) + .Returns(new List { A.Fake() }); + + sut = new AssetFolderGrain(Store, assetQuery, limit, A.Dummy()); + sut.ActivateAsync(Id).Wait(); + } + + [Fact] + public void Should_set_limit() + { + A.CallTo(() => limit.SetLimit(5000, TimeSpan.FromMinutes(5))) + .MustHaveHappened(); + } + + [Fact] + public async Task Command_should_throw_exception_if_rule_is_deleted() + { + await ExecuteCreateAsync(); + await ExecuteDeleteAsync(); + + await Assert.ThrowsAsync(ExecuteUpdateAsync); + } + + [Fact] + public async Task Create_should_create_events_and_update_state() + { + var command = new CreateAssetFolder { FolderName = "New Name" }; + + var result = await sut.ExecuteAsync(CreateAssetFolderCommand(command)); + + result.ShouldBeEquivalent(sut.Snapshot); + + Assert.Equal(command.FolderName, sut.Snapshot.FolderName); + + LastEvents + .ShouldHaveSameEvents( + CreateAssetFolderEvent(new AssetFolderCreated + { + FolderName = command.FolderName + }) + ); + } + + [Fact] + public async Task Update_should_create_events_and_update_state() + { + var command = new RenameAssetFolder { FolderName = "New Name" }; + + await ExecuteCreateAsync(); + + var result = await sut.ExecuteAsync(CreateAssetFolderCommand(command)); + + result.ShouldBeEquivalent(sut.Snapshot); + + Assert.Equal(command.FolderName, sut.Snapshot.FolderName); + + LastEvents + .ShouldHaveSameEvents( + CreateAssetFolderEvent(new AssetFolderRenamed + { + FolderName = command.FolderName + }) + ); + } + + [Fact] + public async Task Move_should_create_events_and_update_state() + { + var command = new MoveAssetFolder { ParentId = parentId }; + + await ExecuteCreateAsync(); + + var result = await sut.ExecuteAsync(CreateAssetFolderCommand(command)); + + result.ShouldBeEquivalent(sut.Snapshot); + + Assert.Equal(parentId, sut.Snapshot.ParentId); + + LastEvents + .ShouldHaveSameEvents( + CreateAssetFolderEvent(new AssetFolderMoved { ParentId = parentId }) + ); + } + + [Fact] + public async Task Delete_should_create_events_with_total_file_size() + { + var command = new DeleteAssetFolder(); + + await ExecuteCreateAsync(); + + var result = await sut.ExecuteAsync(CreateAssetFolderCommand(command)); + + result.ShouldBeEquivalent(new EntitySavedResult(1)); + + Assert.True(sut.Snapshot.IsDeleted); + + LastEvents + .ShouldHaveSameEvents( + CreateAssetFolderEvent(new AssetFolderDeleted()) + ); + } + + private Task ExecuteCreateAsync() + { + return sut.ExecuteAsync(CreateAssetFolderCommand(new CreateAssetFolder { FolderName = "My Folder" })); + } + + private Task ExecuteUpdateAsync() + { + return sut.ExecuteAsync(CreateAssetFolderCommand(new RenameAssetFolder { FolderName = "My Folder" })); + } + + private Task ExecuteDeleteAsync() + { + return sut.ExecuteAsync(CreateAssetFolderCommand(new DeleteAssetFolder())); + } + + protected T CreateAssetFolderEvent(T @event) where T : AssetFolderEvent + { + @event.AssetFolderId = assetFolderId; + + return CreateEvent(@event); + } + + protected T CreateAssetFolderCommand(T command) where T : AssetFolderCommand + { + command.AssetFolderId = assetFolderId; + + return CreateCommand(command); + } + } +} diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetGrainTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetGrainTests.cs index 301aada09..23dc31f52 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetGrainTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/AssetGrainTests.cs @@ -27,11 +27,12 @@ namespace Squidex.Domain.Apps.Entities.Assets public class AssetGrainTests : HandlerTestBase { private readonly ITagService tagService = A.Fake(); + private readonly IAssetQueryService assetQuery = A.Fake(); private readonly IActivationLimit limit = A.Fake(); private readonly ImageInfo image = new ImageInfo(2048, 2048); - private readonly AssetFile file = new AssetFile("my-image.png", "image/png", 1024, () => new MemoryStream()); + private readonly Guid parentId = Guid.NewGuid(); private readonly Guid assetId = Guid.NewGuid(); - private readonly string fileHash = Guid.NewGuid().ToString(); + private readonly AssetFile file = new AssetFile("my-image.png", "image/png", 1024, () => new MemoryStream()); private readonly AssetGrain sut; protected override Guid Id @@ -41,10 +42,13 @@ namespace Squidex.Domain.Apps.Entities.Assets public AssetGrainTests() { + A.CallTo(() => assetQuery.FindAssetFolderAsync(parentId)) + .Returns(new List { A.Fake() }); + A.CallTo(() => tagService.NormalizeTagsAsync(AppId, TagGroups.Assets, A>.Ignored, A>.Ignored)) .Returns(new Dictionary()); - sut = new AssetGrain(Store, tagService, limit, A.Dummy()); + sut = new AssetGrain(Store, tagService, assetQuery, limit, A.Dummy()); sut.ActivateAsync(Id).Wait(); } @@ -56,7 +60,7 @@ namespace Squidex.Domain.Apps.Entities.Assets } [Fact] - public async Task Command_should_throw_exception_if_rule_is_deleted() + public async Task Command_should_throw_exception_if_asset_is_deleted() { await ExecuteCreateAsync(); await ExecuteDeleteAsync(); @@ -65,16 +69,16 @@ namespace Squidex.Domain.Apps.Entities.Assets } [Fact] - public async Task Create_should_create_events() + public async Task Create_should_create_events_and_update_state() { - var command = new CreateAsset { File = file, ImageInfo = image, FileHash = fileHash, Tags = new HashSet() }; + var command = new CreateAsset { File = file, ImageInfo = image, FileHash = "NewHash", Tags = new HashSet() }; var result = await sut.ExecuteAsync(CreateAssetCommand(command)); result.ShouldBeEquivalent(sut.Snapshot); Assert.Equal(0, sut.Snapshot.FileVersion); - Assert.Equal(fileHash, sut.Snapshot.FileHash); + Assert.Equal(command.FileHash, sut.Snapshot.FileHash); LastEvents .ShouldHaveSameEvents( @@ -82,8 +86,8 @@ namespace Squidex.Domain.Apps.Entities.Assets { IsImage = true, FileName = file.FileName, - FileHash = fileHash, FileSize = file.FileSize, + FileHash = command.FileHash, FileVersion = 0, MimeType = file.MimeType, PixelWidth = image.PixelWidth, @@ -95,9 +99,9 @@ namespace Squidex.Domain.Apps.Entities.Assets } [Fact] - public async Task Update_should_create_events() + public async Task Update_should_create_events_and_update_state() { - var command = new UpdateAsset { File = file, ImageInfo = image, FileHash = fileHash }; + var command = new UpdateAsset { File = file, ImageInfo = image, FileHash = "NewHash" }; await ExecuteCreateAsync(); @@ -106,7 +110,7 @@ namespace Squidex.Domain.Apps.Entities.Assets result.ShouldBeEquivalent(sut.Snapshot); Assert.Equal(1, sut.Snapshot.FileVersion); - Assert.Equal(fileHash, sut.Snapshot.FileHash); + Assert.Equal(command.FileHash, sut.Snapshot.FileHash); LastEvents .ShouldHaveSameEvents( @@ -114,7 +118,7 @@ namespace Squidex.Domain.Apps.Entities.Assets { IsImage = true, FileSize = file.FileSize, - FileHash = fileHash, + FileHash = command.FileHash, FileVersion = 1, MimeType = file.MimeType, PixelWidth = image.PixelWidth, @@ -124,7 +128,7 @@ namespace Squidex.Domain.Apps.Entities.Assets } [Fact] - public async Task AnnotateName_should_create_events() + public async Task AnnotateName_should_create_events_and_update_state() { var command = new AnnotateAsset { FileName = "My New Image.png" }; @@ -143,7 +147,7 @@ namespace Squidex.Domain.Apps.Entities.Assets } [Fact] - public async Task AnnotateSlug_should_create_events() + public async Task AnnotateSlug_should_create_events_and_update_state() { var command = new AnnotateAsset { Slug = "my-new-image.png" }; @@ -162,7 +166,7 @@ namespace Squidex.Domain.Apps.Entities.Assets } [Fact] - public async Task AnnotateTag_should_create_events() + public async Task AnnotateTag_should_create_events_and_update_state() { var command = new AnnotateAsset { Tags = new HashSet() }; @@ -178,6 +182,25 @@ namespace Squidex.Domain.Apps.Entities.Assets ); } + [Fact] + public async Task Move_should_create_events_and_update_state() + { + var command = new MoveAsset { ParentId = parentId }; + + await ExecuteCreateAsync(); + + var result = await sut.ExecuteAsync(CreateAssetCommand(command)); + + result.ShouldBeEquivalent(sut.Snapshot); + + Assert.Equal(parentId, sut.Snapshot.ParentId); + + LastEvents + .ShouldHaveSameEvents( + CreateAssetEvent(new AssetMoved { ParentId = parentId }) + ); + } + [Fact] public async Task Delete_should_create_events_with_total_file_size() { diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Guards/GuardAssetFolderTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Guards/GuardAssetFolderTests.cs new file mode 100644 index 000000000..37f08f6f5 --- /dev/null +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Guards/GuardAssetFolderTests.cs @@ -0,0 +1,167 @@ +// ========================================================================== +// 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.Threading.Tasks; +using FakeItEasy; +using Squidex.Domain.Apps.Entities.Assets.Commands; +using Squidex.Domain.Apps.Entities.TestHelpers; +using Squidex.Infrastructure.Validation; +using Xunit; + +namespace Squidex.Domain.Apps.Entities.Assets.Guards +{ + public class GuardAssetFolderTests + { + private readonly IAssetQueryService assetQuery = A.Fake(); + + [Fact] + public async Task CanCreate_should_throw_exception_when_folder_name_not_defined() + { + var command = new CreateAssetFolder(); + + A.CallTo(() => assetQuery.FindAssetFolderAsync(command.ParentId)) + .Returns(new List()); + + await ValidationAssert.ThrowsAsync(() => GuardAssetFolder.CanCreate(command, assetQuery), + new ValidationError("Folder name is required.", "FolderName")); + } + + [Fact] + public async Task CanCreate_should_throw_exception_when_folder_not_found() + { + var command = new CreateAssetFolder { FolderName = "My Folder", ParentId = Guid.NewGuid() }; + + A.CallTo(() => assetQuery.FindAssetFolderAsync(command.ParentId)) + .Returns(new List()); + + await ValidationAssert.ThrowsAsync(() => GuardAssetFolder.CanCreate(command, assetQuery), + new ValidationError("Asset folder does not exist.", "ParentId")); + } + + [Fact] + public async Task CanCreate_should_not_throw_exception_when_folder_found() + { + var command = new CreateAssetFolder { FolderName = "My Folder", ParentId = Guid.NewGuid() }; + + A.CallTo(() => assetQuery.FindAssetFolderAsync(command.ParentId)) + .Returns(new List { CreateFolder() }); + + await GuardAssetFolder.CanCreate(command, assetQuery); + } + + [Fact] + public async Task CanCreate_should_not_throw_exception_when_added_to_root() + { + var command = new CreateAssetFolder { FolderName = "My Folder" }; + + await GuardAssetFolder.CanCreate(command, assetQuery); + } + + [Fact] + public async Task CanMove_should_throw_exception_when_adding_to_its_own_child() + { + var id = Guid.NewGuid(); + + var command = new MoveAssetFolder { ParentId = Guid.NewGuid() }; + + A.CallTo(() => assetQuery.FindAssetFolderAsync(command.ParentId)) + .Returns(new List + { + CreateFolder(id), + CreateFolder(command.ParentId) + }); + + await ValidationAssert.ThrowsAsync(() => GuardAssetFolder.CanMove(command, assetQuery, id, Guid.NewGuid()), + new ValidationError("Cannot add folder to its own child.", "ParentId")); + } + + [Fact] + public async Task CanMove_should_throw_exception_when_folder_not_found() + { + var command = new MoveAssetFolder { ParentId = Guid.NewGuid() }; + + A.CallTo(() => assetQuery.FindAssetFolderAsync(command.ParentId)) + .Returns(new List()); + + await ValidationAssert.ThrowsAsync(() => GuardAssetFolder.CanMove(command, assetQuery, Guid.NewGuid(), Guid.NewGuid()), + new ValidationError("Asset folder does not exist.", "ParentId")); + } + + [Fact] + public async Task CanMove_should_throw_exception_when_folder_has_not_changed() + { + var command = new MoveAssetFolder { ParentId = Guid.NewGuid() }; + + await ValidationAssert.ThrowsAsync(() => GuardAssetFolder.CanMove(command, assetQuery, Guid.NewGuid(), command.ParentId), + new ValidationError("Asset folder is already part of this folder.", "ParentId")); + } + + [Fact] + public async Task CanMove_should_not_throw_exception_when_folder_found() + { + var command = new MoveAssetFolder { ParentId = Guid.NewGuid() }; + + A.CallTo(() => assetQuery.FindAssetFolderAsync(command.ParentId)) + .Returns(new List { CreateFolder() }); + + await GuardAssetFolder.CanMove(command, assetQuery, Guid.NewGuid(), Guid.NewGuid()); + } + + [Fact] + public async Task CanMove_should_not_throw_exception_when_added_to_root() + { + var command = new MoveAssetFolder(); + + await GuardAssetFolder.CanMove(command, assetQuery, Guid.NewGuid(), Guid.NewGuid()); + } + + [Fact] + public void CanRename_should_throw_exception_if_folder_name_is_empty() + { + var command = new RenameAssetFolder(); + + ValidationAssert.Throws(() => GuardAssetFolder.CanRename(command, "My Folder"), + new ValidationError("Folder name is required.", "FolderName")); + } + + [Fact] + public void CanRename_should_throw_exception_if_names_are_the_same() + { + var command = new RenameAssetFolder { FolderName = "My Folder" }; + + ValidationAssert.Throws(() => GuardAssetFolder.CanRename(command, "My Folder"), + new ValidationError("Asset folder has already this name.", "FolderName")); + } + + [Fact] + public void CanRename_should_not_throw_exception_if_names_are_different() + { + var command = new RenameAssetFolder { FolderName = "New Folder Name" }; + + GuardAssetFolder.CanRename(command, "My Folder"); + } + + [Fact] + public void CanDelete_should_not_throw_exception() + { + var command = new DeleteAssetFolder(); + + GuardAssetFolder.CanDelete(command); + } + + private IAssetFolderEntity CreateFolder(Guid id = default) + { + var assetFolder = A.Fake(); + + A.CallTo(() => assetFolder.Id).Returns(id); + + return assetFolder; + } + } +} diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Guards/GuardAssetTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Guards/GuardAssetTests.cs index 94e23930a..a343212ab 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Guards/GuardAssetTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Guards/GuardAssetTests.cs @@ -5,6 +5,10 @@ // All rights reserved. Licensed under the MIT license. // ========================================================================== +using System; +using System.Collections.Generic; +using System.Threading.Tasks; +using FakeItEasy; using Squidex.Domain.Apps.Entities.Assets.Commands; using Squidex.Domain.Apps.Entities.TestHelpers; using Squidex.Infrastructure.Validation; @@ -14,6 +18,79 @@ namespace Squidex.Domain.Apps.Entities.Assets.Guards { public class GuardAssetTests { + private readonly IAssetQueryService assetQuery = A.Fake(); + + [Fact] + public async Task CanCreate_should_not_throw_exception_when_folder_found() + { + var command = new CreateAsset { ParentId = Guid.NewGuid() }; + + A.CallTo(() => assetQuery.FindAssetFolderAsync(command.ParentId)) + .Returns(new List { CreateFolder() }); + + await GuardAsset.CanCreate(command, assetQuery); + } + + [Fact] + public async Task CanCreate_should_throw_exception_when_folder_not_found() + { + var command = new CreateAsset { ParentId = Guid.NewGuid() }; + + A.CallTo(() => assetQuery.FindAssetFolderAsync(command.ParentId)) + .Returns(new List()); + + await ValidationAssert.ThrowsAsync(() => GuardAsset.CanCreate(command, assetQuery), + new ValidationError("Asset folder does not exist.", "ParentId")); + } + + [Fact] + public async Task CanCreate_should_not_throw_exception_when_added_to_root() + { + var command = new CreateAsset(); + + await GuardAsset.CanCreate(command, assetQuery); + } + + [Fact] + public async Task CanMove_should_throw_exception_when_folder_not_found() + { + var command = new MoveAsset { ParentId = Guid.NewGuid() }; + + A.CallTo(() => assetQuery.FindAssetFolderAsync(command.ParentId)) + .Returns(new List()); + + await ValidationAssert.ThrowsAsync(() => GuardAsset.CanMove(command, assetQuery, Guid.NewGuid()), + new ValidationError("Asset folder does not exist.", "ParentId")); + } + + [Fact] + public async Task CanMove_should_throw_exception_when_folder_has_not_changed() + { + var command = new MoveAsset { ParentId = Guid.NewGuid() }; + + await ValidationAssert.ThrowsAsync(() => GuardAsset.CanMove(command, assetQuery, command.ParentId), + new ValidationError("Asset is already part of this folder.", "ParentId")); + } + + [Fact] + public async Task CanMove_should_not_throw_exception_when_folder_found() + { + var command = new MoveAsset { ParentId = Guid.NewGuid() }; + + A.CallTo(() => assetQuery.FindAssetFolderAsync(command.ParentId)) + .Returns(new List { CreateFolder() }); + + await GuardAsset.CanMove(command, assetQuery, Guid.NewGuid()); + } + + [Fact] + public async Task CanMove_should_not_throw_exception_when_added_to_root() + { + var command = new MoveAsset(); + + await GuardAsset.CanMove(command, assetQuery, Guid.NewGuid()); + } + [Fact] public void CanAnnotate_should_throw_exception_if_nothing_defined() { @@ -31,14 +108,6 @@ namespace Squidex.Domain.Apps.Entities.Assets.Guards GuardAsset.CanAnnotate(command, "asset-name", "asset-slug"); } - [Fact] - public void CanCreate_should_not_throw_exception() - { - var command = new CreateAsset(); - - GuardAsset.CanCreate(command); - } - [Fact] public void CanUpdate_should_not_throw_exception() { @@ -54,5 +123,14 @@ namespace Squidex.Domain.Apps.Entities.Assets.Guards GuardAsset.CanDelete(command); } + + private IAssetFolderEntity CreateFolder(Guid id = default) + { + var assetFolder = A.Fake(); + + A.CallTo(() => assetFolder.Id).Returns(id); + + return assetFolder; + } } } diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Queries/AssetQueryServiceTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Queries/AssetQueryServiceTests.cs index f804851c7..a210ec60b 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Queries/AssetQueryServiceTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/Queries/AssetQueryServiceTests.cs @@ -22,6 +22,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries { private readonly IAssetEnricher assetEnricher = A.Fake(); private readonly IAssetRepository assetRepository = A.Fake(); + private readonly IAssetFolderRepository assetFolderRepository = A.Fake(); private readonly NamedId appId = NamedId.Of(Guid.NewGuid(), "my-app"); private readonly Context requestContext; private readonly AssetQueryParser queryParser = A.Fake(); @@ -34,7 +35,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries A.CallTo(() => queryParser.ParseQuery(requestContext, A.Ignored)) .Returns(new ClrQuery()); - sut = new AssetQueryService(assetEnricher, assetRepository, queryParser); + sut = new AssetQueryService(assetEnricher, assetRepository, assetFolderRepository, queryParser); } [Fact] @@ -44,7 +45,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries var enriched = new AssetEntity(); - A.CallTo(() => assetRepository.FindAssetAsync(found.Id, false)) + A.CallTo(() => assetRepository.FindAssetAsync(found.Id)) .Returns(found); A.CallTo(() => assetEnricher.EnrichAsync(found, requestContext)) @@ -90,7 +91,7 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries A.CallTo(() => assetEnricher.EnrichAsync(A>.That.IsSameSequenceAs(found1, found2), requestContext)) .Returns(new List { enriched1, enriched2 }); - var result = await sut.QueryAsync(requestContext, Q.Empty.WithIds(ids)); + var result = await sut.QueryAsync(requestContext, null, Q.Empty.WithIds(ids)); Assert.Equal(8, result.Total); @@ -106,17 +107,136 @@ namespace Squidex.Domain.Apps.Entities.Assets.Queries var enriched1 = new AssetEntity(); var enriched2 = new AssetEntity(); - A.CallTo(() => assetRepository.QueryAsync(appId.Id, A.Ignored)) + var parentId = Guid.NewGuid(); + + A.CallTo(() => assetRepository.QueryAsync(appId.Id, parentId, A.Ignored)) .Returns(ResultList.CreateFrom(8, found1, found2)); A.CallTo(() => assetEnricher.EnrichAsync(A>.That.IsSameSequenceAs(found1, found2), requestContext)) .Returns(new List { enriched1, enriched2 }); - var result = await sut.QueryAsync(requestContext, Q.Empty); + var result = await sut.QueryAsync(requestContext, parentId, Q.Empty); Assert.Equal(8, result.Total); Assert.Equal(new[] { enriched1, enriched2 }, result.ToArray()); } + + [Fact] + public async Task Should_load_assets_folders_from_repository() + { + var parentId = Guid.NewGuid(); + + var assetFolders = ResultList.CreateFrom(10); + + A.CallTo(() => assetFolderRepository.QueryAsync(appId.Id, parentId)) + .Returns(assetFolders); + + var result = await sut.QueryAssetFoldersAsync(requestContext, parentId); + + Assert.Same(assetFolders, result); + } + + [Fact] + public async Task Should_resolve_folder_path_from_root() + { + var folderId1 = Guid.NewGuid(); + var folder1 = CreateFolder(folderId1); + + A.CallTo(() => assetFolderRepository.FindAssetFolderAsync(folderId1)) + .Returns(folder1); + + var result = await sut.FindAssetFolderAsync(folderId1); + + Assert.Equal(result, new[] { folder1 }); + } + + [Fact] + public async Task Should_resolve_folder_path_from_child() + { + var folderId1 = Guid.NewGuid(); + var folderId2 = Guid.NewGuid(); + var folderId3 = Guid.NewGuid(); + + var folder1 = CreateFolder(folderId1); + var folder2 = CreateFolder(folderId2, folderId1); + var folder3 = CreateFolder(folderId3, folderId2); + + A.CallTo(() => assetFolderRepository.FindAssetFolderAsync(folderId1)) + .Returns(folder1); + + A.CallTo(() => assetFolderRepository.FindAssetFolderAsync(folderId2)) + .Returns(folder2); + + A.CallTo(() => assetFolderRepository.FindAssetFolderAsync(folderId3)) + .Returns(folder3); + + var result = await sut.FindAssetFolderAsync(folderId3); + + Assert.Equal(result, new[] { folder1, folder2, folder3 }); + } + + [Fact] + public async Task Should_not_resolve_folder_path_if_root_not_found() + { + var folderId1 = Guid.NewGuid(); + + A.CallTo(() => assetFolderRepository.FindAssetFolderAsync(folderId1)) + .Returns(Task.FromResult(null)); + + var result = await sut.FindAssetFolderAsync(folderId1); + + Assert.Empty(result); + } + + [Fact] + public async Task Should_not_resolve_folder_path_if_parent_of_child_not_found() + { + var folderId1 = Guid.NewGuid(); + var folderId2 = Guid.NewGuid(); + + var folder1 = CreateFolder(folderId1); + var folder2 = CreateFolder(folderId2, folderId1); + + A.CallTo(() => assetFolderRepository.FindAssetFolderAsync(folderId1)) + .Returns(Task.FromResult(null)); + + A.CallTo(() => assetFolderRepository.FindAssetFolderAsync(folderId2)) + .Returns(folder2); + + var result = await sut.FindAssetFolderAsync(folderId2); + + Assert.Empty(result); + } + + [Fact] + public async Task Should_not_resolve_folder_path_if_recursion_detected() + { + var folderId1 = Guid.NewGuid(); + var folderId2 = Guid.NewGuid(); + + var folder1 = CreateFolder(folderId1, folderId2); + var folder2 = CreateFolder(folderId2, folderId1); + + A.CallTo(() => assetFolderRepository.FindAssetFolderAsync(folderId1)) + .Returns(Task.FromResult(null)); + + A.CallTo(() => assetFolderRepository.FindAssetFolderAsync(folderId2)) + .Returns(folder2); + + var result = await sut.FindAssetFolderAsync(folderId2); + + Assert.Empty(result); + } + + private IAssetFolderEntity CreateFolder(Guid id, Guid parentId = default) + { + var assetFolder = A.Fake(); + + A.CallTo(() => assetFolder.Id).Returns(id); + A.CallTo(() => assetFolder.ParentId).Returns(parentId); + + return assetFolder; + } } } \ No newline at end of file diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs index 1fba7f791..73efc9fc5 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/GraphQL/GraphQLQueriesTests.cs @@ -155,7 +155,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL var asset = CreateAsset(Guid.NewGuid()); - A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), A.That.Matches(x => x.ODataQuery == "?$top=30&$skip=5&$filter=my-query"))) + A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), null, A.That.Matches(x => x.ODataQuery == "?$top=30&$skip=5&$filter=my-query"))) .Returns(ResultList.CreateFrom(0, asset)); var result = await sut.QueryAsync(requestContext, new GraphQLQuery { Query = query }); @@ -228,7 +228,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL var asset = CreateAsset(Guid.NewGuid()); - A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), A.That.Matches(x => x.ODataQuery == "?$top=30&$skip=5&$filter=my-query"))) + A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), null, A.That.Matches(x => x.ODataQuery == "?$top=30&$skip=5&$filter=my-query"))) .Returns(ResultList.CreateFrom(10, asset)); var result = await sut.QueryAsync(requestContext, new GraphQLQuery { Query = query }); @@ -284,7 +284,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL } }".Replace("", assetId.ToString()); - A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), MatchIdQuery(assetId))) + A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), null, MatchIdQuery(assetId))) .Returns(ResultList.CreateFrom(1)); var result = await sut.QueryAsync(requestContext, new GraphQLQuery { Query = query }); @@ -331,7 +331,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL } }".Replace("", assetId.ToString()); - A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), MatchIdQuery(assetId))) + A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), null, MatchIdQuery(assetId))) .Returns(ResultList.CreateFrom(1, asset)); var result = await sut.QueryAsync(requestContext, new GraphQLQuery { Query = query }); @@ -1131,7 +1131,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL A.CallTo(() => contentQuery.QueryAsync(MatchsContentContext(), MatchId(contentId))) .Returns(ResultList.CreateFrom(1, content)); - A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), A.Ignored)) + A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), null, A.Ignored)) .Returns(ResultList.CreateFrom(0, assetRef)); var result = await sut.QueryAsync(requestContext, new GraphQLQuery { Query = query }); @@ -1184,10 +1184,10 @@ namespace Squidex.Domain.Apps.Entities.Contents.GraphQL } }".Replace("", assetId2.ToString()); - A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), MatchIdQuery(assetId1))) + A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), null, MatchIdQuery(assetId1))) .Returns(ResultList.CreateFrom(0, asset1)); - A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), MatchIdQuery(assetId2))) + A.CallTo(() => assetQuery.QueryAsync(MatchsAssetContext(), null, MatchIdQuery(assetId2))) .Returns(ResultList.CreateFrom(0, asset2)); var result = await sut.QueryAsync(requestContext, new GraphQLQuery { Query = query1 }, new GraphQLQuery { Query = query2 }); diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentEnricherAssetsTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentEnricherAssetsTests.cs index f51336474..7333491dc 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentEnricherAssetsTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Queries/ContentEnricherAssetsTests.cs @@ -87,7 +87,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries new[] { document2.Id, image2.Id }) }; - A.CallTo(() => assetQuery.QueryAsync(A.That.Matches(x => x.IsNoAssetEnrichment()), A.That.Matches(x => x.Ids.Count == 4))) + A.CallTo(() => assetQuery.QueryAsync(A.That.Matches(x => x.IsNoAssetEnrichment()), null, A.That.Matches(x => x.Ids.Count == 4))) .Returns(ResultList.CreateFrom(4, image1, image2, document1, document2)); var enriched = await sut.EnrichAsync(source, requestContext); @@ -122,7 +122,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries new[] { document2.Id, image2.Id }) }; - A.CallTo(() => assetQuery.QueryAsync(A.That.Matches(x => x.IsNoAssetEnrichment()), A.That.Matches(x => x.Ids.Count == 4))) + A.CallTo(() => assetQuery.QueryAsync(A.That.Matches(x => x.IsNoAssetEnrichment()), null, A.That.Matches(x => x.Ids.Count == 4))) .Returns(ResultList.CreateFrom(4, image1, image2, document1, document2)); var enriched = await sut.EnrichAsync(source, requestContext); @@ -160,7 +160,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries Assert.Null(enriched.ElementAt(0).ReferenceData); - A.CallTo(() => assetQuery.QueryAsync(A.Ignored, A.Ignored)) + A.CallTo(() => assetQuery.QueryAsync(A.Ignored, null, A.Ignored)) .MustNotHaveHappened(); } @@ -176,7 +176,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries Assert.Null(enriched.ElementAt(0).ReferenceData); - A.CallTo(() => assetQuery.QueryAsync(A.Ignored, A.Ignored)) + A.CallTo(() => assetQuery.QueryAsync(A.Ignored, null, A.Ignored)) .MustNotHaveHappened(); } @@ -192,7 +192,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries Assert.NotNull(enriched.ElementAt(0).ReferenceData); - A.CallTo(() => assetQuery.QueryAsync(A.Ignored, A.Ignored)) + A.CallTo(() => assetQuery.QueryAsync(A.Ignored, null, A.Ignored)) .MustNotHaveHappened(); } @@ -203,7 +203,7 @@ namespace Squidex.Domain.Apps.Entities.Contents.Queries await sut.EnrichAsync(source, requestContext); - A.CallTo(() => assetQuery.QueryAsync(A.Ignored, A.Ignored)) + A.CallTo(() => assetQuery.QueryAsync(A.Ignored, null, A.Ignored)) .MustNotHaveHappened(); } diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleGrainTests.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleGrainTests.cs index 8a1fb7211..9c8096d98 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleGrainTests.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Rules/RuleGrainTests.cs @@ -15,7 +15,6 @@ using Squidex.Domain.Apps.Entities.Rules.State; using Squidex.Domain.Apps.Entities.TestHelpers; using Squidex.Domain.Apps.Events.Rules; using Squidex.Infrastructure; -using Squidex.Infrastructure.Collections; using Squidex.Infrastructure.Commands; using Squidex.Infrastructure.EventSourcing; using Squidex.Infrastructure.Log; @@ -37,7 +36,7 @@ namespace Squidex.Domain.Apps.Entities.Rules public sealed class TestAction : RuleAction { - public Uri Url { get; set; } + public int Value { get; set; } } public RuleGrainTests() @@ -209,30 +208,16 @@ namespace Squidex.Domain.Apps.Entities.Rules private static CreateRule MakeCreateCommand() { - var newTrigger = new ContentChangedTriggerV2 - { - Schemas = ReadOnlyCollection.Empty() - }; - - var newAction = new TestAction - { - Url = new Uri("https://squidex.io/v2") - }; + var newTrigger = new ManualTrigger(); + var newAction = new TestAction { Value = 123 }; return new CreateRule { Trigger = newTrigger, Action = newAction }; } private static UpdateRule MakeUpdateCommand() { - var newTrigger = new ContentChangedTriggerV2 - { - Schemas = ReadOnlyCollection.Empty() - }; - - var newAction = new TestAction - { - Url = new Uri("https://squidex.io/v2") - }; + var newTrigger = new ManualTrigger(); + var newAction = new TestAction { Value = 123 }; return new UpdateRule { Trigger = newTrigger, Action = newAction, Name = "NewName" }; } diff --git a/backend/tests/Squidex.Infrastructure.Tests/CollectionExtensionsTests.cs b/backend/tests/Squidex.Infrastructure.Tests/CollectionExtensionsTests.cs index 223bb4ffb..7e074b05c 100644 --- a/backend/tests/Squidex.Infrastructure.Tests/CollectionExtensionsTests.cs +++ b/backend/tests/Squidex.Infrastructure.Tests/CollectionExtensionsTests.cs @@ -15,6 +15,34 @@ namespace Squidex.Infrastructure private readonly Dictionary valueDictionary = new Dictionary(); private readonly Dictionary> listDictionary = new Dictionary>(); + [Fact] + public void IndexOf_should_return_index_when_found() + { + var source = new List<(int Value, int Other)> + { + (5, 5), + (4, 4) + }; + + var index = source.IndexOf(x => x.Other == 4); + + Assert.Equal(1, index); + } + + [Fact] + public void IndexOf_should_return_negative_value_when_not_found() + { + var source = new List<(int Value, int Other)> + { + (5, 5), + (4, 4) + }; + + var index = source.IndexOf(x => x.Other == 2); + + Assert.Equal(-1, index); + } + [Fact] public void GetOrDefault_should_return_value_if_key_exists() { diff --git a/frontend/app/app.module.ts b/frontend/app/app.module.ts index 63c98476b..a38224668 100644 --- a/frontend/app/app.module.ts +++ b/frontend/app/app.module.ts @@ -63,7 +63,7 @@ export function configAnalyticsId() { } export function configDecimalSeparator() { - return new DecimalSeparatorConfig('.'); + return new DecimalSeparatorConfig('.'); } export function configCurrency() { diff --git a/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.html b/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.html index f690b1919..2b7033039 100644 --- a/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.html +++ b/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.html @@ -1,6 +1,6 @@ - + Consumers @@ -14,25 +14,33 @@ - - - - - - - - + + +
- Name - - Position - - Actions -
+ + + + + + + +
+ Name + + Position + + Actions +
+ - - - +
+ + + +
+
+ diff --git a/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.ts b/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.ts index cfee6abc9..0de18d12f 100644 --- a/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.ts +++ b/frontend/app/features/administration/pages/event-consumers/event-consumers-page.component.ts @@ -7,7 +7,7 @@ import { Component, OnInit } from '@angular/core'; import { timer } from 'rxjs'; -import { onErrorResumeNext, switchMap } from 'rxjs/operators'; +import { switchMap } from 'rxjs/operators'; import { DialogModel, ResourceOwner } from '@app/shared'; @@ -31,7 +31,7 @@ export class EventConsumersPageComponent extends ResourceOwner implements OnInit public ngOnInit() { this.eventConsumersState.load(); - this.own(timer(5000, 5000).pipe(switchMap(() => this.eventConsumersState.load(true, true)), onErrorResumeNext())); + this.own(timer(5000, 5000).pipe(switchMap(() => this.eventConsumersState.load(false, true)))); } public reload() { diff --git a/frontend/app/features/administration/pages/users/users-page.component.html b/frontend/app/features/administration/pages/users/users-page.component.html index 137d2a271..72feb75c1 100644 --- a/frontend/app/features/administration/pages/users/users-page.component.html +++ b/frontend/app/features/administration/pages/users/users-page.component.html @@ -1,6 +1,6 @@ - + Users @@ -27,40 +27,40 @@ -
- - - - - - - - - -
-   - - Name - - Email - - Actions -
-
- -
-
- + + +
+ + + + + + + + +
+   + + Name + + Email + + Actions +
+ + +
+
-
- -
- -
+ + + + + diff --git a/frontend/app/features/administration/state/event-consumers.state.spec.ts b/frontend/app/features/administration/state/event-consumers.state.spec.ts index 9849635be..82123f410 100644 --- a/frontend/app/features/administration/state/event-consumers.state.spec.ts +++ b/frontend/app/features/administration/state/event-consumers.state.spec.ts @@ -44,10 +44,20 @@ describe('EventConsumersState', () => { expect(eventConsumersState.snapshot.eventConsumers).toEqual([eventConsumer1, eventConsumer2]); expect(eventConsumersState.snapshot.isLoaded).toBeTruthy(); + expect(eventConsumersState.snapshot.isLoading).toBeFalsy(); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); + it('should reset loading when loading failed', () => { + eventConsumersService.setup(x => x.getEventConsumers()) + .returns(() => throwError('error')); + + eventConsumersState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(eventConsumersState.snapshot.isLoading).toBeFalsy(); + }); + it('should show notification on load when reload is true', () => { eventConsumersService.setup(x => x.getEventConsumers()) .returns(() => of(new EventConsumersDto([eventConsumer1, eventConsumer2]))).verifiable(); diff --git a/frontend/app/features/administration/state/event-consumers.state.ts b/frontend/app/features/administration/state/event-consumers.state.ts index 4d5668fa8..ceefabeb5 100644 --- a/frontend/app/features/administration/state/event-consumers.state.ts +++ b/frontend/app/features/administration/state/event-consumers.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; +import { finalize, tap } from 'rxjs/operators'; import { DialogService, @@ -23,6 +23,9 @@ interface Snapshot { // Indicates if event consumers are loaded. isLoaded?: boolean; + + // Indicates if event consumers are loading. + isLoading?: boolean; } type EventConsumersList = ReadonlyArray; @@ -35,6 +38,9 @@ export class EventConsumersState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + constructor( private readonly dialogs: DialogService, private readonly eventConsumersService: EventConsumersService @@ -43,20 +49,33 @@ export class EventConsumersState extends State { } public load(isReload = false, silent = false): Observable { - if (!isReload) { + if (isReload && !silent) { this.resetState(); } + return this.loadInternal(isReload, silent); + } + + private loadInternal(isReload: boolean, silent: boolean): Observable { + if (!silent) { + this.next({ isLoading: true }); + } + return this.eventConsumersService.getEventConsumers().pipe( tap(({ items: eventConsumers }) => { if (isReload && !silent) { this.dialogs.notifyInfo('Event Consumers reloaded.'); } - this.next(s => { - return { ...s, eventConsumers, isLoaded: true }; + this.next({ + eventConsumers, + isLoaded: true, + isLoading: false }); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareSubscribed(this.dialogs, { silent })); } diff --git a/frontend/app/features/administration/state/users.state.spec.ts b/frontend/app/features/administration/state/users.state.spec.ts index 4ded26b20..c66ef5e87 100644 --- a/frontend/app/features/administration/state/users.state.spec.ts +++ b/frontend/app/features/administration/state/users.state.spec.ts @@ -6,6 +6,7 @@ */ import { of, throwError } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -57,13 +58,23 @@ describe('UsersState', () => { usersState.load().subscribe(); + expect(usersState.snapshot.isLoaded).toBeTruthy(); + expect(usersState.snapshot.isLoading).toBeFalsy(); expect(usersState.snapshot.users).toEqual([user1, user2]); expect(usersState.snapshot.usersPager.numberOfItems).toEqual(200); - expect(usersState.snapshot.isLoaded).toBeTruthy(); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); + it('should reset loading when loading failed', () => { + usersService.setup(x => x.getUsers(10, 0, undefined)) + .returns(() => throwError('error')); + + usersState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(usersState.snapshot.isLoading).toBeFalsy(); + }); + it('should load page size from local store', () => { localStore.setup(x => x.getInt('users.pageSize', 10)) .returns(() => 25); diff --git a/frontend/app/features/administration/state/users.state.ts b/frontend/app/features/administration/state/users.state.ts index 077a39851..224ced34f 100644 --- a/frontend/app/features/administration/state/users.state.ts +++ b/frontend/app/features/administration/state/users.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { Observable, of } from 'rxjs'; -import { catchError, tap } from 'rxjs/operators'; +import { catchError, finalize, tap } from 'rxjs/operators'; import '@app/framework/utils/rxjs-extensions'; @@ -39,6 +39,9 @@ interface Snapshot { // Indicates if the users are loaded. isLoaded?: boolean; + // Indicates if the users are loading. + isLoading?: boolean; + // The selected user. selectedUser?: UserDto | null; @@ -63,6 +66,9 @@ export class UsersState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + public canCreate = this.project(x => x.canCreate === true); @@ -105,15 +111,17 @@ export class UsersState extends State { public load(isReload = false): Observable { if (!isReload) { - const selectedUser = this.snapshot.selectedUser; + const usersPager = this.snapshot.usersPager.reset(); - this.resetState({ selectedUser }); + this.resetState({ usersPager, selectedUser: this.snapshot.selectedUser }); } return this.loadInternal(isReload); } - private loadInternal(isReload = false): Observable { + private loadInternal(isReload: boolean): Observable { + this.next({ isLoading: true }); + return this.usersService.getUsers( this.snapshot.usersPager.pageSize, this.snapshot.usersPager.skip, @@ -135,12 +143,16 @@ export class UsersState extends State { return { ...s, canCreate, isLoaded: true, + isLoading: false, selectedUser, users, usersPager }; }); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareSubscribed(this.dialogs)); } @@ -184,13 +196,13 @@ export class UsersState extends State { public search(query: string): Observable { this.next(s => ({ ...s, usersPager: s.usersPager.reset(), usersQuery: query })); - return this.loadInternal(); + return this.loadInternal(false); } public setPager(usersPager: Pager) { - this.next(s => ({ ...s, usersPager })); + this.next({ usersPager }); - return this.loadInternal(); + return this.loadInternal(false); } private replaceUser(user: UserDto) { diff --git a/frontend/app/features/apps/pages/apps-page.component.html b/frontend/app/features/apps/pages/apps-page.component.html index a8f1e9631..2a267d86e 100644 --- a/frontend/app/features/apps/pages/apps-page.component.html +++ b/frontend/app/features/apps/pages/apps-page.component.html @@ -48,7 +48,7 @@
- +

New App

@@ -62,7 +62,7 @@
- +

New Blog Sample

@@ -79,7 +79,7 @@
- +

New Profile Sample

@@ -96,7 +96,7 @@
- +

New Identity App

diff --git a/frontend/app/features/apps/pages/apps-page.component.scss b/frontend/app/features/apps/pages/apps-page.component.scss index 5776d6080..02998e6a5 100644 --- a/frontend/app/features/apps/pages/apps-page.component.scss +++ b/frontend/app/features/apps/pages/apps-page.component.scss @@ -105,6 +105,12 @@ } } +.card-image { + img { + height: 6rem; + } +} + .info { color: $color-border-dark; padding: 2rem; diff --git a/frontend/app/features/assets/pages/assets-page.component.html b/frontend/app/features/assets/pages/assets-page.component.html index 82a1b2527..f9d930107 100644 --- a/frontend/app/features/assets/pages/assets-page.component.html +++ b/frontend/app/features/assets/pages/assets-page.component.html @@ -1,6 +1,6 @@ - + Assets @@ -44,11 +44,32 @@
+
+ + + +
- + + + + + + +
+ +
+ + + + + @@ -60,4 +81,10 @@ + + + + + diff --git a/frontend/app/features/assets/pages/assets-page.component.scss b/frontend/app/features/assets/pages/assets-page.component.scss index 98574b085..d615d5710 100644 --- a/frontend/app/features/assets/pages/assets-page.component.scss +++ b/frontend/app/features/assets/pages/assets-page.component.scss @@ -22,4 +22,13 @@ } } } +} + +.grid-header { + padding-left: 1rem; +} + +.grid-content { + padding-top: 1rem; + padding-bottom: 1rem; } \ No newline at end of file diff --git a/frontend/app/features/assets/pages/assets-page.component.ts b/frontend/app/features/assets/pages/assets-page.component.ts index eba5a29d4..ee7824fc3 100644 --- a/frontend/app/features/assets/pages/assets-page.component.ts +++ b/frontend/app/features/assets/pages/assets-page.component.ts @@ -10,6 +10,7 @@ import { FormControl } from '@angular/forms'; import { AssetsState, + DialogModel, LocalStoreService, Queries, Query, @@ -27,6 +28,8 @@ export class AssetsPageComponent extends ResourceOwner implements OnInit { public queries = new Queries(this.uiState, 'assets'); + public addAssetFolderDialog = new DialogModel(); + public isListView: boolean; constructor( diff --git a/frontend/app/features/content/pages/contents/contents-page.component.html b/frontend/app/features/content/pages/contents/contents-page.component.html index 26c62f71b..bb6676758 100644 --- a/frontend/app/features/content/pages/contents/contents-page.component.html +++ b/frontend/app/features/content/pages/contents/contents-page.component.html @@ -1,6 +1,6 @@ - + Contents @@ -38,71 +38,75 @@ -
- - - - - - - - -
- - - Actions - - - -
-
- -
- {{selectionCount}} items selected   - - - - -
+ + +
+ {{selectionCount}} items selected   + + + + +
+ -
-
- - - + +
+ + + + + + +
+ + + Actions + + + +
-
-
+ -
- -
+ +
+ + + +
+
+ + + + + + diff --git a/frontend/app/features/content/pages/contents/contents-page.component.scss b/frontend/app/features/content/pages/contents/contents-page.component.scss index 37ec92dda..2f1b55277 100644 --- a/frontend/app/features/content/pages/contents/contents-page.component.scss +++ b/frontend/app/features/content/pages/contents/contents-page.component.scss @@ -18,12 +18,6 @@ min-width: 100%; } -.grid-content { - overflow-y: auto; - overflow-x: auto; - padding-right: 0; -} - .icon-plus { font-size: .8rem; } diff --git a/frontend/app/features/content/shared/assets-editor.component.html b/frontend/app/features/content/shared/assets-editor.component.html index 71bc882ea..f4bb6a22f 100644 --- a/frontend/app/features/content/shared/assets-editor.component.html +++ b/frontend/app/features/content/shared/assets-editor.component.html @@ -22,7 +22,7 @@
- @@ -35,7 +35,7 @@
- diff --git a/frontend/app/features/content/shared/content-list-cell.directive.ts b/frontend/app/features/content/shared/content-list-cell.directive.ts index 77f150f12..1f0d46de4 100644 --- a/frontend/app/features/content/shared/content-list-cell.directive.ts +++ b/frontend/app/features/content/shared/content-list-cell.directive.ts @@ -68,7 +68,7 @@ export class ContentListWidthPipe implements PipeTransform { return 0; } - return `${getTableWidth(value.referenceFields) + 100}px`; + return `${getTableWidth(value.listFields) + 100}px`; } } diff --git a/frontend/app/features/content/shared/contents-selector.component.html b/frontend/app/features/content/shared/contents-selector.component.html index 799a9627f..9f36cd230 100644 --- a/frontend/app/features/content/shared/contents-selector.component.html +++ b/frontend/app/features/content/shared/contents-selector.component.html @@ -1,4 +1,4 @@ - +
@@ -38,47 +38,49 @@ -
- - - - - - - - -
- - - - - - -
-
- -
-
- - - + + +
+ + + + + + +
+ + + + + + +
-
-
- -
- -
+ + + +
+ + + +
+
+ + + + + + diff --git a/frontend/app/features/dashboard/pages/dashboard-page.component.html b/frontend/app/features/dashboard/pages/dashboard-page.component.html index 64462fa58..a222cf389 100644 --- a/frontend/app/features/dashboard/pages/dashboard-page.component.html +++ b/frontend/app/features/dashboard/pages/dashboard-page.component.html @@ -15,7 +15,7 @@
- +

New Schema

@@ -29,7 +29,7 @@
- +

API Documentation

@@ -43,7 +43,7 @@
- +

Feedback & Support

@@ -57,7 +57,7 @@
- +

Github

diff --git a/frontend/app/features/dashboard/pages/dashboard-page.component.scss b/frontend/app/features/dashboard/pages/dashboard-page.component.scss index 33106b62d..1b5d18fe4 100644 --- a/frontend/app/features/dashboard/pages/dashboard-page.component.scss +++ b/frontend/app/features/dashboard/pages/dashboard-page.component.scss @@ -30,6 +30,12 @@ } } +.card-image { + img { + height: 5rem; + } +} + .card { & { margin-right: 1rem; diff --git a/frontend/app/features/rules/pages/events/rule-events-page.component.html b/frontend/app/features/rules/pages/events/rule-events-page.component.html index f40dcd544..0f3a847e1 100644 --- a/frontend/app/features/rules/pages/events/rule-events-page.component.html +++ b/frontend/app/features/rules/pages/events/rule-events-page.component.html @@ -1,6 +1,6 @@ - + Events @@ -14,83 +14,87 @@ - - - - - - - - - - + + +
- Status - - Event - - Description - - Created -
+ + + + + + + + + - - - - - - - - - - + + + + + + + + + - - - -
+ Status + + Event + + Description + + Created +
- {{event.jobResult}} - - {{event.eventName}} - - {{event.description}} - - {{event.created | sqxFromNow}} - - -
-
-

Last Invocation

-
- -
-
- {{event.result}} -
-
- Attempts: {{event.numCalls}} -
-
- Next: {{event.nextAttempt | sqxFromNow}} -
-
-
+ {{event.jobResult}} + + {{event.eventName}} + + {{event.description}} + + {{event.created | sqxFromNow}} + + +
+
+

Last Invocation

+
+ +
+
+ {{event.result}} +
+
+ Attempts: {{event.numCalls}} +
+
+ Next: {{event.nextAttempt | sqxFromNow}} +
+
+ - -
-
-
-
- -
-
-
+ +
+
+
+
+ +
+
+ + + + + - + + + diff --git a/frontend/app/features/rules/pages/rules/rules-page.component.html b/frontend/app/features/rules/pages/rules/rules-page.component.html index f7ab095ad..ef97afaa6 100644 --- a/frontend/app/features/rules/pages/rules/rules-page.component.html +++ b/frontend/app/features/rules/pages/rules/rules-page.component.html @@ -1,6 +1,6 @@ - + Rules @@ -22,38 +22,42 @@ - -
- No rule created yet. - - + +
+ +
+ No rule created yet. + + +
+ + + + +
+ + + + + +
- - - - -
- - - - - - + diff --git a/frontend/app/features/rules/pages/rules/rules-page.component.ts b/frontend/app/features/rules/pages/rules/rules-page.component.ts index 7418562e5..2f3f66e0d 100644 --- a/frontend/app/features/rules/pages/rules/rules-page.component.ts +++ b/frontend/app/features/rules/pages/rules/rules-page.component.ts @@ -46,7 +46,7 @@ export class RulesPageComponent implements OnInit { this.ruleActions = actions; }); - this.schemasState.load(); + this.schemasState.loadIfNotLoaded(); } public reload() { diff --git a/frontend/app/features/schemas/pages/schema/schema-edit-form.component.ts b/frontend/app/features/schemas/pages/schema/schema-edit-form.component.ts index 65bdfa976..e1cfd177d 100644 --- a/frontend/app/features/schemas/pages/schema/schema-edit-form.component.ts +++ b/frontend/app/features/schemas/pages/schema/schema-edit-form.component.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { Component, Input, OnInit } from '@angular/core'; +import { Component, Input, OnChanges } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { @@ -20,7 +20,7 @@ import { styleUrls: ['./schema-edit-form.component.scss'], templateUrl: './schema-edit-form.component.html' }) -export class SchemaEditFormComponent implements OnInit { +export class SchemaEditFormComponent implements OnChanges { public readonly standalone = { standalone: true }; @Input() @@ -37,7 +37,7 @@ export class SchemaEditFormComponent implements OnInit { ) { } - public ngOnInit() { + public ngOnChanges() { this.isEditable = this.schema.canUpdate; this.editForm.load(this.schema.properties); diff --git a/frontend/app/features/schemas/pages/schema/schema-page.component.html b/frontend/app/features/schemas/pages/schema/schema-page.component.html index 888a7863f..dc2def78b 100644 --- a/frontend/app/features/schemas/pages/schema/schema-page.component.html +++ b/frontend/app/features/schemas/pages/schema/schema-page.component.html @@ -1,6 +1,6 @@ - +
  • diff --git a/frontend/app/features/settings/pages/backups/backups-page.component.html b/frontend/app/features/settings/pages/backups/backups-page.component.html index b0c33d067..b617fa8f9 100644 --- a/frontend/app/features/settings/pages/backups/backups-page.component.html +++ b/frontend/app/features/settings/pages/backups/backups-page.component.html @@ -1,6 +1,6 @@ - + Backups @@ -18,22 +18,30 @@ - -
    - Your have reached the maximum number of backups: 10. -
    - -
    - No backups created yet. - - -
    - - - + + + +
    + Your have reached the maximum number of backups: 10. +
    +     + +
    + +
    + No backups created yet. + + +
    + + + +     +
    +     diff --git a/frontend/app/features/settings/pages/backups/backups-page.component.ts b/frontend/app/features/settings/pages/backups/backups-page.component.ts index 96299f082..81c173e16 100644 --- a/frontend/app/features/settings/pages/backups/backups-page.component.ts +++ b/frontend/app/features/settings/pages/backups/backups-page.component.ts @@ -7,7 +7,7 @@ import { Component, OnInit } from '@angular/core'; import { timer } from 'rxjs'; -import { onErrorResumeNext, switchMap } from 'rxjs/operators'; +import { switchMap } from 'rxjs/operators'; import { ApiUrlConfig, @@ -32,9 +32,7 @@ export class BackupsPageComponent extends ResourceOwner implements OnInit { public ngOnInit() { this.backupsState.load(); - this.own( - timer(3000, 3000).pipe(switchMap(() => this.backupsState.load(true, true).pipe(onErrorResumeNext()))) - .subscribe()); + this.own(timer(3000, 3000).pipe(switchMap(() => this.backupsState.load(false, true)))); } public reload() { diff --git a/frontend/app/features/settings/pages/clients/clients-page.component.html b/frontend/app/features/settings/pages/clients/clients-page.component.html index 66c811cbb..58292802f 100644 --- a/frontend/app/features/settings/pages/clients/clients-page.component.html +++ b/frontend/app/features/settings/pages/clients/clients-page.component.html @@ -1,6 +1,6 @@ - + Clients @@ -14,20 +14,24 @@     - -
    - No client created yet. -
    + +
    + +
    + No client created yet. +
    + + + + + - - - - - - -     + + +
    +     diff --git a/frontend/app/features/settings/pages/contributors/contributors-page.component.html b/frontend/app/features/settings/pages/contributors/contributors-page.component.html index 26596660e..a98d561fc 100644 --- a/frontend/app/features/settings/pages/contributors/contributors-page.component.html +++ b/frontend/app/features/settings/pages/contributors/contributors-page.component.html @@ -1,6 +1,6 @@ - + Contributors @@ -21,8 +21,8 @@ - - + +
    @@ -34,15 +34,17 @@ [roles]="roles"> - -
    +
    + + Big team? Add many contributors at once + +
    + + -
    - - Big team? Add many contributors at once - -
    - +
    + +
    - -     - +
    No contributors found.
    -
    + +
    + + + - + diff --git a/frontend/app/features/settings/pages/contributors/contributors-page.component.scss b/frontend/app/features/settings/pages/contributors/contributors-page.component.scss index 9795c0ac2..bb69890d6 100644 --- a/frontend/app/features/settings/pages/contributors/contributors-page.component.scss +++ b/frontend/app/features/settings/pages/contributors/contributors-page.component.scss @@ -2,9 +2,5 @@ @import '_mixins'; .import-hint { - margin-bottom: 1rem; -} - -.panel-alert { - margin: 0; + padding-right: $panel-padding; } \ No newline at end of file diff --git a/frontend/app/features/settings/pages/languages/languages-page.component.html b/frontend/app/features/settings/pages/languages/languages-page.component.html index 094c01250..d0f4387cf 100644 --- a/frontend/app/features/settings/pages/languages/languages-page.component.html +++ b/frontend/app/features/settings/pages/languages/languages-page.component.html @@ -1,6 +1,6 @@ - + Languages @@ -14,17 +14,21 @@ - - - - - - - + +
    + + + + + + + +
    +     diff --git a/frontend/app/features/settings/pages/patterns/patterns-page.component.html b/frontend/app/features/settings/pages/patterns/patterns-page.component.html index bdb21c3b4..1c181e72c 100644 --- a/frontend/app/features/settings/pages/patterns/patterns-page.component.html +++ b/frontend/app/features/settings/pages/patterns/patterns-page.component.html @@ -1,6 +1,6 @@  - + Patterns @@ -14,17 +14,21 @@ - -
    - No pattern created yet. + +
    + +
    + No pattern created yet. +
    + + + + + +
    - - - - - - +     diff --git a/frontend/app/features/settings/pages/plans/plans-page.component.html b/frontend/app/features/settings/pages/plans/plans-page.component.html index fffdf96e3..899071774 100644 --- a/frontend/app/features/settings/pages/plans/plans-page.component.html +++ b/frontend/app/features/settings/pages/plans/plans-page.component.html @@ -14,25 +14,33 @@ - -
    - You have not created the subscription. Therefore you cannot change the plan. + + + +
    + You have not created the subscription. Therefore you cannot change the plan. +
    +     +     + +
    + +
    + No plan configured, this app has unlimited usage. +
    + +
    + + +
    + +
    + Go to Billing Portal for payment history and subscription overview. +
    +
    - -
    - No plan configured, this app has unlimited usage. -
    - -
    - - -
    - -
    - Go to Billing Portal for payment history and subscription overview. -
    - +     diff --git a/frontend/app/features/settings/pages/roles/roles-page.component.html b/frontend/app/features/settings/pages/roles/roles-page.component.html index 831933202..9361b7ef0 100644 --- a/frontend/app/features/settings/pages/roles/roles-page.component.html +++ b/frontend/app/features/settings/pages/roles/roles-page.component.html @@ -1,6 +1,6 @@ - + Roles @@ -14,11 +14,15 @@ - - - - - + +
    + + + + + +
    +     diff --git a/frontend/app/features/settings/pages/workflows/workflows-page.component.html b/frontend/app/features/settings/pages/workflows/workflows-page.component.html index 7302384a9..14d93de7c 100644 --- a/frontend/app/features/settings/pages/workflows/workflows-page.component.html +++ b/frontend/app/features/settings/pages/workflows/workflows-page.component.html @@ -1,6 +1,6 @@ - + Workflows @@ -14,28 +14,34 @@ - -
    -
      -
    • {{error}}
      • -
    + + + +
    +
      +
    • {{error}}
      • +
    +
    +
    + {{errors[0]}} +
    +     +     + +
    + +
    + No workflows created yet. +
    + + + + + +
    -
    - {{errors[0]}} -
    - - - -
    - No workflows created yet. -
    - - - - - -     +     diff --git a/frontend/app/framework/angular/ignore-scrollbar.directive.ts b/frontend/app/framework/angular/ignore-scrollbar.directive.ts deleted file mode 100644 index ed83fb0fc..000000000 --- a/frontend/app/framework/angular/ignore-scrollbar.directive.ts +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. - */ - -import { AfterViewInit, Directive, ElementRef, HostListener, OnInit, Renderer2 } from '@angular/core'; -import { timer } from 'rxjs'; - -import { ResourceOwner } from '@app/framework/internal'; - -@Directive({ - selector: '[sqxIgnoreScrollbar]' -}) -export class IgnoreScrollbarDirective extends ResourceOwner implements OnInit, AfterViewInit { - private parent: any; - private scollbarWidth = 0; - - constructor( - private readonly element: ElementRef, - private readonly renderer: Renderer2 - ) { - super(); - } - - @HostListener('resize)') - public onResize() { - this.reposition(); - } - - public ngOnInit() { - this.parent = this.renderer.parentNode(this.element.nativeElement); - - this.own(timer(100, 100).subscribe(() => this.reposition)); - } - - public ngAfterViewInit() { - this.reposition(); - } - - private reposition() { - if (!this.parent) { - return; - } - - const parentOuter = this.parent.offsetWidth; - const parentInner = this.parent.clientWidth; - - const scrollbarWidth = parentOuter - parentInner; - - if (scrollbarWidth !== this.scollbarWidth) { - this.scollbarWidth = scrollbarWidth; - - this.renderer.setStyle(this.element.nativeElement, 'marginRight', `-${scrollbarWidth}px`); - } - } -} \ No newline at end of file diff --git a/frontend/app/framework/angular/list-view.component.html b/frontend/app/framework/angular/list-view.component.html new file mode 100644 index 000000000..691c52f34 --- /dev/null +++ b/frontend/app/framework/angular/list-view.component.html @@ -0,0 +1,33 @@ +
    + +
    + + +
    + +
    + +
    + +
    +     + + +
    + + + +
    + +
    + +
    +     + +
    + +
    + +
    + Loading +
    \ No newline at end of file diff --git a/frontend/app/framework/angular/list-view.component.scss b/frontend/app/framework/angular/list-view.component.scss new file mode 100644 index 000000000..795d3c81f --- /dev/null +++ b/frontend/app/framework/angular/list-view.component.scss @@ -0,0 +1,95 @@ +@import '_mixins'; +@import '_vars'; + +:host { + @include flex-box; + @include flex-direction(column); + @include flex-grow(1); + overflow: hidden; + padding: 0; + position: relative; +} + +:host(.overflow) { + overflow: visible; +} + +.grid { + &-content, + &-header, + &-footer { + @include transition(opacity .2 ease); + padding: 0 $panel-padding; + } + + &-content { + @include flex-grow(1); + padding: $panel-padding; + + &.tabled { + padding-top: .5rem; + padding-bottom: .5rem; + } + + &.normal { + overflow-y: auto; + } + + &.synced { + overflow-y: auto; + overflow-x: auto; + padding-right: 0; + } + } + + &-header { + & { + @include flex-shrink(0); + border: 0; + border-bottom: 2px solid $color-border; + overflow-x: hidden; + overflow-y: hidden; + } + + .inner { + display: table-cell; + } + + /deep/ th { + padding: .75rem; + } + + /deep/ table { + margin: 0; + } + + /deep/ .table-items { + margin: 0; + } + } + + &-footer { + & { + @include flex-shrink(1); + border: 0; + border-top: 2px solid $color-border; + } + + /deep/ .pagination { + margin: .25rem 0; + } + } +} + +.loader, +.loading-indicator { + pointer-events: none; +} + +.loading-indicator { + @include opacity(.5); +} + +.loader { + @include absolute(20%, 0, auto, 0); +} \ No newline at end of file diff --git a/frontend/app/framework/angular/list-view.component.ts b/frontend/app/framework/angular/list-view.component.ts new file mode 100644 index 000000000..56f2ada0a --- /dev/null +++ b/frontend/app/framework/angular/list-view.component.ts @@ -0,0 +1,85 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, HostBinding, Input, Renderer2, ViewChild } from '@angular/core'; + +import { fadeAnimation } from '@app/framework/internal'; + +@Component({ + selector: 'sqx-list-view', + styleUrls: ['./list-view.component.scss'], + templateUrl: './list-view.component.html', + animations: [ + fadeAnimation + ], + changeDetection: ChangeDetectionStrategy.Default +}) +export class ListViewComponent implements AfterViewInit { + private timer: any; + + @ViewChild('headerElement', { static: false }) + public headerElement: ElementRef; + + @ViewChild('footerElement', { static: false }) + public footerElement: ElementRef; + + @ViewChild('contentElement', { static: false }) + public contentElement: ElementRef; + + @Input() @HostBinding('class.overflow') + public overflow = false; + + @Input() + public syncedHeader = false; + + @Input() + public table = false; + + @Input() + public isLoaded = true; + + @Input() + public set isLoading(value: boolean) { + if (value) { + this.isLoadingValue = value; + + this.changeDetector.markForCheck(); + + clearTimeout(this.timer); + } else { + this.timer = setTimeout(() => { + this.isLoadingValue = value; + + this.changeDetector.markForCheck(); + }, 250); + } + } + + public isLoadingValue = false; + + constructor( + private readonly changeDetector: ChangeDetectorRef, + private readonly renderer: Renderer2 + ) { + } + + public ngAfterViewInit() { + this.hideWhenEmpty(this.headerElement); + this.hideWhenEmpty(this.footerElement); + this.hideWhenEmpty(this.contentElement); + } + + private hideWhenEmpty(element: ElementRef) { + if (element && element.nativeElement) { + const isEmpty = element.nativeElement.children.length === 0; + + if (isEmpty) { + this.renderer.setStyle(element.nativeElement, 'display', 'none'); + } + } + } +} \ No newline at end of file diff --git a/frontend/app/framework/angular/modals/modal-dialog.component.html b/frontend/app/framework/angular/modals/modal-dialog.component.html index d4e2af3ef..4d49c1370 100644 --- a/frontend/app/framework/angular/modals/modal-dialog.component.html +++ b/frontend/app/framework/angular/modals/modal-dialog.component.html @@ -11,11 +11,11 @@
    -
    +
    -
    +
    diff --git a/frontend/app/framework/angular/modals/modal-dialog.component.scss b/frontend/app/framework/angular/modals/modal-dialog.component.scss index 4a639159b..d40eed85d 100644 --- a/frontend/app/framework/angular/modals/modal-dialog.component.scss +++ b/frontend/app/framework/angular/modals/modal-dialog.component.scss @@ -3,4 +3,11 @@ .modal { display: block; +} + +.flexed { + @include flex-box; + @include flex-grow(1); + @include flex-direction(column); + padding: 0; } \ No newline at end of file diff --git a/frontend/app/framework/angular/modals/modal-dialog.component.ts b/frontend/app/framework/angular/modals/modal-dialog.component.ts index 9f6ad5518..0b6fd7366 100644 --- a/frontend/app/framework/angular/modals/modal-dialog.component.ts +++ b/frontend/app/framework/angular/modals/modal-dialog.component.ts @@ -38,18 +38,15 @@ export class ModalDialogComponent implements AfterViewInit { public large = false; @Input() - public fullHeight = false; - - @Input() - public tabsClass = ''; + public flexBody = false; @Input() - public contentClass = ''; + public fullHeight = false; @ViewChild('tabsElement', { static: false }) public tabsElement: ElementRef; - @ViewChild('footerElement', { static: false }) + @ViewChild('tabsElement', { static: false }) public footerElement: ElementRef; constructor( @@ -58,15 +55,17 @@ export class ModalDialogComponent implements AfterViewInit { } public ngAfterViewInit() { - this.hideWhenEmpty(this.tabsElement.nativeElement); - this.hideWhenEmpty(this.footerElement.nativeElement); + this.hideWhenEmpty(this.tabsElement); + this.hideWhenEmpty(this.footerElement); } - private hideWhenEmpty(element: any) { - const isEmpty = element.children.length === 0; + private hideWhenEmpty(element: ElementRef) { + if (element && element.nativeElement) { + const isEmpty = element.nativeElement.children.length === 0; - if (isEmpty) { - this.renderer.setStyle(element, 'display', 'none'); + if (isEmpty) { + this.renderer.setStyle(element.nativeElement, 'display', 'none'); + } } } diff --git a/frontend/app/framework/angular/pager.component.html b/frontend/app/framework/angular/pager.component.html index a9b446d5f..d78a6b698 100644 --- a/frontend/app/framework/angular/pager.component.html +++ b/frontend/app/framework/angular/pager.component.html @@ -1,19 +1,21 @@
    \ No newline at end of file diff --git a/frontend/app/framework/angular/pager.component.scss b/frontend/app/framework/angular/pager.component.scss index 1e90e29b3..e891b9183 100644 --- a/frontend/app/framework/angular/pager.component.scss +++ b/frontend/app/framework/angular/pager.component.scss @@ -3,7 +3,14 @@ .form-control { display: inline-block; - margin-left: 2rem; + margin-right: 2rem; margin-top: .25rem; width: auto; +} + +.page-info { + display: inline-block; + text-align: right; + text-decoration: none; + width: 14rem; } \ No newline at end of file diff --git a/frontend/app/framework/angular/panel.component.html b/frontend/app/framework/angular/panel.component.html index ca6c79566..7e5eebb42 100644 --- a/frontend/app/framework/angular/panel.component.html +++ b/frontend/app/framework/angular/panel.component.html @@ -16,7 +16,7 @@
    - + @@ -37,7 +37,9 @@
    -
    -
    +
    diff --git a/frontend/app/framework/angular/panel.component.scss b/frontend/app/framework/angular/panel.component.scss index d1951ab29..83949a038 100644 --- a/frontend/app/framework/angular/panel.component.scss +++ b/frontend/app/framework/angular/panel.component.scss @@ -1,2 +1,6 @@ @import '_mixins'; -@import '_vars'; \ No newline at end of file +@import '_vars'; + +.no-padding { + padding: 0; +} \ No newline at end of file diff --git a/frontend/app/framework/angular/panel.component.ts b/frontend/app/framework/angular/panel.component.ts index 8f7015f50..8acfbbbb8 100644 --- a/frontend/app/framework/angular/panel.component.ts +++ b/frontend/app/framework/angular/panel.component.ts @@ -60,13 +60,13 @@ export class PanelComponent implements AfterViewInit, OnDestroy, OnInit { public showClose = true; @Input() - public contentClass = ''; + public grid = false; @Input() - public customClose = false; + public noPadding = false; @Input() - public sidebarClass = ''; + public customClose = false; @ViewChild('panel', { static: false }) public panel: ElementRef; diff --git a/frontend/app/framework/angular/sync-width.directive.ts b/frontend/app/framework/angular/sync-width.directive.ts new file mode 100644 index 000000000..709abf0e1 --- /dev/null +++ b/frontend/app/framework/angular/sync-width.directive.ts @@ -0,0 +1,44 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { AfterViewInit, Directive, ElementRef, Input, OnInit, Renderer2 } from '@angular/core'; +import { timer } from 'rxjs'; + +import { ResourceOwner } from '@app/framework/internal'; + +@Directive({ + selector: '[sqxSyncWidth]' +}) +export class SyncWidthDirective extends ResourceOwner implements OnInit, AfterViewInit { + @Input('sqxSyncWidth') + public target: HTMLElement; + + constructor( + private readonly element: ElementRef, + private readonly renderer: Renderer2 + ) { + super(); + } + + public ngOnInit() { + this.own(timer(100, 100).subscribe(() => this.reposition())); + } + + public ngAfterViewInit() { + this.reposition(); + } + + private reposition() { + if (!this.target) { + return; + } + + const size = this.element.nativeElement.clientWidth; + + this.renderer.setStyle(this.target, 'width', `${size}px`); + } +} \ No newline at end of file diff --git a/frontend/app/framework/declarations.ts b/frontend/app/framework/declarations.ts index 24db0631f..a9518ced4 100644 --- a/frontend/app/framework/declarations.ts +++ b/frontend/app/framework/declarations.ts @@ -59,8 +59,8 @@ export * from './angular/code.component'; export * from './angular/external-link.directive'; export * from './angular/highlight.pipe'; export * from './angular/hover-background.directive'; -export * from './angular/ignore-scrollbar.directive'; export * from './angular/image-source.directive'; +export * from './angular/list-view.component'; export * from './angular/pager.component'; export * from './angular/panel-container.directive'; export * from './angular/panel.component'; @@ -71,6 +71,7 @@ export * from './angular/shortcut.component'; export * from './angular/status-icon.component'; export * from './angular/stop-click.directive'; export * from './angular/sync-scrolling.directive'; +export * from './angular/sync-width.directive'; export * from './angular/template-wrapper.directive'; export * from './angular/title.component'; diff --git a/frontend/app/framework/module.ts b/frontend/app/framework/module.ts index dff25a441..9dff85e35 100644 --- a/frontend/app/framework/module.ts +++ b/frontend/app/framework/module.ts @@ -48,7 +48,6 @@ import { HighlightPipe, HoverBackgroundDirective, IFrameEditorComponent, - IgnoreScrollbarDirective, ImageSourceDirective, IndeterminateValueDirective, ISODatePipe, @@ -56,6 +55,7 @@ import { KeysPipe, KNumberPipe, LightenPipe, + ListViewComponent, LoadingInterceptor, LoadingService, LocalStoreService, @@ -87,6 +87,7 @@ import { StatusIconComponent, StopClickDirective, SyncScollingDirective, + SyncWidthDirective, TagEditorComponent, TemplateWrapperDirective, TitleComponent, @@ -135,7 +136,6 @@ import { HighlightPipe, HoverBackgroundDirective, IFrameEditorComponent, - IgnoreScrollbarDirective, ImageSourceDirective, IndeterminateValueDirective, ISODatePipe, @@ -143,6 +143,7 @@ import { KeysPipe, KNumberPipe, LightenPipe, + ListViewComponent, MarkdownPipe, ModalDialogComponent, ModalDirective, @@ -167,6 +168,7 @@ import { StatusIconComponent, StopClickDirective, SyncScollingDirective, + SyncWidthDirective, TagEditorComponent, TemplateWrapperDirective, TitleComponent, @@ -208,7 +210,6 @@ import { HighlightPipe, HoverBackgroundDirective, IFrameEditorComponent, - IgnoreScrollbarDirective, ImageSourceDirective, IndeterminateValueDirective, ISODatePipe, @@ -216,6 +217,7 @@ import { KeysPipe, KNumberPipe, LightenPipe, + ListViewComponent, MarkdownPipe, ModalDirective, ModalDialogComponent, @@ -241,6 +243,7 @@ import { StatusIconComponent, StopClickDirective, SyncScollingDirective, + SyncWidthDirective, TagEditorComponent, TemplateWrapperDirective, TitleComponent, diff --git a/frontend/app/framework/state.ts b/frontend/app/framework/state.ts index 9aaefa80d..131d9d372 100644 --- a/frontend/app/framework/state.ts +++ b/frontend/app/framework/state.ts @@ -191,19 +191,29 @@ export class State { this.state = new BehaviorSubject(state); } - public resetState(update?: ((v: T) => Readonly) | object) { - this.state.next(this.initialState); + public resetState(update?: ((v: T) => Readonly) | Partial) { + let newState = this.initialState; if (update) { - this.next(update); + if (Types.isFunction(update)) { + newState = update(this.initialState); + } else { + newState = { ...this.initialState, ...update }; + } } + + this.state.next(newState); } - public next(update: ((v: T) => Readonly) | object) { + public next(update: ((v: T) => Readonly) | Partial) { + let newState: T; + if (Types.isFunction(update)) { - this.state.next(update(this.state.value)); + newState = update(this.state.value); } else { - this.state.next(Object.assign({}, this.snapshot, update)); + newState = { ...this.state.value, ...update }; } + + this.state.next(newState); } } \ No newline at end of file diff --git a/frontend/app/shared/components/app-form.component.html b/frontend/app/shared/components/app-form.component.html index 4714b5cc8..5fa4347d9 100644 --- a/frontend/app/shared/components/app-form.component.html +++ b/frontend/app/shared/components/app-form.component.html @@ -18,7 +18,7 @@ - + You can only use letters, numbers and dashes and not more than 40 characters. diff --git a/frontend/app/shared/components/asset-dialog.component.html b/frontend/app/shared/components/asset-dialog.component.html index 10962b59b..81ce3a59a 100644 --- a/frontend/app/shared/components/asset-dialog.component.html +++ b/frontend/app/shared/components/asset-dialog.component.html @@ -1,5 +1,5 @@
    - + Update Asset @@ -37,7 +37,7 @@ - + diff --git a/frontend/app/shared/components/asset-dialog.component.ts b/frontend/app/shared/components/asset-dialog.component.ts index 02969c1e4..e06c07f3a 100644 --- a/frontend/app/shared/components/asset-dialog.component.ts +++ b/frontend/app/shared/components/asset-dialog.component.ts @@ -5,15 +5,13 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { AnnotateAssetForm, - AppsState, AssetDto, - AssetsService, - StatefulComponent + AssetsState } from '@app/shared/internal'; @Component({ @@ -22,12 +20,9 @@ import { templateUrl: './asset-dialog.component.html', changeDetection: ChangeDetectionStrategy.OnPush }) -export class AssetDialogComponent extends StatefulComponent implements OnInit { +export class AssetDialogComponent implements OnInit { @Output() - public cancel = new EventEmitter(); - - @Output() - public complete = new EventEmitter(); + public complete = new EventEmitter(); @Input() public asset: AssetDto; @@ -39,16 +34,10 @@ export class AssetDialogComponent extends StatefulComponent implements OnInit { public annotateForm = new AnnotateAssetForm(this.formBuilder); - constructor(changeDetector: ChangeDetectorRef, - private readonly appsState: AppsState, - private readonly assetsService: AssetsService, + constructor( + private readonly assetsState: AssetsState, private readonly formBuilder: FormBuilder ) { - super(changeDetector, { - isRenaming: false, - isTagging: false, - progress: 0 - }); } public ngOnInit() { @@ -62,12 +51,8 @@ export class AssetDialogComponent extends StatefulComponent implements OnInit { this.annotateForm.generateSlug(this.asset); } - public emitCancel() { - this.cancel.emit(); - } - - public emitComplete(asset: AssetDto) { - this.complete.emit(asset); + public emitComplete() { + this.complete.emit(); } public annotateAsset() { @@ -78,9 +63,9 @@ export class AssetDialogComponent extends StatefulComponent implements OnInit { const value = this.annotateForm.submit(this.asset); if (value) { - this.assetsService.putAsset(this.appsState.appName, this.asset, value, this.asset.version) - .subscribe(dto => { - this.emitComplete(dto); + this.assetsState.updateAsset(this.asset, value) + .subscribe(() => { + this.emitComplete(); }, error => { this.annotateForm.submitFailed(error); }); diff --git a/frontend/app/shared/components/asset-folder-form.component.html b/frontend/app/shared/components/asset-folder-form.component.html new file mode 100644 index 000000000..04d4b171d --- /dev/null +++ b/frontend/app/shared/components/asset-folder-form.component.html @@ -0,0 +1,43 @@ + + + + + Rename Folder + + + Create Folder + + + + + + +
    + + + + + +
    + +
    + + The folder name is used as display name and must not be unique. + +
    +     + + + + + + +     + \ No newline at end of file diff --git a/frontend/app/shared/components/asset-folder-form.component.scss b/frontend/app/shared/components/asset-folder-form.component.scss new file mode 100644 index 000000000..fbb752506 --- /dev/null +++ b/frontend/app/shared/components/asset-folder-form.component.scss @@ -0,0 +1,2 @@ +@import '_vars'; +@import '_mixins'; \ No newline at end of file diff --git a/frontend/app/shared/components/asset-folder-form.component.ts b/frontend/app/shared/components/asset-folder-form.component.ts new file mode 100644 index 000000000..41065601a --- /dev/null +++ b/frontend/app/shared/components/asset-folder-form.component.ts @@ -0,0 +1,69 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { FormBuilder } from '@angular/forms'; + +import { + AssetFolderDto, + AssetFolderForm, + AssetsState +} from '@app/shared/internal'; + +@Component({ + selector: 'sqx-asset-folder-form', + styleUrls: ['./asset-folder-form.component.scss'], + templateUrl: './asset-folder-form.component.html', + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class AssetFolderFormComponent implements OnInit { + @Output() + public complete = new EventEmitter(); + + @Input() + public assetFolder: AssetFolderDto; + + public editForm = new AssetFolderForm(this.formBuilder); + + constructor( + private readonly assetsState: AssetsState, + private readonly formBuilder: FormBuilder + ) { + } + + public ngOnInit() { + if (this.assetFolder) { + this.editForm.load({ folderName: this.assetFolder.folderName }); + } + } + + public emitComplete() { + this.complete.emit(); + } + + public createAssetFolder() { + const value = this.editForm.submit(); + + if (value) { + if (this.assetFolder) { + this.assetsState.updateAssetFolder(this.assetFolder, value) + .subscribe(() => { + this.emitComplete(); + }, error => { + this.editForm.submitFailed(error); + }); + } else { + this.assetsState.createAssetFolder(value.folderName) + .subscribe(() => { + this.emitComplete(); + }, error => { + this.editForm.submitFailed(error); + }); + } + } + } +} \ No newline at end of file diff --git a/frontend/app/shared/components/asset-folder.component.html b/frontend/app/shared/components/asset-folder.component.html new file mode 100644 index 000000000..b57b65cdc --- /dev/null +++ b/frontend/app/shared/components/asset-folder.component.html @@ -0,0 +1,46 @@ +
    +
    +
    +
    + +
    +
    + {{assetFolder.folderName}} +
    +
    +
    + + + +
    + + + Rename + + +
    + + + + Delete + +
    + +
    +
    +
    +
    +
    + + + + + + \ No newline at end of file diff --git a/frontend/app/shared/components/asset-folder.component.scss b/frontend/app/shared/components/asset-folder.component.scss new file mode 100644 index 000000000..c0a1cbb47 --- /dev/null +++ b/frontend/app/shared/components/asset-folder.component.scss @@ -0,0 +1,36 @@ +@import '_vars'; +@import '_mixins'; + +:host /deep/ { + .cdk-drag-placeholder { + display: none; + } +} + +img { + height: 1.5rem; + margin-right: 1rem; + margin-bottom: .25rem; +} + +.card { + & { + border-width: 1px; + border-bottom-width: 1px; + width: $asset-width; + } + + &-body { + font-size: 1.1rem; + padding-top: .75rem; + padding-bottom: .75rem; + padding-right: .5rem; + line-height: 2.2rem; + } +} + +.icon-folder { + color: $color-dark1-border1; + margin-right: .5rem; + margin-top: 0; +} \ No newline at end of file diff --git a/frontend/app/shared/components/asset-folder.component.ts b/frontend/app/shared/components/asset-folder.component.ts new file mode 100644 index 000000000..240dcd4aa --- /dev/null +++ b/frontend/app/shared/components/asset-folder.component.ts @@ -0,0 +1,63 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; + +import { + AssetFolderDto, + AssetPathItem, + DialogModel, + fadeAnimation, + ModalModel, + Types +} from '@app/shared/internal'; + +@Component({ + selector: 'sqx-asset-folder', + styleUrls: ['./asset-folder.component.scss'], + templateUrl: './asset-folder.component.html', + animations: [ + fadeAnimation + ], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class AssetFolderComponent { + @Output() + public navigate = new EventEmitter(); + + @Output() + public delete = new EventEmitter(); + + @Input() + public assetFolder: AssetFolderDto | AssetPathItem; + + public dropdown = new ModalModel(); + + public editDialog = new DialogModel(); + + public get canUpdate() { + return Types.is(this.assetFolder, AssetFolderDto) && this.assetFolder.canUpdate; + } + + public get canDelete() { + return Types.is(this.assetFolder, AssetFolderDto) && this.assetFolder.canDelete; + } + + public preventSelection(mouseEvent: MouseEvent) { + if (mouseEvent.detail > 1) { + mouseEvent.preventDefault(); + } + } + + public emitNavigate() { + this.navigate.emit(this.assetFolder); + } + + public emitDelete() { + this.delete.emit(this.assetFolder); + } +} \ No newline at end of file diff --git a/frontend/app/shared/components/asset-path.component.ts b/frontend/app/shared/components/asset-path.component.ts new file mode 100644 index 000000000..fe91d26a0 --- /dev/null +++ b/frontend/app/shared/components/asset-path.component.ts @@ -0,0 +1,45 @@ +/* + * Squidex Headless CMS + * + * @license + * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. + */ + +import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; + +import { AssetPathItem } from '@app/shared/internal'; + +@Component({ + selector: 'sqx-asset-path', + template: ` + + Search Results + + + + + + + {{item.folderName}} + + + + `, + styles: [ + `i { + vertical-align: middle; + }` + ], + changeDetection: ChangeDetectionStrategy.OnPush +}) +export class AssetPathComponent { + @Output() + public navigate = new EventEmitter(); + + @Input() + public path: ReadonlyArray; + + public emitNavigate(item: AssetPathItem) { + this.navigate.emit(item); + } +} \ No newline at end of file diff --git a/frontend/app/shared/components/asset.component.html b/frontend/app/shared/components/asset.component.html index a170956ea..9e29768da 100644 --- a/frontend/app/shared/components/asset.component.html +++ b/frontend/app/shared/components/asset.component.html @@ -92,12 +92,12 @@ -
    +
    -
    +
    @@ -152,11 +152,8 @@ - + \ No newline at end of file diff --git a/frontend/app/shared/components/asset.component.scss b/frontend/app/shared/components/asset.component.scss index 9cd1d5483..92665980e 100644 --- a/frontend/app/shared/components/asset.component.scss +++ b/frontend/app/shared/components/asset.component.scss @@ -1,7 +1,9 @@ @import '_vars'; @import '_mixins'; -$list-height: 2.375rem; +// sass-lint:disable single-line-per-selector + +$list-height: 2.25rem; @mixin overlay-container { position: relative; @@ -34,12 +36,6 @@ $list-height: 2.375rem; color: $color-dark-foreground; } -:host { - padding-bottom: 1rem; - padding-left: 8px; - padding-right: 8px; -} - :host(.isListView) { padding: 0; } @@ -59,21 +55,20 @@ $list-height: 2.375rem; width: $asset-width; border-top-width: 1px; border-width: 1px; + margin-bottom: 1rem; + margin-right: .5rem; } - &-body, - &-footer { + &-body { position: relative; padding: 1rem; - } - - &-body { - padding: 0; min-height: $asset-header; max-height: $asset-header; } &-footer { + position: relative; + padding: 1rem; padding-top: .5rem; min-height: $asset-footer; max-height: auto; @@ -109,8 +104,7 @@ $list-height: 2.375rem; background: $color-dark-black; } - &-name, - &-info { + &-name, &-info { @include truncate; } @@ -131,10 +125,10 @@ $list-height: 2.375rem; } &-icon { - line-height: $asset-image; - background: $color-border; - height: $asset-image; + padding: 2rem; + background: $color-asset-bg; border: 0; + height: $asset-image; text-align: center; } } @@ -210,7 +204,7 @@ $list-height: 2.375rem; .image { @include absolute(0, auto, 0, 4px); border: 0; - background: $color-border; + background: $color-asset-bg; width: $list-height + 2rem; } @@ -232,7 +226,6 @@ $list-height: 2.375rem; } &-name { - width: 100%; padding-right: .5rem; } @@ -284,6 +277,10 @@ $list-height: 2.375rem; } } +img { + max-height: 100%; +} + .selectable { cursor: pointer; } diff --git a/frontend/app/shared/components/asset.component.ts b/frontend/app/shared/components/asset.component.ts index 5ab252ccf..34aa3c218 100644 --- a/frontend/app/shared/components/asset.component.ts +++ b/frontend/app/shared/components/asset.component.ts @@ -9,6 +9,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Ho import { AssetDto, + AssetsState, AssetUploaderState, DialogModel, DialogService, @@ -32,9 +33,6 @@ export class AssetComponent implements OnInit { @Output() public remove = new EventEmitter(); - @Output() - public update = new EventEmitter(); - @Output() public delete = new EventEmitter(); @@ -42,11 +40,14 @@ export class AssetComponent implements OnInit { public select = new EventEmitter(); @Input() - public initFile: File; + public assetFile: File; @Input() public asset: AssetDto; + @Input() + public assetsState: AssetsState; + @Input() public removeMode = false; @@ -80,12 +81,12 @@ export class AssetComponent implements OnInit { } public ngOnInit() { - const initFile = this.initFile; + const assetFile = this.assetFile; - if (initFile) { + if (assetFile) { this.setProgress(1); - this.assetUploader.uploadFile(initFile) + this.assetUploader.uploadFile(assetFile, this.assetsState) .subscribe(dto => { if (Types.isNumber(dto)) { this.setProgress(dto); @@ -107,11 +108,13 @@ export class AssetComponent implements OnInit { this.setProgress(1); this.assetUploader.uploadAsset(this.asset, files[0]) - .subscribe(dto => { - if (Types.isNumber(dto)) { - this.setProgress(dto); + .subscribe(asset => { + if (Types.isNumber(asset)) { + this.setProgress(asset); } else { - this.updateAsset(dto, true); + this.setProgress(0); + + this.asset = asset; } }, error => { this.dialogs.notifyError(error); @@ -129,10 +132,6 @@ export class AssetComponent implements OnInit { } } - public cancelEdit() { - this.editDialog.hide(); - } - public emitSelect() { this.select.emit(this.asset); } @@ -149,10 +148,6 @@ export class AssetComponent implements OnInit { this.loadError.emit(error); } - public emitUpdate() { - this.update.emit(); - } - public emitRemove() { this.remove.emit(); } @@ -162,16 +157,4 @@ export class AssetComponent implements OnInit { this.changeDetector.markForCheck(); } - - public updateAsset(asset: AssetDto, emitEvent: boolean) { - this.asset = asset; - - if (emitEvent) { - this.emitUpdate(); - } - - this.setProgress(0); - - this.cancelEdit(); - } } \ No newline at end of file diff --git a/frontend/app/shared/components/assets-list.component.html b/frontend/app/shared/components/assets-list.component.html index 9e203b7d6..db84d11fb 100644 --- a/frontend/app/shared/components/assets-list.component.html +++ b/frontend/app/shared/components/assets-list.component.html @@ -14,25 +14,81 @@
    Drop file on existing item to replace the asset with a newer version.
    -
    - - - - - - + + +
    +
    + +
    Folders
    +     + +
    +
    +
    + + + +
    + +
    +
    + + + +
    +
    +
    + + + +
    Files
    +     + +
    + + + + + +
    +     +
    -
    + - \ No newline at end of file + + + \ No newline at end of file diff --git a/frontend/app/shared/components/assets-list.component.scss b/frontend/app/shared/components/assets-list.component.scss index 7acbb132d..d77265223 100644 --- a/frontend/app/shared/components/assets-list.component.scss +++ b/frontend/app/shared/components/assets-list.component.scss @@ -3,9 +3,42 @@ .unrow { display: block; - padding-left: 8px; - padding-right: 8px; - margin: 0; +} + +h5 { + font-size: .9rem; + margin-top: 0; + margin-bottom: .5rem; +} + +.folders { + .cdk-drag-placeholder { + @include absolute(0, auto, auto, auto); + } +} + +.folder-container { + & { + width: $asset-width; + position: relative; + margin-bottom: 1rem; + margin-right: .5rem; + height: $asset-folder-height; + } + + &-over { + @include absolute(-6px, -6px, -6px, -6px); + @include opacity(0); + border: 2px solid $color-theme-blue; + } + + &.cdk-drop-list-dragging { + &:hover { + .folder-container-over { + @include opacity(1); + } + } + } } .file-drop { @@ -14,9 +47,9 @@ border: 2px dashed $color-border; background: transparent; padding: 1rem; - text-align: center; margin-bottom: 1rem; margin-right: 0; + text-align: center; } &.drag { @@ -42,11 +75,6 @@ } } -.assets { - margin-left: -8px; - margin-right: -8px; -} - .btn { cursor: default; } \ No newline at end of file diff --git a/frontend/app/shared/components/assets-list.component.ts b/frontend/app/shared/components/assets-list.component.ts index c8780d436..ec4d3bff0 100644 --- a/frontend/app/shared/components/assets-list.component.ts +++ b/frontend/app/shared/components/assets-list.component.ts @@ -5,12 +5,15 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ +import { CdkDrag, CdkDragDrop, CdkDropList } from '@angular/cdk/drag-drop'; import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, Input, Output } from '@angular/core'; import { AssetDto, + AssetFolderDto, AssetsState, - getFiles + getFiles, + Types } from '@app/shared/internal'; @Component({ @@ -32,9 +35,15 @@ export class AssetsListComponent { @Input() public isListView = false; + @Input() + public indicateLoading = false; + @Input() public selectedIds: object; + @Input() + public showPager = true; + public newFiles: ReadonlyArray = []; constructor( @@ -52,20 +61,28 @@ export class AssetsListComponent { } else { this.newFiles = this.newFiles.removed(file); - this.state.add(asset); + this.state.addAsset(asset); } } - public search() { - this.state.load(); + public move(drag: CdkDragDrop) { + if (!this.isDisabled && drag.isPointerOverContainer) { + const item = drag.item.data; + + if (Types.is(item, AssetDto)) { + this.state.moveAsset(item, drag.container.data); + } else { + this.state.moveAssetFolder(item, drag.container.data); + } + } } - public delete(asset: AssetDto) { - this.state.delete(asset); + public deleteAsset(asset: AssetDto) { + this.state.deleteAsset(asset); } - public update(asset: AssetDto) { - this.state.update(asset); + public deleteAssetFolder(assetFolder: AssetFolderDto) { + this.state.deleteAssetFolder(assetFolder); } public emitSelect(asset: AssetDto) { @@ -86,7 +103,11 @@ export class AssetsListComponent { return true; } - public trackByAsset(index: number, asset: AssetDto) { + public canEnter(drag: CdkDrag, drop: CdkDropList) { + return drag.data.id !== drop.data; + } + + public trackByAssetItem(index: number, asset: AssetDto | AssetFolderDto) { return asset.id; } } diff --git a/frontend/app/shared/components/assets-selector.component.html b/frontend/app/shared/components/assets-selector.component.html index f32d2e450..ba49f2877 100644 --- a/frontend/app/shared/components/assets-selector.component.html +++ b/frontend/app/shared/components/assets-selector.component.html @@ -44,6 +44,7 @@ + Comments diff --git a/frontend/app/shared/components/comments.component.ts b/frontend/app/shared/components/comments.component.ts index 7f02e8476..bde07f7ad 100644 --- a/frontend/app/shared/components/comments.component.ts +++ b/frontend/app/shared/components/comments.component.ts @@ -8,7 +8,7 @@ import { Component, Input, OnInit } from '@angular/core'; import { FormBuilder } from '@angular/forms'; import { timer } from 'rxjs'; -import { onErrorResumeNext, switchMap } from 'rxjs/operators'; +import { switchMap } from 'rxjs/operators'; import { AppsState, @@ -50,9 +50,7 @@ export class CommentsComponent extends ResourceOwner implements OnInit { public ngOnInit() { this.state = new CommentsState(this.appsState, this.commentsId, this.commentsService, this.dialogs); - this.own( - timer(0, 4000).pipe(switchMap(() => this.state.load().pipe(onErrorResumeNext()))) - .subscribe()); + this.own(timer(0, 4000).pipe(switchMap(() => this.state.load()))); } public delete(comment: CommentDto) { diff --git a/frontend/app/shared/components/pipes.ts b/frontend/app/shared/components/pipes.ts index 6e042cdad..60e20c0c8 100644 --- a/frontend/app/shared/components/pipes.ts +++ b/frontend/app/shared/components/pipes.ts @@ -213,7 +213,7 @@ export class UserPictureRefPipe extends UserAsyncPipe implements PipeTransform { if (type === 'subject') { return users.getUser(id).pipe(map(u => this.apiUrl.buildUrl(`api/users/${u.id}/picture`))); } else { - return of('./images/client.png'); + return of('./images/client.svg'); } }); } @@ -276,7 +276,7 @@ export class FileIconPipe implements PipeTransform { mimeIcon = knownTypes.indexOf(asset.fileType) >= 0 ? asset.fileType : 'generic'; } - return `./images/asset_${mimeIcon}.png`; + return `./images/asset_${mimeIcon}.svg`; } } diff --git a/frontend/app/shared/components/search-form.component.ts b/frontend/app/shared/components/search-form.component.ts index 4c68c0ed1..80d75f0c1 100644 --- a/frontend/app/shared/components/search-form.component.ts +++ b/frontend/app/shared/components/search-form.component.ts @@ -66,6 +66,10 @@ export class SearchFormComponent implements OnChanges { } public ngOnChanges(changes: SimpleChanges) { + if (changes['queryModel'] && !changes['query']) { + this.query = {}; + } + if (changes['query'] || changes['queries']) { this.updateSaveKey(); } @@ -73,10 +77,6 @@ export class SearchFormComponent implements OnChanges { if (changes['query']) { this.hasFilter = hasFilter(this.query); } - - if (changes['queryModel']) { - this.query = {}; - } } public search(close = false) { diff --git a/frontend/app/shared/declarations.ts b/frontend/app/shared/declarations.ts index 40116db0c..bbbf65b1d 100644 --- a/frontend/app/shared/declarations.ts +++ b/frontend/app/shared/declarations.ts @@ -7,24 +7,27 @@ export * from './components/app-form.component'; export * from './components/asset-dialog.component'; +export * from './components/asset-folder.component'; +export * from './components/asset-folder-form.component'; +export * from './components/asset-path.component'; +export * from './components/asset-uploader.component'; export * from './components/asset.component'; export * from './components/assets-list.component'; export * from './components/assets-selector.component'; -export * from './components/asset-uploader.component'; export * from './components/comment.component'; export * from './components/comments.component'; +export * from './components/geolocation-editor.component'; export * from './components/help-markdown.pipe'; export * from './components/help.component'; -export * from './components/geolocation-editor.component'; -export * from './components/history.component'; export * from './components/history-list.component'; +export * from './components/history.component'; export * from './components/language-selector.component'; export * from './components/markdown-editor.component'; export * from './components/pipes'; export * from './components/references-dropdown.component'; export * from './components/rich-editor.component'; -export * from './components/schema-category.component'; export * from './components/saved-queries.component'; +export * from './components/schema-category.component'; export * from './components/search-form.component'; export * from './components/table-header.component'; diff --git a/frontend/app/shared/module.ts b/frontend/app/shared/module.ts index 1a13fbf4c..5c52e73b8 100644 --- a/frontend/app/shared/module.ts +++ b/frontend/app/shared/module.ts @@ -20,6 +20,9 @@ import { AppsState, AssetComponent, AssetDialogComponent, + AssetFolderComponent, + AssetFolderFormComponent, + AssetPathComponent, AssetPreviewUrlPipe, AssetsDialogState, AssetsListComponent, @@ -85,6 +88,7 @@ import { SchemaMustNotBeSingletonGuard, SchemasService, SchemasState, + SchemaTagConverter, SearchFormComponent, SortingComponent, TableHeaderComponent, @@ -105,7 +109,6 @@ import { WorkflowsService, WorkflowsState } from './declarations'; -import { SchemaTagConverter } from './state/schema-tag-converter'; @NgModule({ imports: [ @@ -117,17 +120,20 @@ import { SchemaTagConverter } from './state/schema-tag-converter'; AppFormComponent, AssetComponent, AssetDialogComponent, + AssetFolderComponent, + AssetFolderFormComponent, + AssetPathComponent, AssetPreviewUrlPipe, - AssetUrlPipe, AssetsListComponent, AssetsSelectorComponent, AssetUploaderComponent, + AssetUrlPipe, CommentComponent, CommentsComponent, FileIconPipe, - FilterNodeComponent, - FilterLogicalComponent, FilterComparisonComponent, + FilterLogicalComponent, + FilterNodeComponent, GeolocationEditorComponent, HelpComponent, HelpMarkdownPipe, @@ -138,28 +144,31 @@ import { SchemaTagConverter } from './state/schema-tag-converter'; MarkdownEditorComponent, QueryComponent, ReferencesDropdownComponent, + RichEditorComponent, SavedQueriesComponent, SchemaCategoryComponent, + SearchFormComponent, SortingComponent, + TableHeaderComponent, UserDtoPicture, UserIdPicturePipe, UserNamePipe, UserNameRefPipe, UserPicturePipe, - UserPictureRefPipe, - RichEditorComponent, - SearchFormComponent, - TableHeaderComponent + UserPictureRefPipe ], exports: [ AppFormComponent, AssetComponent, AssetDialogComponent, + AssetFolderComponent, + AssetFolderFormComponent, + AssetPathComponent, AssetPreviewUrlPipe, - AssetUrlPipe, AssetsListComponent, AssetsSelectorComponent, AssetUploaderComponent, + AssetUrlPipe, CommentComponent, CommentsComponent, DragDropModule, @@ -178,13 +187,13 @@ import { SchemaTagConverter } from './state/schema-tag-converter'; SavedQueriesComponent, SchemaCategoryComponent, SearchFormComponent, + TableHeaderComponent, UserDtoPicture, UserIdPicturePipe, UserNamePipe, UserNameRefPipe, UserPicturePipe, - UserPictureRefPipe, - TableHeaderComponent + UserPictureRefPipe ], providers: [ AssetsDialogState diff --git a/frontend/app/shared/services/assets.service.spec.ts b/frontend/app/shared/services/assets.service.spec.ts index e3453d5da..10a171851 100644 --- a/frontend/app/shared/services/assets.service.spec.ts +++ b/frontend/app/shared/services/assets.service.spec.ts @@ -12,14 +12,18 @@ import { AnalyticsService, ApiUrlConfig, AssetDto, + AssetFolderDto, + AssetFoldersDto, AssetsDto, AssetsService, DateTime, ErrorDto, + MathHelper, Resource, ResourceLinks, Version } from '@app/shared/internal'; + import { encodeQuery } from '../state/query'; describe('AssetsService', () => { @@ -86,6 +90,10 @@ describe('AssetsService', () => { items: [ assetResponse(12), assetResponse(13) + ], + folders: [ + assetFolderResponse(22), + assetFolderResponse(23) ] }); @@ -96,6 +104,35 @@ describe('AssetsService', () => { ])); })); + it('should make get request to get asset folders', + inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => { + + let assets: AssetFoldersDto; + + assetsService.getAssetFolders('my-app', 'parent1').subscribe(result => { + assets = result; + }); + + const req = httpMock.expectOne(`http://service/p/api/apps/my-app/assets/folders?parentId=parent1`); + + expect(req.request.method).toEqual('GET'); + expect(req.request.headers.get('If-Match')).toBeNull(); + + req.flush({ + total: 10, + items: [ + assetFolderResponse(22), + assetFolderResponse(23) + ] + }); + + expect(assets!).toEqual( + new AssetFoldersDto(10, [ + createAssetFolder(22), + createAssetFolder(23) + ])); + })); + it('should make get request to get asset', inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => { @@ -159,11 +196,11 @@ describe('AssetsService', () => { let asset: AssetDto; - assetsService.postAssetFile('my-app', null!).subscribe(result => { + assetsService.postAssetFile('my-app', null!, 'parent1').subscribe(result => { asset = result; }); - const req = httpMock.expectOne('http://service/p/api/apps/my-app/assets'); + const req = httpMock.expectOne('http://service/p/api/apps/my-app/assets?parentId=parent1'); expect(req.request.method).toEqual('POST'); expect(req.request.headers.get('If-Match')).toBeNull(); @@ -179,13 +216,13 @@ describe('AssetsService', () => { let asset: AssetDto; let error: ErrorDto; - assetsService.postAssetFile('my-app', null!).subscribe(result => { + assetsService.postAssetFile('my-app', null!, 'parent1').subscribe(result => { asset = result; }, e => { error = e; }); - const req = httpMock.expectOne('http://service/p/api/apps/my-app/assets'); + const req = httpMock.expectOne('http://service/p/api/apps/my-app/assets?parentId=parent1'); expect(req.request.method).toEqual('POST'); expect(req.request.headers.get('If-Match')).toBeNull(); @@ -277,7 +314,28 @@ describe('AssetsService', () => { expect(asset!).toEqual(createAsset(123)); })); - it('should make delete request to delete asset', + it('should make delete request to move asset item', + inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => { + + const resource: Resource = { + _links: { + move: { method: 'DELETE', href: 'api/apps/my-app/assets/123/parent' } + } + }; + + const dto = { parentId: 'parent1' }; + + assetsService.putAssetItemParent('my-app', resource, dto, version).subscribe(); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/assets/123/parent'); + + expect(req.request.method).toEqual('DELETE'); + expect(req.request.headers.get('If-Match')).toEqual(version.value); + + req.flush({}); + })); + + it('should make delete request to delete asset item', inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => { const resource: Resource = { @@ -286,7 +344,7 @@ describe('AssetsService', () => { } }; - assetsService.deleteAsset('my-app', resource, version).subscribe(); + assetsService.deleteAssetItem('my-app', resource, version).subscribe(); const req = httpMock.expectOne('http://service/p/api/apps/my-app/assets/123'); @@ -296,7 +354,57 @@ describe('AssetsService', () => { req.flush({}); })); - function assetResponse(id: number, suffix = '') { + it('should make post request to create asset folder', + inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => { + + const dto = { folderName: 'My Folder' }; + + let assetFolder: AssetFolderDto; + + assetsService.postAssetFolder('my-app', dto).subscribe(result => { + assetFolder = result; + }); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/assets/folders'); + + expect(req.request.method).toEqual('POST'); + expect(req.request.headers.get('If-Match')).toBeNull(); + + req.flush(assetFolderResponse(22)); + + expect(assetFolder!).toEqual(createAssetFolder(22)); + })); + + it('should make put request to update asset folder', + inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => { + + const dto = { folderName: 'My Folder' }; + + const resource: Resource = { + _links: { + update: { method: 'PUT', href: 'api/apps/my-app/assets/folders/123' } + } + }; + + let assetFolder: AssetFolderDto; + + assetsService.putAssetFolder('my-app', resource, dto, version).subscribe(result => { + assetFolder = result; + }); + + const req = httpMock.expectOne('http://service/p/api/apps/my-app/assets/folders/123'); + + expect(req.request.method).toEqual('PUT'); + expect(req.request.headers.get('If-Match')).toBe(version.value); + + req.flush(assetFolderResponse(22)); + + expect(assetFolder!).toEqual(createAssetFolder(22)); + })); + + function assetResponse(id: number, suffix = '', parentId?: string) { + parentId = parentId || MathHelper.EMPTY_GUID; + return { id: `id${id}`, created: `${id % 1000 + 2000}-12-12T10:10:00`, @@ -308,6 +416,7 @@ describe('AssetsService', () => { fileType: 'png', fileSize: id * 2, fileVersion: id * 4, + parentId, mimeType: 'image/png', isImage: true, pixelWidth: id * 3, @@ -323,9 +432,24 @@ describe('AssetsService', () => { } }; } + + function assetFolderResponse(id: number, suffix = '', parentId?: string) { + parentId = parentId || MathHelper.EMPTY_GUID; + + return { + id: `id${id}`, + folderName: `My Folder${id}${suffix}`, + parentId, + version: id, + _links: { + update: { method: 'PUT', href: `/assets/folders/${id}` } + } + }; + + } }); -export function createAsset(id: number, tags?: ReadonlyArray, suffix = '') { +export function createAsset(id: number, tags?: ReadonlyArray, suffix = '', parentId?: string) { const links: ResourceLinks = { update: { method: 'PUT', href: `/assets/${id}` } }; @@ -334,6 +458,8 @@ export function createAsset(id: number, tags?: ReadonlyArray, suffix = ' isDuplicate: 'true' }; + parentId = parentId || MathHelper.EMPTY_GUID; + return new AssetDto(links, meta, `id${id}`, DateTime.parseISO_UTC(`${id % 1000 + 2000}-12-12T10:10:00`), `creator${id}`, @@ -343,6 +469,7 @@ export function createAsset(id: number, tags?: ReadonlyArray, suffix = ' 'png', id * 2, id * 4, + parentId, 'image/png', true, id * 3, @@ -350,4 +477,14 @@ export function createAsset(id: number, tags?: ReadonlyArray, suffix = ' `my-name${id}${suffix}.png`, tags || ['tag1', 'tag2'], new Version(`${id}`)); +} + +export function createAssetFolder(id: number, suffix = '', parentId?: string) { + parentId = parentId || MathHelper.EMPTY_GUID; + + const links: ResourceLinks = { + update: { method: 'PUT', href: `/assets/folders/${id}` } + }; + + return new AssetFolderDto(links, `id${id}`, `My Folder${id}${suffix}`, parentId, new Version(`${id}`)); } \ No newline at end of file diff --git a/frontend/app/shared/services/assets.service.ts b/frontend/app/shared/services/assets.service.ts index 8af0d2a0d..8190a725e 100644 --- a/frontend/app/shared/services/assets.service.ts +++ b/frontend/app/shared/services/assets.service.ts @@ -44,6 +44,7 @@ export class AssetDto { public readonly canPreview: boolean; public readonly canUpdate: boolean; public readonly canUpload: boolean; + public readonly canMove: boolean; public get isDuplicate() { return this._meta && this._meta['isDuplicate'] === 'true'; @@ -64,6 +65,7 @@ export class AssetDto { public readonly fileType: string, public readonly fileSize: number, public readonly fileVersion: number, + public readonly parentId: string, public readonly mimeType: string, public readonly isImage: boolean, public readonly pixelWidth: number | null | undefined, @@ -79,6 +81,7 @@ export class AssetDto { this.canDelete = hasAnyLink(links, 'delete'); this.canUpdate = hasAnyLink(links, 'update'); this.canUpload = hasAnyLink(links, 'upload'); + this.canMove = hasAnyLink(links, 'move'); this._meta = meta; } @@ -88,12 +91,52 @@ export class AssetDto { } } +export class AssetFoldersDto extends ResultSet { + public get canCreate() { + return hasAnyLink(this._links, 'create'); + } +} + +export class AssetFolderDto { + public readonly _links: ResourceLinks; + + public readonly canDelete: boolean; + public readonly canUpdate: boolean; + public readonly canMove: boolean; + + constructor(links: ResourceLinks, + public readonly id: string, + public readonly folderName: string, + public readonly parentId: string, + public readonly version: Version + ) { + this._links = links; + + this.canDelete = hasAnyLink(links, 'delete'); + this.canUpdate = hasAnyLink(links, 'update'); + this.canMove = hasAnyLink(links, 'move'); + } +} + export interface AnnotateAssetDto { readonly fileName?: string; readonly slug?: string; readonly tags?: ReadonlyArray; } +export interface CreateAssetFolderDto { + readonly parentId?: string; + readonly folderName: string; +} + +export interface RenameAssetFolderDto { + readonly folderName: string; +} + +export interface MoveAssetItemDto { + readonly parentId?: string; +} + @Injectable() export class AssetsService { constructor( @@ -109,7 +152,7 @@ export class AssetsService { return this.http.get<{ [name: string]: number }>(url); } - public getAssets(appName: string, take: number, skip: number, query?: Query, tags?: ReadonlyArray, ids?: ReadonlyArray): Observable { + public getAssets(appName: string, take: number, skip: number, query?: Query, tags?: ReadonlyArray, ids?: ReadonlyArray, parentId?: string): Observable { let fullQuery = ''; if (ids) { @@ -144,11 +187,15 @@ export class AssetsService { } fullQuery = `q=${encodeQuery(queryObj)}`; + + if (parentId) { + fullQuery += `&parentId=${parentId}`; + } } const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets?${fullQuery}`); - return this.http.get<{ total: number, items: any[] } & Resource>(url).pipe( + return this.http.get<{ total: number, items: any[], folders: any[] } & Resource>(url).pipe( map(({ total, items, _links }) => { const assets = items.map(item => parseAsset(item)); @@ -157,8 +204,32 @@ export class AssetsService { pretifyError('Failed to load assets. Please reload.')); } - public postAssetFile(appName: string, file: File): Observable { - const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets`); + public getAssetFolders(appName: string, parentId?: string): Observable { + const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets/folders?parentId=${parentId}`); + + return this.http.get<{ total: number, items: any[], folders: any[] } & Resource>(url).pipe( + map(({ total, items, _links }) => { + const assetFolders = items.map(item => parseAssetFolder(item)); + + return new AssetFoldersDto(total, assetFolders, _links); + }), + pretifyError('Failed to load asset folders. Please reload.')); + } + + public getAsset(appName: string, id: string): Observable { + const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets/${id}`); + + return HTTP.getVersioned(this.http, url).pipe( + map(({ payload }) => { + const body = payload.body; + + return parseAsset(body); + }), + pretifyError('Failed to load assets. Please reload.')); + } + + public postAssetFile(appName: string, file: File, parentId?: string): Observable { + const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets?parentId=${parentId}`); return HTTP.upload(this.http, 'POST', url, file).pipe( filter(event => @@ -190,18 +261,6 @@ export class AssetsService { pretifyError('Failed to upload asset. Please reload.')); } - public getAsset(appName: string, id: string): Observable { - const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets/${id}`); - - return HTTP.getVersioned(this.http, url).pipe( - map(({ payload }) => { - const body = payload.body; - - return parseAsset(body); - }), - pretifyError('Failed to load assets. Please reload.')); - } - public putAssetFile(appName: string, resource: Resource, file: File, version: Version): Observable { const link = resource._links['upload']; @@ -237,6 +296,19 @@ export class AssetsService { pretifyError('Failed to replace asset. Please reload.')); } + public postAssetFolder(appName: string, dto: CreateAssetFolderDto): Observable { + const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets/folders`); + + return HTTP.postVersioned(this.http, url, dto).pipe( + map(({ payload }) => { + return parseAssetFolder(payload.body); + }), + tap(() => { + this.analytics.trackEvent('AssetFolder', 'Updated', appName); + }), + pretifyError('Failed to create asset folder. Please reload.')); + } + public putAsset(appName: string, resource: Resource, dto: AnnotateAssetDto, version: Version): Observable { const link = resource._links['update']; @@ -247,19 +319,46 @@ export class AssetsService { return parseAsset(payload.body); }), tap(() => { - this.analytics.trackEvent('Analytics', 'Updated', appName); + this.analytics.trackEvent('Asset', 'Updated', appName); }), pretifyError('Failed to update asset. Please reload.')); } - public deleteAsset(appName: string, asset: Resource, version: Version): Observable> { + public putAssetFolder(appName: string, resource: Resource, dto: RenameAssetFolderDto, version: Version): Observable { + const link = resource._links['update']; + + const url = this.apiUrl.buildUrl(link.href); + + return HTTP.requestVersioned(this.http, link.method, url, version, dto).pipe( + map(({ payload }) => { + return parseAssetFolder(payload.body); + }), + tap(() => { + this.analytics.trackEvent('AssetFolder', 'Updated', appName); + }), + pretifyError('Failed to update asset folder. Please reload.')); + } + + public putAssetItemParent(appName: string, resource: Resource, dto: MoveAssetItemDto, version: Version): Observable> { + const link = resource._links['move']; + + const url = this.apiUrl.buildUrl(link.href); + + return HTTP.requestVersioned(this.http, link.method, url, version, dto).pipe( + tap(() => { + this.analytics.trackEvent('Asset', 'Moved', appName); + }), + pretifyError('Failed to move asset. Please reload.')); + } + + public deleteAssetItem(appName: string, asset: Resource, version: Version): Observable> { const link = asset._links['delete']; const url = this.apiUrl.buildUrl(link.href); return HTTP.requestVersioned(this.http, link.method, url, version).pipe( tap(() => { - this.analytics.trackEvent('Analytics', 'Deleted', appName); + this.analytics.trackEvent('Asset', 'Deleted', appName); }), pretifyError('Failed to delete asset. Please reload.')); } @@ -275,6 +374,7 @@ function parseAsset(response: any) { response.fileType, response.fileSize, response.fileVersion, + response.parentId, response.mimeType, response.isImage, response.pixelWidth, @@ -282,4 +382,12 @@ function parseAsset(response: any) { response.slug, response.tags || [], new Version(response.version.toString())); +} + +function parseAssetFolder(response: any) { + return new AssetFolderDto(response._links, + response.id, + response.folderName, + response.parentId, + new Version(response.version.toString())); } \ No newline at end of file diff --git a/frontend/app/shared/state/asset-uploader.state.spec.ts b/frontend/app/shared/state/asset-uploader.state.spec.ts index 5c88cf7f5..11e299f16 100644 --- a/frontend/app/shared/state/asset-uploader.state.spec.ts +++ b/frontend/app/shared/state/asset-uploader.state.spec.ts @@ -21,6 +21,7 @@ import { import { createAsset } from './../services/assets.service.spec'; import { TestValues } from './_test-helpers'; +import { AssetsState } from './assets.state'; describe('AssetUploaderState', () => { const { @@ -48,7 +49,7 @@ describe('AssetUploaderState', () => { it('should create initial state when uploading file', () => { const file: File = { name: 'my-file' }; - assetsService.setup(x => x.postAssetFile(app, file)) + assetsService.setup(x => x.postAssetFile(app, file, undefined)) .returns(() => never()).verifiable(); assetUploader.uploadFile(file).subscribe(); @@ -59,10 +60,26 @@ describe('AssetUploaderState', () => { expect(upload.progress).toBe(1); }); + it('should upload file with folder id from asset state', () => { + const assetsState = Mock.ofType(); + + assetsState.setup(x => x.parentId) + .returns(() => 'parent1'); + + const file: File = { name: 'my-file' }; + + assetsService.setup(x => x.postAssetFile(app, file, 'parent1')) + .returns(() => never()).verifiable(); + + assetUploader.uploadFile(file, assetsState.object).subscribe(); + + expect().nothing(); + }); + it('should update progress when uploading file makes progress', () => { const file: File = { name: 'my-file' }; - assetsService.setup(x => x.postAssetFile(app, file)) + assetsService.setup(x => x.postAssetFile(app, file, undefined)) .returns(() => ofForever(10, 20)).verifiable(); assetUploader.uploadFile(file).subscribe(); @@ -76,7 +93,7 @@ describe('AssetUploaderState', () => { it('should update status when uploading file failed', () => { const file: File = { name: 'my-file' }; - assetsService.setup(x => x.postAssetFile(app, file)) + assetsService.setup(x => x.postAssetFile(app, file, undefined)) .returns(() => throwError('Error')).verifiable(); assetUploader.uploadFile(file).pipe(onErrorResumeNext()).subscribe(); @@ -90,7 +107,7 @@ describe('AssetUploaderState', () => { it('should update status when uploading file completes', (cb) => { const file: File = { name: 'my-file' }; - assetsService.setup(x => x.postAssetFile(app, file)) + assetsService.setup(x => x.postAssetFile(app, file, undefined)) .returns(() => of(10, 20, asset)).verifiable(); let uploadedAsset: AssetDto; diff --git a/frontend/app/shared/state/asset-uploader.state.ts b/frontend/app/shared/state/asset-uploader.state.ts index e1ddaf544..b1db14991 100644 --- a/frontend/app/shared/state/asset-uploader.state.ts +++ b/frontend/app/shared/state/asset-uploader.state.ts @@ -71,13 +71,15 @@ export class AssetUploaderState extends State { } public uploadFile(file: File, target?: AssetsState): Observable { - const stream = this.assetsService.postAssetFile(this.appName, file); + const parentId = target ? target.parentId : undefined; + + const stream = this.assetsService.postAssetFile(this.appName, file, parentId); return this.upload(stream, MathHelper.guid(), file, asset => { if (asset.isDuplicate) { this.dialogs.notifyError('Asset has already been uploaded.'); } else if (target) { - target.add(asset); + target.addAsset(asset); } return asset; diff --git a/frontend/app/shared/state/assets.forms.ts b/frontend/app/shared/state/assets.forms.ts index c618f74b6..9b65ea159 100644 --- a/frontend/app/shared/state/assets.forms.ts +++ b/frontend/app/shared/state/assets.forms.ts @@ -92,4 +92,16 @@ export class AnnotateAssetForm extends Form { + constructor(formBuilder: FormBuilder) { + super(formBuilder.group({ + folderName: ['', + [ + Validators.required + ] + ] + })); + } } \ No newline at end of file diff --git a/frontend/app/shared/state/assets.state.spec.ts b/frontend/app/shared/state/assets.state.spec.ts index c29dec235..a5fad032b 100644 --- a/frontend/app/shared/state/assets.state.spec.ts +++ b/frontend/app/shared/state/assets.state.spec.ts @@ -5,20 +5,24 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { + AssetFoldersDto, + AssetPathItem, AssetsDto, AssetsService, AssetsState, DialogService, LocalStoreService, + MathHelper, Pager, versioned } from '@app/shared/internal'; -import { createAsset } from './../services/assets.service.spec'; +import { createAsset, createAssetFolder } from './../services/assets.service.spec'; import { TestValues } from './_test-helpers'; import { encodeQuery } from './query'; @@ -27,14 +31,16 @@ describe('AssetsState', () => { const { app, appsState, - newVersion, - version + newVersion } = TestValues; const asset1 = createAsset(1, ['tag1', 'shared']); const asset2 = createAsset(2, ['tag2', 'shared']); - const newAsset = createAsset(3, ['new']); + const assetFolder1 = createAssetFolder(1); + const assetFolder2 = createAssetFolder(2); + + const newAssetFolder = createAssetFolder(0, '_new'); let dialogs: IMock; let assetsService: IMock; @@ -50,7 +56,7 @@ describe('AssetsState', () => { assetsService = Mock.ofType(); assetsService.setup(x => x.getTags(app)) - .returns(() => of({ tag1: 1, shared: 2, tag2: 1 })).verifiable(Times.atLeastOnce()); + .returns(() => of({ tag1: 1, shared: 2, tag2: 1 })); assetsState = new AssetsState(appsState.object, assetsService.object, dialogs.object, localStore.object); }); @@ -60,8 +66,13 @@ describe('AssetsState', () => { }); describe('Loading', () => { + beforeEach(() => { + assetsService.setup(x => x.getAssetFolders(app, MathHelper.EMPTY_GUID)) + .returns(() => of(new AssetFoldersDto(2, [assetFolder1, assetFolder2]))).verifiable(Times.atLeastOnce()); + }); + it('should load assets', () => { - assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue([]))) + assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue([]), undefined, MathHelper.EMPTY_GUID)) .returns(() => of(new AssetsDto(200, [asset1, asset2]))).verifiable(); assetsState.load().subscribe(); @@ -69,12 +80,13 @@ describe('AssetsState', () => { expect(assetsState.snapshot.assets).toEqual([asset1, asset2]); expect(assetsState.snapshot.assetsPager.numberOfItems).toEqual(200); expect(assetsState.snapshot.isLoaded).toBeTruthy(); + expect(assetsState.snapshot.isLoading).toBeFalsy(); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); it('should show notification on load when reload is true', () => { - assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue([]))) + assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue([]), undefined, MathHelper.EMPTY_GUID)) .returns(() => of(new AssetsDto(200, [asset1, asset2]))).verifiable(); assetsState.load(true).subscribe(); @@ -84,20 +96,11 @@ describe('AssetsState', () => { dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.once()); }); - it('should load with tags when tag toggled', () => { - assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue(['tag1']))) - .returns(() => of(new AssetsDto(0, []))).verifiable(); - - assetsState.toggleTag('tag1').subscribe(); - - expect(assetsState.isTagSelected('tag1')).toBeTruthy(); - }); - it('should load without tags when tag untoggled', () => { - assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue(['tag1']))) + assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue(['tag1']), undefined, undefined)) .returns(() => of(new AssetsDto(0, []))).verifiable(); - assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue([]))) + assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue([]), undefined, MathHelper.EMPTY_GUID)) .returns(() => of(new AssetsDto(0, []))).verifiable(); assetsState.toggleTag('tag1').subscribe(); @@ -106,17 +109,8 @@ describe('AssetsState', () => { expect(assetsState.isTagSelected('tag1')).toBeFalsy(); }); - it('should load with tags when tags selected', () => { - assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue(['tag1', 'tag2']))) - .returns(() => of(new AssetsDto(0, []))).verifiable(); - - assetsState.selectTags(['tag1', 'tag2']).subscribe(); - - expect(assetsState.isTagSelected('tag1')).toBeTruthy(); - }); - it('should load without tags when tags reset', () => { - assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue([]))) + assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue([]), undefined, MathHelper.EMPTY_GUID)) .returns(() => of(new AssetsDto(0, []))).verifiable(); assetsState.resetTags().subscribe(); @@ -125,7 +119,7 @@ describe('AssetsState', () => { }); it('should load with new pagination when paging', () => { - assetsService.setup(x => x.getAssets(app, 30, 30, undefined, It.isValue([]))) + assetsService.setup(x => x.getAssets(app, 30, 30, undefined, It.isValue([]), undefined, MathHelper.EMPTY_GUID)) .returns(() => of(new AssetsDto(200, []))).verifiable(); assetsState.setPager(new Pager(200, 1, 30)).subscribe(); @@ -134,7 +128,7 @@ describe('AssetsState', () => { }); it('should update page size in local store', () => { - assetsService.setup(x => x.getAssets(app, 50, 0, undefined, It.isValue([]))) + assetsService.setup(x => x.getAssets(app, 50, 0, undefined, It.isValue([]), undefined, MathHelper.EMPTY_GUID)) .returns(() => of(new AssetsDto(200, []))).verifiable(); assetsState.setPager(new Pager(0, 0, 50)); @@ -143,11 +137,74 @@ describe('AssetsState', () => { expect().nothing(); }); + }); + + describe('Navigating', () => { + beforeEach(() => { + assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isAny(), undefined, It.isAny())) + .returns(() => of(new AssetsDto(0, []))); + + assetsService.setup(x => x.getAssetFolders(app, It.isAny())) + .returns(() => of(new AssetFoldersDto(0, []))); + }); + + it('should move to child', () => { + assetsState.navigate({ id: '1', folderName: 'Folder1' }).subscribe(); + assetsState.navigate({ id: '2', folderName: 'Folder2' }).subscribe(); + + let path: ReadonlyArray; + + assetsState.path.subscribe(result => { + path = result; + }); + + expect(path!).toEqual([ + { id: MathHelper.EMPTY_GUID, folderName: 'Assets' }, + { id: '1', folderName: 'Folder1' }, + { id: '2', folderName: 'Folder2' } + ]); + }); + + it('should navigate back to parent', () => { + assetsState.navigate({ id: '1', folderName: 'Folder1' }).subscribe(); + assetsState.navigate({ id: '2', folderName: 'Folder2' }).subscribe(); + assetsState.navigate({ id: MathHelper.EMPTY_GUID, folderName: 'Assets' }).subscribe(); + + let path: ReadonlyArray; + + assetsState.path.subscribe(result => { + path = result; + }); + + expect(path!).toEqual([ + { id: MathHelper.EMPTY_GUID, folderName: 'Assets' } + ]); + }); + }); + + describe('Searching', () => { + it('should load with tags when tag toggled', () => { + assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue(['tag1']), undefined, undefined)) + .returns(() => of(new AssetsDto(0, []))).verifiable(); + + assetsState.toggleTag('tag1').subscribe(); + + expect(assetsState.isTagSelected('tag1')).toBeTruthy(); + }); + + it('should load with tags when tags selected', () => { + assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue(['tag1', 'tag2']), undefined, undefined)) + .returns(() => of(new AssetsDto(0, []))).verifiable(); + + assetsState.selectTags(['tag1', 'tag2']).subscribe(); + + expect(assetsState.isTagSelected('tag1')).toBeTruthy(); + }); it('should load with query when searching', () => { const query = { fullText: 'my-query' }; - assetsService.setup(x => x.getAssets(app, 30, 0, query, It.isValue([]))) + assetsService.setup(x => x.getAssets(app, 30, 0, query, It.isValue([]), undefined, undefined)) .returns(() => of(new AssetsDto(0, []))).verifiable(); assetsState.search(query).subscribe(); @@ -159,46 +216,183 @@ describe('AssetsState', () => { describe('Updates', () => { beforeEach(() => { - assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue([]))) + assetsService.setup(x => x.getAssetFolders(app, MathHelper.EMPTY_GUID)) + .returns(() => of(new AssetFoldersDto(2, [assetFolder1, assetFolder2]))); + assetsService.setup(x => x.getAssets(app, 30, 0, undefined, It.isValue([]), undefined, MathHelper.EMPTY_GUID)) .returns(() => of(new AssetsDto(200, [asset1, asset2]))).verifiable(); assetsState.load(true).subscribe(); }); it('should add asset to snapshot when created', () => { - assetsState.add(newAsset); + const newAsset = createAsset(5, ['new']); + + assetsState.addAsset(newAsset); expect(assetsState.snapshot.assets).toEqual([newAsset, asset1, asset2]); expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(201); }); + it('should not add asset to snapshot when parent id is not the same', () => { + const newAsset = createAsset(5, ['new'], 'new', 'other-parent'); + + assetsState.addAsset(newAsset); + + expect(assetsState.snapshot.assets).toEqual([asset1, asset2]); + expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(200); + }); + it('should increment tags when asset added', () => { - assetsState.add(newAsset); - assetsState.add(newAsset); + assetsState.addAsset(createAsset(5, ['new'])); + assetsState.addAsset(createAsset(6, ['new'])); + + expect(assetsState.snapshot.tagsAvailable).toEqual({ tag1: 1, tag2: 1, shared: 2, new: 2 }); + }); + + it('should add asset folder when created', () => { + const request = { folderName: 'New Folder', parentId: MathHelper.EMPTY_GUID }; + + assetsService.setup(x => x.postAssetFolder(app, It.isValue(request))) + .returns(() => of(newAssetFolder)); + + assetsState.createAssetFolder(request.folderName); - expect(assetsState.snapshot.tags).toEqual({ tag1: 1, tag2: 1, shared: 2, new: 2 }); + expect(assetsState.snapshot.assetFolders).toEqual([newAssetFolder, assetFolder1, assetFolder2]); + }); + + it('should add asset folder when path has changed', () => { + const otherPath = createAssetFolder(3, '_new', 'otherParent'); + + const request = { folderName: 'New Folder', parentId: MathHelper.EMPTY_GUID }; + + assetsService.setup(x => x.postAssetFolder(app, It.isValue(request))) + .returns(() => of(otherPath)); + + assetsState.createAssetFolder(request.folderName); + + expect(assetsState.snapshot.assetFolders).toEqual([assetFolder1, assetFolder2]); }); it('should update asset when updated', () => { - const update = createAsset(1, ['new'], '_new'); + const updated = createAsset(1, ['new'], '_new'); + + const request = { fileName: 'New Name' }; + + assetsService.setup(x => x.putAsset(app, asset1, request, asset1.version)) + .returns(() => of(updated)); + + assetsState.updateAsset(asset1, request); + + const asset1New = assetsState.snapshot.assets[0]; + + expect(asset1New).toEqual(updated); + expect(assetsState.snapshot.tagsAvailable).toEqual({ tag2: 1, shared: 1, new: 1 }); + }); + + it('should update asset folder when updated', () => { + const updated = createAssetFolder(1, '_new'); + + const request = { folderName: 'New Name' }; + + assetsService.setup(x => x.putAssetFolder(app, assetFolder1, request, assetFolder1.version)) + .returns(() => of(updated)); + + assetsState.updateAssetFolder(assetFolder1, request); + + const assetFolder1New = assetsState.snapshot.assetFolders[0]; + + expect(assetFolder1New).toEqual(updated); + }); + + it('should remove asset from snapshot when moved to other folder', () => { + const request = { parentId: 'newParent' }; + + assetsService.setup(x => x.putAssetItemParent(app, asset1, It.isValue(request), asset1.version)) + .returns(() => of(versioned(newVersion))); + + assetsState.moveAsset(asset1, request.parentId).subscribe(); + + expect(assetsState.snapshot.assets.length).toBe(1); + expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(200); + }); - assetsState.update(update); + it('should not do anything when moving asset to current parent', () => { + const request = { parentId: MathHelper.EMPTY_GUID }; - const newAsset1 = assetsState.snapshot.assets[0]; + assetsState.moveAsset(asset1, request.parentId).pipe(onErrorResumeNext()).subscribe(); - expect(newAsset1).toEqual(update); - expect(assetsState.snapshot.tags).toEqual({ tag2: 1, shared: 1, new: 1 }); + expect(assetsState.snapshot.assets.length).toBe(2); + expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(200); + }); + + it('should move asset back to snapshot when moving via api failed', () => { + const request = { parentId: 'newParent' }; + + assetsService.setup(x => x.putAssetItemParent(app, asset1, It.isValue(request), asset1.version)) + .returns(() => throwError('error')); + + assetsState.moveAsset(asset1, request.parentId).pipe(onErrorResumeNext()).subscribe(); + + expect(assetsState.snapshot.assets.length).toBe(2); + expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(200); + }); + + it('should remove asset folder from snapshot when moved to other folder', () => { + const request = { parentId: 'newParent' }; + + assetsService.setup(x => x.putAssetItemParent(app, assetFolder1, It.isValue(request), assetFolder1.version)) + .returns(() => of(versioned(newVersion))); + + assetsState.moveAssetFolder(assetFolder1, request.parentId).subscribe(); + + expect(assetsState.snapshot.assetFolders.length).toBe(1); + }); + + it('should not do anything when moving asset folder to itself', () => { + const request = { parentId: assetFolder1.id }; + + assetsState.moveAssetFolder(assetFolder1, request.parentId).pipe(onErrorResumeNext()).subscribe(); + + expect(assetsState.snapshot.assets.length).toBe(2); + }); + + it('should not do anything when moving asset folder to current parent', () => { + const request = { parentId: MathHelper.EMPTY_GUID }; + + assetsState.moveAssetFolder(assetFolder1, request.parentId).pipe(onErrorResumeNext()).subscribe(); + + expect(assetsState.snapshot.assets.length).toBe(2); + }); + + it('should move asset folder back to snapshot when moving via api failed', () => { + const request = { parentId: 'newParent' }; + + assetsService.setup(x => x.putAssetItemParent(app, assetFolder1, It.isValue(request), assetFolder1.version)) + .returns(() => throwError('error')); + + assetsState.moveAssetFolder(assetFolder1, request.parentId).pipe(onErrorResumeNext()).subscribe(); + + expect(assetsState.snapshot.assets.length).toBe(2); }); it('should remove asset from snapshot when deleted', () => { - assetsService.setup(x => x.deleteAsset(app, asset1, version)) + assetsService.setup(x => x.deleteAssetItem(app, asset1, asset1.version)) .returns(() => of(versioned(newVersion))); - assetsState.delete(asset1).subscribe(); + assetsState.deleteAsset(asset1).subscribe(); expect(assetsState.snapshot.assets.length).toBe(1); expect(assetsState.snapshot.assetsPager.numberOfItems).toBe(199); - expect(assetsState.snapshot.tags).toEqual({ shared: 1, tag2: 1 }); + expect(assetsState.snapshot.tagsAvailable).toEqual({ shared: 1, tag2: 1 }); + }); + + it('should remove asset folder from snapshot when deleted', () => { + assetsService.setup(x => x.deleteAssetItem(app, assetFolder1, assetFolder1.version)) + .returns(() => of(versioned(newVersion))); + + assetsState.deleteAssetFolder(assetFolder1).subscribe(); + + expect(assetsState.snapshot.assetFolders.length).toBe(1); }); }); }); \ No newline at end of file diff --git a/frontend/app/shared/state/assets.state.ts b/frontend/app/shared/state/assets.state.ts index b4481d7a3..712f2d7f3 100644 --- a/frontend/app/shared/state/assets.state.ts +++ b/frontend/app/shared/state/assets.state.ts @@ -6,33 +6,53 @@ */ import { Injectable } from '@angular/core'; -import { combineLatest, Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; +import { empty, forkJoin, Observable, of, throwError } from 'rxjs'; +import { catchError, finalize, tap } from 'rxjs/operators'; import { compareStrings, DialogService, LocalStoreService, + MathHelper, Pager, shareSubscribed, State } from '@app/framework'; -import { AssetDto, AssetsService} from './../services/assets.service'; +import { + AnnotateAssetDto, + AssetDto, + AssetFolderDto, + AssetsService, + RenameAssetFolderDto +} from './../services/assets.service'; + import { AppsState } from './apps.state'; import { SavedQuery } from './queries'; import { encodeQuery, Query } from './query'; +export type AssetPathItem = { id: string, folderName: string }; + +type TagsAvailable = { [name: string]: number }; +type TagsSelected = { [name: string]: boolean }; + +const EMPTY_FOLDERS: { canCreate: boolean, items: ReadonlyArray } = { canCreate: false, items: [] }; + +const ROOT_PATH: ReadonlyArray = [{ id: MathHelper.EMPTY_GUID, folderName: 'Assets' }]; + interface Snapshot { // All assets tags. - tags: { [name: string]: number }; + tagsAvailable: TagsAvailable; // The selected asset tags. - tagsSelected: { [name: string]: boolean }; + tagsSelected: TagsSelected; // The current assets. assets: ReadonlyArray; + // The current asset folders. + assetFolders: ReadonlyArray; + // The pagination information. assetsPager: Pager; @@ -42,17 +62,29 @@ interface Snapshot { // The json of the assets query. assetsQueryJson: string; + // The folder path. + path: ReadonlyArray; + + // The parent folder. + parentFolder?: AssetPathItem; + // Indicates if the assets are loaded. isLoaded?: boolean; + // Indicates if the assets are loading. + isLoading?: boolean; + // Indicates if the user can create assets. canCreate?: boolean; + + // Indicates if the user can create asset folders. + canCreateFolders?: boolean; } @Injectable() export class AssetsState extends State { public tagsUnsorted = - this.project(x => x.tags); + this.project(x => x.tagsAvailable); public tagsSelected = this.project(x => x.tagsSelected); @@ -69,6 +101,9 @@ export class AssetsState extends State { public assets = this.project(x => x.assets); + public assetFolders = + this.project(x => x.assetFolders); + public assetsQuery = this.project(x => x.assetsQuery); @@ -78,9 +113,27 @@ export class AssetsState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + + public path = + this.project(x => x.path); + + public pathAvailable = + this.project(x => x.path.length > 0); + + public parentFolder = + this.project(x => x.parentFolder); + + public pathRoot = + this.project(x => x.path[x.path.length - 1]); + public canCreate = this.project(x => x.canCreate === true); + public canCreateFolders = + this.project(x => x.canCreateFolders === true); + constructor( private readonly appsState: AppsState, private readonly assetsService: AssetsService, @@ -88,10 +141,12 @@ export class AssetsState extends State { private readonly localStore: LocalStoreService ) { super({ + assetFolders: [], assets: [], assetsPager: Pager.fromLocalStore('assets', localStore, 30), assetsQueryJson: '', - tags: {}, + path: ROOT_PATH, + tagsAvailable: {}, tagsSelected: {} }); @@ -108,131 +163,263 @@ export class AssetsState extends State { return this.loadInternal(isReload); } - private loadInternal(isReload = false): Observable { - return combineLatest( + private loadInternal(isReload: boolean): Observable { + this.next({ isLoading: true }); + + const searchTags = Object.keys(this.snapshot.tagsSelected); + + const assets$ = this.assetsService.getAssets(this.appName, this.snapshot.assetsPager.pageSize, this.snapshot.assetsPager.skip, this.snapshot.assetsQuery, - Object.keys(this.snapshot.tagsSelected)), - this.assetsService.getTags(this.appName) - ).pipe( - tap(([ { items: assets, total, canCreate }, tags ]) => { + searchTags, undefined, this.parentId); + + const assetFolders$ = + this.snapshot.path.length === 0 ? + of(EMPTY_FOLDERS) : + this.assetsService.getAssetFolders(this.appName, this.parentId); + + const tags$ = + this.snapshot.path.length === 1 ? + this.assetsService.getTags(this.appName) : + of(this.snapshot.tagsAvailable); + + return forkJoin(([assets$, assetFolders$, tags$])).pipe( + tap(([assets, assetFolders, tagsAvailable]) => { if (isReload) { this.dialogs.notifyInfo('Assets reloaded.'); } + this.next(s => ({ + ...s, + assetFolders: assetFolders.items, + assets: assets.items, + assetsPager: s.assetsPager.setCount(assets.total), + canCreate: assets.canCreate, + canCreateFolders: assetFolders.canCreate, + isLoaded: true, + isLoading: false, + parentFolder: getParent(s.path), + tagsAvailable + })); + }), + finalize(() => { + this.next({ isLoading: false }); + }), + shareSubscribed(this.dialogs)); + } + + public addAsset(asset: AssetDto) { + if (asset.parentId !== this.parentId || this.snapshot.assets.find(x => x.id === asset.id)) { + return; + } + + this.next(s => { + const assets = [asset, ...s.assets]; + const assetsPager = s.assetsPager.incrementCount(); + + const tags = updateTags(s, asset); + + return { ...s, assets, assetsPager, ...tags }; + }); + } + + public createAssetFolder(folderName: string) { + return this.assetsService.postAssetFolder(this.appName, { folderName, parentId: this.parentId }).pipe( + tap(assetFolder => { + if (assetFolder.parentId !== this.parentId) { + return; + } + this.next(s => { - const assetsPager = s.assetsPager.setCount(total); + const assetFolders = [...s.assetFolders, assetFolder].sortedByString(x => x.folderName); - return { ...s, assets, assetsPager, isLoaded: true, tags, canCreate }; + return { ...s, assetFolders }; }); }), shareSubscribed(this.dialogs)); } - public add(asset: AssetDto) { + public updateAsset(asset: AssetDto, request: AnnotateAssetDto) { + return this.assetsService.putAsset(this.appName, asset, request, asset.version).pipe( + tap(updated => { + this.next(s => { + const tags = updateTags(s, updated); + + const assets = s.assets.replaceBy('id', updated); + + return { ...s, assets, ...tags }; + }); + }), + shareSubscribed(this.dialogs, { silent: true })); + } + + public updateAssetFolder(assetFolder: AssetFolderDto, request: RenameAssetFolderDto) { + return this.assetsService.putAssetFolder(this.appName, assetFolder, request, assetFolder.version).pipe( + tap(updated => { + this.next(s => { + const assetFolders = s.assetFolders.replaceBy('id', updated); + + return { ...s, assetFolders }; + }); + }), + shareSubscribed(this.dialogs, { silent: true })); + } + + public moveAsset(asset: AssetDto, parentId?: string) { + if (asset.parentId === parentId) { + return empty(); + } + this.next(s => { - const assets = [asset, ...s.assets]; - const assetsPager = s.assetsPager.incrementCount(); + const assets = s.assets.filter(x => x.id !== asset.id); + + return { ...s, assets }; + }); + + return this.assetsService.putAssetItemParent(this.appName, asset, { parentId }, asset.version).pipe( + catchError(error => { + this.next(s => { + const assets = [asset, ...s.assets]; + + return { ...s, assets }; + }); + + return throwError(error); + }), + shareSubscribed(this.dialogs)); + } - const tags = { ...s.tags }; + public moveAssetFolder(assetFolder: AssetFolderDto, parentId?: string) { + if (assetFolder.id === parentId || assetFolder.parentId === parentId) { + return empty(); + } - addTags(asset, tags); + this.next(s => { + const assetFolders = s.assetFolders.filter(x => x.id !== assetFolder.id); - return { ...s, assets, assetsPager, tags }; + return { ...s, assetFolders }; }); + + return this.assetsService.putAssetItemParent(this.appName, assetFolder, { parentId }, assetFolder.version).pipe( + catchError(error => { + this.next(s => { + const assetFolders = [...s.assetFolders, assetFolder].sortedByString(x => x.folderName); + + return { ...s, assetFolders }; + }); + + return throwError(error); + }), + shareSubscribed(this.dialogs)); } - public delete(asset: AssetDto): Observable { - return this.assetsService.deleteAsset(this.appName, asset, asset.version).pipe( + public deleteAsset(asset: AssetDto): Observable { + return this.assetsService.deleteAssetItem(this.appName, asset, asset.version).pipe( tap(() => { - return this.next(s => { + this.next(s => { const assets = s.assets.filter(x => x.id !== asset.id); const assetsPager = s.assetsPager.decrementCount(); - const tags = { ...s.tags }; - const tagsSelected = { ...s.tagsSelected }; + const tags = updateTags(s, undefined, asset); - removeTags(asset, tags, tagsSelected); + return { ...s, assets, assetsPager, ...tags }; + }); + }), + shareSubscribed(this.dialogs)); + } - return { ...s, assets, assetsPager, tags, tagsSelected }; + public deleteAssetFolder(assetFolder: AssetFolderDto): Observable { + return this.assetsService.deleteAssetItem(this.appName, assetFolder, assetFolder.version).pipe( + tap(() => { + this.next(s => { + const assetFolders = s.assetFolders.filter(x => x.id !== assetFolder.id); + + return { ...s, assetFolders }; }); }), shareSubscribed(this.dialogs)); } - public update(asset: AssetDto) { - this.next(s => { - const previous = s.assets.find(x => x.id === asset.id); + public setPager(assetsPager: Pager) { + this.next({ assetsPager }); - const tags = { ...s.tags }; - const tagsSelected = { ...s.tagsSelected }; + return this.loadInternal(false); + } + + public searchInternal(query?: Query | null, tags?: TagsSelected) { + this.next(s => { + const newState = { ...s, assetsPager: s.assetsPager.reset() }; - if (previous) { - removeTags(previous, tags, tagsSelected); + if (query !== null) { + newState.assetsQuery = query; + newState.assetsQueryJson = encodeQuery(query); } - if (asset) { - addTags(asset, tags); + if (tags) { + newState.tagsSelected = tags; } - const assets = s.assets.replaceBy('id', asset); + if (Object.keys(newState.tagsSelected).length > 0 || (newState.assetsQuery && newState.assetsQuery.fullText)) { + newState.path = []; + newState.assetFolders = []; + } else if (newState.path.length === 0) { + newState.path = ROOT_PATH; + } - return { ...s, assets, tags, tagsSelected }; + return newState; }); + + return this.loadInternal(false); } public toggleTag(tag: string): Observable { - this.next(s => { - const tagsSelected = { ...s.tagsSelected }; + const tagsSelected = { ...this.snapshot.tagsSelected }; - if (tagsSelected[tag]) { - delete tagsSelected[tag]; - } else { - tagsSelected[tag] = true; - } + if (tagsSelected[tag]) { + delete tagsSelected[tag]; + } else { + tagsSelected[tag] = true; + } - const assetsPager = s.assetsPager.reset(); + return this.searchInternal(null, tagsSelected); + } - return { ...s, assetsPager, tagsSelected }; - }); + public selectTags(tags: ReadonlyArray): Observable { + const tagsSelected = {}; + + for (const tag of tags) { + tagsSelected[tag] = true; + } - return this.loadInternal(); + return this.searchInternal(null, tagsSelected); } - public selectTags(tags: ReadonlyArray): Observable { + public navigate(folder: AssetPathItem) { this.next(s => { - const tagsSelected = {}; + let path = s.path; - for (const tag of tags) { - tagsSelected[tag] = true; - } + const index = path.findIndex(x => x.id === folder.id); - const assetsPager = s.assetsPager.reset(); + if (index >= 0) { + path = path.slice(0, index + 1); + } else { + path = [...path, folder]; + } - return { ...s, assetsPager: assetsPager, tagsSelected }; + return { ...s, path }; }); - return this.loadInternal(); + return this.loadInternal(false); } public resetTags(): Observable { - this.next(s => ({ ...s, assetsPager: s.assetsPager.reset(), tagsSelected: {} })); - - return this.loadInternal(); + return this.searchInternal(null, {}); } public search(query?: Query): Observable { - this.next(s => ({ ...s, assetsPager: s.assetsPager.reset(), assetsQuery: query, assetsQueryJson: encodeQuery(query) })); - - return this.loadInternal(); - } - - public setPager(assetsPager: Pager) { - this.next(s => ({ ...s, assetsPager })); - - return this.loadInternal(); + return this.searchInternal(query); } public isQueryUsed(saved: SavedQuery) { @@ -247,35 +434,54 @@ export class AssetsState extends State { return Object.keys(this.snapshot.tagsSelected).length === 0; } + public get parentId() { + return this.snapshot.path.length > 0 ? this.snapshot.path[this.snapshot.path.length - 1].id : undefined; + } + private get appName() { return this.appsState.appName; } } -function addTags(asset: AssetDto, tags: { [x: string]: number; }) { - for (const tag of asset.tags) { - if (tags[tag]) { - tags[tag]++; - } else { - tags[tag] = 1; +function updateTags(snapshot: Snapshot, newAsset?: AssetDto, oldAsset?: AssetDto) { + if (!oldAsset && newAsset) { + oldAsset = snapshot.assets.find(x => x.id === newAsset.id); + } + + const tagsAvailable = { ...snapshot.tagsAvailable }; + const tagsSelected = { ...snapshot.tagsSelected }; + + if (oldAsset) { + for (const tag of oldAsset.tags) { + if (tagsAvailable[tag] === 1) { + delete tagsAvailable[tag]; + delete tagsSelected[tag]; + } else { + tagsAvailable[tag]--; + } } } -} -function removeTags(previous: AssetDto, tags: { [x: string]: number; }, tagsSelected: { [x: string]: boolean; }) { - for (const tag of previous.tags) { - if (tags[tag] === 1) { - delete tags[tag]; - delete tagsSelected[tag]; - } else { - tags[tag]--; + if (newAsset) { + for (const tag of newAsset.tags) { + if (tagsAvailable[tag]) { + tagsAvailable[tag]++; + } else { + tagsAvailable[tag] = 1; + } } } + + return { tagsAvailable, tagsSelected }; } function sort(tags: { [name: string]: number }) { return Object.keys(tags).sort(compareStrings).map(name => ({ name, count: tags[name] })); } +function getParent(path: ReadonlyArray) { + return path.length > 1 ? { folderName: '', id: path[path.length - 2].id } : undefined; +} + @Injectable() export class AssetsDialogState extends AssetsState { } \ No newline at end of file diff --git a/frontend/app/shared/state/backups.state.spec.ts b/frontend/app/shared/state/backups.state.spec.ts index 79269f000..7b0478594 100644 --- a/frontend/app/shared/state/backups.state.spec.ts +++ b/frontend/app/shared/state/backups.state.spec.ts @@ -53,10 +53,20 @@ describe('BackupsState', () => { expect(backupsState.snapshot.backups).toEqual([backup1, backup2]); expect(backupsState.snapshot.isLoaded).toBeTruthy(); + expect(backupsState.snapshot.isLoading).toBeFalsy(); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); + it('should reset loading when loading failed', () => { + backupsService.setup(x => x.getBackups(app)) + .returns(() => throwError('error')); + + backupsState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(backupsState.snapshot.isLoading).toBeFalsy(); + }); + it('should show notification on load when reload is true', () => { backupsService.setup(x => x.getBackups(app)) .returns(() => of(new BackupsDto(2, [backup1, backup2], {}))).verifiable(); diff --git a/frontend/app/shared/state/backups.state.ts b/frontend/app/shared/state/backups.state.ts index e7d89ad15..e47806d85 100644 --- a/frontend/app/shared/state/backups.state.ts +++ b/frontend/app/shared/state/backups.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; +import { finalize, tap } from 'rxjs/operators'; import { DialogService, @@ -26,6 +26,9 @@ interface Snapshot { // Indicates if the backups are loaded. isLoaded?: boolean; + // Indicates if the backups are loading. + isLoading?: boolean; + // Indicates if the user can create new backups. canCreate?: boolean; } @@ -43,6 +46,9 @@ export class BackupsState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + public canCreate = this.project(x => x.canCreate === true); @@ -55,20 +61,34 @@ export class BackupsState extends State { } public load(isReload = false, silent = false): Observable { - if (!isReload) { + if (isReload && !silent) { this.resetState(); } + return this.loadInternal(isReload, silent); + } + + private loadInternal(isReload: boolean, silent: boolean): Observable { + if (!silent) { + this.next({ isLoading: true }); + } + return this.backupsService.getBackups(this.appName).pipe( tap(({ items: backups, canCreate }) => { if (isReload && !silent) { this.dialogs.notifyInfo('Backups reloaded.'); } - this.next(s => { - return { ...s, backups, isLoaded: true, canCreate }; + this.next({ + backups, + canCreate, + isLoaded: true, + isLoading: false }); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareSubscribed(this.dialogs, { silent })); } diff --git a/frontend/app/shared/state/clients.state.spec.ts b/frontend/app/shared/state/clients.state.spec.ts index 0cd494fcd..45cf9dac6 100644 --- a/frontend/app/shared/state/clients.state.spec.ts +++ b/frontend/app/shared/state/clients.state.spec.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -53,12 +54,22 @@ describe('ClientsState', () => { clientsState.load().subscribe(); expect(clientsState.snapshot.clients).toEqual(oldClients.items); + expect(clientsState.snapshot.isLoaded).toBeTruthy(); + expect(clientsState.snapshot.isLoading).toBeFalsy(); expect(clientsState.snapshot.version).toEqual(version); - expect(clientsState.isLoaded).toBeTruthy(); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); + it('should reset loading when loading failed', () => { + clientsService.setup(x => x.getClients(app)) + .returns(() => throwError('error')); + + clientsState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(clientsState.snapshot.isLoading).toBeFalsy(); + }); + it('should show notification on load when reload is true', () => { clientsService.setup(x => x.getClients(app)) .returns(() => of(versioned(version, oldClients))).verifiable(); diff --git a/frontend/app/shared/state/clients.state.ts b/frontend/app/shared/state/clients.state.ts index 4a0e7f81d..fbe975894 100644 --- a/frontend/app/shared/state/clients.state.ts +++ b/frontend/app/shared/state/clients.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; +import { finalize, tap } from 'rxjs/operators'; import { DialogService, @@ -36,6 +36,9 @@ interface Snapshot { // Indicates if the clients are loaded. isLoaded?: boolean; + // Indicates if the clients are loading. + isLoading?: boolean; + // Indicates if the user can create new clients. canCreate?: boolean; } @@ -50,6 +53,9 @@ export class ClientsState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + public canCreate = this.project(x => x.canCreate === true); @@ -66,6 +72,12 @@ export class ClientsState extends State { this.resetState(); } + return this.loadInternal(isReload); + } + + private loadInternal(isReload: boolean): Observable { + this.next({ isLoading: true }); + return this.clientsService.getClients(this.appName).pipe( tap(({ version, payload }) => { if (isReload) { @@ -74,6 +86,9 @@ export class ClientsState extends State { this.replaceClients(payload, version); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareSubscribed(this.dialogs)); } @@ -104,14 +119,12 @@ export class ClientsState extends State { private replaceClients(payload: ClientsPayload, version: Version) { const { canCreate, items: clients } = payload; - this.next(s => { - return { - ...s, - canCreate, - clients, - isLoaded: true, - version - }; + this.next({ + canCreate, + clients, + isLoaded: true, + isLoading: false, + version }); } diff --git a/frontend/app/shared/state/contents.state.ts b/frontend/app/shared/state/contents.state.ts index 0e1be11a6..187001915 100644 --- a/frontend/app/shared/state/contents.state.ts +++ b/frontend/app/shared/state/contents.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { empty, forkJoin, Observable, of } from 'rxjs'; -import { catchError, switchMap, tap } from 'rxjs/operators'; +import { catchError, finalize, switchMap, tap } from 'rxjs/operators'; import { DialogService, @@ -43,6 +43,9 @@ interface Snapshot { // Indicates if the contents are loaded. isLoaded?: boolean; + // Indicates if the contents are loading. + isLoading?: boolean; + // The statuses. statuses?: ReadonlyArray; @@ -78,6 +81,9 @@ export abstract class ContentsStateBase extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + public canCreate = this.project(x => x.canCreate === true); @@ -135,18 +141,10 @@ export abstract class ContentsStateBase extends State { } public load(isReload = false): Observable { - if (!isReload) { - if (this.schemaId !== this.previousId) { - const contentsPager = Pager.fromLocalStore('contents', this.localStore); - - this.resetState({ contentsPager }); - } else { - const contentsPager = this.snapshot.contentsPager; - const contentsQuery = this.snapshot.contentsQuery; - const contentsQueryJson = this.snapshot.contentsQueryJson; - - this.resetState({ contentsPager, contentsQuery, contentsQueryJson }); - } + if (!isReload && this.schemaId !== this.previousId) { + const contentsPager = this.snapshot.contentsPager.reset(); + + this.resetState({ contentsPager, selectedContent: this.snapshot.selectedContent }); } return this.loadInternal(isReload); @@ -160,15 +158,17 @@ export abstract class ContentsStateBase extends State { return this.loadInternal(false); } - private loadInternal(isReload = false) { + private loadInternal(isReload: boolean) { return this.loadInternalCore(isReload).pipe(shareSubscribed(this.dialogs)); } - private loadInternalCore(isReload = false) { + private loadInternalCore(isReload: boolean) { if (!this.appName || !this.schemaId) { return empty(); } + this.next({ isLoading: true }); + this.previousId = this.schemaId; return this.contentsService.getContents(this.appName, this.schemaId, @@ -197,10 +197,14 @@ export abstract class ContentsStateBase extends State { contents, contentsPager, isLoaded: true, + isLoading: false, selectedContent, statuses }; }); + }), + finalize(() => { + this.next({ isLoading: false }); })); } @@ -238,7 +242,7 @@ export abstract class ContentsStateBase extends State { return of(error); }), - switchMap(() => this.loadInternalCore()), + switchMap(() => this.loadInternalCore(false)), shareSubscribed(this.dialogs, { silent: true })); } @@ -256,7 +260,7 @@ export abstract class ContentsStateBase extends State { return of(error); }), - switchMap(() => this.loadInternal()), + switchMap(() => this.loadInternal(false)), shareSubscribed(this.dialogs, { silent: true })); } @@ -323,13 +327,13 @@ export abstract class ContentsStateBase extends State { public search(contentsQuery?: Query): Observable { this.next(s => ({ ...s, contentsPager: s.contentsPager.reset(), contentsQuery, contentsQueryJson: encodeQuery(contentsQuery) })); - return this.loadInternal(); + return this.loadInternal(false); } public setPager(contentsPager: Pager) { this.next(s => ({ ...s, contentsPager })); - return this.loadInternal(); + return this.loadInternal(false); } public isQueryUsed(saved: SavedQuery) { diff --git a/frontend/app/shared/state/contributors.state.spec.ts b/frontend/app/shared/state/contributors.state.spec.ts index d33ae4e68..d87a6c3d1 100644 --- a/frontend/app/shared/state/contributors.state.spec.ts +++ b/frontend/app/shared/state/contributors.state.spec.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { of } from 'rxjs'; +import { empty, of, throwError } from 'rxjs'; +import { catchError, onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -21,6 +22,7 @@ import { import { createContributors } from '../services/contributors.service.spec'; +import { ErrorDto } from '@app/framework'; import { TestValues } from './_test-helpers'; describe('ContributorsState', () => { @@ -50,10 +52,10 @@ describe('ContributorsState', () => { localStore = Mock.ofType(); contributorsService = Mock.ofType(); - contributorsState = new ContributorsState(appsState.object, contributorsService.object, dialogs.object, localStore.object); - contributorsService.setup(x => x.getContributors(app)) .returns(() => of(versioned(version, oldContributors))).verifiable(); + + contributorsState = new ContributorsState(appsState.object, contributorsService.object, dialogs.object, localStore.object); }); afterEach(() => { @@ -67,12 +69,22 @@ describe('ContributorsState', () => { expect(contributorsState.snapshot.contributors).toEqual(oldContributors.items); expect(contributorsState.snapshot.contributorsPager).toEqual(new Pager(20, 0, 10)); expect(contributorsState.snapshot.isLoaded).toBeTruthy(); + expect(contributorsState.snapshot.isLoading).toBeFalsy(); expect(contributorsState.snapshot.maxContributors).toBe(oldContributors.maxContributors); expect(contributorsState.snapshot.version).toEqual(version); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); + it('should reset loading when loading failed', () => { + contributorsService.setup(x => x.getContributors(app)) + .returns(() => throwError('error')); + + contributorsState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(contributorsState.snapshot.isLoading).toBeFalsy(); + }); + it('should only show current page of contributors', () => { contributorsState.load().subscribe(); @@ -150,6 +162,44 @@ describe('ContributorsState', () => { expectNewContributors(updated); }); + it('should return proper error when user to add does not exist', () => { + const request = { contributorId: 'mail2stehle@gmail.com', role: 'Developer' }; + + contributorsService.setup(x => x.postContributor(app, request, version)) + .returns(() => throwError(new ErrorDto(404, '404'))); + + let error: ErrorDto; + + contributorsState.assign(request).pipe( + catchError(err => { + error = err; + + return empty(); + }) + ).subscribe(); + + expect(error!.message).toBe('The user does not exist.'); + }); + + it('should return original error when not a 404', () => { + const request = { contributorId: 'mail2stehle@gmail.com', role: 'Developer' }; + + contributorsService.setup(x => x.postContributor(app, request, version)) + .returns(() => throwError(new ErrorDto(500, '500'))); + + let error: ErrorDto; + + contributorsState.assign(request).pipe( + catchError(err => { + error = err; + + return empty(); + }) + ).subscribe(); + + expect(error!.message).toBe('500'); + }); + it('should update contributors when contribution revoked', () => { const updated = createContributors(5, 6); diff --git a/frontend/app/shared/state/contributors.state.ts b/frontend/app/shared/state/contributors.state.ts index b17419249..7cc225582 100644 --- a/frontend/app/shared/state/contributors.state.ts +++ b/frontend/app/shared/state/contributors.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { Observable, throwError } from 'rxjs'; -import { catchError, tap } from 'rxjs/operators'; +import { catchError, finalize, tap } from 'rxjs/operators'; import { DialogService, @@ -40,6 +40,9 @@ interface Snapshot { // Indicates if the contributors are loaded. isLoaded?: boolean; + // Indicates if the contributors are loading. + isLoading?: boolean; + // The maximum allowed users. maxContributors: number; @@ -75,6 +78,9 @@ export class ContributorsState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + public canCreate = this.project(x => x.canCreate === true); @@ -106,10 +112,18 @@ export class ContributorsState extends State { } public load(isReload = false): Observable { - if (!isReload) { - this.resetState(); + if (isReload) { + const contributorsPager = this.snapshot.contributorsPager.reset(); + + this.resetState({ contributorsPager }); } + return this.loadInternal(isReload); + } + + private loadInternal(isReload: boolean): Observable { + this.next({ isLoading: true }); + return this.contributorsService.getContributors(this.appName).pipe( tap(({ version, payload }) => { if (isReload) { @@ -118,6 +132,9 @@ export class ContributorsState extends State { this.replaceContributors(version, payload); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareSubscribed(this.dialogs)); } @@ -163,6 +180,7 @@ export class ContributorsState extends State { contributors, contributorsPager, isLoaded: true, + isLoading: false, maxContributors, version }; diff --git a/frontend/app/shared/state/languages.state.spec.ts b/frontend/app/shared/state/languages.state.spec.ts index c745dfce6..c084c34ad 100644 --- a/frontend/app/shared/state/languages.state.spec.ts +++ b/frontend/app/shared/state/languages.state.spec.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -46,12 +47,10 @@ describe('LanguagesState', () => { dialogs = Mock.ofType(); allLanguagesService = Mock.ofType(); - allLanguagesService.setup(x => x.getLanguages()) .returns(() => of([languageDE, languageEN, languageIT, languageES])).verifiable(); languagesService = Mock.ofType(); - languagesService.setup(x => x.getLanguages(app)) .returns(() => of({ payload: oldLanguages, version })).verifiable(); @@ -81,11 +80,21 @@ describe('LanguagesState', () => { ]); expect(languagesState.snapshot.allLanguagesNew).toEqual([languageIT, languageES]); expect(languagesState.snapshot.isLoaded).toBeTruthy(); + expect(languagesState.snapshot.isLoading).toBeFalsy(); expect(languagesState.snapshot.version).toEqual(version); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); + it('should reset loading when loading failed', () => { + languagesService.setup(x => x.getLanguages(app)) + .returns(() => throwError('error')); + + languagesState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(languagesState.snapshot.isLoading).toBeFalsy(); + }); + it('should show notification on load when reload is true', () => { languagesState.load(true).subscribe(); diff --git a/frontend/app/shared/state/languages.state.ts b/frontend/app/shared/state/languages.state.ts index c5017ba14..5908d8336 100644 --- a/frontend/app/shared/state/languages.state.ts +++ b/frontend/app/shared/state/languages.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { forkJoin, Observable } from 'rxjs'; -import { map, shareReplay, tap } from 'rxjs/operators'; +import { finalize, map, shareReplay, tap } from 'rxjs/operators'; import { DialogService, @@ -54,6 +54,9 @@ interface Snapshot { // Indicates if the languages are loaded. isLoaded?: boolean; + // Indicates if the languages are loading. + isLoading?: boolean; + // Inedicates if the user can add a language. canCreate?: boolean; } @@ -75,6 +78,9 @@ export class LanguagesState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + public canCreate = this.project(x => x.canCreate === true); @@ -93,10 +99,16 @@ export class LanguagesState extends State { } public load(isReload = false): Observable { - if (!isReload) { + if (isReload) { this.resetState(); } + return this.loadInternal(isReload); + } + + private loadInternal(isReload: boolean): Observable { + this.next({ isLoading: true }); + return forkJoin(this.getAllLanguages(), this.getAppLanguages()).pipe( map(args => { return { allLanguages: args[0], languages: args[1] }; @@ -110,6 +122,9 @@ export class LanguagesState extends State { this.replaceLanguages(languages.payload, languages.version, sorted); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareSubscribed(this.dialogs)); } @@ -145,11 +160,12 @@ export class LanguagesState extends State { return { ...s, - canCreate, - languages: languages.map(x => this.createLanguage(x, languages)), allLanguages: allLanguages, allLanguagesNew: allLanguages.filter(x => !languages.find(l => l.iso2Code === x.iso2Code)), + canCreate, isLoaded: true, + isLoading: false, + languages: languages.map(x => this.createLanguage(x, languages)), version: version }; }); diff --git a/frontend/app/shared/state/patterns.state.spec.ts b/frontend/app/shared/state/patterns.state.spec.ts index e367b4dea..ea0d64533 100644 --- a/frontend/app/shared/state/patterns.state.spec.ts +++ b/frontend/app/shared/state/patterns.state.spec.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -52,12 +53,23 @@ describe('PatternsState', () => { patternsState.load().subscribe(); + expect(patternsState.snapshot.isLoaded).toBeTruthy(); + expect(patternsState.snapshot.isLoading).toBeFalsy(); expect(patternsState.snapshot.patterns).toEqual(oldPatterns.items); expect(patternsState.snapshot.version).toEqual(version); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); + it('should reset loading when loading failed', () => { + patternsService.setup(x => x.getPatterns(app)) + .returns(() => throwError('error')); + + patternsState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(patternsState.snapshot.isLoading).toBeFalsy(); + }); + it('should show notification on load when reload is true', () => { patternsService.setup(x => x.getPatterns(app)) .returns(() => of(versioned(version, oldPatterns))).verifiable(); diff --git a/frontend/app/shared/state/patterns.state.ts b/frontend/app/shared/state/patterns.state.ts index 7055d8191..94a980527 100644 --- a/frontend/app/shared/state/patterns.state.ts +++ b/frontend/app/shared/state/patterns.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; +import { finalize, tap } from 'rxjs/operators'; import { DialogService, @@ -36,6 +36,9 @@ interface Snapshot { // Indicates if the patterns are loaded. isLoaded?: boolean; + // Indicates if the patterns are loading. + isLoading?: boolean; + // Indicates if patterns can be created. canCreate?: boolean; } @@ -50,6 +53,9 @@ export class PatternsState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + public canCreate = this.project(x => x.canCreate === true); @@ -66,6 +72,12 @@ export class PatternsState extends State { this.resetState(); } + return this.loadInternal(isReload); + } + + private loadInternal(isReload: boolean): Observable { + this.next({ isLoading: true }); + return this.patternsService.getPatterns(this.appName).pipe( tap(({ version, payload }) => { if (isReload) { @@ -74,6 +86,9 @@ export class PatternsState extends State { this.replacePatterns(payload, version); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareMapSubscribed(this.dialogs, x => x.payload)); } @@ -104,8 +119,11 @@ export class PatternsState extends State { private replacePatterns(payload: PatternsPayload, version: Version) { const { canCreate, items: patterns } = payload; - this.next(s => { - return { ...s, patterns, isLoaded: true, version, canCreate }; + this.next({ + isLoaded: true, + isLoading: false, + patterns, + version, canCreate }); } diff --git a/frontend/app/shared/state/plans.state.spec.ts b/frontend/app/shared/state/plans.state.spec.ts index b2422e9ba..ca8377aec 100644 --- a/frontend/app/shared/state/plans.state.spec.ts +++ b/frontend/app/shared/state/plans.state.spec.ts @@ -5,7 +5,7 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; @@ -83,14 +83,24 @@ describe('PlansState', () => { { isSelected: false, isYearlySelected: false, plan: oldPlans.plans[0] }, { isSelected: false, isYearlySelected: true, plan: oldPlans.plans[1] } ]); - expect(plansState.snapshot.isOwner).toBeFalsy(); - expect(plansState.snapshot.isLoaded).toBeTruthy(); expect(plansState.snapshot.hasPortal).toBeTruthy(); + expect(plansState.snapshot.isLoaded).toBeTruthy(); + expect(plansState.snapshot.isLoading).toBeFalsy(); + expect(plansState.snapshot.isOwner).toBeFalsy(); expect(plansState.snapshot.version).toEqual(version); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); + it('should reset loading when loading failed', () => { + plansService.setup(x => x.getPlans(app)) + .returns(() => throwError('error')); + + plansState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(plansState.snapshot.isLoading).toBeFalsy(); + }); + it('should show notification on load when reload is true', () => { plansService.setup(x => x.getPlans(app)) .returns(() => of(versioned(version, oldPlans))).verifiable(); diff --git a/frontend/app/shared/state/plans.state.ts b/frontend/app/shared/state/plans.state.ts index 7e3cef192..9e2358e8e 100644 --- a/frontend/app/shared/state/plans.state.ts +++ b/frontend/app/shared/state/plans.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; +import { finalize, tap } from 'rxjs/operators'; import { DialogService, @@ -41,6 +41,9 @@ interface Snapshot { // Indicates if the plans are loaded. isLoaded?: boolean; + // Indicates if the plans are loading. + isLoading?: boolean; + // Indicates if there is a billing portal for the current Squidex instance. hasPortal?: boolean; @@ -59,6 +62,9 @@ export class PlansState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + public isDisabled = this.project(x => !x.isOwner); @@ -81,26 +87,33 @@ export class PlansState extends State { this.resetState(); } + return this.loadInternal(isReload, overridePlanId); + } + + private loadInternal(isReload: boolean, overridePlanId?: string): Observable { + this.next({ isLoading: true }); + return this.plansService.getPlans(this.appName).pipe( tap(({ version, payload }) => { if (isReload) { this.dialogs.notifyInfo('Plans reloaded.'); } - this.next(s => { - const planId = overridePlanId || payload.currentPlanId; - const plans = payload.plans.map(x => this.createPlan(x, planId)); - - return { - ...s, - plans: plans, - isOwner: !payload.planOwner || payload.planOwner === this.userId, - isLoaded: true, - version, - hasPortal: payload.hasPortal - }; + const planId = overridePlanId || payload.currentPlanId; + const plans = payload.plans.map(x => this.createPlan(x, planId)); + + this.next({ + hasPortal: payload.hasPortal, + isLoaded: true, + isLoading: false, + isOwner: !payload.planOwner || payload.planOwner === this.userId, + plans: plans, + version }); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareSubscribed(this.dialogs)); } diff --git a/frontend/app/shared/state/roles.state.spec.ts b/frontend/app/shared/state/roles.state.spec.ts index 78ff2ac80..555d276e5 100644 --- a/frontend/app/shared/state/roles.state.spec.ts +++ b/frontend/app/shared/state/roles.state.spec.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -48,13 +49,23 @@ describe('RolesState', () => { rolesState.load().subscribe(); - expect(rolesState.snapshot.roles).toEqual(oldRoles.items); expect(rolesState.snapshot.isLoaded).toBeTruthy(); + expect(rolesState.snapshot.isLoading).toBeFalsy(); + expect(rolesState.snapshot.roles).toEqual(oldRoles.items); expect(rolesState.snapshot.version).toEqual(version); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); + it('should reset loading when loading failed', () => { + rolesService.setup(x => x.getRoles(app)) + .returns(() => throwError('error')); + + rolesState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(rolesState.snapshot.isLoading).toBeFalsy(); + }); + it('should show notification on load when reload is true', () => { rolesService.setup(x => x.getRoles(app)) .returns(() => of(versioned(version, oldRoles))).verifiable(); diff --git a/frontend/app/shared/state/roles.state.ts b/frontend/app/shared/state/roles.state.ts index fade507e7..c95b92f97 100644 --- a/frontend/app/shared/state/roles.state.ts +++ b/frontend/app/shared/state/roles.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; +import { finalize, tap } from 'rxjs/operators'; import { DialogService, @@ -36,6 +36,9 @@ interface Snapshot { // Indicates if the roles are loaded. isLoaded?: boolean; + // Indicates if the roles are loading. + isLoading?: boolean; + // Indicates if the user can add a role. canCreate?: boolean; } @@ -50,6 +53,9 @@ export class RolesState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + public canCreate = this.project(x => x.canCreate === true); @@ -66,7 +72,13 @@ export class RolesState extends State { this.resetState(); } - return this.rolesService.getRoles(this.appName).pipe( + return this.loadInternal(isReload); + } + + private loadInternal(isReload: boolean): Observable { + this.next({ isLoading: true }); + + return this.rolesService.getRoles(this.appName).pipe( tap(({ version, payload }) => { if (isReload) { this.dialogs.notifyInfo('Roles reloaded.'); @@ -74,6 +86,9 @@ export class RolesState extends State { this.replaceRoles(payload, version); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareSubscribed(this.dialogs)); } @@ -104,8 +119,12 @@ export class RolesState extends State { private replaceRoles(payload: RolesPayload, version: Version) { const { canCreate, items: roles } = payload; - this.next(s => { - return { ...s, roles, isLoaded: true, version, canCreate }; + this.next({ + canCreate, + isLoaded: true, + isLoading: false, + roles, + version }); } diff --git a/frontend/app/shared/state/rule-events.state.spec.ts b/frontend/app/shared/state/rule-events.state.spec.ts index 82e753410..e17aac7a9 100644 --- a/frontend/app/shared/state/rule-events.state.spec.ts +++ b/frontend/app/shared/state/rule-events.state.spec.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -51,13 +52,23 @@ describe('RuleEventsState', () => { }); it('should load ruleEvents', () => { + expect(ruleEventsState.snapshot.isLoaded).toBeTruthy(); + expect(ruleEventsState.snapshot.isLoading).toBeFalsy(); expect(ruleEventsState.snapshot.ruleEvents).toEqual(oldRuleEvents); expect(ruleEventsState.snapshot.ruleEventsPager.numberOfItems).toEqual(200); - expect(ruleEventsState.snapshot.isLoaded).toBeTruthy(); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); + it('should reset loading when loading failed', () => { + rulesService.setup(x => x.getEvents(app, 10, 0, undefined)) + .returns(() => throwError('error')); + + ruleEventsState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(ruleEventsState.snapshot.isLoading).toBeFalsy(); + }); + it('should load page size from local store', () => { localStore.setup(x => x.getInt('rule-events.pageSize', 10)) .returns(() => 25); @@ -109,6 +120,18 @@ describe('RuleEventsState', () => { rulesService.verify(x => x.getEvents(app, 10, 0, '12'), Times.once()); }); + it('should not load again when rule id has not changed', () => { + rulesService.setup(x => x.getEvents(app, 10, 0, '12')) + .returns(() => of(new RuleEventsDto(200, []))); + + ruleEventsState.filterByRule('12').subscribe(); + ruleEventsState.filterByRule('12').subscribe(); + + expect().nothing(); + + rulesService.verify(x => x.getEvents(app, 10, 0, '12'), Times.once()); + }); + it('should call service when enqueuing event', () => { rulesService.setup(x => x.enqueueEvent(app, oldRuleEvents[0])) .returns(() => of({})); diff --git a/frontend/app/shared/state/rule-events.state.ts b/frontend/app/shared/state/rule-events.state.ts index 3d2fdc5e1..7c2e5b4c1 100644 --- a/frontend/app/shared/state/rule-events.state.ts +++ b/frontend/app/shared/state/rule-events.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { empty, Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; +import { finalize, tap } from 'rxjs/operators'; import { DialogService, @@ -31,6 +31,9 @@ interface Snapshot { // Indicates if the rule events are loaded. isLoaded?: boolean; + // Indicates if the rule events are loading. + isLoading?: boolean; + // The current rule id. ruleId?: string; } @@ -46,6 +49,9 @@ export class RuleEventsState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + constructor( private readonly appsState: AppsState, private readonly dialogs: DialogService, @@ -70,7 +76,9 @@ export class RuleEventsState extends State { return this.loadInternal(isReload); } - private loadInternal(isReload = false): Observable { + private loadInternal(isReload: boolean): Observable { + this.next({ isLoading: true }); + return this.rulesService.getEvents(this.appName, this.snapshot.ruleEventsPager.pageSize, this.snapshot.ruleEventsPager.skip, @@ -83,9 +91,18 @@ export class RuleEventsState extends State { return this.next(s => { const ruleEventsPager = s.ruleEventsPager.setCount(total); - return { ...s, ruleEvents, ruleEventsPager, isLoaded: true }; + return { + ...s, + isLoaded: true, + isLoading: false, + ruleEvents, + ruleEventsPager + }; }); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareSubscribed(this.dialogs)); } @@ -116,13 +133,13 @@ export class RuleEventsState extends State { this.next(s => ({ ...s, ruleEventsPager: s.ruleEventsPager.reset(), ruleId })); - return this.loadInternal(); + return this.loadInternal(false); } public setPager(ruleEventsPager: Pager): Observable { this.next(s => ({ ...s, ruleEventsPager })); - return this.loadInternal(); + return this.loadInternal(false); } private get appName() { diff --git a/frontend/app/shared/state/rules.state.spec.ts b/frontend/app/shared/state/rules.state.spec.ts index 63b35fb32..afc8afbe5 100644 --- a/frontend/app/shared/state/rules.state.spec.ts +++ b/frontend/app/shared/state/rules.state.spec.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { RulesState } from './rules.state'; @@ -56,12 +57,22 @@ describe('RulesState', () => { rulesState.load().subscribe(); - expect(rulesState.snapshot.rules).toEqual([rule1, rule2]); expect(rulesState.snapshot.isLoaded).toBeTruthy(); + expect(rulesState.snapshot.isLoading).toBeFalsy(); + expect(rulesState.snapshot.rules).toEqual([rule1, rule2]); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); + it('should reset loading when loading failed', () => { + rulesService.setup(x => x.getRules(app)) + .returns(() => throwError('error')); + + rulesState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(rulesState.snapshot.isLoading).toBeFalsy(); + }); + it('should show notification on load when reload is true', () => { rulesService.setup(x => x.getRules(app)) .returns(() => of(new RulesDto([rule1, rule2]))).verifiable(); diff --git a/frontend/app/shared/state/rules.state.ts b/frontend/app/shared/state/rules.state.ts index ce6370612..b1e0e15f7 100644 --- a/frontend/app/shared/state/rules.state.ts +++ b/frontend/app/shared/state/rules.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; +import { finalize, tap } from 'rxjs/operators'; import { DialogService, @@ -30,6 +30,9 @@ interface Snapshot { // Indicates if the rules are loaded. isLoaded?: boolean; + // Indicates if the rules are loading. + isLoading?: boolean; + // Indicates if the user can create rules. canCreate?: boolean; @@ -47,6 +50,9 @@ export class RulesState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + public canCreate = this.project(x => x.canCreate === true); @@ -66,21 +72,29 @@ export class RulesState extends State { this.resetState(); } + return this.loadInternal(isReload); + } + + private loadInternal(isReload: boolean): Observable { + this.next({ isLoading: true }); + return this.rulesService.getRules(this.appName).pipe( tap(({ items: rules, canCreate, canReadEvents }) => { if (isReload) { this.dialogs.notifyInfo('Rules reloaded.'); } - this.next(s => { - return { ...s, - canCreate, - canReadEvents, - isLoaded: true, - rules - }; + this.next({ + canCreate, + canReadEvents, + isLoaded: true, + isLoading: false, + rules }); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareSubscribed(this.dialogs)); } diff --git a/frontend/app/shared/state/schemas.state.spec.ts b/frontend/app/shared/state/schemas.state.spec.ts index aae84c9c8..94023646c 100644 --- a/frontend/app/shared/state/schemas.state.spec.ts +++ b/frontend/app/shared/state/schemas.state.spec.ts @@ -6,6 +6,7 @@ */ import { of, throwError } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { SchemaCategory, SchemasState } from './schemas.state'; @@ -87,8 +88,9 @@ describe('SchemasState', () => { schemasState.addCategory('category3'); schemasState.load(true).subscribe(); - expect(schemasState.snapshot.schemas).toEqual(oldSchemas.items); expect(schemasState.snapshot.isLoaded).toBeTruthy(); + expect(schemasState.snapshot.isLoading).toBeFalsy(); + expect(schemasState.snapshot.schemas).toEqual(oldSchemas.items); const categories = getCategories(schemasState); @@ -101,6 +103,15 @@ describe('SchemasState', () => { schemasService.verifyAll(); }); + it('should reset loading when loading failed', () => { + schemasService.setup(x => x.getSchemas(app)) + .returns(() => throwError('error')); + + schemasState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(schemasState.snapshot.isLoading).toBeFalsy(); + }); + it('should show notification on load when reload is true', () => { schemasService.setup(x => x.getSchemas(app)) .returns(() => of(oldSchemas)).verifiable(); diff --git a/frontend/app/shared/state/schemas.state.ts b/frontend/app/shared/state/schemas.state.ts index a234a27fc..75e50c274 100644 --- a/frontend/app/shared/state/schemas.state.ts +++ b/frontend/app/shared/state/schemas.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { empty, Observable, of } from 'rxjs'; -import { catchError, tap } from 'rxjs/operators'; +import { catchError, finalize, tap } from 'rxjs/operators'; import { compareStrings, @@ -47,6 +47,9 @@ interface Snapshot { // Indicates if the schemas are loaded. isLoaded?: boolean; + // Indicates if the schemas are loading. + isLoading?: boolean; + // The selected schema. selectedSchema?: SchemaDetailsDto | null; @@ -78,6 +81,9 @@ export class SchemasState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + public canCreate = this.project(x => x.canCreate === true); @@ -137,12 +143,6 @@ export class SchemasState extends State { } public load(isReload = false): Observable { - if (!isReload) { - const selectedSchema = this.snapshot.selectedSchema; - - this.resetState({ selectedSchema }); - } - return this.loadInternal(isReload); } @@ -154,19 +154,27 @@ export class SchemasState extends State { return this.loadInternal(false); } - private loadInternal(isReload = false): Observable { + private loadInternal(isReload: boolean): Observable { + this.next({ isLoading: true }); + return this.schemasService.getSchemas(this.appName).pipe( tap(({ items, canCreate }) => { if (isReload) { this.dialogs.notifyInfo('Schemas reloaded.'); } - return this.next(s => { - const schemas = items.sortedByString(x => x.displayName); + const schemas = items.sortedByString(x => x.displayName); - return { ...s, schemas, isLoaded: true, canCreate }; + return this.next({ + canCreate, + isLoaded: true, + isLoading: true, + schemas }); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareSubscribed(this.dialogs)); } @@ -199,7 +207,7 @@ export class SchemasState extends State { this.next(s => { const categories = [...s.categories, name]; - return { ...s, categories: categories }; + return { ...s, categories }; }); } @@ -207,7 +215,7 @@ export class SchemasState extends State { this.next(s => { const categories = s.categories.removed(name); - return { ...s, categories: categories }; + return { ...s, categories }; }); } diff --git a/frontend/app/shared/state/workflows.state.spec.ts b/frontend/app/shared/state/workflows.state.spec.ts index 3ae064688..343ff0bda 100644 --- a/frontend/app/shared/state/workflows.state.spec.ts +++ b/frontend/app/shared/state/workflows.state.spec.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { of } from 'rxjs'; +import { of, throwError } from 'rxjs'; +import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; import { @@ -52,13 +53,23 @@ describe('WorkflowsState', () => { workflowsState.load().subscribe(); - expect(workflowsState.snapshot.workflows).toEqual(oldWorkflows.items); expect(workflowsState.snapshot.isLoaded).toBeTruthy(); + expect(workflowsState.snapshot.isLoading).toBeFalsy(); expect(workflowsState.snapshot.version).toEqual(version); + expect(workflowsState.snapshot.workflows).toEqual(oldWorkflows.items); dialogs.verify(x => x.notifyInfo(It.isAnyString()), Times.never()); }); + it('should reset loading when loading failed', () => { + workflowsService.setup(x => x.getWorkflows(app)) + .returns(() => throwError('error')); + + workflowsState.load().pipe(onErrorResumeNext()).subscribe(); + + expect(workflowsState.snapshot.isLoading).toBeFalsy(); + }); + it('should show notification on load when reload is true', () => { workflowsService.setup(x => x.getWorkflows(app)) .returns(() => of(versioned(version, oldWorkflows))).verifiable(); diff --git a/frontend/app/shared/state/workflows.state.ts b/frontend/app/shared/state/workflows.state.ts index 4bb50b44a..1e8e5b7b2 100644 --- a/frontend/app/shared/state/workflows.state.ts +++ b/frontend/app/shared/state/workflows.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { tap } from 'rxjs/operators'; +import { finalize, tap } from 'rxjs/operators'; import { DialogService, @@ -37,6 +37,9 @@ interface Snapshot { // Indicates if the workflows are loaded. isLoaded?: boolean; + // Indicates if the workflows are loading. + isLoading?: boolean; + // Indicates if the user can create new workflow. canCreate?: boolean; } @@ -52,6 +55,9 @@ export class WorkflowsState extends State { public isLoaded = this.project(x => x.isLoaded === true); + public isLoading = + this.project(x => x.isLoading === true); + public canCreate = this.project(x => x.canCreate === true); @@ -68,6 +74,12 @@ export class WorkflowsState extends State { this.resetState(); } + return this.loadInternal(isReload); + } + + private loadInternal(isReload: boolean): Observable { + this.next({ isLoading: true }); + return this.workflowsService.getWorkflows(this.appName).pipe( tap(({ version, payload }) => { if (isReload) { @@ -76,6 +88,9 @@ export class WorkflowsState extends State { this.replaceWorkflows(payload, version); }), + finalize(() => { + this.next({ isLoading: false }); + }), shareSubscribed(this.dialogs)); } @@ -108,8 +123,13 @@ export class WorkflowsState extends State { private replaceWorkflows(payload: WorkflowsPayload, version: Version) { const { canCreate, errors, items: workflows } = payload; - this.next(s => { - return { ...s, workflows, errors, isLoaded: true, version, canCreate }; + this.next({ + canCreate, + errors, + isLoaded: true, + isLoading: false, + version, + workflows }); } diff --git a/frontend/app/shell/pages/home/home-page.component.html b/frontend/app/shell/pages/home/home-page.component.html index 6d93c2dc4..e9c7d6cd5 100644 --- a/frontend/app/shell/pages/home/home-page.component.html +++ b/frontend/app/shell/pages/home/home-page.component.html @@ -1,7 +1,7 @@