feat: add persistence and restoration of email template filters in UI and backend
This commit is contained in:
@@ -40,14 +40,24 @@ public class AdminTemplatesController : Controller
|
|||||||
|
|
||||||
// GET /admin/templates/create
|
// GET /admin/templates/create
|
||||||
[HttpGet("create")]
|
[HttpGet("create")]
|
||||||
public IActionResult Create()
|
public IActionResult Create([FromQuery] string? serviceNameFilter, [FromQuery] string? keyFilter)
|
||||||
{
|
{
|
||||||
return View("Edit", new EmailTemplateEditViewModel());
|
return View("Edit", new EmailTemplateEditViewModel
|
||||||
|
{
|
||||||
|
ServiceNameFilter = serviceNameFilter,
|
||||||
|
KeyFilter = keyFilter
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// GET /admin/templates/{serviceName}/{key}/{languageCode}
|
// GET /admin/templates/{serviceName}/{key}/{languageCode}
|
||||||
[HttpGet("{serviceName}/{key}/{languageCode}")]
|
[HttpGet("{serviceName}/{key}/{languageCode}")]
|
||||||
public async Task<IActionResult> Edit(string serviceName, string key, string languageCode, CancellationToken ct)
|
public async Task<IActionResult> Edit(
|
||||||
|
string serviceName,
|
||||||
|
string key,
|
||||||
|
string languageCode,
|
||||||
|
[FromQuery] string? serviceNameFilter,
|
||||||
|
[FromQuery] string? keyFilter,
|
||||||
|
CancellationToken ct)
|
||||||
{
|
{
|
||||||
var result = await _mediator.Send(new GetEmailTemplateQuery(serviceName, key, languageCode), ct);
|
var result = await _mediator.Send(new GetEmailTemplateQuery(serviceName, key, languageCode), ct);
|
||||||
if (!result.IsSuccess || result.Result is null)
|
if (!result.IsSuccess || result.Result is null)
|
||||||
@@ -63,7 +73,9 @@ public class AdminTemplatesController : Controller
|
|||||||
Subject = template.Subject,
|
Subject = template.Subject,
|
||||||
HtmlBody = template.HtmlBody,
|
HtmlBody = template.HtmlBody,
|
||||||
TextBody = template.TextBody,
|
TextBody = template.TextBody,
|
||||||
VariablesJson = JsonSerializer.Serialize(template.Variables)
|
VariablesJson = JsonSerializer.Serialize(template.Variables),
|
||||||
|
ServiceNameFilter = serviceNameFilter,
|
||||||
|
KeyFilter = keyFilter
|
||||||
};
|
};
|
||||||
|
|
||||||
return View(vm);
|
return View(vm);
|
||||||
@@ -127,15 +139,21 @@ public class AdminTemplatesController : Controller
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return RedirectToAction(nameof(Index));
|
return RedirectToAction(nameof(Index), new { serviceName = model.ServiceNameFilter, key = model.KeyFilter });
|
||||||
}
|
}
|
||||||
|
|
||||||
// POST /admin/templates/{serviceName}/{key}/{languageCode}/delete
|
// POST /admin/templates/{serviceName}/{key}/{languageCode}/delete
|
||||||
[HttpPost("{serviceName}/{key}/{languageCode}/delete")]
|
[HttpPost("{serviceName}/{key}/{languageCode}/delete")]
|
||||||
[ValidateAntiForgeryToken]
|
[ValidateAntiForgeryToken]
|
||||||
public async Task<IActionResult> Delete(string serviceName, string key, string languageCode, CancellationToken ct)
|
public async Task<IActionResult> Delete(
|
||||||
|
string serviceName,
|
||||||
|
string key,
|
||||||
|
string languageCode,
|
||||||
|
[FromForm] string? serviceNameFilter,
|
||||||
|
[FromForm] string? keyFilter,
|
||||||
|
CancellationToken ct)
|
||||||
{
|
{
|
||||||
await _mediator.Send(new DeleteEmailTemplateCommand(serviceName, key, languageCode), ct);
|
await _mediator.Send(new DeleteEmailTemplateCommand(serviceName, key, languageCode), ct);
|
||||||
return RedirectToAction(nameof(Index));
|
return RedirectToAction(nameof(Index), new { serviceName = serviceNameFilter, key = keyFilter });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -25,6 +25,8 @@ public class EmailTemplateEditViewModel
|
|||||||
|
|
||||||
// JSON array: [{"name":"UserName","required":true}, ...]
|
// JSON array: [{"name":"UserName","required":true}, ...]
|
||||||
public string VariablesJson { get; set; } = "[]";
|
public string VariablesJson { get; set; } = "[]";
|
||||||
|
public string? ServiceNameFilter { get; set; }
|
||||||
|
public string? KeyFilter { get; set; }
|
||||||
|
|
||||||
public bool IsNew => Id == null;
|
public bool IsNew => Id == null;
|
||||||
public string PageTitle => IsNew ? "Create Email Template" : "Edit Email Template";
|
public string PageTitle => IsNew ? "Create Email Template" : "Edit Email Template";
|
||||||
|
|||||||
@@ -10,6 +10,8 @@
|
|||||||
@Html.AntiForgeryToken()
|
@Html.AntiForgeryToken()
|
||||||
<input asp-for="Id" type="hidden" />
|
<input asp-for="Id" type="hidden" />
|
||||||
<input type="hidden" name="IsNew" value="@Model.IsNew" />
|
<input type="hidden" name="IsNew" value="@Model.IsNew" />
|
||||||
|
<input asp-for="ServiceNameFilter" type="hidden" />
|
||||||
|
<input asp-for="KeyFilter" type="hidden" />
|
||||||
|
|
||||||
@if (!ViewData.ModelState.IsValid)
|
@if (!ViewData.ModelState.IsValid)
|
||||||
{
|
{
|
||||||
@@ -116,7 +118,7 @@
|
|||||||
<button type="submit" form="templateForm" class="btn btn-primary">
|
<button type="submit" form="templateForm" class="btn btn-primary">
|
||||||
<i class="bi bi-floppy me-1"></i> Save
|
<i class="bi bi-floppy me-1"></i> Save
|
||||||
</button>
|
</button>
|
||||||
<a href="/admin/templates" class="btn btn-secondary">
|
<a href="/admin/templates@(string.IsNullOrWhiteSpace(Model.ServiceNameFilter) && string.IsNullOrWhiteSpace(Model.KeyFilter) ? string.Empty : $"?serviceName={Uri.EscapeDataString(Model.ServiceNameFilter ?? string.Empty)}&key={Uri.EscapeDataString(Model.KeyFilter ?? string.Empty)}")" class="btn btn-secondary">
|
||||||
<i class="bi bi-x-lg me-1"></i> Cancel
|
<i class="bi bi-x-lg me-1"></i> Cancel
|
||||||
</a>
|
</a>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,18 +4,24 @@
|
|||||||
ViewData["Title"] = "Email Templates";
|
ViewData["Title"] = "Email Templates";
|
||||||
var serviceNameFilter = ViewData["ServiceNameFilter"] as string ?? string.Empty;
|
var serviceNameFilter = ViewData["ServiceNameFilter"] as string ?? string.Empty;
|
||||||
var keyFilter = ViewData["KeyFilter"] as string ?? string.Empty;
|
var keyFilter = ViewData["KeyFilter"] as string ?? string.Empty;
|
||||||
|
var filterQuery = string.IsNullOrWhiteSpace(serviceNameFilter) && string.IsNullOrWhiteSpace(keyFilter)
|
||||||
|
? string.Empty
|
||||||
|
: $"?serviceNameFilter={Uri.EscapeDataString(serviceNameFilter)}&keyFilter={Uri.EscapeDataString(keyFilter)}";
|
||||||
|
var listQuery = string.IsNullOrWhiteSpace(serviceNameFilter) && string.IsNullOrWhiteSpace(keyFilter)
|
||||||
|
? string.Empty
|
||||||
|
: $"?serviceName={Uri.EscapeDataString(serviceNameFilter)}&key={Uri.EscapeDataString(keyFilter)}";
|
||||||
}
|
}
|
||||||
|
|
||||||
<div class="page-header">
|
<div class="page-header">
|
||||||
<h2><i class="bi bi-envelope-paper"></i> Email Templates</h2>
|
<h2><i class="bi bi-envelope-paper"></i> Email Templates</h2>
|
||||||
<a href="/admin/templates/create" class="btn btn-primary btn-sm">
|
<a href="/admin/templates/create@filterQuery" class="btn btn-primary btn-sm">
|
||||||
<i class="bi bi-plus-lg me-1"></i> Create New Template
|
<i class="bi bi-plus-lg me-1"></i> Create New Template
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="card shadow-sm mb-3">
|
<div class="card shadow-sm mb-3">
|
||||||
<div class="card-body">
|
<div class="card-body">
|
||||||
<form method="get" action="/admin/templates" class="row g-2 align-items-end">
|
<form id="templateFiltersForm" method="get" action="/admin/templates" class="row g-2 align-items-end">
|
||||||
<div class="col-12 col-md-5">
|
<div class="col-12 col-md-5">
|
||||||
<label class="form-label fw-semibold" for="serviceName">Service Name</label>
|
<label class="form-label fw-semibold" for="serviceName">Service Name</label>
|
||||||
<input id="serviceName"
|
<input id="serviceName"
|
||||||
@@ -34,7 +40,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="col-12 col-md-2 d-flex gap-2">
|
<div class="col-12 col-md-2 d-flex gap-2">
|
||||||
<button type="submit" class="btn btn-primary w-100">Filter</button>
|
<button type="submit" class="btn btn-primary w-100">Filter</button>
|
||||||
<a href="/admin/templates" class="btn btn-outline-secondary w-100">Clear</a>
|
<a id="clearTemplateFilters" href="/admin/templates" class="btn btn-outline-secondary w-100">Clear</a>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
@@ -50,6 +56,61 @@
|
|||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
<script>
|
||||||
|
(() => {
|
||||||
|
const storageKey = 'hrynco.notificationService.adminTemplates.filters';
|
||||||
|
const form = document.getElementById('templateFiltersForm');
|
||||||
|
const serviceNameInput = document.getElementById('serviceName');
|
||||||
|
const keyInput = document.getElementById('key');
|
||||||
|
const clearLink = document.getElementById('clearTemplateFilters');
|
||||||
|
|
||||||
|
if (!form || !serviceNameInput || !keyInput || !clearLink) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const saveState = () => {
|
||||||
|
const state = {
|
||||||
|
serviceName: serviceNameInput.value ?? '',
|
||||||
|
key: keyInput.value ?? ''
|
||||||
|
};
|
||||||
|
|
||||||
|
localStorage.setItem(storageKey, JSON.stringify(state));
|
||||||
|
};
|
||||||
|
|
||||||
|
const restoreState = () => {
|
||||||
|
const raw = localStorage.getItem(storageKey);
|
||||||
|
if (!raw) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
const state = JSON.parse(raw);
|
||||||
|
const serviceName = typeof state.serviceName === 'string' ? state.serviceName : '';
|
||||||
|
const key = typeof state.key === 'string' ? state.key : '';
|
||||||
|
|
||||||
|
serviceNameInput.value = serviceName;
|
||||||
|
keyInput.value = key;
|
||||||
|
|
||||||
|
return serviceName.length > 0 || key.length > 0;
|
||||||
|
} catch {
|
||||||
|
localStorage.removeItem(storageKey);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
form.addEventListener('submit', saveState);
|
||||||
|
clearLink.addEventListener('click', () => localStorage.removeItem(storageKey));
|
||||||
|
|
||||||
|
const hasQueryParams = new URLSearchParams(window.location.search).toString().length > 0;
|
||||||
|
if (!hasQueryParams && restoreState()) {
|
||||||
|
form.requestSubmit();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
saveState();
|
||||||
|
})();
|
||||||
|
</script>
|
||||||
|
|
||||||
@if (Model is null || Model.Count == 0)
|
@if (Model is null || Model.Count == 0)
|
||||||
{
|
{
|
||||||
<div class="card shadow-sm table-card">
|
<div class="card shadow-sm table-card">
|
||||||
@@ -85,13 +146,15 @@ else
|
|||||||
<td>@t.LanguageCode</td>
|
<td>@t.LanguageCode</td>
|
||||||
<td>@t.Subject</td>
|
<td>@t.Subject</td>
|
||||||
<td class="text-end">
|
<td class="text-end">
|
||||||
<a href="/admin/templates/@t.ServiceName/@t.Key/@t.LanguageCode"
|
<a href="/admin/templates/@t.ServiceName/@t.Key/@t.LanguageCode@filterQuery"
|
||||||
class="btn btn-sm btn-outline-primary me-1">
|
class="btn btn-sm btn-outline-primary me-1">
|
||||||
<i class="bi bi-pencil"></i> Edit
|
<i class="bi bi-pencil"></i> Edit
|
||||||
</a>
|
</a>
|
||||||
<form method="post"
|
<form method="post"
|
||||||
action="/admin/templates/@t.ServiceName/@t.Key/@t.LanguageCode/delete"
|
action="/admin/templates/@t.ServiceName/@t.Key/@t.LanguageCode/delete"
|
||||||
class="d-inline">
|
class="d-inline">
|
||||||
|
<input type="hidden" name="serviceNameFilter" value="@serviceNameFilter" />
|
||||||
|
<input type="hidden" name="keyFilter" value="@keyFilter" />
|
||||||
@Html.AntiForgeryToken()
|
@Html.AntiForgeryToken()
|
||||||
<button type="submit"
|
<button type="submit"
|
||||||
class="btn btn-sm btn-outline-danger"
|
class="btn btn-sm btn-outline-danger"
|
||||||
|
|||||||
Reference in New Issue
Block a user