Compare commits
10 Commits
5627483589
...
feat/blazo
| Author | SHA1 | Date | |
|---|---|---|---|
| 9f7519941a | |||
| 66e58b4a1a | |||
| de9d8c6f37 | |||
| 47f48ba12a | |||
| 60241c9c6d | |||
| 2a939b4cad | |||
| e89d471c6f | |||
| ece676fbcf | |||
| fac4ec28a4 | |||
| a3b11ed63f |
@@ -20,9 +20,9 @@ public record ReadRecentReceiverSuggestionsQuery : IRequest<IReadOnlyList<Recent
|
||||
internal string? Username { get; private init; }
|
||||
|
||||
/// <summary>
|
||||
/// Desired number of results. Default value is 5.
|
||||
/// Desired number of results.
|
||||
/// </summary>
|
||||
public int Take { get; init; } = 5;
|
||||
public int? Take { get; init; } = null;
|
||||
|
||||
/// <summary>
|
||||
/// Returns a new query instance scoped to the specified sender username.
|
||||
@@ -45,9 +45,9 @@ public class ReadRecentReceiverSuggestionsQueryHandler(IRepository<EnvelopeRecei
|
||||
/// Retrieves distinct recent receiver suggestions grouped by receiver email.
|
||||
/// </summary>
|
||||
/// <param name="request">Suggestion query.</param>
|
||||
/// <param name="cancellationToken">Cancellation token.</param>
|
||||
/// <param name="cancel">Cancellation token.</param>
|
||||
/// <returns>Ordered list of recent receiver suggestions.</returns>
|
||||
public async Task<IReadOnlyList<RecentReceiverSuggestionDto>> Handle(ReadRecentReceiverSuggestionsQuery request, CancellationToken cancellationToken)
|
||||
public async Task<IReadOnlyList<RecentReceiverSuggestionDto>> Handle(ReadRecentReceiverSuggestionsQuery request, CancellationToken cancel)
|
||||
{
|
||||
var query = repository.Query
|
||||
.AsNoTracking()
|
||||
@@ -80,7 +80,7 @@ public class ReadRecentReceiverSuggestionsQueryHandler(IRepository<EnvelopeRecei
|
||||
|
||||
// 3) Tie-break: if multiple rows share the same latest timestamp for an email,
|
||||
// pick a deterministic name via Max(FullName), then order by most recent usage.
|
||||
var suggestions = await latestRows
|
||||
var suggestions = latestRows
|
||||
.GroupBy(x => new { x.EmailAddress, x.LastUsedAt })
|
||||
.Select(g => new RecentReceiverSuggestionDto
|
||||
{
|
||||
@@ -89,10 +89,10 @@ public class ReadRecentReceiverSuggestionsQueryHandler(IRepository<EnvelopeRecei
|
||||
LastUsedAt = g.Key.LastUsedAt,
|
||||
})
|
||||
.OrderByDescending(x => x.LastUsedAt)
|
||||
.ThenBy(x => x.EmailAddress)
|
||||
.Take(request.Take)
|
||||
.ToListAsync(cancellationToken);
|
||||
.ThenBy(x => x.EmailAddress);
|
||||
|
||||
return suggestions;
|
||||
return request.Take is int take
|
||||
? await suggestions.Take(take).ToListAsync(cancel)
|
||||
: await suggestions.ToListAsync(cancel);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -567,6 +567,12 @@
|
||||
<data name="AddReceiver" xml:space="preserve">
|
||||
<value>Empfänger hinzufügen</value>
|
||||
</data>
|
||||
<data name="SenderWizard_RecentReceivers" xml:space="preserve">
|
||||
<value>Zuletzt verwendete Empfänger</value>
|
||||
</data>
|
||||
<data name="Skip" xml:space="preserve">
|
||||
<value>Überspringen</value>
|
||||
</data>
|
||||
<data name="DeleteReceiver" xml:space="preserve">
|
||||
<value>Empfänger löschen</value>
|
||||
</data>
|
||||
|
||||
@@ -567,6 +567,12 @@
|
||||
<data name="AddReceiver" xml:space="preserve">
|
||||
<value>Add Receiver</value>
|
||||
</data>
|
||||
<data name="SenderWizard_RecentReceivers" xml:space="preserve">
|
||||
<value>Recently used recipients</value>
|
||||
</data>
|
||||
<data name="Skip" xml:space="preserve">
|
||||
<value>Skip</value>
|
||||
</data>
|
||||
<data name="DeleteReceiver" xml:space="preserve">
|
||||
<value>Delete Receiver</value>
|
||||
</data>
|
||||
|
||||
@@ -567,6 +567,12 @@
|
||||
<data name="AddReceiver" xml:space="preserve">
|
||||
<value>Ajouter un destinataire</value>
|
||||
</data>
|
||||
<data name="SenderWizard_RecentReceivers" xml:space="preserve">
|
||||
<value>Destinataires recents</value>
|
||||
</data>
|
||||
<data name="Skip" xml:space="preserve">
|
||||
<value>Passer</value>
|
||||
</data>
|
||||
<data name="DeleteReceiver" xml:space="preserve">
|
||||
<value>Supprimer le destinataire</value>
|
||||
</data>
|
||||
|
||||
@@ -1,10 +1,16 @@
|
||||
@using EnvelopeGenerator.Application.Common.Dto
|
||||
@using EnvelopeGenerator.Application.Common.Dto.Receiver
|
||||
@using EnvelopeGenerator.Application.Resources
|
||||
@using EnvelopeGenerator.Domain.Constants
|
||||
@using EnvelopeGenerator.Domain.Resources
|
||||
@using EnvelopeGenerator.Server.Client.Components.Sender.ReceiverSuggestionFilter
|
||||
@using EnvelopeGenerator.Server.Client.Services
|
||||
@using Microsoft.AspNetCore.Components.Forms
|
||||
@using Microsoft.Extensions.Localization
|
||||
@inject IStringLocalizer<Model> ModelLocalizer
|
||||
@inject IStringLocalizer<Resource> UiLocalizer
|
||||
@inject ReceiverService ReceiverService
|
||||
@inject PdfRenderService PdfRenderService
|
||||
|
||||
<DxPopup Visible="@_isVisible"
|
||||
VisibleChanged="OnPopupVisibleChangedAsync"
|
||||
@@ -102,6 +108,117 @@
|
||||
}
|
||||
else if (_currentStep == 2)
|
||||
{
|
||||
<div class="sender-create-wizard__settings-grid">
|
||||
<div class="sender-create-wizard__settings-group">
|
||||
<div class="sender-create-wizard__settings-title">
|
||||
@L("SenderEditor_EnvelopeSettings", "Envelope-Einstellungen")
|
||||
</div>
|
||||
|
||||
<div class="sender-create-wizard__form-grid">
|
||||
<div class="sender-create-wizard__field">
|
||||
<label class="sender-create-wizard__label">@L("CertificationType", "Zertifizierung")</label>
|
||||
<select @bind="_certificationType" class="sender-create-wizard__select">
|
||||
<option value="1">@L("AdvancedElectronicSignature", "Advanced Electronic Signature")</option>
|
||||
<option value="2">@L("ElectronicSignature", "Electronic Signature")</option>
|
||||
<option value="3">@L("QualifiedSignature", "Qualified Signature")</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="sender-create-wizard__field">
|
||||
<label class="sender-create-wizard__label">@L("FinalEmailToCreator", "Finale E-Mail an Ersteller")</label>
|
||||
<select @bind="_finalEmailToCreator" class="sender-create-wizard__select">
|
||||
<option value="0">@L("No", "Nein")</option>
|
||||
<option value="1">@L("Yes", "Ja")</option>
|
||||
<option value="2">@L("YesWithAttachment", "Ja, mit Anhang")</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="sender-create-wizard__field">
|
||||
<label class="sender-create-wizard__label">@L("FinalEmailToReceivers", "Finale E-Mail an Empfänger")</label>
|
||||
<select @bind="_finalEmailToReceivers" class="sender-create-wizard__select">
|
||||
<option value="0">@L("No", "Nein")</option>
|
||||
<option value="1">@L("Yes", "Ja")</option>
|
||||
<option value="2">@L("YesWithAttachment", "Ja, mit Anhang")</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="sender-create-wizard__field sender-create-wizard__field--full">
|
||||
<div class="sender-create-wizard__settings-toggles">
|
||||
<label class="sender-create-wizard__settings-toggle">
|
||||
<input type="checkbox" checked="@_tfaEnabled" @onchange="OnTfaChanged" />
|
||||
@L("TFAEnabled", "2FA aktiviert")
|
||||
</label>
|
||||
<label class="sender-create-wizard__settings-toggle">
|
||||
<input type="checkbox" checked="@_useAccessCode" @onchange="OnUseAccessCodeChanged" disabled="@_tfaEnabled" />
|
||||
@L("UseAccessCode", "Zugriffscode verwenden")
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="sender-create-wizard__settings-group">
|
||||
<div class="sender-create-wizard__settings-title">
|
||||
@L("SendReminderEmails", "Erinnerungs-E-Mails senden")
|
||||
</div>
|
||||
|
||||
<div class="sender-create-wizard__form-grid">
|
||||
<div class="sender-create-wizard__field sender-create-wizard__field--full">
|
||||
<label class="sender-create-wizard__settings-toggle">
|
||||
<input type="checkbox" checked="@_sendReminderEmails" @onchange="OnSendReminderEmailsChanged" />
|
||||
@L("SendReminderEmails", "Erinnerungs-E-Mails senden")
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="sender-create-wizard__field">
|
||||
<label class="sender-create-wizard__label">@L("FirstReminderDays", "Erste Erinnerung (Tage)")</label>
|
||||
<InputNumber @bind-Value="_firstReminderDays" class="form-control form-control-sm" disabled="@(!_sendReminderEmails)" />
|
||||
</div>
|
||||
|
||||
<div class="sender-create-wizard__field">
|
||||
<label class="sender-create-wizard__label">@L("ReminderIntervalDays", "Erinnerungsintervall (Tage)")</label>
|
||||
<InputNumber @bind-Value="_reminderIntervalDays" class="form-control form-control-sm" disabled="@(!_sendReminderEmails)" />
|
||||
</div>
|
||||
|
||||
<div class="sender-create-wizard__field">
|
||||
<label class="sender-create-wizard__label">@L("ExpiresWhenDays", "Läuft ab nach (Tage)")</label>
|
||||
<InputNumber @bind-Value="_expiresWhenDays" class="form-control form-control-sm" />
|
||||
</div>
|
||||
|
||||
<div class="sender-create-wizard__field">
|
||||
<label class="sender-create-wizard__label">@L("ExpiresWarningWhenDays", "Ablaufwarnung (Tage)")</label>
|
||||
<InputNumber @bind-Value="_expiresWarningWhenDays" class="form-control form-control-sm" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
else if (_currentStep == 3)
|
||||
{
|
||||
<div class="sender-create-wizard__suggestions">
|
||||
<div class="sender-create-wizard__suggestions-title">@L("SenderWizard_RecentReceivers", "Zuletzt verwendete Empfänger")</div>
|
||||
|
||||
@if (_isLoadingRecentSuggestions)
|
||||
{
|
||||
<div class="sender-create-wizard__empty-list">@L("Loading", "Lädt...")</div>
|
||||
}
|
||||
else if (_recentReceiverSuggestions.Count > 0)
|
||||
{
|
||||
<div class="sender-create-wizard__suggestion-list" role="listbox" aria-label="Recent receivers">
|
||||
@foreach (var suggestion in FilteredRecentSuggestions)
|
||||
{
|
||||
<button type="button"
|
||||
class="sender-create-wizard__suggestion-item"
|
||||
@onclick="() => ApplyRecentSuggestion(suggestion)"
|
||||
disabled="@IsActionLocked">
|
||||
<span class="sender-create-wizard__suggestion-name">@suggestion.FullName</span>
|
||||
<span class="sender-create-wizard__suggestion-email">@suggestion.EmailAddress</span>
|
||||
</button>
|
||||
}
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
<div class="sender-create-wizard__form-grid">
|
||||
<div class="sender-create-wizard__field">
|
||||
<label class="sender-create-wizard__label">
|
||||
@@ -127,10 +244,15 @@
|
||||
</div>
|
||||
|
||||
<div class="sender-create-wizard__receiver-actions">
|
||||
<DxButton Text='@L("AddReceiver", "Empfänger hinzufügen")'
|
||||
RenderStyle="ButtonRenderStyle.Secondary"
|
||||
Click="AddReceiver"
|
||||
Enabled="@(!IsActionLocked)" />
|
||||
<button type="button"
|
||||
class="sender-create-wizard__add-receiver-btn"
|
||||
@onclick="AddReceiver"
|
||||
disabled="@IsActionLocked">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" fill="currentColor" viewBox="0 0 16 16" aria-hidden="true">
|
||||
<path d="M8 4a.5.5 0 0 1 .5.5V7.5H11.5a.5.5 0 0 1 0 1H8.5v3a.5.5 0 0 1-1 0v-3H4.5a.5.5 0 0 1 0-1H7.5v-3A.5.5 0 0 1 8 4z" />
|
||||
</svg>
|
||||
<span>@L("AddReceiver", "Empfänger hinzufügen")</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@if (_receivers.Count == 0)
|
||||
@@ -141,22 +263,47 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="sender-create-wizard__receiver-list">
|
||||
@foreach (var receiver in _receivers)
|
||||
{
|
||||
<div class="sender-create-wizard__receiver-item">
|
||||
<div>
|
||||
<div class="sender-create-wizard__receiver-name">@receiver.FullName</div>
|
||||
<div class="sender-create-wizard__receiver-email">@receiver.EmailAddress</div>
|
||||
<div class="sender-create-wizard__receiver-tagbox-wrap">
|
||||
<label class="sender-create-wizard__label" for="wizardReceiversTagBox">
|
||||
@L("Receiver", "Empfänger")
|
||||
</label>
|
||||
<DxTagBox Data="@_receivers"
|
||||
TData="CreateEnvelopeWizardReceiver"
|
||||
TValue="CreateEnvelopeWizardReceiver"
|
||||
AllowCustomTags="true"
|
||||
@bind-Tags="@_receiverTags"
|
||||
@bind-Tags:after="OnReceiverTagsChanged"
|
||||
HideSelectedItems="false"
|
||||
TextFieldName="@nameof(CreateEnvelopeWizardReceiver.EmailAddress)"
|
||||
ListRenderMode="ListRenderMode.Virtual"
|
||||
SearchMode="ListSearchMode.AutoSearch"
|
||||
SearchFilterCondition="ListSearchFilterCondition.Contains"
|
||||
SearchTextParseMode="ListSearchTextParseMode.GroupWordsByAnd"
|
||||
CssClass="sender-create-wizard__receiver-tagbox"
|
||||
InputId="wizardReceiversTagBox"
|
||||
Enabled="@(!IsActionLocked)">
|
||||
<TagDisplayTemplate Context="tagContext">
|
||||
<div class="sender-create-wizard__receiver-tag">
|
||||
@if (tagContext.DataItem is CreateEnvelopeWizardReceiver receiver)
|
||||
{
|
||||
<span class="sender-create-wizard__receiver-tag-name">@receiver.FullName</span>
|
||||
<span class="sender-create-wizard__receiver-tag-email">@receiver.EmailAddress</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span class="sender-create-wizard__receiver-tag-email">@tagContext.DisplayText</span>
|
||||
}
|
||||
<button type="button"
|
||||
class="sender-create-wizard__receiver-tag-remove"
|
||||
@onclick="tagContext.RemoveTagAction"
|
||||
aria-label="Remove receiver"
|
||||
disabled="@IsActionLocked">x</button>
|
||||
</div>
|
||||
<button type="button"
|
||||
class="sender-create-wizard__receiver-remove"
|
||||
@onclick="() => RemoveReceiver(receiver)"
|
||||
disabled="@IsActionLocked">
|
||||
@L("Delete", "Löschen")
|
||||
</button>
|
||||
</div>
|
||||
}
|
||||
</TagDisplayTemplate>
|
||||
<EmptyDataAreaTemplate Context="emptyContext">
|
||||
<div class="sender-create-wizard__tagbox-empty"></div>
|
||||
</EmptyDataAreaTemplate>
|
||||
</DxTagBox>
|
||||
</div>
|
||||
}
|
||||
}
|
||||
@@ -180,16 +327,31 @@
|
||||
|
||||
@if (_documentBytes is not null)
|
||||
{
|
||||
<div class="sender-create-wizard__document-meta">
|
||||
<div class="sender-create-wizard__document-name">@_documentFileName</div>
|
||||
<div class="sender-create-wizard__document-size">@_documentSizeText</div>
|
||||
<div class="sender-create-wizard__document-preview-card">
|
||||
<div class="sender-create-wizard__document-meta">
|
||||
<div class="sender-create-wizard__document-name">@_documentFileName</div>
|
||||
<div class="sender-create-wizard__document-size">@_documentSizeText</div>
|
||||
</div>
|
||||
<div class="sender-create-wizard__document-preview-wrap">
|
||||
<SenderPdfImageEditor IsPlacementMode="false"
|
||||
PageCount="@_documentPreviewPageCount"
|
||||
Pages="@_documentPreviewPages"
|
||||
PdfDataUrl="@DocumentPreviewDataUrl"
|
||||
PdfFileName="@_documentFileName"
|
||||
Fields="@_documentPreviewFieldOverlays"
|
||||
EditorClick="OnDocumentPreviewEditorClickAsync"
|
||||
RemoveField="OnDocumentPreviewRemoveFieldAsync"
|
||||
MoveField="OnDocumentPreviewMoveFieldAsync" />
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="sender-create-wizard__empty-list">
|
||||
@L("SenderWizard_DocumentRequiredHint", "Bitte laden Sie ein PDF-Dokument hoch, um fortzufahren.")
|
||||
</div>
|
||||
<PdfFileDropZone Disabled="@IsActionLocked"
|
||||
HasDocument="false"
|
||||
UploadText='@L("SenderWizard_DocumentRequiredHint", "Bitte laden Sie ein PDF-Dokument hoch, um fortzufahren.")'
|
||||
DragDropHintText='@L("SenderWizard_DragDropPdfHint", "Oder ziehen Sie die PDF-Datei hierher.")'
|
||||
FileSelected="OnDocumentSelectedAsync" />
|
||||
}
|
||||
</div>
|
||||
}
|
||||
@@ -246,7 +408,7 @@
|
||||
[Parameter]
|
||||
public IReadOnlyList<EnvelopeTypeDto> EnvelopeTypes { get; set; } = [];
|
||||
|
||||
private const int TotalSteps = 4;
|
||||
private const int TotalSteps = 5;
|
||||
private static readonly System.ComponentModel.DataAnnotations.EmailAddressAttribute EmailValidator = new();
|
||||
|
||||
private bool _isVisible;
|
||||
@@ -257,18 +419,38 @@
|
||||
private int? _selectedEnvelopeTypeId;
|
||||
private string _message = string.Empty;
|
||||
private string _language = "de-DE";
|
||||
private bool _useAccessCode;
|
||||
private bool _tfaEnabled;
|
||||
private int _certificationType = (int)CertificationType.AdvancedElectronicSignature;
|
||||
private int _finalEmailToCreator = (int)FinalEmailType.No;
|
||||
private int _finalEmailToReceivers = (int)FinalEmailType.No;
|
||||
private bool _sendReminderEmails;
|
||||
private int _firstReminderDays;
|
||||
private int _reminderIntervalDays;
|
||||
private int _expiresWhenDays;
|
||||
private int _expiresWarningWhenDays;
|
||||
|
||||
private string _receiverName = string.Empty;
|
||||
private string _receiverEmail = string.Empty;
|
||||
private readonly List<CreateEnvelopeWizardReceiver> _receivers = [];
|
||||
private IEnumerable<string> _receiverTags = [];
|
||||
private readonly List<RecentReceiverSuggestionDto> _recentReceiverSuggestions = [];
|
||||
private bool _isLoadingRecentSuggestions;
|
||||
private bool _recentSuggestionsLoaded;
|
||||
|
||||
private const int SuggestionLimit = 20;
|
||||
|
||||
private byte[]? _documentBytes;
|
||||
private string? _documentFileName;
|
||||
private string _documentSizeText = string.Empty;
|
||||
private int _documentPreviewPageCount;
|
||||
private List<PdfPageImageDto> _documentPreviewPages = [];
|
||||
private bool _isDocumentUploading;
|
||||
private bool _isStepActionRunning;
|
||||
private bool _isFinishing;
|
||||
|
||||
private readonly IReadOnlyList<SenderPdfFieldOverlay> _documentPreviewFieldOverlays = [];
|
||||
|
||||
private string? _validationMessage;
|
||||
|
||||
private bool IsActionLocked => _isDocumentUploading || _isStepActionRunning || _isFinishing;
|
||||
@@ -277,12 +459,20 @@
|
||||
private bool IsLastStep => _currentStep >= TotalSteps - 1;
|
||||
private bool CanSkipCurrentStep => _currentStep == 1;
|
||||
|
||||
private IReadOnlyList<RecentReceiverSuggestionDto> FilteredRecentSuggestions =>
|
||||
BuildFilteredRecentSuggestions();
|
||||
|
||||
private string? DocumentPreviewDataUrl => _documentBytes is { Length: > 0 }
|
||||
? $"data:application/pdf;base64,{Convert.ToBase64String(_documentBytes)}"
|
||||
: null;
|
||||
|
||||
private string CurrentStepTitle => _currentStep switch
|
||||
{
|
||||
0 => L("SenderWizard_Step_Basics", "Grunddaten"),
|
||||
1 => L("SenderWizard_Step_Message", "Nachricht und Optionen"),
|
||||
2 => L("SenderWizard_Step_Receivers", "Empfänger"),
|
||||
3 => L("SenderWizard_Step_Document", "Dokument"),
|
||||
2 => L("SenderEditor_EnvelopeSettings", "Envelope-Einstellungen"),
|
||||
3 => L("SenderWizard_Step_Receivers", "Empfänger"),
|
||||
4 => L("SenderWizard_Step_Document", "Dokument"),
|
||||
_ => L("SenderWizard_Step_Basics", "Grunddaten")
|
||||
};
|
||||
|
||||
@@ -290,8 +480,9 @@
|
||||
{
|
||||
0 => L("SenderWizard_Step_Basics_Desc", "Starten Sie mit den Pflichtangaben für den Umschlag."),
|
||||
1 => L("SenderWizard_Step_Message_Desc", "Fügen Sie optionale Nachricht und Einstellungen hinzu."),
|
||||
2 => L("SenderWizard_Step_Receivers_Desc", "Definieren Sie die Empfänger für den Signaturprozess."),
|
||||
3 => L("SenderWizard_Step_Document_Desc", "Laden Sie das Dokument hoch und platzieren Sie Signaturfelder."),
|
||||
2 => L("SenderWizard_Step_Settings_Desc", "Konfigurieren Sie Sicherheits-, Erinnerungs- und Ablaufoptionen."),
|
||||
3 => L("SenderWizard_Step_Receivers_Desc", "Definieren Sie die Empfänger für den Signaturprozess."),
|
||||
4 => L("SenderWizard_Step_Document_Desc", "Laden Sie das Dokument hoch und platzieren Sie Signaturfelder."),
|
||||
_ => L("SenderWizard_Step_Basics_Desc", "Starten Sie mit den Pflichtangaben für den Umschlag.")
|
||||
};
|
||||
|
||||
@@ -299,6 +490,9 @@
|
||||
{
|
||||
_isVisible = Visible;
|
||||
|
||||
if (_selectedEnvelopeTypeId is null && EnvelopeTypes.Count > 0)
|
||||
ApplyDefaultEnvelopeType();
|
||||
|
||||
if (Visible && !_previousVisible)
|
||||
ResetWizardState();
|
||||
|
||||
@@ -340,6 +534,10 @@
|
||||
if (int.TryParse(raw, out var id) && id > 0)
|
||||
{
|
||||
_selectedEnvelopeTypeId = id;
|
||||
var selectedType = EnvelopeTypes.FirstOrDefault(x => x.Id == id);
|
||||
if (selectedType is not null)
|
||||
ApplyEnvelopeTypeDefaults(selectedType);
|
||||
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
@@ -380,6 +578,7 @@
|
||||
}
|
||||
|
||||
_receivers.Add(new CreateEnvelopeWizardReceiver(fullName, email));
|
||||
_receiverTags = _receivers.Select(x => x.EmailAddress).ToList();
|
||||
_receiverName = string.Empty;
|
||||
_receiverEmail = string.Empty;
|
||||
_validationMessage = null;
|
||||
@@ -392,10 +591,38 @@
|
||||
return Task.CompletedTask;
|
||||
|
||||
_receivers.Remove(receiver);
|
||||
_receiverTags = _receivers.Select(x => x.EmailAddress).ToList();
|
||||
_validationMessage = null;
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private Task OnReceiverTagsChanged()
|
||||
{
|
||||
var selectedEmails = _receiverTags.ToHashSet(StringComparer.OrdinalIgnoreCase);
|
||||
|
||||
_receivers.RemoveAll(x => !selectedEmails.Contains(x.EmailAddress));
|
||||
_receiverTags = _receivers.Select(x => x.EmailAddress).ToList();
|
||||
_validationMessage = null;
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private IReadOnlyList<RecentReceiverSuggestionDto> BuildFilteredRecentSuggestions()
|
||||
{
|
||||
if (_recentReceiverSuggestions.Count == 0)
|
||||
return [];
|
||||
|
||||
var handler = new ReceiverSuggestionFilterHandler(_recentReceiverSuggestions);
|
||||
var filtered = handler.Filter(_receiverName, _receiverEmail);
|
||||
|
||||
return filtered
|
||||
.GroupBy(x => x.EmailAddress, StringComparer.OrdinalIgnoreCase)
|
||||
.Select(g => g.OrderByDescending(x => x.LastUsedAt).First())
|
||||
.OrderByDescending(x => x.LastUsedAt)
|
||||
.ThenBy(x => x.EmailAddress, StringComparer.OrdinalIgnoreCase)
|
||||
.Take(SuggestionLimit)
|
||||
.ToList();
|
||||
}
|
||||
|
||||
private async Task OnDocumentSelectedAsync(InputFileChangeEventArgs args)
|
||||
{
|
||||
if (IsActionLocked)
|
||||
@@ -424,6 +651,22 @@
|
||||
_documentBytes = ms.ToArray();
|
||||
_documentFileName = file.Name;
|
||||
_documentSizeText = FormatSize(_documentBytes.Length);
|
||||
|
||||
_documentPreviewPages = [];
|
||||
try
|
||||
{
|
||||
_documentPreviewPages = (await PdfRenderService.RenderPagesAsync(_documentBytes))
|
||||
.OrderBy(x => x.PageNumber)
|
||||
.ToList();
|
||||
}
|
||||
catch
|
||||
{
|
||||
_documentPreviewPages = [];
|
||||
}
|
||||
|
||||
_documentPreviewPageCount = _documentPreviewPages.Count > 0
|
||||
? _documentPreviewPages.Count
|
||||
: EstimatePdfPageCount(_documentBytes) ?? 1;
|
||||
}
|
||||
finally
|
||||
{
|
||||
@@ -458,7 +701,12 @@
|
||||
_validationMessage = null;
|
||||
|
||||
if (!IsLastStep)
|
||||
{
|
||||
_currentStep++;
|
||||
|
||||
if (_currentStep == 3)
|
||||
await EnsureRecentSuggestionsLoadedAsync();
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
@@ -511,6 +759,16 @@
|
||||
Message: _message.Trim(),
|
||||
EnvelopeTypeId: _selectedEnvelopeTypeId,
|
||||
Language: string.IsNullOrWhiteSpace(_language) ? "de-DE" : _language,
|
||||
UseAccessCode: _useAccessCode,
|
||||
TFAEnabled: _tfaEnabled,
|
||||
CertificationType: _certificationType,
|
||||
FinalEmailToCreator: _finalEmailToCreator,
|
||||
FinalEmailToReceivers: _finalEmailToReceivers,
|
||||
SendReminderEmails: _sendReminderEmails,
|
||||
FirstReminderDays: _firstReminderDays,
|
||||
ReminderIntervalDays: _reminderIntervalDays,
|
||||
ExpiresWhenDays: _expiresWhenDays,
|
||||
ExpiresWarningWhenDays: _expiresWarningWhenDays,
|
||||
Receivers: _receivers.ToList(),
|
||||
DocumentBytes: _documentBytes,
|
||||
DocumentFileName: _documentFileName);
|
||||
@@ -543,7 +801,7 @@
|
||||
if (_currentStep == 1)
|
||||
return;
|
||||
|
||||
if (_currentStep == 2 && (!string.IsNullOrWhiteSpace(_receiverName) || !string.IsNullOrWhiteSpace(_receiverEmail)))
|
||||
if (_currentStep == 3 && (!string.IsNullOrWhiteSpace(_receiverName) || !string.IsNullOrWhiteSpace(_receiverEmail)))
|
||||
{
|
||||
await AddReceiver();
|
||||
return;
|
||||
@@ -569,10 +827,48 @@
|
||||
await VisibleChanged.InvokeAsync(value);
|
||||
}
|
||||
|
||||
private async Task EnsureRecentSuggestionsLoadedAsync()
|
||||
{
|
||||
if (_recentSuggestionsLoaded || _isLoadingRecentSuggestions)
|
||||
return;
|
||||
|
||||
_isLoadingRecentSuggestions = true;
|
||||
try
|
||||
{
|
||||
var suggestions = await ReceiverService.GetRecentReceiverSuggestionsAsync(SuggestionLimit);
|
||||
_recentReceiverSuggestions.Clear();
|
||||
_recentReceiverSuggestions.AddRange(suggestions);
|
||||
_recentSuggestionsLoaded = true;
|
||||
}
|
||||
catch
|
||||
{
|
||||
_recentReceiverSuggestions.Clear();
|
||||
_recentSuggestionsLoaded = true;
|
||||
}
|
||||
finally
|
||||
{
|
||||
_isLoadingRecentSuggestions = false;
|
||||
await InvokeAsync(StateHasChanged);
|
||||
}
|
||||
}
|
||||
|
||||
private void ApplyRecentSuggestion(RecentReceiverSuggestionDto suggestion)
|
||||
{
|
||||
if (IsActionLocked)
|
||||
return;
|
||||
|
||||
_receiverName = suggestion.FullName;
|
||||
_receiverEmail = suggestion.EmailAddress;
|
||||
_validationMessage = null;
|
||||
}
|
||||
|
||||
private bool ValidateCurrentStep()
|
||||
{
|
||||
if (_currentStep == 0)
|
||||
{
|
||||
if (_selectedEnvelopeTypeId is null && EnvelopeTypes.Count > 0)
|
||||
_selectedEnvelopeTypeId = GetDefaultEnvelopeTypeId();
|
||||
|
||||
if (string.IsNullOrWhiteSpace(_title))
|
||||
{
|
||||
_validationMessage = L("SenderEditor_Validation_TitleRequired", "Bitte geben Sie einen Titel ein.");
|
||||
@@ -589,6 +885,17 @@
|
||||
}
|
||||
|
||||
if (_currentStep == 2)
|
||||
{
|
||||
if (!ValidateSettings(out var settingsError))
|
||||
{
|
||||
_validationMessage = settingsError;
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
if (_currentStep == 3)
|
||||
{
|
||||
if (_receivers.Count == 0)
|
||||
{
|
||||
@@ -599,7 +906,7 @@
|
||||
return true;
|
||||
}
|
||||
|
||||
if (_currentStep == 3)
|
||||
if (_currentStep == 4)
|
||||
{
|
||||
if (_documentBytes is null || _documentBytes.Length == 0)
|
||||
{
|
||||
@@ -627,23 +934,212 @@
|
||||
return $"{bytes} B";
|
||||
}
|
||||
|
||||
private static int? EstimatePdfPageCount(byte[]? documentBytes)
|
||||
{
|
||||
if (documentBytes is null || documentBytes.Length == 0)
|
||||
return null;
|
||||
|
||||
try
|
||||
{
|
||||
var text = System.Text.Encoding.ASCII.GetString(documentBytes);
|
||||
const string marker = "/Type /Page";
|
||||
var count = 0;
|
||||
var index = 0;
|
||||
|
||||
while (true)
|
||||
{
|
||||
index = text.IndexOf(marker, index, StringComparison.Ordinal);
|
||||
if (index < 0)
|
||||
break;
|
||||
|
||||
count++;
|
||||
index += marker.Length;
|
||||
}
|
||||
|
||||
return count > 0 ? count : null;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private Task OnDocumentPreviewEditorClickAsync(MouseEventArgs _)
|
||||
{
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private Task OnDocumentPreviewRemoveFieldAsync(int _)
|
||||
{
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private Task OnDocumentPreviewMoveFieldAsync(SenderPdfFieldMoveRequest _)
|
||||
{
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private void OnTfaChanged(ChangeEventArgs args)
|
||||
{
|
||||
_validationMessage = null;
|
||||
_tfaEnabled = ParseCheckboxValue(args);
|
||||
if (_tfaEnabled)
|
||||
_useAccessCode = true;
|
||||
}
|
||||
|
||||
private void OnUseAccessCodeChanged(ChangeEventArgs args)
|
||||
{
|
||||
_validationMessage = null;
|
||||
|
||||
if (_tfaEnabled)
|
||||
{
|
||||
_useAccessCode = true;
|
||||
return;
|
||||
}
|
||||
|
||||
_useAccessCode = ParseCheckboxValue(args);
|
||||
}
|
||||
|
||||
private void OnSendReminderEmailsChanged(ChangeEventArgs args)
|
||||
{
|
||||
_validationMessage = null;
|
||||
_sendReminderEmails = ParseCheckboxValue(args);
|
||||
}
|
||||
|
||||
private static bool ParseCheckboxValue(ChangeEventArgs args)
|
||||
{
|
||||
if (args.Value is bool boolValue)
|
||||
return boolValue;
|
||||
|
||||
return bool.TryParse(args.Value?.ToString(), out var parsed) && parsed;
|
||||
}
|
||||
|
||||
private void ApplyEnvelopeTypeDefaults(EnvelopeTypeDto envelopeType)
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(envelopeType.Language))
|
||||
_language = envelopeType.Language;
|
||||
|
||||
if (envelopeType.UseAccessCode.HasValue)
|
||||
_useAccessCode = envelopeType.UseAccessCode.Value;
|
||||
|
||||
if (_tfaEnabled)
|
||||
_useAccessCode = true;
|
||||
|
||||
if (envelopeType.CertificationType.HasValue)
|
||||
_certificationType = envelopeType.CertificationType.Value;
|
||||
|
||||
if (envelopeType.FinalEmailToCreator.HasValue)
|
||||
_finalEmailToCreator = envelopeType.FinalEmailToCreator.Value;
|
||||
|
||||
if (envelopeType.FinalEmailToReceivers.HasValue)
|
||||
_finalEmailToReceivers = envelopeType.FinalEmailToReceivers.Value;
|
||||
|
||||
if (envelopeType.SendReminderEmails.HasValue)
|
||||
_sendReminderEmails = envelopeType.SendReminderEmails.Value;
|
||||
|
||||
if (envelopeType.FirstReminderDays.HasValue)
|
||||
_firstReminderDays = envelopeType.FirstReminderDays.Value;
|
||||
|
||||
if (envelopeType.ReminderIntervalDays.HasValue)
|
||||
_reminderIntervalDays = envelopeType.ReminderIntervalDays.Value;
|
||||
|
||||
if (envelopeType.ExpiresDays.HasValue)
|
||||
_expiresWhenDays = envelopeType.ExpiresDays.Value;
|
||||
|
||||
if (envelopeType.ExpiresWarningDays.HasValue)
|
||||
_expiresWarningWhenDays = envelopeType.ExpiresWarningDays.Value;
|
||||
|
||||
NormalizeSettings();
|
||||
}
|
||||
|
||||
private void NormalizeSettings()
|
||||
{
|
||||
_language = string.IsNullOrWhiteSpace(_language) ? "de-DE" : _language.Trim();
|
||||
|
||||
if (_tfaEnabled)
|
||||
_useAccessCode = true;
|
||||
|
||||
_firstReminderDays = Math.Max(0, _firstReminderDays);
|
||||
_reminderIntervalDays = Math.Max(0, _reminderIntervalDays);
|
||||
_expiresWhenDays = Math.Max(0, _expiresWhenDays);
|
||||
_expiresWarningWhenDays = Math.Max(0, _expiresWarningWhenDays);
|
||||
|
||||
if (_expiresWhenDays > 0 && _expiresWarningWhenDays > _expiresWhenDays)
|
||||
_expiresWarningWhenDays = _expiresWhenDays;
|
||||
}
|
||||
|
||||
private bool ValidateSettings(out string? message)
|
||||
{
|
||||
NormalizeSettings();
|
||||
|
||||
if (_sendReminderEmails && _reminderIntervalDays <= 0)
|
||||
{
|
||||
message = L("SenderEditor_Validation_ReminderInterval", "Bitte geben Sie ein Erinnerungsintervall groesser als 0 Tage ein.");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (_sendReminderEmails && _firstReminderDays < 0)
|
||||
{
|
||||
message = L("SenderEditor_Validation_FirstReminder", "Bitte geben Sie gueltige Tage fuer die erste Erinnerung ein.");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (_expiresWhenDays > 0 && _expiresWarningWhenDays > _expiresWhenDays)
|
||||
{
|
||||
message = L("SenderEditor_Validation_ExpiryWarning", "Die Ablaufwarnung darf nicht nach dem Ablaufdatum liegen.");
|
||||
return false;
|
||||
}
|
||||
|
||||
message = null;
|
||||
return true;
|
||||
}
|
||||
|
||||
private void ApplyDefaultEnvelopeType()
|
||||
{
|
||||
_selectedEnvelopeTypeId = GetDefaultEnvelopeTypeId();
|
||||
if (!_selectedEnvelopeTypeId.HasValue)
|
||||
return;
|
||||
|
||||
var selectedType = EnvelopeTypes.FirstOrDefault(x => x.Id == _selectedEnvelopeTypeId.Value);
|
||||
if (selectedType is not null)
|
||||
ApplyEnvelopeTypeDefaults(selectedType);
|
||||
}
|
||||
|
||||
private void ResetWizardState()
|
||||
{
|
||||
_currentStep = 0;
|
||||
_validationMessage = null;
|
||||
|
||||
_title = string.Empty;
|
||||
_selectedEnvelopeTypeId = GetDefaultEnvelopeTypeId();
|
||||
_selectedEnvelopeTypeId = null;
|
||||
_message = string.Empty;
|
||||
_language = "de-DE";
|
||||
_useAccessCode = false;
|
||||
_tfaEnabled = false;
|
||||
_certificationType = (int)CertificationType.AdvancedElectronicSignature;
|
||||
_finalEmailToCreator = (int)FinalEmailType.No;
|
||||
_finalEmailToReceivers = (int)FinalEmailType.No;
|
||||
_sendReminderEmails = false;
|
||||
_firstReminderDays = 0;
|
||||
_reminderIntervalDays = 0;
|
||||
_expiresWhenDays = 0;
|
||||
_expiresWarningWhenDays = 0;
|
||||
|
||||
_receiverName = string.Empty;
|
||||
_receiverEmail = string.Empty;
|
||||
_receivers.Clear();
|
||||
_receiverTags = [];
|
||||
_recentReceiverSuggestions.Clear();
|
||||
_isLoadingRecentSuggestions = false;
|
||||
_recentSuggestionsLoaded = false;
|
||||
|
||||
_documentBytes = null;
|
||||
_documentFileName = null;
|
||||
_documentSizeText = string.Empty;
|
||||
_documentPreviewPageCount = 0;
|
||||
_documentPreviewPages = [];
|
||||
|
||||
ApplyDefaultEnvelopeType();
|
||||
}
|
||||
|
||||
private int? GetDefaultEnvelopeTypeId()
|
||||
@@ -667,4 +1163,5 @@
|
||||
var uiValue = UiLocalizer[key];
|
||||
return uiValue.ResourceNotFound ? fallback : uiValue.Value;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -5,6 +5,16 @@ public sealed record CreateEnvelopeWizardResult(
|
||||
string Message,
|
||||
int? EnvelopeTypeId,
|
||||
string Language,
|
||||
bool UseAccessCode,
|
||||
bool TFAEnabled,
|
||||
int CertificationType,
|
||||
int FinalEmailToCreator,
|
||||
int FinalEmailToReceivers,
|
||||
bool SendReminderEmails,
|
||||
int FirstReminderDays,
|
||||
int ReminderIntervalDays,
|
||||
int ExpiresWhenDays,
|
||||
int ExpiresWarningWhenDays,
|
||||
IReadOnlyList<CreateEnvelopeWizardReceiver> Receivers,
|
||||
byte[]? DocumentBytes,
|
||||
string? DocumentFileName);
|
||||
|
||||
@@ -0,0 +1,104 @@
|
||||
@using Microsoft.AspNetCore.Components.Forms
|
||||
|
||||
<div class="sender-pdf-dropzone @DropZoneClass">
|
||||
<div class="sender-pdf-dropzone__content">
|
||||
<div class="sender-pdf-dropzone__title">@CurrentActionText</div>
|
||||
@if (!string.IsNullOrWhiteSpace(DragDropHintText))
|
||||
{
|
||||
<div class="sender-pdf-dropzone__hint">@DragDropHintText</div>
|
||||
}
|
||||
</div>
|
||||
|
||||
<InputFile OnChange="OnFileSelectedAsync"
|
||||
accept="@Accept"
|
||||
disabled="@Disabled"
|
||||
@ondragenter="OnDragEnter"
|
||||
@ondragleave="OnDragLeave"
|
||||
@ondragover="OnDragOver"
|
||||
@ondrop="OnDrop"
|
||||
class="sender-pdf-dropzone__input" />
|
||||
</div>
|
||||
|
||||
@code {
|
||||
[Parameter]
|
||||
public bool Disabled { get; set; }
|
||||
|
||||
[Parameter]
|
||||
public bool HasDocument { get; set; }
|
||||
|
||||
[Parameter]
|
||||
public string Accept { get; set; } = ".pdf";
|
||||
|
||||
[Parameter]
|
||||
public string UploadText { get; set; } = "PDF hochladen";
|
||||
|
||||
[Parameter]
|
||||
public string ReplaceText { get; set; } = "PDF ersetzen";
|
||||
|
||||
[Parameter]
|
||||
public string DragDropHintText { get; set; } = "Datei hierhin ziehen oder klicken";
|
||||
|
||||
[Parameter]
|
||||
public EventCallback<InputFileChangeEventArgs> FileSelected { get; set; }
|
||||
|
||||
private int _dragDepth;
|
||||
private bool _isDragActive;
|
||||
|
||||
private string CurrentActionText => HasDocument ? ReplaceText : UploadText;
|
||||
|
||||
private string DropZoneClass
|
||||
{
|
||||
get
|
||||
{
|
||||
if (Disabled)
|
||||
return "sender-pdf-dropzone--disabled";
|
||||
|
||||
return _isDragActive ? "sender-pdf-dropzone--drag-active" : string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDragEnter(DragEventArgs _)
|
||||
{
|
||||
if (Disabled)
|
||||
return;
|
||||
|
||||
_dragDepth++;
|
||||
_isDragActive = true;
|
||||
}
|
||||
|
||||
private void OnDragLeave(DragEventArgs _)
|
||||
{
|
||||
if (Disabled)
|
||||
return;
|
||||
|
||||
_dragDepth = Math.Max(0, _dragDepth - 1);
|
||||
if (_dragDepth == 0)
|
||||
_isDragActive = false;
|
||||
}
|
||||
|
||||
private void OnDragOver(DragEventArgs _)
|
||||
{
|
||||
if (Disabled)
|
||||
return;
|
||||
|
||||
_isDragActive = true;
|
||||
}
|
||||
|
||||
private void OnDrop(DragEventArgs _)
|
||||
{
|
||||
_dragDepth = 0;
|
||||
_isDragActive = false;
|
||||
}
|
||||
|
||||
private async Task OnFileSelectedAsync(InputFileChangeEventArgs args)
|
||||
{
|
||||
_dragDepth = 0;
|
||||
_isDragActive = false;
|
||||
|
||||
if (Disabled)
|
||||
return;
|
||||
|
||||
if (FileSelected.HasDelegate)
|
||||
await FileSelected.InvokeAsync(args);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
namespace EnvelopeGenerator.Server.Client.Components.Sender.ReceiverSuggestionFilter;
|
||||
|
||||
public readonly record struct ReceiverFilterCriteria
|
||||
{
|
||||
public readonly string FullName;
|
||||
public readonly string EmailAddress;
|
||||
|
||||
public ReceiverFilterCriteria(string? fullName = "", string? emailAddress = "")
|
||||
{
|
||||
FullName = Normalize(fullName);
|
||||
EmailAddress = Normalize(emailAddress);
|
||||
}
|
||||
|
||||
public readonly bool Matches(ReceiverFilterCriteria criteria)
|
||||
=> FullName.Contains(criteria.FullName, StringComparison.Ordinal)
|
||||
&& EmailAddress.Contains(criteria.EmailAddress, StringComparison.Ordinal);
|
||||
|
||||
private static string Normalize(string? text)
|
||||
{
|
||||
if (string.IsNullOrWhiteSpace(text))
|
||||
return string.Empty;
|
||||
|
||||
return string.Concat(text.Where(c => !char.IsWhiteSpace(c))).ToLowerInvariant();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
using EnvelopeGenerator.Application.Common.Dto.Receiver;
|
||||
|
||||
namespace EnvelopeGenerator.Server.Client.Components.Sender.ReceiverSuggestionFilter;
|
||||
|
||||
public class ReceiverSuggestionFilterHandler(IEnumerable<RecentReceiverSuggestionDto> suggestions)
|
||||
{
|
||||
private readonly IReadOnlyList<Entry> _entries = suggestions
|
||||
.Where(x => !string.IsNullOrWhiteSpace(x.FullName) && !string.IsNullOrWhiteSpace(x.EmailAddress))
|
||||
.Select(x => new Entry(new ReceiverFilterCriteria(x.FullName, x.EmailAddress), x))
|
||||
.ToList();
|
||||
|
||||
private readonly record struct Entry(ReceiverFilterCriteria Criteria, RecentReceiverSuggestionDto Suggestion);
|
||||
|
||||
public IEnumerable<RecentReceiverSuggestionDto> Filter(ReceiverFilterCriteria criteria)
|
||||
{
|
||||
return _entries
|
||||
.Where(x => x.Criteria.Matches(criteria))
|
||||
.Select(x => x.Suggestion);
|
||||
}
|
||||
|
||||
public IEnumerable<RecentReceiverSuggestionDto> Filter(string fullName, string emailAddress)
|
||||
{
|
||||
var criteria = new ReceiverFilterCriteria(fullName, emailAddress);
|
||||
return Filter(criteria);
|
||||
}
|
||||
}
|
||||
@@ -31,6 +31,11 @@
|
||||
<link href="@AppVersion.GetVersionedUrl("css/envelope-viewer.css")" rel="stylesheet" />
|
||||
<script src="@AppVersion.GetVersionedUrl("js/envelope-editor.js")"></script>
|
||||
|
||||
<DxLoadingPanel Visible="@IsBootstrapLoading"
|
||||
IsContentBlocked="true"
|
||||
ApplyBackgroundShading="true"
|
||||
IndicatorAreaVisible="true"
|
||||
Text='@L("SenderEditor_BootstrapLoadingHint", "Der Umschlag wird vorbereitet und die Daten werden uebernommen.")'>
|
||||
<div class="envelope-viewer-layout">
|
||||
|
||||
@* ── Action Bar ── *@
|
||||
@@ -426,6 +431,7 @@
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</DxLoadingPanel>
|
||||
|
||||
<DxPopup @bind-Visible="_receiverPopupVisible"
|
||||
HeaderText='@L("AddReceiver", "Empfänger hinzufügen")'
|
||||
@@ -670,6 +676,7 @@
|
||||
static readonly System.ComponentModel.DataAnnotations.EmailAddressAttribute ReceiverEmailValidator = new();
|
||||
|
||||
bool IsEditMode => EnvelopeId.HasValue && EnvelopeId.Value > 0;
|
||||
bool IsBootstrapLoading => !IsEditMode && !_bootstrapApplied;
|
||||
|
||||
// ── Lifecycle ──
|
||||
|
||||
@@ -704,17 +711,22 @@
|
||||
if (EnvelopeId.HasValue && EnvelopeId.Value > 0)
|
||||
_editingEnvelopeId = EnvelopeId.Value;
|
||||
|
||||
if (!IsEditMode && !_bootstrapApplied && !string.IsNullOrWhiteSpace(BootstrapToken))
|
||||
_pendingBootstrapToken = BootstrapToken;
|
||||
|
||||
if (IsEditMode && _loadedEnvelopeId != EnvelopeId)
|
||||
{
|
||||
await LoadEnvelopeForEditAsync(EnvelopeId!.Value);
|
||||
return;
|
||||
}
|
||||
|
||||
if (IsEditMode)
|
||||
if (IsEditMode || _bootstrapApplied)
|
||||
return;
|
||||
|
||||
if (string.IsNullOrWhiteSpace(BootstrapToken))
|
||||
{
|
||||
NavigationManager.NavigateTo("/sender", replace: true);
|
||||
return;
|
||||
}
|
||||
|
||||
_pendingBootstrapToken = BootstrapToken;
|
||||
}
|
||||
|
||||
async Task TryApplyBootstrapAsync(string token)
|
||||
@@ -724,7 +736,7 @@
|
||||
|
||||
if (payload is null)
|
||||
{
|
||||
NavigationManager.NavigateTo("/sender/editor", replace: true);
|
||||
NavigationManager.NavigateTo("/sender", replace: true);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -732,6 +744,17 @@
|
||||
_envelopeMessage = payload.Message ?? string.Empty;
|
||||
_selectedEnvelopeTypeId = payload.EnvelopeTypeId;
|
||||
_language = string.IsNullOrWhiteSpace(payload.Language) ? "de-DE" : payload.Language;
|
||||
_useAccessCode = payload.UseAccessCode;
|
||||
_tfaEnabled = payload.TFAEnabled;
|
||||
_certificationType = payload.CertificationType;
|
||||
_finalEmailToCreator = payload.FinalEmailToCreator;
|
||||
_finalEmailToReceivers = payload.FinalEmailToReceivers;
|
||||
_sendReminderEmails = payload.SendReminderEmails;
|
||||
_firstReminderDays = payload.FirstReminderDays;
|
||||
_reminderIntervalDays = payload.ReminderIntervalDays;
|
||||
_expiresWhenDays = payload.ExpiresWhenDays;
|
||||
_expiresWarningWhenDays = payload.ExpiresWarningWhenDays;
|
||||
NormalizeSettings();
|
||||
|
||||
_receivers = payload.Receivers
|
||||
.Select((receiver, index) => new ReceiverDraft(
|
||||
@@ -774,8 +797,6 @@
|
||||
_pagePreviews = [];
|
||||
_pageCount = 0;
|
||||
}
|
||||
|
||||
NavigationManager.NavigateTo("/sender/editor", replace: true);
|
||||
}
|
||||
|
||||
protected override async Task OnAfterRenderAsync(bool firstRender)
|
||||
@@ -789,6 +810,15 @@
|
||||
if (!OperatingSystem.IsBrowser())
|
||||
return;
|
||||
|
||||
if (!IsEditMode && !_bootstrapApplied && !string.IsNullOrWhiteSpace(_pendingBootstrapToken))
|
||||
{
|
||||
var token = _pendingBootstrapToken;
|
||||
_pendingBootstrapToken = null;
|
||||
await TryApplyBootstrapAsync(token);
|
||||
await InvokeAsync(StateHasChanged);
|
||||
return;
|
||||
}
|
||||
|
||||
if (_saveDraftAfterBootstrap && !_isSaving)
|
||||
{
|
||||
_saveDraftAfterBootstrap = false;
|
||||
@@ -796,12 +826,6 @@
|
||||
return;
|
||||
}
|
||||
|
||||
if (!IsEditMode && !_bootstrapApplied && !string.IsNullOrWhiteSpace(_pendingBootstrapToken))
|
||||
{
|
||||
var token = _pendingBootstrapToken;
|
||||
_pendingBootstrapToken = null;
|
||||
await TryApplyBootstrapAsync(token);
|
||||
}
|
||||
}
|
||||
|
||||
async Task LoadEnvelopeForEditAsync(int envelopeId)
|
||||
|
||||
@@ -730,6 +730,16 @@
|
||||
Message: result.Message,
|
||||
EnvelopeTypeId: result.EnvelopeTypeId,
|
||||
Language: result.Language,
|
||||
UseAccessCode: result.UseAccessCode,
|
||||
TFAEnabled: result.TFAEnabled,
|
||||
CertificationType: result.CertificationType,
|
||||
FinalEmailToCreator: result.FinalEmailToCreator,
|
||||
FinalEmailToReceivers: result.FinalEmailToReceivers,
|
||||
SendReminderEmails: result.SendReminderEmails,
|
||||
FirstReminderDays: result.FirstReminderDays,
|
||||
ReminderIntervalDays: result.ReminderIntervalDays,
|
||||
ExpiresWhenDays: result.ExpiresWhenDays,
|
||||
ExpiresWarningWhenDays: result.ExpiresWarningWhenDays,
|
||||
Receivers: result.Receivers
|
||||
.Select(x => new CreateEnvelopeBootstrapReceiver(x.FullName, x.EmailAddress))
|
||||
.ToList(),
|
||||
|
||||
@@ -47,6 +47,16 @@ public sealed record CreateEnvelopeBootstrapPayload(
|
||||
string Message,
|
||||
int? EnvelopeTypeId,
|
||||
string Language,
|
||||
bool UseAccessCode,
|
||||
bool TFAEnabled,
|
||||
int CertificationType,
|
||||
int FinalEmailToCreator,
|
||||
int FinalEmailToReceivers,
|
||||
bool SendReminderEmails,
|
||||
int FirstReminderDays,
|
||||
int ReminderIntervalDays,
|
||||
int ExpiresWhenDays,
|
||||
int ExpiresWarningWhenDays,
|
||||
IReadOnlyList<CreateEnvelopeBootstrapReceiver> Receivers,
|
||||
byte[]? DocumentBytes,
|
||||
string? DocumentFileName);
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using System.Net.Http.Json;
|
||||
using System.Text.Json;
|
||||
using EnvelopeGenerator.Application.Common.Dto.Receiver;
|
||||
|
||||
namespace EnvelopeGenerator.Server.Client.Services;
|
||||
|
||||
@@ -26,4 +27,21 @@ public class ReceiverService(IHttpClientFactory httpClientFactory)
|
||||
var emails = await response.Content.ReadFromJsonAsync<List<string>>(JsonOptions, cancel);
|
||||
return emails ?? [];
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Fetches recent receiver suggestions for the authenticated sender.
|
||||
/// Calls GET /api/EnvelopeReceiver/recent-suggestions?take={take}.
|
||||
/// </summary>
|
||||
public async Task<IReadOnlyList<RecentReceiverSuggestionDto>> GetRecentReceiverSuggestionsAsync(int take = 20, CancellationToken cancel = default)
|
||||
{
|
||||
using var http = httpClientFactory.CreateClient("EnvelopeGenerator.Server");
|
||||
var url = $"/api/EnvelopeReceiver/recent-suggestions?take={take}";
|
||||
var response = await http.GetAsync(url, cancel);
|
||||
|
||||
if (!response.IsSuccessStatusCode)
|
||||
return [];
|
||||
|
||||
var suggestions = await response.Content.ReadFromJsonAsync<List<RecentReceiverSuggestionDto>>(JsonOptions, cancel);
|
||||
return suggestions ?? [];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1242,6 +1242,40 @@
|
||||
grid-column: 1 / -1;
|
||||
}
|
||||
|
||||
.sender-create-wizard__settings-grid {
|
||||
display: grid;
|
||||
gap: 0.8rem;
|
||||
}
|
||||
|
||||
.sender-create-wizard__settings-group {
|
||||
border: 1px solid rgba(148, 163, 184, 0.34);
|
||||
border-radius: 10px;
|
||||
background: rgba(248, 250, 252, 0.86);
|
||||
padding: 0.8rem;
|
||||
}
|
||||
|
||||
.sender-create-wizard__settings-title {
|
||||
font-size: 0.8rem;
|
||||
font-weight: 800;
|
||||
color: #334155;
|
||||
margin-bottom: 0.6rem;
|
||||
}
|
||||
|
||||
.sender-create-wizard__settings-toggles {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 0.55rem 1.1rem;
|
||||
}
|
||||
|
||||
.sender-create-wizard__settings-toggle {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.4rem;
|
||||
font-size: 0.82rem;
|
||||
font-weight: 600;
|
||||
color: #334155;
|
||||
}
|
||||
|
||||
.sender-create-wizard__label {
|
||||
font-size: 0.82rem;
|
||||
font-weight: 700;
|
||||
@@ -1271,6 +1305,133 @@
|
||||
justify-content: flex-end;
|
||||
}
|
||||
|
||||
.sender-create-wizard__add-receiver-btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 0.4rem;
|
||||
min-height: 36px;
|
||||
min-width: 220px;
|
||||
font-weight: 700;
|
||||
font-size: 0.84rem;
|
||||
border: 1px solid rgba(14, 116, 144, 0.28);
|
||||
border-radius: 8px;
|
||||
background: rgba(236, 254, 255, 0.95);
|
||||
color: #0f766e;
|
||||
box-shadow: 0 6px 14px rgba(14, 116, 144, 0.15);
|
||||
padding: 0.45rem 0.9rem;
|
||||
}
|
||||
|
||||
.sender-create-wizard__add-receiver-btn:hover:not(:disabled) {
|
||||
background: rgba(207, 250, 254, 1);
|
||||
color: #0f766e;
|
||||
}
|
||||
|
||||
.sender-create-wizard__add-receiver-btn:disabled {
|
||||
opacity: 0.58;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.sender-create-wizard__suggestions {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.45rem;
|
||||
}
|
||||
|
||||
.sender-create-wizard__suggestions-title {
|
||||
font-size: 0.8rem;
|
||||
font-weight: 700;
|
||||
color: #475569;
|
||||
}
|
||||
|
||||
.sender-create-wizard__suggestion-list {
|
||||
display: flex;
|
||||
flex-wrap: nowrap;
|
||||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
white-space: nowrap;
|
||||
gap: 0.45rem;
|
||||
padding-bottom: 0.25rem;
|
||||
}
|
||||
|
||||
.sender-create-wizard__suggestion-item {
|
||||
display: flex;
|
||||
flex: 0 0 auto;
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
gap: 0.12rem;
|
||||
border: 1px solid rgba(14, 116, 144, 0.22);
|
||||
border-radius: 999px;
|
||||
background: rgba(236, 254, 255, 0.85);
|
||||
color: #0f172a;
|
||||
padding: 0.35rem 0.7rem;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.sender-create-wizard__receiver-tagbox-wrap {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.35rem;
|
||||
}
|
||||
|
||||
.sender-create-wizard__receiver-tagbox {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.sender-create-wizard__receiver-tag {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 0.4rem;
|
||||
padding: 0.18rem 0.45rem;
|
||||
border-radius: 999px;
|
||||
background: rgba(236, 254, 255, 0.95);
|
||||
border: 1px solid rgba(14, 116, 144, 0.25);
|
||||
}
|
||||
|
||||
.sender-create-wizard__receiver-tag-name {
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.sender-create-wizard__receiver-tag-email {
|
||||
color: #64748b;
|
||||
font-size: 0.78rem;
|
||||
}
|
||||
|
||||
.sender-create-wizard__receiver-tag-remove {
|
||||
border: 0;
|
||||
background: transparent;
|
||||
color: #0f766e;
|
||||
font-size: 0.76rem;
|
||||
font-weight: 700;
|
||||
line-height: 1;
|
||||
padding: 0;
|
||||
width: 1rem;
|
||||
height: 1rem;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.sender-create-wizard__tagbox-empty {
|
||||
height: 0;
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.sender-create-wizard__suggestion-item:disabled {
|
||||
opacity: 0.58;
|
||||
}
|
||||
|
||||
.sender-create-wizard__suggestion-name {
|
||||
font-size: 0.77rem;
|
||||
font-weight: 700;
|
||||
line-height: 1.1;
|
||||
}
|
||||
|
||||
.sender-create-wizard__suggestion-email {
|
||||
font-size: 0.72rem;
|
||||
color: #155e75;
|
||||
line-height: 1.1;
|
||||
}
|
||||
|
||||
.sender-create-wizard__receiver-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@@ -1339,6 +1500,66 @@
|
||||
display: none;
|
||||
}
|
||||
|
||||
.sender-pdf-dropzone {
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
min-height: 92px;
|
||||
border: 1px dashed rgba(100, 116, 139, 0.5);
|
||||
border-radius: 8px;
|
||||
background: rgba(248, 250, 252, 0.9);
|
||||
color: #334155;
|
||||
cursor: pointer;
|
||||
transition: border-color 120ms ease, background-color 120ms ease, box-shadow 120ms ease;
|
||||
}
|
||||
|
||||
.sender-pdf-dropzone:hover {
|
||||
border-color: rgba(126, 34, 206, 0.45);
|
||||
background: rgba(241, 245, 249, 0.95);
|
||||
}
|
||||
|
||||
.sender-pdf-dropzone--drag-active {
|
||||
border-color: rgba(16, 185, 129, 0.75);
|
||||
background: linear-gradient(180deg, rgba(16, 185, 129, 0.14), rgba(16, 185, 129, 0.08));
|
||||
box-shadow: 0 0 0 3px rgba(16, 185, 129, 0.16);
|
||||
}
|
||||
|
||||
.sender-pdf-dropzone--disabled {
|
||||
opacity: 0.55;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.sender-pdf-dropzone__content {
|
||||
text-align: center;
|
||||
display: grid;
|
||||
gap: 0.2rem;
|
||||
padding: 0.75rem 0.9rem;
|
||||
}
|
||||
|
||||
.sender-pdf-dropzone__title {
|
||||
font-size: 0.86rem;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.sender-pdf-dropzone__hint {
|
||||
font-size: 0.78rem;
|
||||
color: #64748b;
|
||||
}
|
||||
|
||||
.sender-pdf-dropzone__input {
|
||||
position: absolute;
|
||||
inset: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
opacity: 0;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.sender-pdf-dropzone--disabled .sender-pdf-dropzone__input {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.sender-create-wizard__document-meta {
|
||||
border: 1px solid rgba(16, 185, 129, 0.3);
|
||||
border-radius: 8px;
|
||||
@@ -1346,6 +1567,28 @@
|
||||
padding: 0.55rem 0.7rem;
|
||||
}
|
||||
|
||||
.sender-create-wizard__document-preview-card {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 0.65rem;
|
||||
}
|
||||
|
||||
.sender-create-wizard__document-preview-wrap {
|
||||
border: 1px solid rgba(148, 163, 184, 0.38);
|
||||
border-radius: 10px;
|
||||
background: rgba(248, 250, 252, 0.96);
|
||||
height: 320px;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.sender-create-wizard__document-preview-wrap .sender-image-editor-shell {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.sender-create-wizard__document-preview-wrap .sender-image-editor {
|
||||
min-height: 0;
|
||||
}
|
||||
|
||||
.sender-create-wizard__document-name {
|
||||
color: #064e3b;
|
||||
font-size: 0.85rem;
|
||||
@@ -1397,6 +1640,10 @@
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.sender-pdf-dropzone {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.sender-create-wizard__upload-btn {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user