Refactor: Replace EnvelopeTypeId with EnvelopeType enum
Replaced all instances of `EnvelopeTypeId` (int/int?) with `Type` (EnvelopeType/EnvelopeType?) across the codebase to improve type safety and readability. Updated affected properties, methods, and logic in DTOs, commands, handlers, and Razor components. Introduced conditional compilation to handle differences between .NET and .NET Framework where necessary. Removed obsolete helper methods for `EnvelopeTypeId`. This refactor ensures consistent use of the strongly-typed `EnvelopeType` enum, reducing the risk of invalid values and aligning with best practices.
This commit is contained in:
@@ -100,7 +100,7 @@
|
||||
<div class="sender-settings-grid">
|
||||
<div class="sender-settings-field">
|
||||
<label class="sender-settings-label">@L("EnvelopeType", "Umschlagtyp")</label>
|
||||
<select value="@(_selectedEnvelopeTypeId?.ToString() ?? string.Empty)"
|
||||
<select value="@(_selectedType?.ToString() ?? string.Empty)"
|
||||
@onchange="OnEnvelopeTypeChanged"
|
||||
class="sender-settings-select">
|
||||
<option value="">@L("SenderEditor_SelectTemplate", "Vorlage auswählen")</option>
|
||||
@@ -692,7 +692,7 @@
|
||||
bool _titleTouched = false;
|
||||
|
||||
List<EnvelopeTypeDefaultsDto> _envelopeTypes = [];
|
||||
int? _selectedEnvelopeTypeId;
|
||||
EnvelopeType? _selectedType;
|
||||
string _language = "de-DE";
|
||||
bool _useAccessCode;
|
||||
bool _tfaEnabled;
|
||||
@@ -778,7 +778,7 @@
|
||||
|
||||
_envelopeTitle = envelope.Title ?? string.Empty;
|
||||
_envelopeMessage = envelope.Message ?? string.Empty;
|
||||
_selectedEnvelopeTypeId = envelope.EnvelopeTypeId;
|
||||
_selectedType = envelope.Type;
|
||||
_language = string.IsNullOrWhiteSpace(envelope.Language) ? "de-DE" : envelope.Language;
|
||||
_useAccessCode = envelope.UseAccessCode;
|
||||
_tfaEnabled = envelope.TFAEnabled;
|
||||
@@ -963,13 +963,15 @@
|
||||
Task OnEnvelopeTypeChanged(ChangeEventArgs e)
|
||||
{
|
||||
var raw = e.Value?.ToString();
|
||||
if (!int.TryParse(raw, out var id) || id <= 0)
|
||||
if (!int.TryParse(raw, out var idInt) || idInt <= 0)
|
||||
{
|
||||
_selectedEnvelopeTypeId = null;
|
||||
_selectedType = null;
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
_selectedEnvelopeTypeId = id;
|
||||
var id = idInt.ToEnvelopeType();
|
||||
|
||||
_selectedType = id;
|
||||
var selectedType = _envelopeTypes.FirstOrDefault(x => x.Id == id);
|
||||
if (selectedType is not null)
|
||||
ApplyEnvelopeTypeDefaults(selectedType);
|
||||
@@ -1350,7 +1352,7 @@
|
||||
return new CreateEnvelopeCommand
|
||||
{
|
||||
EnvelopeId = envelopeId,
|
||||
EnvelopeTypeId = _selectedEnvelopeTypeId,
|
||||
Type = _selectedType,
|
||||
Title = _envelopeTitle,
|
||||
Message = _envelopeMessage,
|
||||
Language = _language,
|
||||
|
||||
@@ -796,7 +796,7 @@
|
||||
|
||||
var command = new CreateEnvelopeCommand
|
||||
{
|
||||
EnvelopeTypeId = result.EnvelopeTypeId,
|
||||
Type = result.Type,
|
||||
Title = result.Title,
|
||||
Message = result.Message,
|
||||
Language = string.IsNullOrWhiteSpace(result.Language) ? "de-DE" : result.Language,
|
||||
|
||||
Reference in New Issue
Block a user