Hero: planning en hero-brede aan/uit verwijderd (hero altijd aan, live zodra er een titel is); migratie, API, admin, tests en docs bijgewerkt
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -110,7 +110,7 @@ public class HeroAsfSiteE2ETests : IClassFixture<AsfSiteFactory>
|
||||
await InScope(sp => sp.GetRequiredService<IHeroService>().SaveAsync(
|
||||
new HeroSaveRequest(seed.GetProperty("title").GetString(), seed.GetProperty("tagline").GetString(), null, seed.GetProperty("display").GetString(),
|
||||
seed.GetProperty("buttons").EnumerateArray().Select(b => new HeroButtonRequest(b.GetProperty("label").GetString(), b.GetProperty("target").GetString())).ToList(),
|
||||
true, null, null, slides, focusEdits), caller, default));
|
||||
slides, focusEdits), caller, default));
|
||||
|
||||
await InScope(async sp =>
|
||||
{
|
||||
|
||||
@@ -131,7 +131,7 @@ public class HeroInjectionPipelineTests : IClassFixture<HeroInjectionFactory>
|
||||
// Upload a photo and publish a hero through the module's services.
|
||||
var image = await InScope(sp => sp.GetRequiredService<IHeroImageService>().UploadAsync(new MemoryStream(Photo()), Photo().Length, caller, default));
|
||||
await InScope(async sp => await sp.GetRequiredService<IHeroService>().SaveAsync(
|
||||
new HeroSaveRequest("Andrea Slop", "Lifestyle fotograaf · Huizen", null, "slideshow", [new HeroButtonRequest("Lees meer", "/over-mij")], true, null, null,
|
||||
new HeroSaveRequest("Andrea Slop", "Lifestyle fotograaf · Huizen", null, "slideshow", [new HeroButtonRequest("Lees meer", "/over-mij")],
|
||||
[new HeroSlideRequest(null, Guid.Parse(image.Id), "Zwangerschapsfoto in de duinen")]), caller, default));
|
||||
await InScope(async sp =>
|
||||
{
|
||||
@@ -189,28 +189,7 @@ public class HeroInjectionPipelineTests : IClassFixture<HeroInjectionFactory>
|
||||
conditional.Headers.IfNoneMatch.Add(live.Headers.ETag);
|
||||
(await client.SendAsync(conditional)).StatusCode.Should().Be(HttpStatusCode.NotModified);
|
||||
|
||||
// Switching the hero off puts the baked page back at once.
|
||||
await InScope(async sp =>
|
||||
{
|
||||
var service = sp.GetRequiredService<IHeroService>();
|
||||
var current = await service.GetAsync(default);
|
||||
await service.SaveAsync(new HeroSaveRequest(current.Title, current.Tagline, current.Lead, current.Display, [], IsActive: false, null, null,
|
||||
current.Slides.Select(s => new HeroSlideRequest(Guid.Parse(s.Id), Guid.Parse(s.ImageId), s.Alt)).ToList()), caller, default);
|
||||
return 0;
|
||||
});
|
||||
var off = await client.GetStringAsync("/hero");
|
||||
off.Should().Contain("baked hero").And.Contain("baked preload").And.NotContain("cms-hero-picture");
|
||||
|
||||
// And a media directory that lost its files leaves the baked hero too (no broken first image).
|
||||
await InScope(async sp =>
|
||||
{
|
||||
var service = sp.GetRequiredService<IHeroService>();
|
||||
var current = await service.GetAsync(default);
|
||||
await service.SaveAsync(new HeroSaveRequest(current.Title, current.Tagline, current.Lead, current.Display, [], IsActive: true, null, null,
|
||||
current.Slides.Select(s => new HeroSlideRequest(Guid.Parse(s.Id), Guid.Parse(s.ImageId), s.Alt)).ToList()), caller, default);
|
||||
return 0;
|
||||
});
|
||||
(await client.GetStringAsync("/hero")).Should().Contain("cms-hero-picture");
|
||||
// A media directory that lost its files leaves the baked hero too (no broken first image).
|
||||
Directory.Delete(Path.Combine(_factory.MediaDirectory, "hero"), recursive: true);
|
||||
await InScope(sp => { sp.GetRequiredService<SlpModularCms.Core.Hosting.Website.IIndexHtmlCache>().Invalidate(); return Task.FromResult(0); });
|
||||
var missing = await client.GetStringAsync("/hero");
|
||||
|
||||
@@ -9,7 +9,7 @@ namespace SlpModularCms.Modules.Hero.Tests;
|
||||
public class HeroFocusSaveTests
|
||||
{
|
||||
private static HeroSaveRequest Save(Guid imageId, IReadOnlyList<HeroImageFocusRequest>? focus)
|
||||
=> new("Andrea Slop", null, null, "single", [], true, null, null, [new HeroSlideRequest(null, imageId, "foto")], focus);
|
||||
=> new("Andrea Slop", null, null, "single", [], [new HeroSlideRequest(null, imageId, "foto")], focus);
|
||||
|
||||
[Fact]
|
||||
public async Task TheLiveHero_KeepsItsOldSet_UntilTheNewSetIsCut_AndThenSwitchesToIt()
|
||||
@@ -112,7 +112,7 @@ public class HeroFocusSaveTests
|
||||
var live = rig.Db.HeroImages.Single().SetHash;
|
||||
|
||||
// The save stops after the new files were written (here: the hero refers to a slide of another hero).
|
||||
var failing = new HeroSaveRequest("Andrea Slop", null, null, "single", [], true, null, null, [new HeroSlideRequest(Guid.NewGuid(), id, "foto")],
|
||||
var failing = new HeroSaveRequest("Andrea Slop", null, null, "single", [], [new HeroSlideRequest(Guid.NewGuid(), id, "foto")],
|
||||
[new HeroImageFocusRequest(id, new FocusDto(0.9, 0.9, 2))]);
|
||||
var act = async () => await rig.Service.SaveAsync(failing, HeroTestRig.Admin, default);
|
||||
await act.Should().ThrowAsync<HeroSaveRejectedException>();
|
||||
@@ -273,7 +273,7 @@ public class HeroFocusSaveTests
|
||||
var ready = await rig.Upload(HeroTestRig.Photo(seed: 3));
|
||||
var first = await rig.UploadWithoutRendering(HeroTestRig.Photo(seed: 1));
|
||||
var second = await rig.UploadWithoutRendering(HeroTestRig.Photo(seed: 2));
|
||||
var request = new HeroSaveRequest("Titel", null, null, "slideshow", [], true, null, null,
|
||||
var request = new HeroSaveRequest("Titel", null, null, "slideshow", [],
|
||||
[new HeroSlideRequest(null, Guid.Parse(first.Id), "een"), new HeroSlideRequest(null, Guid.Parse(second.Id), "twee"), new HeroSlideRequest(null, Guid.Parse(ready.Id), "drie")]);
|
||||
|
||||
var saved = await rig.Service.SaveAsync(request, HeroTestRig.Admin, default);
|
||||
|
||||
@@ -82,7 +82,7 @@ public class HeroSaveRequestValidationTests
|
||||
private static HeroSaveRequest Valid() => new(
|
||||
"Websites,\napps\n& meer.", null, "Een lead.", "single",
|
||||
[new HeroButtonRequest("Bekijk pakketten", "#pakketten"), new HeroButtonRequest("Plan een gesprek", "#contact")],
|
||||
true, null, null, []);
|
||||
[]);
|
||||
|
||||
private static List<ValidationResult> Run(HeroSaveRequest request)
|
||||
{
|
||||
@@ -133,16 +133,6 @@ public class HeroSaveRequestValidationTests
|
||||
Run(Valid() with { Buttons = [new HeroButtonRequest("", ""), new HeroButtonRequest(null, null)] }).Should().BeEmpty("empty buttons are ignored");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TheSchedule_MustRunForward()
|
||||
{
|
||||
var t = new DateTimeOffset(2026, 12, 1, 0, 0, 0, TimeSpan.Zero);
|
||||
Members(Run(Valid() with { StartsAt = t, EndsAt = t })).Should().Contain("EndsAt");
|
||||
Members(Run(Valid() with { StartsAt = t, EndsAt = t.AddDays(-1) })).Should().Contain("EndsAt");
|
||||
Run(Valid() with { StartsAt = t, EndsAt = t.AddDays(1) }).Should().BeEmpty();
|
||||
Run(Valid() with { StartsAt = null, EndsAt = t }).Should().BeEmpty();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ASlide_NeedsAnImage_AndAnAltTextOrTheDecorativeFlag()
|
||||
{
|
||||
@@ -310,23 +300,13 @@ public class HeroMappingTests
|
||||
hero.Slides.Should().HaveCount(80);
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(true, null, null, true)]
|
||||
[InlineData(false, null, null, false)]
|
||||
[InlineData(true, "2026-11-17", null, false)]
|
||||
[InlineData(true, "2026-11-16T12:00:00Z", null, true)]
|
||||
[InlineData(true, null, "2026-11-16T12:00:00Z", false)]
|
||||
[InlineData(true, null, "2026-11-16T12:00:01Z", true)]
|
||||
[InlineData(true, "2026-11-01", "2026-12-01", true)]
|
||||
public void TheScheduleAndTheSwitch_DecideWhetherItIsLive(bool active, string? start, string? end, bool live)
|
||||
[Fact]
|
||||
public void TheHeroIsAlwaysOn_ItIsLiveAsSoonAsItHasATitle()
|
||||
{
|
||||
var hero = Hero(Slide(0));
|
||||
hero.IsActive = active;
|
||||
hero.StartsAt = start is null ? null : DateTimeOffset.Parse(start, System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.AssumeUniversal);
|
||||
hero.EndsAt = end is null ? null : DateTimeOffset.Parse(end, System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.AssumeUniversal);
|
||||
|
||||
(HeroMapping.ToPublic(hero, Now, 50) is not null).Should().Be(live);
|
||||
HeroMapping.ToAdmin(hero, Now, 50).IsLive.Should().Be(live);
|
||||
(HeroMapping.ToPublic(hero, Now, 50) is not null).Should().BeTrue();
|
||||
HeroMapping.ToAdmin(hero, Now, 50).IsLive.Should().BeTrue();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
||||
@@ -34,7 +34,7 @@ public class HeroSaveTimingTests(ITestOutputHelper output)
|
||||
var slides = ids.Select(id => new HeroSlideRequest(null, id, "foto")).ToList();
|
||||
var focus = ids.Select(id => new HeroImageFocusRequest(id, new FocusDto(0.3, 0.4, 1), null, null)).ToList();
|
||||
watch.Restart();
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], true, null, null, slides, focus), HeroTestRig.Admin, default);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], slides, focus), HeroTestRig.Admin, default);
|
||||
output.WriteLine($"save request with 8 slides and 8 changed focus points: {watch.ElapsedMilliseconds} ms");
|
||||
|
||||
watch.Restart();
|
||||
@@ -43,12 +43,12 @@ public class HeroSaveTimingTests(ITestOutputHelper output)
|
||||
|
||||
watch.Restart();
|
||||
var again = focus.Select(f => f with { Focus = new FocusDto(0.6, 0.4, 1) }).ToList();
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], true, null, null, slides, again), HeroTestRig.Admin, default);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], slides, again), HeroTestRig.Admin, default);
|
||||
output.WriteLine($"save request with 8 changed focus points again: {watch.ElapsedMilliseconds} ms");
|
||||
await rig.RenderPending();
|
||||
|
||||
watch.Restart();
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], true, null, null, slides, null), HeroTestRig.Admin, default);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Andrea Slop", null, null, "slideshow", [], slides, null), HeroTestRig.Admin, default);
|
||||
output.WriteLine($"save without focus changes: {watch.ElapsedMilliseconds} ms");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -147,12 +147,12 @@ public class HeroImageServiceTests
|
||||
{
|
||||
using var rig = new HeroTestRig();
|
||||
var image = await rig.Upload(HeroTestRig.Photo());
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], true, null, null, [new HeroSlideRequest(null, Guid.Parse(image.Id), "foto")]), HeroTestRig.Admin, CancellationToken.None);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], [new HeroSlideRequest(null, Guid.Parse(image.Id), "foto")]), HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
var inUse = async () => await rig.Images.DeleteAsync(Guid.Parse(image.Id), HeroTestRig.Admin, CancellationToken.None);
|
||||
await inUse.Should().ThrowAsync<HeroImageInUseException>();
|
||||
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], true, null, null, []), HeroTestRig.Admin, CancellationToken.None);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], []), HeroTestRig.Admin, CancellationToken.None);
|
||||
await rig.Images.DeleteAsync(Guid.Parse(image.Id), HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
rig.Db.HeroImages.Should().BeEmpty();
|
||||
@@ -227,7 +227,7 @@ public class HeroImageServiceTests
|
||||
public class HeroServiceTests
|
||||
{
|
||||
private static HeroSaveRequest Request(IReadOnlyList<HeroSlideRequest>? slides = null, string title = "Andrea Slop") => new(
|
||||
title, "Lifestyle fotograaf", null, "slideshow", [new HeroButtonRequest("Lees meer", "/over-mij")], true, null, null, slides ?? []);
|
||||
title, "Lifestyle fotograaf", null, "slideshow", [new HeroButtonRequest("Lees meer", "/over-mij")], slides ?? []);
|
||||
|
||||
[Fact]
|
||||
public async Task TheFirstSave_CreatesTheHero_WithItsSlidesInOrder()
|
||||
@@ -312,7 +312,7 @@ public class HeroServiceTests
|
||||
using var rig = new HeroTestRig();
|
||||
|
||||
var saved = await rig.Service.SaveAsync(
|
||||
new HeroSaveRequest("Websites,\r\napps\u0007\n& meer.", " <b>tag</b> ", "lead\nregel twee", "single", [new HeroButtonRequest(" Knop ", " #contact ")], true, null, null, []),
|
||||
new HeroSaveRequest("Websites,\r\napps\u0007\n& meer.", " <b>tag</b> ", "lead\nregel twee", "single", [new HeroButtonRequest(" Knop ", " #contact ")], []),
|
||||
HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
saved.Title.Should().Be("Websites,\napps\n& meer.");
|
||||
@@ -327,7 +327,7 @@ public class HeroServiceTests
|
||||
using var rig = new HeroTestRig();
|
||||
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Websites,\napps\n& meer.", null, "Lead.", "single",
|
||||
[new HeroButtonRequest("Bekijk pakketten", "#pakketten"), new HeroButtonRequest("Plan een gesprek", "#contact")], true, null, null, null), HeroTestRig.Admin, CancellationToken.None);
|
||||
[new HeroButtonRequest("Bekijk pakketten", "#pakketten"), new HeroButtonRequest("Plan een gesprek", "#contact")], null), HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
var pub = (await rig.Public.GetActiveAsync(CancellationToken.None))!;
|
||||
pub.Title.Should().Be("Websites,\napps\n& meer.");
|
||||
@@ -336,20 +336,6 @@ public class HeroServiceTests
|
||||
pub.Slides.Should().BeEmpty();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task ThePublicHero_FollowsTheScheduleOfTheClock()
|
||||
{
|
||||
using var rig = new HeroTestRig();
|
||||
var start = rig.Time.Now.AddDays(1);
|
||||
await rig.Service.SaveAsync(Request() with { StartsAt = start, EndsAt = start.AddDays(7) }, HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
(await rig.Public.GetActiveAsync(CancellationToken.None)).Should().BeNull();
|
||||
rig.Time.Now = start.AddHours(1);
|
||||
(await rig.Public.GetActiveAsync(CancellationToken.None)).Should().NotBeNull();
|
||||
rig.Time.Now = start.AddDays(7);
|
||||
(await rig.Public.GetActiveAsync(CancellationToken.None)).Should().BeNull();
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task WithoutAHero_TheAdminGetsEmptyDefaults_AndThePublicGetsNothing()
|
||||
{
|
||||
@@ -417,7 +403,7 @@ public class HeroMediaCleanupTests
|
||||
// The same photo with the same focus comes back: the same set again, referenced by a new row.
|
||||
var again = await rig.Upload(photo);
|
||||
rig.Db.HeroImages.Single().SetHash.Should().Be(set);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], true, null, null, [new HeroSlideRequest(null, Guid.Parse(again.Id), "foto")]), HeroTestRig.Admin, CancellationToken.None);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], [new HeroSlideRequest(null, Guid.Parse(again.Id), "foto")]), HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
rig.Time.Now = rig.Time.Now.AddDays(8);
|
||||
await rig.Cleanup.RunOnceAsync(CancellationToken.None);
|
||||
@@ -447,7 +433,7 @@ public class HeroMediaCleanupTests
|
||||
{
|
||||
using var rig = new HeroTestRig();
|
||||
var image = await rig.Upload(HeroTestRig.Photo());
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], true, null, null, [new HeroSlideRequest(null, Guid.Parse(image.Id), "foto")]), HeroTestRig.Admin, CancellationToken.None);
|
||||
await rig.Service.SaveAsync(new HeroSaveRequest("Titel", null, null, "single", [], [new HeroSlideRequest(null, Guid.Parse(image.Id), "foto")]), HeroTestRig.Admin, CancellationToken.None);
|
||||
|
||||
rig.Time.Now = rig.Time.Now.AddDays(30);
|
||||
await rig.Cleanup.RunOnceAsync(CancellationToken.None);
|
||||
|
||||
@@ -82,7 +82,7 @@ public sealed class HeroTestRig : IDisposable
|
||||
public async Task<SlpModularCms.Modules.Hero.Models.HeroImageDto> SetFocus(Guid imageId, SlpModularCms.Modules.Hero.Models.HeroFocusRequest request)
|
||||
{
|
||||
await Service.SaveAsync(
|
||||
new SlpModularCms.Modules.Hero.Models.HeroSaveRequest("Titel", null, null, "single", [], true, null, null, [],
|
||||
new SlpModularCms.Modules.Hero.Models.HeroSaveRequest("Titel", null, null, "single", [], [],
|
||||
[new SlpModularCms.Modules.Hero.Models.HeroImageFocusRequest(imageId, request.Focus, request.Wide, request.Tall)]),
|
||||
Admin, CancellationToken.None);
|
||||
await RenderPending();
|
||||
|
||||
@@ -2,7 +2,7 @@ using SlpModularCms.Core.Media;
|
||||
|
||||
namespace SlpModularCms.Modules.Hero.Data.Entities;
|
||||
|
||||
/// <summary>The hero of the site in one language: texts, up to two buttons, the display, the schedule and the slides.</summary>
|
||||
/// <summary>The hero of the site in one language: texts, up to two buttons, the display and the slides.</summary>
|
||||
public class HeroContent
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
@@ -18,9 +18,6 @@ public class HeroContent
|
||||
public string? Button1Target { get; set; }
|
||||
public string? Button2Label { get; set; }
|
||||
public string? Button2Target { get; set; }
|
||||
public DateTimeOffset? StartsAt { get; set; }
|
||||
public DateTimeOffset? EndsAt { get; set; }
|
||||
public bool IsActive { get; set; } = true;
|
||||
public DateTimeOffset UpdatedAt { get; set; }
|
||||
public Guid LastModifiedByUserId { get; set; }
|
||||
|
||||
|
||||
@@ -30,7 +30,6 @@ public class HeroDbContext(DbContextOptions<HeroDbContext> options) : DbContext(
|
||||
entity.Property(e => e.Button1Target).HasMaxLength(500);
|
||||
entity.Property(e => e.Button2Label).HasMaxLength(100);
|
||||
entity.Property(e => e.Button2Target).HasMaxLength(500);
|
||||
entity.Property(e => e.IsActive).IsRequired();
|
||||
entity.Property(e => e.UpdatedAt).IsRequired();
|
||||
entity.Property(e => e.LastModifiedByUserId).IsRequired();
|
||||
entity.HasMany(e => e.Slides).WithOne().HasForeignKey(s => s.HeroId).OnDelete(DeleteBehavior.Cascade);
|
||||
|
||||
@@ -16,7 +16,7 @@ using SlpModularCms.Modules.Hero.Services;
|
||||
|
||||
namespace SlpModularCms.Modules.Hero;
|
||||
|
||||
/// <summary>The manageable hero of a website: texts, buttons, slides with images, schedule; images are processed and served by the host.</summary>
|
||||
/// <summary>The manageable hero of a website: texts, buttons, slides with images; images are processed and served by the host.</summary>
|
||||
[ExcludeFromCodeCoverage]
|
||||
public class HeroModule : IModule
|
||||
{
|
||||
|
||||
@@ -29,7 +29,6 @@ public static class HeroTexts
|
||||
public static readonly TextKey TooMany = new("hero.validation.button.tooMany", "max");
|
||||
}
|
||||
|
||||
public static readonly TextKey EndAfterStart = new("hero.validation.schedule.endAfterStart");
|
||||
|
||||
public static class Slide
|
||||
{
|
||||
|
||||
Generated
+247
@@ -0,0 +1,247 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
using SlpModularCms.Modules.Hero.Data;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace SlpModularCms.Modules.Hero.Migrations
|
||||
{
|
||||
[DbContext(typeof(HeroDbContext))]
|
||||
[Migration("20261117071410_RemoveHeroScheduleAndSwitch")]
|
||||
partial class RemoveHeroScheduleAndSwitch
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasAnnotation("ProductVersion", "10.0.9")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 64);
|
||||
|
||||
modelBuilder.Entity("SlpModularCms.Modules.Hero.Data.Entities.HeroContent", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<string>("Button1Label")
|
||||
.HasMaxLength(100)
|
||||
.HasColumnType("varchar(100)");
|
||||
|
||||
b.Property<string>("Button1Target")
|
||||
.HasMaxLength(500)
|
||||
.HasColumnType("varchar(500)");
|
||||
|
||||
b.Property<string>("Button2Label")
|
||||
.HasMaxLength(100)
|
||||
.HasColumnType("varchar(100)");
|
||||
|
||||
b.Property<string>("Button2Target")
|
||||
.HasMaxLength(500)
|
||||
.HasColumnType("varchar(500)");
|
||||
|
||||
b.Property<string>("Display")
|
||||
.IsRequired()
|
||||
.HasMaxLength(20)
|
||||
.HasColumnType("varchar(20)");
|
||||
|
||||
b.Property<string>("Language")
|
||||
.IsRequired()
|
||||
.HasMaxLength(10)
|
||||
.HasColumnType("varchar(10)");
|
||||
|
||||
b.Property<Guid>("LastModifiedByUserId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<string>("Lead")
|
||||
.HasMaxLength(1000)
|
||||
.HasColumnType("varchar(1000)");
|
||||
|
||||
b.Property<string>("Tagline")
|
||||
.HasMaxLength(200)
|
||||
.HasColumnType("varchar(200)");
|
||||
|
||||
b.Property<string>("Title")
|
||||
.IsRequired()
|
||||
.HasMaxLength(1000)
|
||||
.HasColumnType("varchar(1000)");
|
||||
|
||||
b.Property<DateTimeOffset>("UpdatedAt")
|
||||
.HasColumnType("datetime");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("Language")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("Heroes", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SlpModularCms.Modules.Hero.Data.Entities.HeroImage", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<long>("Bytes")
|
||||
.HasColumnType("bigint");
|
||||
|
||||
b.Property<DateTimeOffset>("CreatedAt")
|
||||
.HasColumnType("datetime");
|
||||
|
||||
b.Property<Guid>("CreatedByUserId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<double>("FocusX")
|
||||
.HasColumnType("double");
|
||||
|
||||
b.Property<double>("FocusY")
|
||||
.HasColumnType("double");
|
||||
|
||||
b.Property<int>("Height")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<string>("OriginalKey")
|
||||
.IsRequired()
|
||||
.HasMaxLength(200)
|
||||
.HasColumnType("varchar(200)");
|
||||
|
||||
b.Property<string>("OriginalSha256")
|
||||
.IsRequired()
|
||||
.HasMaxLength(64)
|
||||
.HasColumnType("varchar(64)");
|
||||
|
||||
b.Property<string>("SetHash")
|
||||
.IsRequired()
|
||||
.HasMaxLength(16)
|
||||
.HasColumnType("varchar(16)");
|
||||
|
||||
b.Property<string>("SourceFormat")
|
||||
.IsRequired()
|
||||
.HasMaxLength(10)
|
||||
.HasColumnType("varchar(10)");
|
||||
|
||||
b.Property<double?>("TallFocusX")
|
||||
.HasColumnType("double");
|
||||
|
||||
b.Property<double?>("TallFocusY")
|
||||
.HasColumnType("double");
|
||||
|
||||
b.Property<double?>("TallZoom")
|
||||
.HasColumnType("double");
|
||||
|
||||
b.Property<string>("Variants")
|
||||
.IsRequired()
|
||||
.HasColumnType("longtext");
|
||||
|
||||
b.Property<double?>("WideFocusX")
|
||||
.HasColumnType("double");
|
||||
|
||||
b.Property<double?>("WideFocusY")
|
||||
.HasColumnType("double");
|
||||
|
||||
b.Property<double?>("WideZoom")
|
||||
.HasColumnType("double");
|
||||
|
||||
b.Property<int>("Width")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.Property<double>("Zoom")
|
||||
.HasColumnType("double");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("OriginalSha256")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("HeroImages", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SlpModularCms.Modules.Hero.Data.Entities.HeroRetiredFile", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<string>("Key")
|
||||
.IsRequired()
|
||||
.HasMaxLength(200)
|
||||
.HasColumnType("varchar(200)");
|
||||
|
||||
b.Property<string>("Kind")
|
||||
.IsRequired()
|
||||
.HasMaxLength(10)
|
||||
.HasColumnType("varchar(10)");
|
||||
|
||||
b.Property<DateTimeOffset>("RetiredAt")
|
||||
.HasColumnType("datetime");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.ToTable("HeroRetiredFiles", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SlpModularCms.Modules.Hero.Data.Entities.HeroSlide", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<string>("Alt")
|
||||
.IsRequired()
|
||||
.HasMaxLength(600)
|
||||
.HasColumnType("varchar(600)");
|
||||
|
||||
b.Property<bool>("Decorative")
|
||||
.HasColumnType("tinyint(1)");
|
||||
|
||||
b.Property<Guid>("HeroId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<Guid>("ImageId")
|
||||
.HasColumnType("char(36)");
|
||||
|
||||
b.Property<bool>("IsActive")
|
||||
.HasColumnType("tinyint(1)");
|
||||
|
||||
b.Property<int>("SortOrder")
|
||||
.HasColumnType("int");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("ImageId");
|
||||
|
||||
b.HasIndex("HeroId", "SortOrder");
|
||||
|
||||
b.ToTable("HeroSlides", (string)null);
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SlpModularCms.Modules.Hero.Data.Entities.HeroSlide", b =>
|
||||
{
|
||||
b.HasOne("SlpModularCms.Modules.Hero.Data.Entities.HeroContent", null)
|
||||
.WithMany("Slides")
|
||||
.HasForeignKey("HeroId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.HasOne("SlpModularCms.Modules.Hero.Data.Entities.HeroImage", "Image")
|
||||
.WithMany()
|
||||
.HasForeignKey("ImageId")
|
||||
.OnDelete(DeleteBehavior.Restrict)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Image");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SlpModularCms.Modules.Hero.Data.Entities.HeroContent", b =>
|
||||
{
|
||||
b.Navigation("Slides");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
||||
+50
@@ -0,0 +1,50 @@
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace SlpModularCms.Modules.Hero.Migrations
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class RemoveHeroScheduleAndSwitch : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "EndsAt",
|
||||
table: "Heroes");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "IsActive",
|
||||
table: "Heroes");
|
||||
|
||||
migrationBuilder.DropColumn(
|
||||
name: "StartsAt",
|
||||
table: "Heroes");
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<DateTimeOffset>(
|
||||
name: "EndsAt",
|
||||
table: "Heroes",
|
||||
type: "datetime",
|
||||
nullable: true);
|
||||
|
||||
migrationBuilder.AddColumn<bool>(
|
||||
name: "IsActive",
|
||||
table: "Heroes",
|
||||
type: "tinyint(1)",
|
||||
nullable: false,
|
||||
defaultValue: false);
|
||||
|
||||
migrationBuilder.AddColumn<DateTimeOffset>(
|
||||
name: "StartsAt",
|
||||
table: "Heroes",
|
||||
type: "datetime",
|
||||
nullable: true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -46,12 +46,6 @@ namespace SlpModularCms.Modules.Hero.Migrations
|
||||
.HasMaxLength(20)
|
||||
.HasColumnType("varchar(20)");
|
||||
|
||||
b.Property<DateTimeOffset?>("EndsAt")
|
||||
.HasColumnType("datetime");
|
||||
|
||||
b.Property<bool>("IsActive")
|
||||
.HasColumnType("tinyint(1)");
|
||||
|
||||
b.Property<string>("Language")
|
||||
.IsRequired()
|
||||
.HasMaxLength(10)
|
||||
@@ -64,9 +58,6 @@ namespace SlpModularCms.Modules.Hero.Migrations
|
||||
.HasMaxLength(1000)
|
||||
.HasColumnType("varchar(1000)");
|
||||
|
||||
b.Property<DateTimeOffset?>("StartsAt")
|
||||
.HasColumnType("datetime");
|
||||
|
||||
b.Property<string>("Tagline")
|
||||
.HasMaxLength(200)
|
||||
.HasColumnType("varchar(200)");
|
||||
|
||||
@@ -43,9 +43,6 @@ public record HeroAdminDto(
|
||||
string? Lead,
|
||||
string Display,
|
||||
IReadOnlyList<HeroButtonDto> Buttons,
|
||||
bool IsActive,
|
||||
DateTimeOffset? StartsAt,
|
||||
DateTimeOffset? EndsAt,
|
||||
IReadOnlyList<HeroSlideAdminDto> Slides,
|
||||
bool IsLive,
|
||||
DateTimeOffset? UpdatedAt,
|
||||
@@ -62,7 +59,7 @@ public record PublicImageDto(
|
||||
|
||||
public record PublicSlideDto(string Id, string Alt, bool Decorative, PublicImageDto Image);
|
||||
|
||||
/// <summary>What visitors and websites get: only content, never the schedule or on/off switches. The same shape is written into <c>#cms-data</c>.</summary>
|
||||
/// <summary>What visitors and websites get: only content, never admin-only state. The same shape is written into <c>#cms-data</c>.</summary>
|
||||
public record PublicHeroDto(
|
||||
string Display,
|
||||
string Title,
|
||||
@@ -107,9 +104,6 @@ public record HeroSaveRequest(
|
||||
string? Lead,
|
||||
string? Display,
|
||||
IReadOnlyList<HeroButtonRequest>? Buttons,
|
||||
bool IsActive,
|
||||
DateTimeOffset? StartsAt,
|
||||
DateTimeOffset? EndsAt,
|
||||
IReadOnlyList<HeroSlideRequest>? Slides,
|
||||
IReadOnlyList<HeroImageFocusRequest>? ImageFocus = null) : IValidatableObject
|
||||
{
|
||||
@@ -195,11 +189,6 @@ public record HeroSaveRequest(
|
||||
}
|
||||
}
|
||||
|
||||
if (StartsAt is not null && EndsAt is not null && EndsAt <= StartsAt)
|
||||
{
|
||||
yield return new ValidationResult(texts.Get(HeroTexts.Validation.EndAfterStart), [nameof(EndsAt)]);
|
||||
}
|
||||
|
||||
var focusEdits = ImageFocus ?? [];
|
||||
for (var i = 0; i < focusEdits.Count; i++)
|
||||
{
|
||||
|
||||
@@ -93,11 +93,8 @@ public static class HeroMapping
|
||||
NeedsRender(image),
|
||||
PreviewSrc: PreviewSrc(image));
|
||||
|
||||
public static bool IsLive(HeroContent hero, DateTimeOffset now)
|
||||
=> hero.IsActive
|
||||
&& !string.IsNullOrWhiteSpace(hero.Title)
|
||||
&& (hero.StartsAt is null || hero.StartsAt <= now)
|
||||
&& (hero.EndsAt is null || now < hero.EndsAt);
|
||||
/// <summary>The hero is always on: it is live as soon as it has usable content (a title). There is no switch and no schedule (a deliberate choice; they may come back later, per slide).</summary>
|
||||
public static bool IsLive(HeroContent hero) => !string.IsNullOrWhiteSpace(hero.Title);
|
||||
|
||||
private static List<HeroButtonDto> Buttons(HeroContent hero)
|
||||
{
|
||||
@@ -118,7 +115,7 @@ public static class HeroMapping
|
||||
/// <summary>The published hero, or null when it is not live. Inactive slides and slides without a stored image are left out.</summary>
|
||||
public static PublicHeroDto? ToPublic(HeroContent hero, DateTimeOffset now, int maxPublishedSlides)
|
||||
{
|
||||
if (!IsLive(hero, now))
|
||||
if (!IsLive(hero))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -159,7 +156,7 @@ public static class HeroMapping
|
||||
{
|
||||
if (hero is null)
|
||||
{
|
||||
return new HeroAdminDto(null, string.Empty, null, null, HeroDisplays.Single, [], true, null, null, [], false, null, maxPublishedSlides);
|
||||
return new HeroAdminDto(null, string.Empty, null, null, HeroDisplays.Single, [], [], false, null, maxPublishedSlides);
|
||||
}
|
||||
|
||||
var slides = hero.Slides
|
||||
@@ -175,11 +172,8 @@ public static class HeroMapping
|
||||
hero.Lead,
|
||||
hero.Display,
|
||||
Buttons(hero),
|
||||
hero.IsActive,
|
||||
hero.StartsAt,
|
||||
hero.EndsAt,
|
||||
slides,
|
||||
IsLive(hero, now),
|
||||
IsLive(hero),
|
||||
hero.UpdatedAt,
|
||||
maxPublishedSlides);
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ public interface IHeroService
|
||||
/// <summary>The hero for the admin (empty defaults when none exists yet), with whether it is live right now.</summary>
|
||||
Task<HeroAdminDto> GetAsync(CancellationToken cancellationToken);
|
||||
|
||||
/// <summary>Replaces the whole hero: texts, buttons, display, schedule and the ordered slide list.</summary>
|
||||
/// <summary>Replaces the whole hero: texts, buttons, display and the ordered slide list.</summary>
|
||||
Task<HeroAdminDto> SaveAsync(HeroSaveRequest request, Guid callerId, CancellationToken cancellationToken);
|
||||
}
|
||||
|
||||
@@ -163,9 +163,6 @@ public class HeroService(
|
||||
hero.Button2Label = buttons.Count > 1 ? buttons[1].Label : null;
|
||||
hero.Button2Target = buttons.Count > 1 ? buttons[1].Target : null;
|
||||
|
||||
hero.IsActive = r.IsActive;
|
||||
hero.StartsAt = r.StartsAt;
|
||||
hero.EndsAt = r.EndsAt;
|
||||
hero.UpdatedAt = now;
|
||||
hero.LastModifiedByUserId = callerId;
|
||||
}
|
||||
@@ -175,7 +172,7 @@ public class HeroService(
|
||||
|
||||
public interface IPublicHeroService
|
||||
{
|
||||
/// <summary>The hero as websites get it, or null (no hero, switched off, outside the schedule or without a title).</summary>
|
||||
/// <summary>The hero as websites get it, or null (no hero or without a title).</summary>
|
||||
Task<PublicHeroDto?> GetActiveAsync(CancellationToken cancellationToken);
|
||||
}
|
||||
|
||||
|
||||
@@ -22,9 +22,6 @@
|
||||
"targetInvalid": "Choose a part of the page (for example #contact), a page of the site (for example /privacy) or a full web address (https://…).",
|
||||
"tooMany": "At most {max} buttons are possible."
|
||||
},
|
||||
"schedule": {
|
||||
"endAfterStart": "The end must be after the start."
|
||||
},
|
||||
"slide": {
|
||||
"imageRequired": "Every image in the list needs a photo.",
|
||||
"imageUnknown": "An image in the list does not exist (any more).",
|
||||
|
||||
@@ -22,9 +22,6 @@
|
||||
"targetInvalid": "Kies een onderdeel van de pagina (bijvoorbeeld #contact), een pagina van de site (bijvoorbeeld /privacy) of een volledig webadres (https://…).",
|
||||
"tooMany": "Er zijn maximaal {max} knoppen mogelijk."
|
||||
},
|
||||
"schedule": {
|
||||
"endAfterStart": "Het einde moet na het begin liggen."
|
||||
},
|
||||
"slide": {
|
||||
"imageRequired": "Elke afbeelding in de lijst heeft een foto nodig.",
|
||||
"imageUnknown": "Een afbeelding in de lijst bestaat niet (meer).",
|
||||
|
||||
Reference in New Issue
Block a user