Add receiver removal functionality to SenderEditor
Enhanced the `SenderEditorPage.razor` by injecting the `EnvelopeReceiverService` to manage envelope receivers. Updated the UI to include a remove button for each receiver, invoking the new `RemoveReceiverAsync` method. This method handles the deletion of receivers from both the UI and the server. Modified `ReceiverDraft` and `SignatureFieldDraft` models to include `ReceiverId` and `ReceiverDraftId` for better tracking. Updated logic for identifying receivers without signature fields and creating receiver commands to use these new identifiers. Added `DeleteAsync` method in `EnvelopeReceiverService.cs` to send DELETE requests for removing receivers. Updated `envelope-viewer.css` to style the new remove button with distinct appearance and hover effects.
This commit is contained in:
@@ -21,6 +21,7 @@
|
|||||||
@inject DocumentService DocumentService
|
@inject DocumentService DocumentService
|
||||||
@inject PdfRenderService PdfRenderService
|
@inject PdfRenderService PdfRenderService
|
||||||
@inject ReceiverService ReceiverService
|
@inject ReceiverService ReceiverService
|
||||||
|
@inject EnvelopeReceiverService EnvelopeReceiverService
|
||||||
@inject EnvelopeService EnvelopeService
|
@inject EnvelopeService EnvelopeService
|
||||||
@inject EnvelopeTypeService EnvelopeTypeService
|
@inject EnvelopeTypeService EnvelopeTypeService
|
||||||
@inject CreateEnvelopeBootstrapStorageService CreateEnvelopeBootstrapStorageService
|
@inject CreateEnvelopeBootstrapStorageService CreateEnvelopeBootstrapStorageService
|
||||||
@@ -224,20 +225,28 @@
|
|||||||
{
|
{
|
||||||
<div class="sender-receivers-list">
|
<div class="sender-receivers-list">
|
||||||
@foreach (var receiver in _receivers)
|
@foreach (var receiver in _receivers)
|
||||||
{
|
{
|
||||||
<div class="sender-receiver-chip" style="--receiver-color:@receiver.Color;">
|
<div class="sender-receiver-chip" style="--receiver-color:@receiver.Color;">
|
||||||
<div class="sender-receiver-chip__body">
|
<div class="sender-receiver-chip__body">
|
||||||
<div class="sender-receiver-chip__name">@receiver.FullName</div>
|
<div class="sender-receiver-chip__name">@receiver.FullName</div>
|
||||||
<div class="sender-receiver-chip__email">@receiver.Email</div>
|
<div class="sender-receiver-chip__email">@receiver.Email</div>
|
||||||
@if (!string.IsNullOrWhiteSpace(receiver.PhoneNumber))
|
@if (!string.IsNullOrWhiteSpace(receiver.PhoneNumber))
|
||||||
{
|
{
|
||||||
<div class="sender-receiver-chip__phone">@receiver.PhoneNumber</div>
|
<div class="sender-receiver-chip__phone">@receiver.PhoneNumber</div>
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button class="pdf-toolbar__btn pdf-toolbar__btn--signature-change sender-toolbar-action-btn sender-toolbar-action-btn--compact sender-receiver-chip__place-btn
|
<button class="pdf-toolbar__btn pdf-toolbar__btn--reset sender-toolbar-action-btn sender-toolbar-action-btn--compact sender-receiver-chip__action sender-receiver-chip__remove-btn"
|
||||||
@(_pendingReceiverForPlacement?.Id == receiver.Id ? "sender-receiver-chip__place-btn--active" : "sender-receiver-chip__place-btn--idle")"
|
@onclick="() => RemoveReceiverAsync(receiver)"
|
||||||
@onclick="() => ActivatePlacementForReceiver(receiver)"
|
title='@L("Delete", "Loeschen")'>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
|
||||||
|
<path d="M4 4L12 12M12 4L4 12" stroke="currentColor" stroke-width="2" stroke-linecap="round" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
|
||||||
|
<button class="pdf-toolbar__btn pdf-toolbar__btn--signature-change sender-toolbar-action-btn sender-toolbar-action-btn--compact sender-receiver-chip__place-btn
|
||||||
|
@(_pendingReceiverForPlacement?.Id == receiver.Id ? "sender-receiver-chip__place-btn--active" : "sender-receiver-chip__place-btn--idle")"
|
||||||
|
@onclick="() => ActivatePlacementForReceiver(receiver)"
|
||||||
style="--receiver-color:@receiver.Color;"
|
style="--receiver-color:@receiver.Color;"
|
||||||
title='@L("SenderEditor_PlaceSignatureField", "Signaturfeld platzieren")'>
|
title='@L("SenderEditor_PlaceSignatureField", "Signaturfeld platzieren")'>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
|
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16">
|
||||||
@@ -762,6 +771,7 @@
|
|||||||
_receivers = payload.Receivers
|
_receivers = payload.Receivers
|
||||||
.Select((receiver, index) => new ReceiverDraft(
|
.Select((receiver, index) => new ReceiverDraft(
|
||||||
Guid.NewGuid(),
|
Guid.NewGuid(),
|
||||||
|
null,
|
||||||
receiver.FullName,
|
receiver.FullName,
|
||||||
receiver.EmailAddress,
|
receiver.EmailAddress,
|
||||||
string.Empty,
|
string.Empty,
|
||||||
@@ -872,12 +882,17 @@
|
|||||||
_receivers = envelopeReceivers
|
_receivers = envelopeReceivers
|
||||||
.Select((er, index) => new ReceiverDraft(
|
.Select((er, index) => new ReceiverDraft(
|
||||||
Guid.NewGuid(),
|
Guid.NewGuid(),
|
||||||
|
er.ReceiverId,
|
||||||
er.Name ?? er.Receiver?.EmailAddress ?? $"Receiver {er.ReceiverId}",
|
er.Name ?? er.Receiver?.EmailAddress ?? $"Receiver {er.ReceiverId}",
|
||||||
er.Receiver?.EmailAddress ?? string.Empty,
|
er.Receiver?.EmailAddress ?? string.Empty,
|
||||||
string.Empty,
|
string.Empty,
|
||||||
ReceiverPalette[index % ReceiverPalette.Length]))
|
ReceiverPalette[index % ReceiverPalette.Length]))
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
var receiverDraftByReceiverId = _receivers
|
||||||
|
.Where(r => r.ReceiverId.HasValue)
|
||||||
|
.ToDictionary(r => r.ReceiverId!.Value, r => r);
|
||||||
|
|
||||||
var receiverById = envelopeReceivers.ToDictionary(er => er.ReceiverId, er => er);
|
var receiverById = envelopeReceivers.ToDictionary(er => er.ReceiverId, er => er);
|
||||||
var colorByEmail = _receivers
|
var colorByEmail = _receivers
|
||||||
.Where(r => !string.IsNullOrWhiteSpace(r.Email))
|
.Where(r => !string.IsNullOrWhiteSpace(r.Email))
|
||||||
@@ -899,10 +914,17 @@
|
|||||||
? receiverColor
|
? receiverColor
|
||||||
: ReceiverPalette[Math.Abs(element.ReceiverId) % ReceiverPalette.Length];
|
: ReceiverPalette[Math.Abs(element.ReceiverId) % ReceiverPalette.Length];
|
||||||
|
|
||||||
|
var receiverDraft = receiverDraftByReceiverId.TryGetValue(element.ReceiverId, out var draft)
|
||||||
|
? draft
|
||||||
|
: _receivers.FirstOrDefault(r =>
|
||||||
|
(!string.IsNullOrWhiteSpace(receiverEmail) && string.Equals(r.Email, receiverEmail, StringComparison.OrdinalIgnoreCase))
|
||||||
|
|| string.Equals(r.FullName, receiverName, StringComparison.OrdinalIgnoreCase));
|
||||||
|
|
||||||
return new SignatureFieldDraft(
|
return new SignatureFieldDraft(
|
||||||
XPt: element.X * 72.0,
|
XPt: element.X * 72.0,
|
||||||
YPt: element.Y * 72.0,
|
YPt: element.Y * 72.0,
|
||||||
Page: element.Page,
|
Page: element.Page,
|
||||||
|
ReceiverDraftId: receiverDraft?.Id ?? Guid.Empty,
|
||||||
ReceiverName: receiverName,
|
ReceiverName: receiverName,
|
||||||
Color: color);
|
Color: color);
|
||||||
})
|
})
|
||||||
@@ -1138,6 +1160,7 @@
|
|||||||
XPt: xPt,
|
XPt: xPt,
|
||||||
YPt: yPt,
|
YPt: yPt,
|
||||||
Page: page1Based,
|
Page: page1Based,
|
||||||
|
ReceiverDraftId: _pendingReceiverForPlacement.Id,
|
||||||
ReceiverName: _pendingReceiverForPlacement.FullName,
|
ReceiverName: _pendingReceiverForPlacement.FullName,
|
||||||
Color: _pendingReceiverForPlacement.Color);
|
Color: _pendingReceiverForPlacement.Color);
|
||||||
|
|
||||||
@@ -1322,7 +1345,7 @@
|
|||||||
|
|
||||||
// Warn if any receiver has no signature field, but don't block
|
// Warn if any receiver has no signature field, but don't block
|
||||||
var receiversWithoutField = _receivers
|
var receiversWithoutField = _receivers
|
||||||
.Where(r => !_signatureFields.Any(f => f.ReceiverName == r.FullName))
|
.Where(r => !_signatureFields.Any(f => f.ReceiverDraftId == r.Id))
|
||||||
.ToList();
|
.ToList();
|
||||||
if (receiversWithoutField.Count > 0)
|
if (receiversWithoutField.Count > 0)
|
||||||
{
|
{
|
||||||
@@ -1397,7 +1420,7 @@
|
|||||||
var receiverCommands = _receivers.Select(receiver =>
|
var receiverCommands = _receivers.Select(receiver =>
|
||||||
{
|
{
|
||||||
var fields = _signatureFields
|
var fields = _signatureFields
|
||||||
.Where(f => f.ReceiverName == receiver.FullName)
|
.Where(f => f.ReceiverDraftId == receiver.Id)
|
||||||
.Select(f => new CreateEnvelopeFieldDto(
|
.Select(f => new CreateEnvelopeFieldDto(
|
||||||
X: f.XPt / 72.0,
|
X: f.XPt / 72.0,
|
||||||
Y: f.YPt / 72.0,
|
Y: f.YPt / 72.0,
|
||||||
@@ -1659,18 +1682,52 @@
|
|||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
_receivers.Add(new ReceiverDraft(Guid.NewGuid(), fullName, email, phoneNumber,
|
_receivers.Add(new ReceiverDraft(Guid.NewGuid(), null, fullName, email, phoneNumber,
|
||||||
ReceiverPalette[_receivers.Count % ReceiverPalette.Length]));
|
ReceiverPalette[_receivers.Count % ReceiverPalette.Length]));
|
||||||
CloseAddReceiverPopup();
|
CloseAddReceiverPopup();
|
||||||
return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async Task RemoveReceiverAsync(ReceiverDraft receiver)
|
||||||
|
{
|
||||||
|
if (_isSaving)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var envelopeId = _editingEnvelopeId
|
||||||
|
?? EnvelopeId
|
||||||
|
?? _loadedEnvelopeId
|
||||||
|
?? GetEnvelopeIdFromCurrentUri();
|
||||||
|
|
||||||
|
if (envelopeId is int persistedEnvelopeId && persistedEnvelopeId > 0 && receiver.ReceiverId is int persistedReceiverId && persistedReceiverId > 0)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await EnvelopeReceiverService.DeleteAsync(persistedEnvelopeId, persistedReceiverId);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.LogError(ex, "[SenderEditor] Failed to remove receiver {ReceiverId} from envelope {EnvelopeId}", persistedReceiverId, persistedEnvelopeId);
|
||||||
|
_saveErrorMessage = string.Format(
|
||||||
|
L("SenderEditor_RemoveReceiverError", "Empfaenger konnte nicht entfernt werden: {0}"),
|
||||||
|
ex.Message);
|
||||||
|
_savePopupVisible = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_receivers.RemoveAll(r => r.Id == receiver.Id);
|
||||||
|
_signatureFields.RemoveAll(f => f.ReceiverDraftId == receiver.Id);
|
||||||
|
|
||||||
|
if (_pendingReceiverForPlacement?.Id == receiver.Id)
|
||||||
|
_pendingReceiverForPlacement = null;
|
||||||
|
}
|
||||||
|
|
||||||
// ── Models ──
|
// ── Models ──
|
||||||
record SignatureFieldDraft(double XPt, double YPt, int Page, string ReceiverName, string Color);
|
record SignatureFieldDraft(double XPt, double YPt, int Page, Guid ReceiverDraftId, string ReceiverName, string Color);
|
||||||
|
|
||||||
record NormalisedCoords(double NormX, double NormY, int PageIndex);
|
record NormalisedCoords(double NormX, double NormY, int PageIndex);
|
||||||
|
|
||||||
record ReceiverDraft(Guid Id, string FullName, string Email, string PhoneNumber, string Color);
|
record ReceiverDraft(Guid Id, int? ReceiverId, string FullName, string Email, string PhoneNumber, string Color);
|
||||||
|
|
||||||
// ── Receiver colour palette (cycles when > 8 receivers) ──
|
// ── Receiver colour palette (cycles when > 8 receivers) ──
|
||||||
static readonly string[] ReceiverPalette =
|
static readonly string[] ReceiverPalette =
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using System.Net.Http.Json;
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using EnvelopeGenerator.Application.EnvelopeReceivers.Commands.CreateEnvelopeReceiver;
|
using EnvelopeGenerator.Application.EnvelopeReceivers.Commands.CreateEnvelopeReceiver;
|
||||||
using EnvelopeGenerator.Server.Client.Models;
|
using EnvelopeGenerator.Server.Client.Models;
|
||||||
|
using Microsoft.AspNetCore.WebUtilities;
|
||||||
|
|
||||||
namespace EnvelopeGenerator.Server.Client.Services;
|
namespace EnvelopeGenerator.Server.Client.Services;
|
||||||
|
|
||||||
@@ -93,4 +94,31 @@ public class EnvelopeReceiverService(IHttpClientFactory httpClientFactory)
|
|||||||
var payload = await response.Content.ReadFromJsonAsync<ReceiverEnvelopeUrlEnabledResponse>(_jsonOptions, cancel);
|
var payload = await response.Content.ReadFromJsonAsync<ReceiverEnvelopeUrlEnabledResponse>(_jsonOptions, cancel);
|
||||||
return payload?.Enabled == true;
|
return payload?.Enabled == true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async Task DeleteAsync(int envelopeId, int receiverId, CancellationToken cancel = default)
|
||||||
|
{
|
||||||
|
if (envelopeId <= 0)
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(envelopeId));
|
||||||
|
if (receiverId <= 0)
|
||||||
|
throw new ArgumentOutOfRangeException(nameof(receiverId));
|
||||||
|
|
||||||
|
using var http = httpClientFactory.CreateClient("EnvelopeGenerator.Server");
|
||||||
|
var url = QueryHelpers.AddQueryString("/api/EnvelopeReceiver", new Dictionary<string, string?>
|
||||||
|
{
|
||||||
|
["EnvelopeId"] = envelopeId.ToString(),
|
||||||
|
["ReceiverId"] = receiverId.ToString()
|
||||||
|
});
|
||||||
|
|
||||||
|
var response = await http.DeleteAsync(url, cancel);
|
||||||
|
if (response.IsSuccessStatusCode)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var body = await response.Content.ReadAsStringAsync(cancel);
|
||||||
|
var statusCode = (int)response.StatusCode;
|
||||||
|
var reasonPhrase = response.ReasonPhrase ?? "Unknown error";
|
||||||
|
throw new HttpRequestException(
|
||||||
|
$"Failed to remove receiver. Status: {statusCode} ({reasonPhrase}){(string.IsNullOrWhiteSpace(body) ? string.Empty : $" - {body}")}",
|
||||||
|
null,
|
||||||
|
response.StatusCode);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1236,6 +1236,17 @@ body.resizing {
|
|||||||
border-color: var(--receiver-color, #7c3aed);
|
border-color: var(--receiver-color, #7c3aed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.sender-receiver-chip__remove-btn {
|
||||||
|
color: #b91c1c;
|
||||||
|
border-color: rgba(185, 28, 28, 0.35);
|
||||||
|
}
|
||||||
|
|
||||||
|
.sender-receiver-chip__remove-btn:hover {
|
||||||
|
background: #b91c1c;
|
||||||
|
color: #ffffff;
|
||||||
|
border-color: #b91c1c;
|
||||||
|
}
|
||||||
|
|
||||||
.sender-editor-action-inner {
|
.sender-editor-action-inner {
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|||||||
Reference in New Issue
Block a user