Merge pull request #190 from mspnp/dev

Configuration Fix

Author: BryanSoltis

src/Components/Modals/AddModal.razor

@@ -272,11 +272,11 @@
                 </div>
             </div>
         </div>
-    </div>
 
-<div class="modern-modal-footer">
-    <button title="Add" @onclick="Save" class="modern-btn-success">Add</button>
-    <button title="Cancel" @onclick="Cancel" class="modern-btn-secondary">Cancel</button>
+    <div class="modern-modal-footer">
+        <button title="Add" @onclick="Save" class="modern-btn-success">Add</button>
+        <button title="Cancel" @onclick="Cancel" class="modern-btn-secondary">Cancel</button>
+    </div>
 </div>
 
 @code {

src/Services/CustomComponentService.cs

@@ -193,18 +193,16 @@ public async Task<ServiceResponse> PostItemAsync(CustomComponent item)
                     // Set the new id
                     if (item.Id == 0)
                     {
-                        item.Id = items.Count + 1;
+                        // Use max ID + 1 instead of count + 1 to avoid ID collisions after deletions
+                        item.Id = items.Count > 0 ? items.Max(x => x.Id) + 1 : 1;
                     }
 
                     int position = 1;
                     items = [.. items.OrderBy(x => x.SortOrder)];
 
                     if (item.SortOrder == 0)
                     {
-                        if (items.Count > 0)
-                        {
-                            item.Id = items.Max(t => t.Id) + 1;
-                        }
+                        item.SortOrder = items.Count + 1;
                     }
 
                     // Determine new item id

src/Services/ResourceComponentService.cs

@@ -124,7 +124,8 @@ public async Task<ServiceResponse> PostItemAsync(ResourceComponent item)
                         // Set the new id
                         if (item.Id == 0)
                         {
-                            item.Id = items.Count + 1;
+                            // Use max ID + 1 instead of count + 1 to avoid ID collisions after deletions
+                            item.Id = items.Count > 0 ? items.Max(x => x.Id) + 1 : 1;
                         }
 
                         int position = 1;

src/Services/ResourceDelimiterService.cs

@@ -144,13 +144,20 @@ public async Task<ServiceResponse> PostItemAsync(ResourceDelimiter item)
             try
             {
                 // Get list of items
-                var items = (await _repository.GetAllAsync()).ToList();
+                var itemsEnumerable = await _repository.GetAllAsync();
+                if (itemsEnumerable == null)
+                {
+                    serviceResponse.ResponseObject = "Resource Delimiters not found!";
+                    return serviceResponse;
+                }
+                var items = itemsEnumerable.ToList();
                 if (GeneralHelper.IsNotNull(items))
                 {
                     // Set the new id
                     if (item.Id == 0)
                     {
-                        item.Id = items.Count + 1;
+                        // Use max ID + 1 instead of count + 1 to avoid ID collisions after deletions
+                        item.Id = items.Count > 0 ? items.Max(x => x.Id) + 1 : 1;
                     }
                     item.Enabled = true;
                     int position = 1;
@@ -199,23 +206,40 @@ public async Task<ServiceResponse> PostItemAsync(ResourceDelimiter item)
                         }
                         else
                         {
-                            item.Id = 1;
-                            item.SortOrder = 1;
+                            // Add new item - ID was already set above
+                            item.SortOrder = items.Count + 1;
+                            
+                            // Disable other items if this new item is enabled
+                            if (item.Enabled)
+                            {
+                                foreach (var existingItem in items)
+                                {
+                                    existingItem.Enabled = false;
+                                }
+                            }
+                            
                             items.Add(item);
                         }
+                    }
+                    else
+                    {
+                        // Add first item to empty list
+                        item.SortOrder = 1;
+                        items.Add(item);
+                    }
 
-                        position = 1;
-                        foreach (ResourceDelimiter thisitem in items.OrderBy(x => x.SortOrder).ToList())
-                        {
-                            thisitem.SortOrder = position;
-                            position += 1;
-                        }
-
-                        // Write items to file
-                        await _repository.SaveAllAsync(items);
-                        serviceResponse.ResponseObject = "Resource Delimiter added/updated!";
-                        serviceResponse.Success = true;
+                    // Normalize sort order
+                    position = 1;
+                    foreach (ResourceDelimiter thisitem in items.OrderBy(x => x.SortOrder).ToList())
+                    {
+                        thisitem.SortOrder = position;
+                        position += 1;
                     }
+
+                    // Write items to file
+                    await _repository.SaveAllAsync(items);
+                    serviceResponse.ResponseObject = "Resource Delimiter added/updated!";
+                    serviceResponse.Success = true;
                 }
                 else
                 {

src/Services/ResourceTypeService.cs

@@ -139,7 +139,8 @@ public async Task<ServiceResponse> PostItemAsync(ResourceType item)
                     // Set the new id
                     if (item.Id == 0)
                     {
-                        item.Id = items.Count + 1;
+                        // Use max ID + 1 instead of count + 1 to avoid ID collisions after deletions
+                        item.Id = items.Count > 0 ? items.Max(x => x.Id) + 1 : 1;
                     }
 
                     // Determine new item id

src/wwwroot/css/modern-components.css

@@ -2966,7 +2966,7 @@ h3.blazored-modal-title,
     padding: 16px 24px;
     border-top: 1px solid var(--color-border);
     background-color: var(--color-bg-secondary);
-    margin-top: auto; /* Push footer to bottom when content is short */
+    flex-shrink: 0; /* Prevent footer from shrinking */
 }
 
 /* Modal Animations */
