From a1ecb43b18f0d3805455bee9e4285e1e89ed89a1 Mon Sep 17 00:00:00 2001 From: Bryan Soltis Date: Tue, 16 Dec 2025 11:37:57 -0600 Subject: [PATCH 1/3] Remove all Bootstrap dependencies - Replace data-bs-toggle and data-bs-dismiss with Blazor @onclick functionality - Fixed collapsible sections across 6 files (Instructions, EditModal, AddModal, AdminLog, Generate, GeneratedNamesLog) - Replaced data-bs-toggle='collapse' with @onclick handlers and C# collapse management - Replaced data-bs-dismiss='alert' with @onclick handlers for alert dismissal - Added ToggleCollapse/GetCollapseClass methods to manage section states - Fixed EditModal @code block structure (missing closing brace) - All sections now properly expand/collapse without page reloads - All alert dismiss buttons now properly hide alerts --- src/Components/Modals/AddModal.razor | 28 ++++-- src/Components/Modals/EditModal.razor | 95 ++++++++++++-------- src/Components/Pages/AdminLog.razor | 24 ++++- src/Components/Pages/Generate.razor | 32 +++++-- src/Components/Pages/GeneratedNamesLog.razor | 24 ++++- src/Components/Pages/Instructions.razor | 45 +++++++--- 6 files changed, 184 insertions(+), 64 deletions(-) diff --git a/src/Components/Modals/AddModal.razor b/src/Components/Modals/AddModal.razor index 85e7b240..7f889157 100644 --- a/src/Components/Modals/AddModal.razor +++ b/src/Components/Modals/AddModal.razor @@ -167,12 +167,10 @@
-
- +
+ Resoure Type Metadata
-
+

This section allows you to edit the Resouce Type metadata. @@ -716,5 +714,25 @@ async Task Cancel() => await ModalInstance.CancelAsync(); + + // Collapse management for sections + private HashSet collapsedSections = new HashSet { "typemetdadata" }; + + private void ToggleCollapse(string section) + { + if (collapsedSections.Contains(section)) + { + collapsedSections.Remove(section); + } + else + { + collapsedSections.Add(section); + } + } + + private string GetCollapseClass(string section) + { + return collapsedSections.Contains(section) ? "collapsed" : ""; + } } diff --git a/src/Components/Modals/EditModal.razor b/src/Components/Modals/EditModal.razor index 7c4d9ff8..7ae57e7e 100644 --- a/src/Components/Modals/EditModal.razor +++ b/src/Components/Modals/EditModal.razor @@ -28,7 +28,7 @@

@if (type == "ResourceType") { - if (Convert.ToBoolean(config.ResourceTypeEditingAllowed)) + if (Convert.ToBoolean(config.ResourceTypeEditingAllowed) && !isDangerAlertDismissed) {
-
} - else + else if (!isWarningAlertDismissed) {
-
@@ -230,12 +230,10 @@
-
- +
+ Resoure Type Metadata
-
+

This section allows you to edit the Resouce Type metadata. @@ -348,12 +346,10 @@

-
- +
+ Resoure Type Metadata
-
+
This section allows you to view the Resouce Type metadata.
@@ -442,12 +438,10 @@ @if (type == "ResourceComponent") {
-
- +
+ Globally Optional Configuration
-
+
This section allows you to add/remove the component as OPTIONAL for all resource types.
@@ -478,12 +472,10 @@
-
- +
+ Globally Exclude Configuration
-
+
This section allows you to add/remove the component as EXCLUDE for all resource types.
@@ -517,12 +509,10 @@ @if ((type == "ResourceType") && (GeneralHelper.IsNotNull(resourceComponents))) {
-
- +
+ Optional Components
-
+
@foreach (ResourceComponent resourceComponent in resourceComponents) { if (resourceComponent.Name != "ResourceType") @@ -549,12 +539,10 @@
-
- +
+ Excluded Components
-
+
@foreach (ResourceComponent resourceComponent in resourceComponents) { //@if (resourceComponent.Name != "ResourceType") @@ -645,6 +633,8 @@ public IAdminLogService? AdminLogService { get; set; } private ServiceResponse serviceResponse = new(); + private bool isDangerAlertDismissed = false; + private bool isWarningAlertDismissed = false; private string itemName = String.Empty; private string itemDisplayName = String.Empty; private string itemShortName = String.Empty; @@ -1183,7 +1173,42 @@ async Task Cancel() => await ModalInstance.CancelAsync(); -} + + // Collapse management for sections + private HashSet collapsedSections = new HashSet + { + "typemetdadata", + "typemetdadatadisabled", + "globallyoptional", + "globallyexclude", + "optionalcomponents", + "excludedcomponents" + }; + + private void ToggleCollapse(string section) + { + if (collapsedSections.Contains(section)) + { + collapsedSections.Remove(section); + } + else + { + collapsedSections.Add(section); + } + } + private string GetCollapseClass(string section) + { + return collapsedSections.Contains(section) ? "collapsed" : ""; + } + private void DismissDangerAlert() + { + isDangerAlertDismissed = true; + } + private void DismissWarningAlert() + { + isWarningAlertDismissed = true; + } +} diff --git a/src/Components/Pages/AdminLog.razor b/src/Components/Pages/AdminLog.razor index 0b28203a..55bc5818 100644 --- a/src/Components/Pages/AdminLog.razor +++ b/src/Components/Pages/AdminLog.razor @@ -64,12 +64,12 @@
-