Skip to content

Commit d799dac

Browse files
BryanSoltisBryanSoltis
authored
Merge pull request #186 from BryanSoltis/dev
Bug fixes
2 parents d669d96 + c23a1bd commit d799dac

File tree

15 files changed

+202
-82
lines changed

15 files changed

+202
-82
lines changed

‎src/AzureNamingTool.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
7-
<Version>5.0.0</Version>
7+
<Version>5.0.1</Version>
88
<GenerateDocumentationFile>true</GenerateDocumentationFile>
99
<NoWarn>$(NoWarn);CS8602;CS8600;CS1998</NoWarn>
1010
<UserSecretsId>eca63fb9-b7f9-454f-910b-5088ae877085</UserSecretsId>

‎src/Components/Modals/AddModal.razor‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,10 @@
167167
</div>
168168
</div>
169169
<div id="typemetdadatacontainer" class="modern-card" style="margin-bottom: 1rem;">
170-
<div class="modern-card-header">
171-
<a id="typemetdadatalink" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#typemetdadata" role="button" aria-expanded="false" aria-controls="typemetdadata">
172-
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resoure Type Metadata
173-
</a>
170+
<div class="modern-card-header collapsible @(GetCollapseClass("typemetdadata"))" @onclick="@(() => ToggleCollapse("typemetdadata"))">
171+
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resource Type Metadata
174172
</div>
175-
<div class="collapse modern-card-body" id="typemetdadata">
173+
<div class="modern-card-body @(GetCollapseClass("typemetdadata"))" id="typemetdadata">
176174
<div style="margin-bottom: 1rem;">
177175
<p>
178176
This section allows you to edit the Resouce Type metadata.
@@ -716,5 +714,25 @@
716714

717715

718716
async Task Cancel() => await ModalInstance.CancelAsync();
717+
718+
// Collapse management for sections
719+
private HashSet<string> collapsedSections = new HashSet<string> { "typemetdadata" };
720+
721+
private void ToggleCollapse(string section)
722+
{
723+
if (collapsedSections.Contains(section))
724+
{
725+
collapsedSections.Remove(section);
726+
}
727+
else
728+
{
729+
collapsedSections.Add(section);
730+
}
731+
}
732+
733+
private string GetCollapseClass(string section)
734+
{
735+
return collapsedSections.Contains(section) ? "collapsed" : "";
736+
}
719737
}
720738

‎src/Components/Modals/EditModal.razor‎

