Browse Source

Fix build.

pull/711/head
Sebastian Stehle 5 years ago
parent
commit
6d8382314a
  1. 8
      backend/src/Migrations/Migrations/RebuildApps.cs
  2. 8
      backend/src/Migrations/Migrations/RebuildAssetFolders.cs
  3. 8
      backend/src/Migrations/Migrations/RebuildAssets.cs
  4. 8
      backend/src/Migrations/Migrations/RebuildContents.cs
  5. 18
      backend/src/Migrations/Migrations/RebuildSnapshots.cs
  6. 4
      backend/src/Squidex/Areas/IdentityServer/Views/Error/Error.cshtml
  7. 4
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/BackupAssetsTests.cs
  8. 2
      backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/BackupContentsTests.cs

8
backend/src/Migrations/Migrations/RebuildApps.cs

@ -6,6 +6,7 @@
// ==========================================================================
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using Squidex.Infrastructure.Commands;
using Squidex.Infrastructure.Migrations;
@ -14,15 +15,18 @@ namespace Migrations.Migrations
public sealed class RebuildApps : IMigration
{
private readonly Rebuilder rebuilder;
private readonly RebuildOptions rebuildOptions;
public RebuildApps(Rebuilder rebuilder)
public RebuildApps(Rebuilder rebuilder,
IOptions<RebuildOptions> rebuildOptions)
{
this.rebuilder = rebuilder;
this.rebuildOptions = rebuildOptions.Value;
}
public Task UpdateAsync()
{
return rebuilder.RebuildAppsAsync();
return rebuilder.RebuildAppsAsync(rebuildOptions.BatchSize);
}
}
}

8
backend/src/Migrations/Migrations/RebuildAssetFolders.cs

@ -6,6 +6,7 @@
// ==========================================================================
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using Squidex.Infrastructure.Commands;
using Squidex.Infrastructure.Migrations;
@ -14,15 +15,18 @@ namespace Migrations.Migrations
public sealed class RebuildAssetFolders : IMigration
{
private readonly Rebuilder rebuilder;
private readonly RebuildOptions rebuildOptions;
public RebuildAssetFolders(Rebuilder rebuilder)
public RebuildAssetFolders(Rebuilder rebuilder,
IOptions<RebuildOptions> rebuildOptions)
{
this.rebuilder = rebuilder;
this.rebuildOptions = rebuildOptions.Value;
}
public Task UpdateAsync()
{
return rebuilder.RebuildAssetFoldersAsync();
return rebuilder.RebuildAssetFoldersAsync(rebuildOptions.BatchSize);
}
}
}

8
backend/src/Migrations/Migrations/RebuildAssets.cs

@ -6,6 +6,7 @@
// ==========================================================================
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using Squidex.Infrastructure.Commands;
using Squidex.Infrastructure.Migrations;
@ -14,15 +15,18 @@ namespace Migrations.Migrations
public sealed class RebuildAssets : IMigration
{
private readonly Rebuilder rebuilder;
private readonly RebuildOptions rebuildOptions;
public RebuildAssets(Rebuilder rebuilder)
public RebuildAssets(Rebuilder rebuilder,
IOptions<RebuildOptions> rebuildOptions)
{
this.rebuilder = rebuilder;
this.rebuildOptions = rebuildOptions.Value;
}
public Task UpdateAsync()
{
return rebuilder.RebuildAssetsAsync();
return rebuilder.RebuildAssetsAsync(rebuildOptions.BatchSize);
}
}
}

8
backend/src/Migrations/Migrations/RebuildContents.cs

@ -6,6 +6,7 @@
// ==========================================================================
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using Squidex.Infrastructure.Commands;
using Squidex.Infrastructure.Migrations;
@ -14,15 +15,18 @@ namespace Migrations.Migrations
public sealed class RebuildContents : IMigration
{
private readonly Rebuilder rebuilder;
private readonly RebuildOptions rebuildOptions;
public RebuildContents(Rebuilder rebuilder)
public RebuildContents(Rebuilder rebuilder,
IOptions<RebuildOptions> rebuildOptions)
{
this.rebuilder = rebuilder;
this.rebuildOptions = rebuildOptions.Value;
}
public Task UpdateAsync()
{
return rebuilder.RebuildContentAsync();
return rebuilder.RebuildContentAsync(rebuildOptions.BatchSize);
}
}
}

