NounSelectOptions =>
+ _nouns.Select(n => new DefectCodeOptionDto { Id = n.Id, Name = n.Name }).ToList();
+
+ ///
+ protected override async Task OnInitializedAsync()
+ {
+ await ReloadAsync();
+ var wis = await WorkInstructionService.GetAllLatestSummariesAsync();
+ _workInstructions = wis.OrderBy(w => w.Title).ToList();
+ _loading = false;
+ }
+
+ private string TabClass(string id) => _activeTab == id ? "active" : "";
+
+ private void SetTab(string tab)
+ {
+ _activeTab = tab;
+ }
+
+ private static string FormatWiLabel(WorkInstructionSummaryDTO wi)
+ {
+ var v = string.IsNullOrWhiteSpace(wi.Version) ? "" : $" v{wi.Version}";
+ return $"{wi.Title}{v}";
+ }
+
+ private string FormatNounRowAdjectives(FailureNounAdminDto row)
+ {
+ if (row.AdjectiveIds.Count == 0)
+ return "—";
+ return string.Join(", ",
+ _adjectives.Where(a => row.AdjectiveIds.Contains(a.Id)).OrderBy(a => a.Name).Select(a => a.Name));
+ }
+
+ private string FormatAdjectiveRowNouns(FailureAdjectiveAdminDto row)
+ {
+ if (row.NounIds.Count == 0)
+ return "—";
+ return string.Join(", ",
+ _nouns.Where(n => row.NounIds.Contains(n.Id)).OrderBy(n => n.Name).Select(n => n.Name));
+ }
+
+ private Task OnEditNounAdjectiveAdd(int adjectiveId)
+ {
+ if (_editNoun is null)
+ {
+ return Task.CompletedTask;
+ }
+ if (!_editNoun.AdjectiveIds.Contains(adjectiveId))
+ {
+ _editNoun.AdjectiveIds.Add(adjectiveId);
+ }
+ return Task.CompletedTask;
+ }
+
+ private Task OnEditNounAdjectiveRemove(int adjectiveId)
+ {
+ _editNoun?.AdjectiveIds.Remove(adjectiveId);
+ return Task.CompletedTask;
+ }
+
+ private Task OnEditAdjectiveNounAdd(int nounId)
+ {
+ if (_editAdjective is null)
+ {
+ return Task.CompletedTask;
+ }
+ if (!_editAdjective.NounIds.Contains(nounId))
+ {
+ _editAdjective.NounIds.Add(nounId);
+ }
+ return Task.CompletedTask;
+ }
+
+ private Task OnEditAdjectiveNounRemove(int nounId)
+ {
+ _editAdjective?.NounIds.Remove(nounId);
+ return Task.CompletedTask;
+ }
+
+ private bool NounMatchesSearch(FailureNounAdminDto n)
+ {
+ if (string.IsNullOrWhiteSpace(_nounSearch))
+ {
+ return true;
+ }
+ var q = _nounSearch.Trim();
+ return n.Name.Contains(q, StringComparison.OrdinalIgnoreCase)
+ || FormatNounRowAdjectives(n).Contains(q, StringComparison.OrdinalIgnoreCase);
+ }
+
+ private bool AdjectiveMatchesSearch(FailureAdjectiveAdminDto a)
+ {
+ if (string.IsNullOrWhiteSpace(_adjectiveSearch))
+ {
+ return true;
+ }
+ var q = _adjectiveSearch.Trim();
+ return a.Name.Contains(q, StringComparison.OrdinalIgnoreCase)
+ || FormatAdjectiveRowNouns(a).Contains(q, StringComparison.OrdinalIgnoreCase);
+ }
+
+ private async Task ReloadAsync()
+ {
+ _nouns = (await DefectCodeService.GetAllNounsAsync()).OrderBy(n => n.Name).ToList();
+ _adjectives = (await DefectCodeService.GetAllAdjectivesAsync()).OrderBy(a => a.Name).ToList();
+ }
+
+ private async Task CreateNounAsync()
+ {
+ if (string.IsNullOrWhiteSpace(_newNounName))
+ return;
+ _saving = true;
+ try
+ {
+ await DefectCodeService.CreateNounAsync(new FailureNounCreateRequest
+ {
+ Name = _newNounName.Trim(),
+ AdjectiveIds = _newNounAdjectiveIds.ToList()
+ });
+ _newNounName = "";
+ _newNounAdjectiveIds.Clear();
+ await ReloadAsync();
+ ToastService.ShowSuccess("Noun created.");
+ }
+ finally
+ {
+ _saving = false;
+ }
+ }
+
+ private async Task CreateAdjectiveAsync()
+ {
+ if (string.IsNullOrWhiteSpace(_newAdjectiveName))
+ return;
+ _saving = true;
+ try
+ {
+ await DefectCodeService.CreateAdjectiveAsync(new FailureAdjectiveCreateRequest
+ {
+ Name = _newAdjectiveName.Trim(),
+ NounIds = _newAdjectiveNounIds.ToList()
+ });
+ _newAdjectiveName = "";
+ _newAdjectiveNounIds.Clear();
+ await ReloadAsync();
+ ToastService.ShowSuccess("Adjective created.");
+ }
+ finally
+ {
+ _saving = false;
+ }
+ }
+
+ private void StartEditNoun(FailureNounAdminDto n)
+ {
+ _editNoun = new FailureNounAdminDto { Id = n.Id, Name = n.Name, AdjectiveIds = [..n.AdjectiveIds] };
+ }
+
+ private void StartEditAdjective(FailureAdjectiveAdminDto a)
+ {
+ _editAdjective = new FailureAdjectiveAdminDto { Id = a.Id, Name = a.Name, NounIds = [..a.NounIds] };
+ }
+
+ private Task CloseEditNounAsync()
+ {
+ _editNoun = null;
+ return Task.CompletedTask;
+ }
+
+ private Task CloseEditAdjectiveAsync()
+ {
+ _editAdjective = null;
+ return Task.CompletedTask;
+ }
+
+ private async Task SaveEditNounAsync()
+ {
+ if (_editNoun is null) return;
+ _saving = true;
+ try
+ {
+ await DefectCodeService.UpdateNounAsync(new FailureNounUpdateRequest
+ {
+ Id = _editNoun.Id,
+ Name = _editNoun.Name.Trim(),
+ AdjectiveIds = _editNoun.AdjectiveIds
+ });
+ _editNoun = null;
+ await ReloadAsync();
+ ToastService.ShowSuccess("Noun updated.");
+ }
+ finally
+ {
+ _saving = false;
+ }
+ }
+
+ private async Task SaveEditAdjectiveAsync()
+ {
+ if (_editAdjective is null) return;
+ _saving = true;
+ try
+ {
+ await DefectCodeService.UpdateAdjectiveAsync(new FailureAdjectiveUpdateRequest
+ {
+ Id = _editAdjective.Id,
+ Name = _editAdjective.Name.Trim(),
+ NounIds = _editAdjective.NounIds
+ });
+ _editAdjective = null;
+ await ReloadAsync();
+ ToastService.ShowSuccess("Adjective updated.");
+ }
+ finally
+ {
+ _saving = false;
+ }
+ }
+
+ private async Task DeleteNounAsync(FailureNounAdminDto n)
+ {
+ _saving = true;
+ try
+ {
+ await DefectCodeService.DeleteNounAsync(n.Id);
+ await ReloadAsync();
+ ToastService.ShowSuccess("Noun deleted.");
+ }
+ finally
+ {
+ _saving = false;
+ }
+ }
+
+ private async Task DeleteAdjectiveAsync(FailureAdjectiveAdminDto a)
+ {
+ _saving = true;
+ try
+ {
+ await DefectCodeService.DeleteAdjectiveAsync(a.Id);
+ await ReloadAsync();
+ ToastService.ShowSuccess("Adjective deleted.");
+ }
+ finally
+ {
+ _saving = false;
+ }
+ }
+
+ private async Task LoadWiNounSelectionAsync()
+ {
+ if (_selectedWorkInstructionId <= 0)
+ return;
+ var ids = await DefectCodeService.GetNounIdsForWorkInstructionAsync(_selectedWorkInstructionId);
+ _wiNounSelection = _nouns.ToDictionary(n => n.Id, n => ids.Contains(n.Id));
+ StateHasChanged();
+ }
+
+ private void ToggleWiNoun(int nounId, ChangeEventArgs e)
+ {
+ var on = e.Value is bool b && b;
+ _wiNounSelection[nounId] = on;
+ }
+
+ private async Task SaveWiNounsAsync()
+ {
+ if (_selectedWorkInstructionId <= 0)
+ return;
+ var ids = _wiNounSelection.Where(kv => kv.Value).Select(kv => kv.Key).ToList();
+ _saving = true;
+ try
+ {
+ await DefectCodeService.SetNounsForWorkInstructionAsync(_selectedWorkInstructionId, ids);
+ ToastService.ShowSuccess("Work instruction nouns saved.");
+ }
+ finally
+ {
+ _saving = false;
+ }
+ }
+}
diff --git a/MESS/MESS.Blazor/Components/Pages/Defects/Defects.razor.css b/MESS/MESS.Blazor/Components/Pages/Defects/Defects.razor.css
new file mode 100644
index 00000000..dfb34cb0
--- /dev/null
+++ b/MESS/MESS.Blazor/Components/Pages/Defects/Defects.razor.css
@@ -0,0 +1,41 @@
+/* Page-specific layout tweaks; inherits global Bootstrap / app.css.
+ App uses body.dark-mode without data-bs-theme=dark, so BS CSS vars stay "light"
+ while inactive tabs must stay readable on dark chrome. */
+.defects-page .nav-tabs .nav-link:not(.active) {
+ color: var(--bs-secondary-color, #6c757d);
+}
+
+body.dark-mode .defects-page .nav-tabs .nav-link:not(.active) {
+ color: rgba(255, 255, 255, 0.88);
+}
+
+body.dark-mode .defects-page .nav-tabs .nav-link:not(.active):hover,
+body.dark-mode .defects-page .nav-tabs .nav-link:not(.active):focus {
+ color: #ffffff;
+}
+
+.defects-page .nav-tabs .nav-link.active {
+ color: var(--bs-body-color, #212529);
+ font-weight: 600;
+}
+
+body.dark-mode .defects-page .form-check-label {
+ color: rgba(255, 255, 255, 0.95);
+}
+
+.defects-page .defects-tab-card {
+ border-top-left-radius: 0;
+ border-top-right-radius: 0;
+}
+
+.defects-page .defects-table-search {
+ max-width: 24rem;
+ width: 100%;
+}
+
+@media (min-width: 768px) {
+ .defects-page .defects-table-search {
+ width: auto;
+ min-width: 18rem;
+ }
+}
diff --git a/MESS/MESS.Blazor/Components/Pages/Phoebe/UserManagement/OperatorManager.razor b/MESS/MESS.Blazor/Components/Pages/Phoebe/UserManagement/OperatorManager.razor
index 0bc33363..4f5dc661 100644
--- a/MESS/MESS.Blazor/Components/Pages/Phoebe/UserManagement/OperatorManager.razor
+++ b/MESS/MESS.Blazor/Components/Pages/Phoebe/UserManagement/OperatorManager.razor
@@ -52,7 +52,9 @@
| User Name |
First Name |
Last Name |
+ Legacy login |
Manage Roles |
+ Password |
User Actions |
diff --git a/MESS/MESS.Blazor/Components/Pages/Phoebe/UserManagement/UserTableRow.razor b/MESS/MESS.Blazor/Components/Pages/Phoebe/UserManagement/UserTableRow.razor
index 0ff76542..2b6fc33f 100644
--- a/MESS/MESS.Blazor/Components/Pages/Phoebe/UserManagement/UserTableRow.razor
+++ b/MESS/MESS.Blazor/Components/Pages/Phoebe/UserManagement/UserTableRow.razor
@@ -21,6 +21,17 @@
|
+
+
+
+
+
+ |
@@ -33,6 +44,34 @@
|
+
+
+
+
+
+ @if (UserRoleDTO.IsNew)
+ {
+ Save user first.
+ }
+
+ |
protected override async Task OnInitializedAsync()
@@ -187,6 +228,58 @@
}
}
+ private async Task SetOrResetPasswordAsync()
+ {
+ if (User == null || UserRoleDTO.IsNew)
+ {
+ return;
+ }
+
+ if (string.IsNullOrWhiteSpace(_newPassword))
+ {
+ ToastService.ShowError("Password is required.");
+ return;
+ }
+
+ if (_newPassword != _confirmPassword)
+ {
+ ToastService.ShowError("Password and confirm password must match.");
+ return;
+ }
+
+ try
+ {
+ IdentityResult result;
+ if (await UserManager.HasPasswordAsync(User))
+ {
+ var token = await UserManager.GeneratePasswordResetTokenAsync(User);
+ result = await UserManager.ResetPasswordAsync(User, token, _newPassword);
+ }
+ else
+ {
+ result = await UserManager.AddPasswordAsync(User, _newPassword);
+ }
+
+ if (result.Succeeded)
+ {
+ _newPassword = "";
+ _confirmPassword = "";
+ ToastService.ShowSuccess($"Password updated for {User.UserName ?? User.Email}.");
+ return;
+ }
+
+ foreach (var error in result.Errors)
+ {
+ ToastService.ShowError(error.Description);
+ }
+ }
+ catch (Exception ex)
+ {
+ Log.Error(ex, "Password reset failed for user {UserId}", User.Id);
+ ToastService.ShowError("Could not update password. Please try again.");
+ }
+ }
+
private void InitiateDeleteUser(string userId)
{
UserToDeleteId = userId;
diff --git a/MESS/MESS.Blazor/Components/Pages/Phoebe/WorkInstruction/WorkInstructionNodes/StepNodeView.razor b/MESS/MESS.Blazor/Components/Pages/Phoebe/WorkInstruction/WorkInstructionNodes/StepNodeView.razor
index 0022bf6d..b22920aa 100644
--- a/MESS/MESS.Blazor/Components/Pages/Phoebe/WorkInstruction/WorkInstructionNodes/StepNodeView.razor
+++ b/MESS/MESS.Blazor/Components/Pages/Phoebe/WorkInstruction/WorkInstructionNodes/StepNodeView.razor
@@ -1,3 +1,4 @@
+@using MESS.Data.Models
@using MESS.Blazor.Components.Pages.Phoebe.WorkInstruction.WorkInstructionNodes.ImageList
@inject IJSRuntime JS
@@ -21,9 +22,21 @@
- |