From ce620d9dc58e0e5f14829614255be072c7e5fcd3 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Tue, 18 Sep 2018 19:34:46 +0200 Subject: [PATCH] Cloning and bugfix. --- .../Contents/ContentQueryService.cs | 4 +--- .../content/pages/contents/contents-page.component.html | 3 ++- .../content/pages/contents/contents-page.component.ts | 4 ++++ .../app/features/content/shared/content-item.component.html | 3 +++ .../app/features/content/shared/content-item.component.ts | 3 +++ .../Contents/ContentQueryServiceTests.cs | 1 - 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs index 79660a929..62ec24a95 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentQueryService.cs @@ -13,8 +13,6 @@ using Microsoft.OData; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Core.ConvertContent; using Squidex.Domain.Apps.Core.Scripting; -using Squidex.Domain.Apps.Core.Tags; -using Squidex.Domain.Apps.Entities.Assets.Queries; using Squidex.Domain.Apps.Entities.Contents.Edm; using Squidex.Domain.Apps.Entities.Contents.Repositories; using Squidex.Domain.Apps.Entities.Schemas; @@ -30,7 +28,7 @@ namespace Squidex.Domain.Apps.Entities.Contents { public sealed class ContentQueryService : IContentQueryService { - private const int MaxResults = 20; + private const int MaxResults = 200; private static readonly Status[] StatusAll = { Status.Archived, Status.Draft, Status.Published }; private static readonly Status[] StatusArchived = { Status.Archived }; private static readonly Status[] StatusPublished = { Status.Published }; diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-page.component.html index 5e8a65c3b..0434c823e 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.html +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.html @@ -110,7 +110,8 @@ (publishing)="publish(content)" (archiving)="archive(content)" (restoring)="restore(content)" - (deleting)="delete(content)"> + (deleting)="delete(content)" + (cloning)="clone(content)"> diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts index 53e09eb8f..5f68b0ab2 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-page.component.ts +++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.ts @@ -139,6 +139,10 @@ export class ContentsPageComponent implements OnDestroy, OnInit { this.changeContentItems(this.select(), 'Restore'); } + public clone(content: ContentDto) { + this.contentsState.create(content.dataDraft, false).pipe(onErrorResumeNext()).subscribe(); + } + public isSelectedQuery(query: string) { return query === this.contentsState.snapshot.contentsQuery || (!query && !this.contentsState.contentsQuery); } diff --git a/src/Squidex/app/features/content/shared/content-item.component.html b/src/Squidex/app/features/content/shared/content-item.component.html index 8ea17c03d..623495825 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.html +++ b/src/Squidex/app/features/content/shared/content-item.component.html @@ -99,6 +99,9 @@ Restore + + Clone + diff --git a/src/Squidex/app/features/content/shared/content-item.component.ts b/src/Squidex/app/features/content/shared/content-item.component.ts index fb94ecd00..567915cd4 100644 --- a/src/Squidex/app/features/content/shared/content-item.component.ts +++ b/src/Squidex/app/features/content/shared/content-item.component.ts @@ -32,6 +32,9 @@ import { ] }) export class ContentItemComponent implements OnChanges { + @Output() + public cloning = new EventEmitter(); + @Output() public deleting = new EventEmitter(); diff --git a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs index ff04b55ca..ea3bb5259 100644 --- a/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs +++ b/tests/Squidex.Domain.Apps.Entities.Tests/Contents/ContentQueryServiceTests.cs @@ -16,7 +16,6 @@ using Squidex.Domain.Apps.Core.Apps; using Squidex.Domain.Apps.Core.Contents; using Squidex.Domain.Apps.Core.Schemas; using Squidex.Domain.Apps.Core.Scripting; -using Squidex.Domain.Apps.Core.Tags; using Squidex.Domain.Apps.Entities.Apps; using Squidex.Domain.Apps.Entities.Contents.Edm; using Squidex.Domain.Apps.Entities.Contents.Repositories;