@@ -2996,7 +2996,6 @@ h3.blazored-modal-title,
     display: flex;
     flex-direction: column;
     max-height: 85vh;
-    overflow-y: auto; /* Enable scrolling on the modal content */
     line-height: 1.6; /* Consistent line height for readability */
     font-size: 14px; /* Consistent font size */
 }
@@ -3015,7 +3014,6 @@ h3.blazored-modal-title,
     flex: 1;
     overflow-y: auto;
     padding: 1.5rem;
-    max-height: calc(85vh - 120px); /* Account for header and footer */
     line-height: 1.6; /* Consistent line height for readability */
     font-size: 14px; /* Consistent font size */
 }

tests/AzureNamingTool.UnitTests/AzureNamingTool.UnitTests.csproj

@@ -1,16 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
 
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="FluentAssertions" Version="6.12.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
         <PackageReference Include="Moq" Version="4.20.70" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="xunit" Version="2.4.1"/>
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

tests/AzureNamingTool.UnitTests/Helpers/ValidationHelperTests.cs

@@ -532,10 +532,10 @@ public void ValidateGeneratedName_ShouldHandleNullInvalidCharacterFields()
             Regx = "^[a-z0-9-]+$",
             LengthMin = "3",
             LengthMax = "20",
-            InvalidCharacters = null,
-            InvalidCharactersStart = null,
-            InvalidCharactersEnd = null,
-            InvalidCharactersConsecutive = null
+            InvalidCharacters = string.Empty,
+            InvalidCharactersStart = string.Empty,
+            InvalidCharactersEnd = string.Empty,
+            InvalidCharactersConsecutive = string.Empty
         };
         var name = "test-resource";
         var delimiter = "-";

tests/AzureNamingTool.UnitTests/Repositories/FileSystemStorageProviderTests.cs

@@ -63,9 +63,10 @@ public async Task GetHealthAsync_ShouldIncludeMetadata_WhenFileSystemIsAccessibl
 
         // Assert
         health.Metadata.Should().NotBeNull("metadata should be provided");
+        health.Metadata!.Should().NotBeNull("metadata should be provided");
 
         // If there was a file locking error (e.g., from concurrent test runs), skip the rest
-        if (health.Metadata.ContainsKey("Error"))
+        if (health.Metadata!.ContainsKey("Error"))
         {
             // File locking can occur in test scenarios - this is acceptable
             health.Metadata.Should().ContainKey("SettingsPath", "error metadata should include settings path");
@@ -127,9 +128,9 @@ public async Task GetHealthAsync_ShouldReportFileCount_WhenSettingsDirectoryHasF
 
         // Assert
         health.Metadata.Should().ContainKey("FileCount");
-        var fileCount = health.Metadata["FileCount"];
+        var fileCount = health.Metadata!["FileCount"];
         fileCount.Should().BeOfType<int>("file count should be an integer");
-        ((int)fileCount).Should().BeGreaterThanOrEqualTo(0, "file count should not be negative");
+        ((int)fileCount!).Should().BeGreaterThanOrEqualTo(0, "file count should not be negative");
     }
 
     /// <summary>
@@ -149,12 +150,12 @@ public async Task GetHealthAsync_ShouldReportMultipleFiles_InProductionEnvironme
 
         // Assert
         health.IsHealthy.Should().BeTrue("production environment should be healthy");
-        var fileCount = (int)health.Metadata["FileCount"];
+        var fileCount = (int)health.Metadata!["FileCount"]!;
         fileCount.Should().BeGreaterThan(0, "settings directory should contain configuration files");
 
         // Validate typical configuration files exist
         health.Metadata.Should().ContainKey("LastModified");
-        health.Metadata["LastModified"].Should().NotBeNull("should report last modification time");
+        health.Metadata!["LastModified"].Should().NotBeNull("should report last modification time");
     }
 
     [Fact]

tests/AzureNamingTool.UnitTests/Services/AdminLogServiceTests.cs

@@ -38,7 +38,7 @@ public async Task GetItemsAsync_ShouldReturnOrderedItems_WhenItemsExist()
         var returnedItems = result.ResponseObject as List<AdminLogMessage>;
         returnedItems.Should().NotBeNull();
         returnedItems!.Should().HaveCount(3);
-        returnedItems[0].Id.Should().Be(2); // Most recent first
+        returnedItems![0].Id.Should().Be(2); // Most recent first
     }
 
     [Fact]