Lines changed: 64 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</p>
2929
@if (type == "ResourceType")
3030
{
31-
if (Convert.ToBoolean(config.ResourceTypeEditingAllowed))
31+
if (Convert.ToBoolean(config.ResourceTypeEditingAllowed) && !isDangerAlertDismissed)
3232
{
3333
<div class="alert alert-danger alert-dismissible fade show" style="margin-bottom: 1rem;" role="alert">
3434
<h4>ATTENTION</h4>
@@ -41,21 +41,21 @@
4141
</p>
4242
</div>
4343
<div>
44-
<button type="button" class="close btn btn-light" data-bs-dismiss="alert" aria-label="Dismiss">
44+
<button type="button" class="close btn btn-light" @onclick="DismissDangerAlert" aria-label="Dismiss">
4545
<span aria-hidden="true">Dismiss</span>
4646
</button>
4747
</div>
4848
</div>
4949
}
50-
else
50+
else if (!isWarningAlertDismissed)
5151
{
5252
<div class="alert alert-warning alert-dismissible fade show" style="margin-bottom: 1rem;" role="alert">
5353
<h4>NOTE</h4>
5454
<div style="margin-bottom: 1rem;">
5555
Resource Type settings are disabled by default. You can allow the editing of these values by enabling the "Resource Type Editing" setting in the Admin section.
5656
</div>
5757
<div>
58-
<button type="button" class="close btn btn-light" data-bs-dismiss="alert" aria-label="Dismiss">
58+
<button type="button" class="close btn btn-light" @onclick="DismissWarningAlert" aria-label="Dismiss">
5959
<span aria-hidden="true">Dismiss</span>
6060
</button>
6161
</div>
@@ -230,12 +230,10 @@
230230
</div>
231231
</div>
232232
<div id="typemetdadatacontainer" class="modern-card" style="margin-bottom: 1rem;">
233-
<div class="modern-card-header">
234-
<a id="typemetdadatalink" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#typemetdadata" role="button" aria-expanded="false" aria-controls="typemetdadata">
235-
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resoure Type Metadata
236-
</a>
233+
<div class="modern-card-header collapsible @(GetCollapseClass("typemetdadata"))" @onclick="@(() => ToggleCollapse("typemetdadata"))">
234+
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resource Type Metadata
237235
</div>
238-
<div class="collapse modern-card-body" id="typemetdadata">
236+
<div class="modern-card-body @(GetCollapseClass("typemetdadata"))" id="typemetdadata">
239237
<div style="margin-bottom: 1rem;">
240238
<p>
241239
This section allows you to edit the Resouce Type metadata.
@@ -348,12 +346,10 @@
348346
</div>
349347
</div>
350348
<div id="typemetdadatadisabledcontainer" class="modern-card" style="margin-bottom: 1rem;">
351-
<div class="modern-card-header">
352-
<a id="typemetdadatadisabledlink" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#typemetdadatadisabled" role="button" aria-expanded="false" aria-controls="typemetdadatadisabled">
353-
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resoure Type Metadata
354-
</a>
349+
<div class="modern-card-header collapsible @(GetCollapseClass("typemetdadatadisabled"))" @onclick="@(() => ToggleCollapse("typemetdadatadisabled"))">
350+
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resource Type Metadata
355351
</div>
356-
<div class="collapse modern-card-body" id="typemetdadatadisabled">
352+
<div class="modern-card-body @(GetCollapseClass("typemetdadatadisabled"))" id="typemetdadatadisabled">
357353
<div style="margin-bottom: 1rem;">
358354
This section allows you to view the Resouce Type metadata.
359355
</div>
@@ -442,12 +438,10 @@
442438
@if (type == "ResourceComponent")
443439
{
444440
<div id="globallyoptionalcontainer" class="modern-card" style="margin-bottom: 1rem;">
445-
<div class="modern-card-header">
446-
<a id="OptionalComponents" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#globallyoptional" role="button" aria-expanded="false" aria-controls="globallyoptional">
447-
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Globally Optional Configuration
448-
</a>
441+
<div class="modern-card-header collapsible @(GetCollapseClass("globallyoptional"))" @onclick="@(() => ToggleCollapse("globallyoptional"))">
442+
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Globally Optional Configuration
449443
</div>
450-
<div class="collapse modern-card-body" id="globallyoptional">
444+
<div class="modern-card-body @(GetCollapseClass("globallyoptional"))" id="globallyoptional">
451445
<div style="margin-bottom: 1rem;">
452446
This section allows you to add/remove the component as OPTIONAL for all resource types.
453447
</div>
@@ -458,7 +452,7 @@
458452
This option will ADD the component as OPTIONAL for all resource types.
459453
</td>
460454
<td>
461-
<button type="button" class="modern-btn-success w-100" @onclick="@(e => FormAction("ResourceComponent","optional-add"))" style="min-width:42px;" title="Add as OPTIONAL for all resoure types">
455+
<button type="button" class="modern-btn-success w-100" @onclick="@(e => FormAction("ResourceComponent","optional-add"))" style="min-width:42px;" title="Add as OPTIONAL for all Resource types">
462456
ADD
463457
</button>
464458
</td>
@@ -468,7 +462,7 @@
468462
This option will REMOVE the component from OPTIONAL for all resource types.
469463
</td>
470464
<td>
471-
<button type="button" class="modern-btn-danger w-100" @onclick="@(e => FormAction("ResourceComponent","optional-remove"))" style="min-width:42px;" title="Remove as OPTIONAL for all resoure types">
465+
<button type="button" class="modern-btn-danger w-100" @onclick="@(e => FormAction("ResourceComponent","optional-remove"))" style="min-width:42px;" title="Remove as OPTIONAL for all Resource types">
472466
REMOVE
473467
</button>
474468
</td>
@@ -478,12 +472,10 @@
478472
</div>
479473
</div>
480474
<div id="globallyexcludecontainer" class="modern-card" style="margin-bottom: 1rem;">
481-
<div class="modern-card-header">
482-
<a id="OptionalComponents" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#globallyexclude" role="button" aria-expanded="false" aria-controls="globallyexclude">
483-
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Globally Exclude Configuration
484-
</a>
475+
<div class="modern-card-header collapsible @(GetCollapseClass("globallyexclude"))" @onclick="@(() => ToggleCollapse("globallyexclude"))">
476+
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Globally Exclude Configuration
485477
</div>
486-
<div class="collapse modern-card-body" id="globallyexclude">
478+
<div class="modern-card-body @(GetCollapseClass("globallyexclude"))" id="globallyexclude">
487479
<div style="margin-bottom: 1rem;">
488480
This section allows you to add/remove the component as EXCLUDE for all resource types.
489481
</div>
@@ -494,7 +486,7 @@
494486
This option will ADD the component as EXCLUDE for all resource types.
495487
</td>
496488
<td>
497-
<button type="button" class="modern-btn-success w-100" @onclick="@(e => FormAction("ResourceComponent","exclude-add"))" style="min-width:42px;" title="Add as EXCLUDE for all resoure types">
489+
<button type="button" class="modern-btn-success w-100" @onclick="@(e => FormAction("ResourceComponent","exclude-add"))" style="min-width:42px;" title="Add as EXCLUDE for all Resource types">
498490
ADD
499491
</button>
500492
</td>
@@ -504,7 +496,7 @@
504496
This option will REMOVE the component from EXCLUDE for all resource types.
505497
</td>
506498
<td>
507-
<button type="button" class="modern-btn-danger w-100" @onclick="@(e => FormAction("ResourceComponent","exclude-remove"))" style="min-width:42px;" title="Remove as EXCLUDE for all resoure types">
499+
<button type="button" class="modern-btn-danger w-100" @onclick="@(e => FormAction("ResourceComponent","exclude-remove"))" style="min-width:42px;" title="Remove as EXCLUDE for all Resource types">
508500
REMOVE
509501
</button>
510502
</td>
@@ -517,12 +509,10 @@
517509
@if ((type == "ResourceType") && (GeneralHelper.IsNotNull(resourceComponents)))
518510
{
519511
<div id="optional" class="modern-card" style="margin-bottom: 1rem;">
520-
<div class="modern-card-header">
521-
<a id="OptionalComponents" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#optionalcomponents" role="button" aria-expanded="false" aria-controls="optionalcomponents">
522-
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Optional Components
523-
</a>
512+
<div class="modern-card-header collapsible @(GetCollapseClass("optionalcomponents"))" @onclick="@(() => ToggleCollapse("optionalcomponents"))">
513+
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Optional Components
524514
</div>
525-
<div class="collapse modern-card-body" id="optionalcomponents">
515+
<div class="modern-card-body @(GetCollapseClass("optionalcomponents"))" id="optionalcomponents">
526516
@foreach (ResourceComponent resourceComponent in resourceComponents)
527517
{
528518
if (resourceComponent.Name != "ResourceType")
@@ -549,12 +539,10 @@
549539
</div>
550540

551541
<div id="excluded" class="modern-card" style="margin-bottom: 1rem;">
552-
<div class="modern-card-header">
553-
<a id="ExcludedComponents" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#excludedcomponents" role="button" aria-expanded="false" aria-controls="excludedcomponents">
554-
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Excluded Components
555-
</a>
542+
<div class="modern-card-header collapsible @(GetCollapseClass("excludedcomponents"))" @onclick="@(() => ToggleCollapse("excludedcomponents"))">
543+
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Excluded Components
556544
</div>
557-
<div class="collapse modern-card-body" id="excludedcomponents">
545+
<div class="modern-card-body @(GetCollapseClass("excludedcomponents"))" id="excludedcomponents">
558546
@foreach (ResourceComponent resourceComponent in resourceComponents)
559547
{
560548
//@if (resourceComponent.Name != "ResourceType")
@@ -645,6 +633,8 @@
645633
public IAdminLogService? AdminLogService { get; set; }
646634

647635
private ServiceResponse serviceResponse = new();
636+
private bool isDangerAlertDismissed = false;
637+
private bool isWarningAlertDismissed = false;
648638
private string itemName = String.Empty;
649639
private string itemDisplayName = String.Empty;
650640
private string itemShortName = String.Empty;
@@ -1183,7 +1173,42 @@
11831173

11841174

11851175
async Task Cancel() => await ModalInstance.CancelAsync();
1186-
}
1176+
1177+
// Collapse management for sections
1178+
private HashSet<string> collapsedSections = new HashSet<string>
1179+
{
1180+
"typemetdadata",
1181+
"typemetdadatadisabled",
1182+
"globallyoptional",
1183+
"globallyexclude",
1184+
"optionalcomponents",
1185+
"excludedcomponents"
1186+
};
1187+
1188+
private void ToggleCollapse(string section)
1189+
{
1190+
if (collapsedSections.Contains(section))
1191+
{
1192+
collapsedSections.Remove(section);
1193+
}
1194+
else
1195+
{
1196+
collapsedSections.Add(section);
1197+
}
1198+
}
11871199

1200+
private string GetCollapseClass(string section)
1201+
{
1202+
return collapsedSections.Contains(section) ? "collapsed" : "";
1203+
}
11881204

1205+
private void DismissDangerAlert()
1206+
{
1207+
isDangerAlertDismissed = true;
1208+
}
11891209

1210+
private void DismissWarningAlert()
1211+
{
1212+
isWarningAlertDismissed = true;
1213+
}
1214+
}

‎src/Components/Pages/AdminLog.razor‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@
6464
</div>
6565

6666
<div class="modern-card mb-4">
67-
<div class="modern-card-header collapsible collapsed" data-bs-toggle="collapse" data-bs-target="#adminlogfilter" aria-expanded="false">
67+
<div class="modern-card-header collapsible @(GetCollapseClass("adminlogfilter"))" @onclick="@(() => ToggleCollapse("adminlogfilter"))">
6868
<h3>
6969
<span class="oi oi-chevron-bottom" aria-hidden="true"></span> Filter Data
7070
</h3>
7171
</div>
72-
<div class="collapse modern-card-body" id="adminlogfilter">
72+
<div class="modern-card-body @(GetCollapseClass("adminlogfilter"))" id="adminlogfilter">
7373
<div class="row mb-3">
7474
<div class="col-auto">
7575
<label class="modern-form-label">Start Date</label>
@@ -272,4 +272,24 @@
272272
enddate = DateTime.Today;
273273
filterData = "";
274274
}
275+
276+
// Collapse management for sections
277+
private HashSet<string> collapsedSections = new HashSet<string> { "adminlogfilter" };
278+
279+
private void ToggleCollapse(string section)
280+
{
281+
if (collapsedSections.Contains(section))
282+
{
283+
collapsedSections.Remove(section);
284+
}
285+
else
286+
{
287+
collapsedSections.Add(section);
288+
}
289+
}
290+
291+
private string GetCollapseClass(string section)
292+
{
293+
return collapsedSections.Contains(section) ? "collapsed" : "";
294+
}
275295
}

0 commit comments

Comments
 (0)