Browse Source

add copy block button (#2518)

pull/2519/head
Jason Dove 10 months ago committed by GitHub
parent
commit
bf4182f115
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 1
      CHANGELOG.md
  2. 6
      ErsatzTV.Application/Scheduling/Commands/CopyBlock.cs
  3. 118
      ErsatzTV.Application/Scheduling/Commands/CopyBlockHandler.cs
  4. 22
      ErsatzTV/Pages/Blocks.razor
  5. 100
      ErsatzTV/Shared/CopyBlockDialog.razor

1
CHANGELOG.md

@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Add `Block Playout Troubleshooting` tool to help investigate block playout history
- Add sequential schedule file and scripted schedule file names to playouts table
- Add empty (but already up-to-date) sqlite3 database to greatly speed up initial startup for fresh installs
- Add button to copy/clone block from blocks table
### Fixed
- Fix NVIDIA startup errors on arm64

6
ErsatzTV.Application/Scheduling/Commands/CopyBlock.cs

@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
using ErsatzTV.Core;
namespace ErsatzTV.Application.Scheduling;
public record CopyBlock(int BlockId, int NewBlockGroupId, string NewBlockName)
: IRequest<Either<BaseError, BlockViewModel>>;

118
ErsatzTV.Application/Scheduling/Commands/CopyBlockHandler.cs

@ -0,0 +1,118 @@ @@ -0,0 +1,118 @@
using ErsatzTV.Core;
using ErsatzTV.Core.Domain;
using ErsatzTV.Core.Domain.Scheduling;
using ErsatzTV.Infrastructure.Data;
using ErsatzTV.Infrastructure.Extensions;
using Microsoft.EntityFrameworkCore;
using static ErsatzTV.Application.Scheduling.Mapper;
namespace ErsatzTV.Application.Scheduling;
public class CopyBlockHandler(IDbContextFactory<TvContext> dbContextFactory)
: IRequestHandler<CopyBlock, Either<BaseError, BlockViewModel>>
{
public async Task<Either<BaseError, BlockViewModel>> Handle(
CopyBlock request,
CancellationToken cancellationToken)
{
try
{
await using TvContext dbContext = await dbContextFactory.CreateDbContextAsync(cancellationToken);
Validation<BaseError, Block> validation = await Validate(dbContext, request, cancellationToken);
return await validation.Apply(p => PerformCopy(dbContext, p, request, cancellationToken));
}
catch (Exception ex)
{
Console.WriteLine(ex.ToString());
return BaseError.New(ex.Message);
}
}
private static async Task<BlockViewModel> PerformCopy(
TvContext dbContext,
Block block,
CopyBlock request,
CancellationToken cancellationToken)
{
DetachEntity(dbContext, block);
block.Name = request.NewBlockName;
block.BlockGroup = null;
block.BlockGroupId = request.NewBlockGroupId;
foreach (BlockItem item in block.Items)
{
DetachEntity(dbContext, item);
item.BlockId = 0;
item.Block = block;
foreach (BlockItemWatermark watermark in item.BlockItemWatermarks)
{
DetachEntity(dbContext, watermark);
watermark.BlockItemId = 0;
watermark.BlockItem = item;
}
foreach (BlockItemGraphicsElement graphicsElement in item.BlockItemGraphicsElements)
{
DetachEntity(dbContext, graphicsElement);
graphicsElement.BlockItemId = 0;
graphicsElement.BlockItem = item;
}
}
await dbContext.Blocks.AddAsync(block, cancellationToken);
await dbContext.BlockItems.AddRangeAsync(block.Items, cancellationToken);
await dbContext.SaveChangesAsync(cancellationToken);
await dbContext.Entry(block).Reference(b => b.BlockGroup).LoadAsync(cancellationToken);
return ProjectToViewModel(block);
}
private static async Task<Validation<BaseError, Block>> Validate(
TvContext dbContext,
CopyBlock request,
CancellationToken cancellationToken) =>
(await BlockMustExist(dbContext, request, cancellationToken), await ValidateName(dbContext, request))
.Apply((block, _) => block);
private static Task<Validation<BaseError, Block>> BlockMustExist(
TvContext dbContext,
CopyBlock request,
CancellationToken cancellationToken) =>
dbContext.Blocks
.AsNoTracking()
.Include(ps => ps.Items)
.ThenInclude(i => i.BlockItemWatermarks)
.Include(ps => ps.Items)
.ThenInclude(i => i.BlockItemGraphicsElements)
.SelectOneAsync(p => p.Id, p => p.Id == request.BlockId, cancellationToken)
.Map(o => o.ToValidation<BaseError>("Block does not exist."));
private static async Task<Validation<BaseError, string>> ValidateName(TvContext dbContext, CopyBlock request)
{
List<string> allNames = await dbContext.Blocks
.Where(b => b.BlockGroupId == request.NewBlockGroupId)
.Map(ps => ps.Name)
.ToListAsync();
Validation<BaseError, string> result1 = request.NotEmpty(c => c.NewBlockName)
.Bind(_ => request.NotLongerThan(50)(c => c.NewBlockName));
var result2 = Optional(request.NewBlockName)
.Where(name => !allNames.Contains(name))
.ToValidation<BaseError>("Block name must be unique within the block group.");
return (result1, result2).Apply((_, _) => request.NewBlockName);
}
private static void DetachEntity<T>(TvContext db, T entity) where T : class
{
db.Entry(entity).State = EntityState.Detached;
if (entity.GetType().GetProperty("Id") is not null)
{
entity.GetType().GetProperty("Id")!.SetValue(entity, 0);
}
}
}

22
ErsatzTV/Pages/Blocks.razor

@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
@inject ISnackbar Snackbar
@inject IMediator Mediator
@inject IDialogService Dialog
@inject NavigationManager NavigationManager
<MudForm Style="max-height: 100%">
<div class="d-flex flex-column" style="height: 100vh; overflow-x: auto">
@ -60,7 +61,7 @@ @@ -60,7 +61,7 @@
<MudHidden Breakpoint="Breakpoint.Xs">
<col style="width: 60px;"/>
<col/>
<col style="width: 120px;"/>
<col style="width: 180px;"/>
</MudHidden>
</ColGroup>
<ToolBarContent>
@ -78,6 +79,7 @@ @@ -78,6 +79,7 @@
</MudTd>
<MudTd>
<div style="align-items: center; display: flex;">
<div style="width: 48px;"></div>
<div style="width: 48px;"></div>
<MudTooltip Text="Delete Block Group">
<MudIconButton Icon="@Icons.Material.Filled.Delete"
@ -98,6 +100,11 @@ @@ -98,6 +100,11 @@
Href="@($"blocks/{context.Id}")">
</MudIconButton>
</MudTooltip>
<MudTooltip Text="Copy Block">
<MudIconButton Icon="@Icons.Material.Filled.ContentCopy"
OnClick="@(_ => CopyBlock(context))">
</MudIconButton>
</MudTooltip>
<MudTooltip Text="Delete Block">
<MudIconButton Icon="@Icons.Material.Filled.Delete"
OnClick="@(_ => DeleteBlock(context))">
@ -258,6 +265,19 @@ @@ -258,6 +265,19 @@
}
}
private async Task CopyBlock(BlockViewModel block)
{
var parameters = new DialogParameters { { "BlockId", block.Id } };
var options = new DialogOptions { CloseButton = true, MaxWidth = MaxWidth.ExtraSmall };
IDialogReference dialog = await Dialog.ShowAsync<CopyBlockDialog>("Copy Block", parameters, options);
DialogResult dialogResult = await dialog.Result;
if (dialogResult is { Canceled: false, Data: BlockViewModel data })
{
NavigationManager.NavigateTo($"blocks/{data.Id}");
}
}
private async Task DeleteBlock(BlockViewModel block)
{
var parameters = new DialogParameters { { "EntityType", "block" }, { "EntityName", block.Name } };

100
ErsatzTV/Shared/CopyBlockDialog.razor

@ -0,0 +1,100 @@ @@ -0,0 +1,100 @@
@using ErsatzTV.Application.Scheduling
@implements IDisposable
@inject IMediator Mediator
@inject ISnackbar Snackbar
@inject ILogger<CopyScheduleDialog> Logger
<MudDialog>
<DialogContent>
<EditForm Model="@_dummyModel" OnSubmit="@(_ => Submit())">
<div class="d-flex mb-6">
<MudText>Select a group for the new block</MudText>
</div>
<MudSelect @bind-Value="_selectedBlockGroup" Class="mb-6 mx-4" Label="New Block Group">
@foreach (BlockGroupViewModel blockGroup in _blockGroups)
{
<MudSelectItem Value="@blockGroup">@blockGroup.Name</MudSelectItem>
}
</MudSelect>
<div class="d-flex mb-6">
<MudText>Enter a name for the new block</MudText>
</div>
<MudTextField T="string" Label="New Block Name"
@bind-Text="@_newName"
Class="mb-6 mx-4">
</MudTextField>
</EditForm>
</DialogContent>
<DialogActions>
<MudButton OnClick="@Cancel" ButtonType="ButtonType.Reset">Cancel</MudButton>
<MudButton Color="Color.Primary" Variant="Variant.Filled" OnClick="@Submit">
Copy Block
</MudButton>
</DialogActions>
</MudDialog>
@code {
private CancellationTokenSource _cts;
[CascadingParameter]
IMudDialogInstance MudDialog { get; set; }
[Parameter]
public int BlockId { get; set; }
private record DummyModel;
private readonly DummyModel _dummyModel = new();
private List<BlockGroupViewModel> _blockGroups = [];
private BlockGroupViewModel _selectedBlockGroup;
private string _newName;
public void Dispose()
{
_cts?.Cancel();
_cts?.Dispose();
}
protected override async Task OnParametersSetAsync()
{
_cts?.Cancel();
_cts?.Dispose();
_cts = new CancellationTokenSource();
var token = _cts.Token;
try
{
_blockGroups = await Mediator.Send(new GetAllBlockGroups(), token);
}
catch (OperationCanceledException)
{
// do nothing
}
}
private bool CanSubmit() => _selectedBlockGroup != null && !string.IsNullOrWhiteSpace(_newName);
private async Task Submit()
{
if (!CanSubmit())
{
return;
}
Either<BaseError, BlockViewModel> maybeResult =
await Mediator.Send(new CopyBlock(BlockId, _selectedBlockGroup.Id, _newName), _cts.Token);
maybeResult.Match(
schedule => { MudDialog.Close(DialogResult.Ok(schedule)); },
error =>
{
Snackbar.Add(error.Value, Severity.Error);
Logger.LogError("Error copying block: {Error}", error.Value);
MudDialog.Close(DialogResult.Cancel());
});
}
private void Cancel(MouseEventArgs e) => MudDialog.Cancel();
}
Loading…
Cancel
Save