18
backend/src/Migrations/Migrations/RebuildSnapshots.cs

@ -6,6 +6,7 @@
// ==========================================================================
using System.Threading.Tasks;
using Microsoft.Extensions.Options;
using Squidex.Infrastructure.Commands;
using Squidex.Infrastructure.Migrations;
@ -14,20 +15,23 @@ namespace Migrations.Migrations
public sealed class RebuildSnapshots : IMigration
{
private readonly Rebuilder rebuilder;
private readonly RebuildOptions rebuildOptions;
public RebuildSnapshots(Rebuilder rebuilder)
public RebuildSnapshots(Rebuilder rebuilder,
IOptions<RebuildOptions> rebuildOptions)
{
this.rebuilder = rebuilder;
this.rebuildOptions = rebuildOptions.Value;
}
public async Task UpdateAsync()
{
await rebuilder.RebuildAppsAsync();
await rebuilder.RebuildSchemasAsync();
await rebuilder.RebuildRulesAsync();
await rebuilder.RebuildContentAsync();
await rebuilder.RebuildAssetsAsync();
await rebuilder.RebuildAssetFoldersAsync();
await rebuilder.RebuildAppsAsync(rebuildOptions.BatchSize);
await rebuilder.RebuildSchemasAsync(rebuildOptions.BatchSize);
await rebuilder.RebuildRulesAsync(rebuildOptions.BatchSize);
await rebuilder.RebuildContentAsync(rebuildOptions.BatchSize);
await rebuilder.RebuildAssetsAsync(rebuildOptions.BatchSize);
await rebuilder.RebuildAssetFoldersAsync(rebuildOptions.BatchSize);
}
}
}

4
backend/src/Squidex/Areas/IdentityServer/Views/Error/Error.cshtml

@ -9,9 +9,9 @@
<h1 class="splash-h1">@T.Get("users.error.headline")</h1>
<p class="splash-text">
@if (Model.Error?.ErrorDescription != null)
@if (Model.ErrorMessage != null)
{
@Model.Error.ErrorDescription
@Model.ErrorMessage
}
else
{

4
backend/tests/Squidex.Domain.Apps.Entities.Tests/Assets/BackupAssetsTests.cs

@ -228,7 +228,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
var rebuildAssets = new HashSet<DomainId>();
A.CallTo(() => rebuilder.InsertManyAsync<AssetDomainObject, AssetDomainObject.State>(A<IEnumerable<DomainId>>._, A<CancellationToken>._))
A.CallTo(() => rebuilder.InsertManyAsync<AssetDomainObject, AssetDomainObject.State>(A<IEnumerable<DomainId>>._, A<int>._, A<CancellationToken>._))
.Invokes((IEnumerable<DomainId> source, CancellationToken _) => rebuildAssets.AddRange(source));
await sut.RestoreAsync(context);
@ -265,7 +265,7 @@ namespace Squidex.Domain.Apps.Entities.Assets
var rebuildAssetFolders = new HashSet<DomainId>();
A.CallTo(() => rebuilder.InsertManyAsync<AssetFolderDomainObject, AssetFolderDomainObject.State>(A<IEnumerable<DomainId>>._, A<CancellationToken>._))
A.CallTo(() => rebuilder.InsertManyAsync<AssetFolderDomainObject, AssetFolderDomainObject.State>(A<IEnumerable<DomainId>>._, A<int>._, A<CancellationToken>._))
.Invokes((IEnumerable<DomainId> source, CancellationToken _) => rebuildAssetFolders.AddRange(source));
await sut.RestoreAsync(context);

2
backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/BackupContentsTests.cs

@ -192,7 +192,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
var rebuildContents = new HashSet<DomainId>();
A.CallTo(() => rebuilder.InsertManyAsync<ContentDomainObject, ContentDomainObject.State>(A<IEnumerable<DomainId>>._, A<CancellationToken>._))
A.CallTo(() => rebuilder.InsertManyAsync<ContentDomainObject, ContentDomainObject.State>(A<IEnumerable<DomainId>>._, A<int>._, A<CancellationToken>._))
.Invokes((IEnumerable<DomainId> source, CancellationToken _) => rebuildContents.AddRange(source));
await sut.RestoreAsync(context);

Loading…
Cancel
Save