From 79e8786370a2ddd0815cc302518fab73ebd4a702 Mon Sep 17 00:00:00 2001
From: bryansoltis <github@soltisweb.com>
Date: Wed, 14 Aug 2024 09:51:37 -0500
Subject: [PATCH 1/4] - Updated Configuration Page messaging - Updated Edit
 Modal messaging - Updated Add Model messaging

---
 src/AzureNamingTool.csproj               |  12 +-
 src/Components/Modals/AddModal.razor     | 226 +++++++++++++--
 src/Components/Modals/EditModal.razor    | 346 ++++++++++++++++++-----
 src/Components/Pages/Admin.razor         |   9 +-
 src/Components/Pages/Configuration.razor |  63 ++++-
 src/Helpers/ModalHelper.cs               |   6 +-
 src/programsettings.json                 |   2 +-
 src/versionalerts.json                   |   5 +
 8 files changed, 566 insertions(+), 103 deletions(-)

diff --git a/src/AzureNamingTool.csproj b/src/AzureNamingTool.csproj
index cc829ac4..2b201162 100644
--- a/src/AzureNamingTool.csproj
+++ b/src/AzureNamingTool.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>4.2.1</Version>
+    <Version>4.3.0</Version>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <UserSecretsId>eca63fb9-b7f9-454f-910b-5088ae877085</UserSecretsId>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -24,11 +24,11 @@
     <PackageReference Include="Blazored.Modal" Version="7.3.1" />
     <PackageReference Include="Blazored.Toast" Version="4.2.1" />
     <PackageReference Include="Markdig" Version="0.37.0" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
-    <PackageReference Include="PSC.Blazor.Components.MarkdownEditor" Version="8.0.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.6.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.6.2" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.6.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
+    <PackageReference Include="PSC.Blazor.Components.MarkdownEditor" Version="8.0.4" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.7.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.0" />
     <PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
   </ItemGroup>
 
diff --git a/src/Components/Modals/AddModal.razor b/src/Components/Modals/AddModal.razor
index 0b307ec9..3ec5bb90 100644
--- a/src/Components/Modals/AddModal.razor
+++ b/src/Components/Modals/AddModal.razor
@@ -2,13 +2,14 @@
 @using AzureNamingTool.Models
 @using AzureNamingTool.Services
 @using Microsoft.AspNetCore.Html
+@using System.Text.RegularExpressions
 @inject IToastService toastService
 @inject StateContainer state
 @inject ProtectedSessionStorage session
 
 <div class="modal fade show d-block" tabindex="-1" role="dialog">
     <div class="modal-backdrop fade show" @onclick="Cancel"></div>
-    <div class="modal-dialog" style="z-index: 1050">
+    <div class="modal-dialog modal-lg" style="z-index: 1050">
         <!-- Pop it above the backdrop -->
         <div class="modal-content @theme.ThemeStyle">
             <div class="modal-header @headerstyle text-white">
@@ -25,7 +26,7 @@
                             Enter the desired configuration.
                         </div>
                         <div class="form-group mb-3">
-                            <label for="name" style="font-weight:bold;">Name</label>
+                            <label for="name" style="font-weight:bold;">@namelabel</label>
                             <input title="Name" value="@itemName" type="text" class="form-control @theme.ThemeStyle" id="name" @onchange="@((ui) => { itemName = (string)ui.Value!;})" />
                         </div>
                         @switch (type)
@@ -127,6 +128,138 @@
                                     </div>
                                 </div>
                                 break;
+                            case "ResourceType":
+                                <div class="form-group mb-3">
+                                    <label for="shortName" style="font-weight:bold;">Short Name</label>
+                                    <input title="Short Name" value="@itemShortName" type="text" class="form-control @theme.ThemeStyle" id="shortname" @onchange="@((ui) => { itemShortName = (string)ui.Value!;})" />
+                                </div>
+                                <div class="mb-3">
+                                    <div class="fw-bold">
+                                        Minimum Length
+                                    </div>
+                                    <div>
+                                        <input title="Minimum Length" value="@itemMinLength" type="text" class="form-control @theme.ThemeStyle" id="minlength" @onchange="@((ui) => { itemMinLength = (string)ui.Value!;})" onkeypress="return (event.charCode !=8 && event.charCode ==0 || (event.charCode >= 48 && event.charCode <= 57))" />
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <div class="fw-bold">
+                                        Maximum Length
+                                    </div>
+                                    <div>
+                                        <input title="Maximum Length" value="@itemMaxLength" type="text" class="form-control @theme.ThemeStyle" id="maxlength" @onchange="@((ui) => { itemMaxLength = (string)ui.Value!;})" onkeypress="return (event.charCode !=8 && event.charCode ==0 || (event.charCode >= 48 && event.charCode <= 57))" />
+                                    </div>
+                                </div>
+                                <div class="mb-3">
+                                    <div class="fw-bold">
+                                        Apply Delimiter
+                                    </div>
+                                    <div class="mb-3">
+                                        If disabled, the current delimiter will not be used for name generation.
+                                    </div>
+                                    <div>
+                                        <label class="switch" title="Apply Delimiter">
+                                            <input type="checkbox" checked="@itemApplyDelimiter" @oninput='args => ComponentSettingChanged(args, "applydelimiter")'>
+                                            <span class="slider round"></span>
+                                        </label>
+                                        <span class="align-text-top"> Enable</span>
+                                    </div>
+                                </div>
+                                <div id="typemetdadatacontainer" class="card mb-3">
+                                    <div class="card-header bg-default text-dark fw-bold">
+                                        <a id="typemetdadatalink" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#typemetdadata" role="button" aria-expanded="false" aria-controls="typemetdadata">
+                                            <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resoure Type Metadata
+                                        </a>
+                                    </div>
+                                    <div class="collapse card card-body @theme.ThemeStyle" id="typemetdadata">
+                                        <div class="mb-3">
+                                            <p>
+                                            This section allows you to edit the Resouce Type metadata.
+                                            </p>
+                                                <div class="alert alert-danger mb-3" role="alert">
+                                                    <h4>ATTENTION</h4>
+                                                    <span class="fw-bold">Please see the <a href="https://github.com/mspnp/AzureNamingTool/wiki/Resource-Type-Editing" target="_blank">Resource Type Editing documentation</a> for guidance on metadata editing.</span>
+                                                </div>
+
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="mb-3">
+                                                <div class="fw-bold">
+                                                    Regex
+                                                </div>
+                                                <div class="mb-3">
+                                                    Regex to apply to generated names.
+                                                </div>
+                                                <div>
+                                                    <input title="RegEx" value="@itemRegEx" type="text" class="form-control @theme.ThemeStyle" id="regex" @onchange="@((ui) => { itemRegEx = (string)ui.Value!;})" />
+                                                </div>
+                                            </div>
+
+                                            <div class="fw-bold">
+                                                Scope
+                                            </div>
+                                            <div>
+                                                <input title="Scope" value="@itemScope" type="text" class="form-control @theme.ThemeStyle" id="scope" @onchange="@((ui) => { itemScope = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Valid Text
+                                            </div>
+                                            <div>
+                                                <input title="Valid Text" value="@itemValidText" type="text" class="form-control @theme.ThemeStyle" id="validtext" @onchange="@((ui) => { itemValidText = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Text
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Text" value="@itemInvalidText" type="text" class="form-control @theme.ThemeStyle" id="invalidtext" @onchange="@((ui) => { itemInvalidText = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Characters
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Characters" value="@itemInvalidCharacters" type="text" class="form-control @theme.ThemeStyle" id="invalidcharacters" @onchange="@((ui) => { itemInvalidCharacters = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Characters Start
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Characters Start" value="@itemInvalidCharactersStart" type="text" class="form-control @theme.ThemeStyle" id="invalidcharactersstart" @onchange="@((ui) => { itemInvalidCharactersStart = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Characters End
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Characters End" value="@itemInvalidCharactersEnd" type="text" class="form-control @theme.ThemeStyle" id="invalidcharactersend" @onchange="@((ui) => { itemInvalidCharactersEnd = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Characters Consecutive
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Characters Consecutive" value="@itemInvalidCharactersConsecutive" type="text" class="form-control @theme.ThemeStyle" id="invalidcharactersconsecutive" @onchange="@((ui) => { itemInvalidCharactersConsecutive = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Static Values
+                                            </div>
+                                            <div>
+                                                <input title="Static Values" value="@itemStaticValues" type="text" class="form-control @theme.ThemeStyle" id="staticvalues" @onchange="@((ui) => { itemStaticValues = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                break;
                             case "AdminUser":
                                 break;
                             default:
@@ -150,17 +283,17 @@
 
 
 @code {
-        [CascadingParameter] BlazoredModalInstance ModalInstance { get; set; } = new();
-        [Parameter] public ThemeInfo theme { get; set; } = new();
+    [CascadingParameter] BlazoredModalInstance ModalInstance { get; set; } = new();
+    [Parameter] public ThemeInfo theme { get; set; } = new();
 
-        [Parameter] public int id { get; set; } = 0;
-        [Parameter] public string title { get; set; } = String.Empty;
-        [Parameter] public string message { get; set; } = String.Empty;
-        [Parameter] public string type { get; set; } = String.Empty;
-        [Parameter] public string parentcomponent { get; set; } = String.Empty;
-        [Parameter] public string headerstyle { get; set; } = String.Empty;
-        [Parameter] public bool admin { get; set; } = false;
-        [Parameter] public ServicesData servicesData { get; set; } = new();
+    [Parameter] public int id { get; set; } = 0;
+    [Parameter] public string title { get; set; } = String.Empty;
+    [Parameter] public string message { get; set; } = String.Empty;
+    [Parameter] public string type { get; set; } = String.Empty;
+    [Parameter] public string parentcomponent { get; set; } = String.Empty;
+    [Parameter] public string headerstyle { get; set; } = String.Empty;
+    [Parameter] public bool admin { get; set; } = false;
+    [Parameter] public ServicesData servicesData { get; set; } = new();
 
 
     private ServiceResponse serviceResponse = new();
@@ -168,17 +301,32 @@
     private string itemShortName = String.Empty;
     private string itemMinLength = "1";
     private string itemMaxLength = "10";
+    private string itemScope = "";
+    private string itemValidText = String.Empty;
+    private string itemInvalidText = String.Empty;
+    private string itemInvalidCharacters = String.Empty;
+    private string itemInvalidCharactersStart = String.Empty;
+    private string itemInvalidCharactersEnd = String.Empty;
+    private string itemInvalidCharactersConsecutive = String.Empty;
+    private string itemRegEx = String.Empty;
+    private string itemStaticValues = String.Empty;
     private string itemComponentType = "standard";
     private bool itemEnforceRandom = false;
     private bool itemAlphanumeric = true;
     private bool itemIsFreeText = false;
-    private bool itemApplyDelimiterBefore = true;
-    private bool itemApplyDelimiterAfter = true;
+    private bool itemApplyDelimiterBefore = true;  // Used to determine if the delimiter will be added before the component
+    private bool itemApplyDelimiterAfter = true;   // Used to determine if the delimiter will be added after the component
+    private bool itemApplyDelimiter = true; // Used to determine if the delimiter is applied to the resource type (all components)
     private string currentuser = String.Empty;
+    private string namelabel = "Name";
 
     protected override async void OnInitialized()
     {
         currentuser = await IdentityHelper.GetCurrentUser(session);
+        if (type == "ResourceType")
+        {
+            namelabel = "Resource";
+        }
     }
 
     async void Save()
@@ -253,14 +401,13 @@
                         serviceResponse = await AdminUserService.PostItem(adminUser);
                     }
                 }
-
                 break;
             default:
                 if ((GeneralHelper.IsNotNull(itemName)) && (GeneralHelper.IsNotNull(itemShortName)))
                 {
                     if ((!String.IsNullOrEmpty(itemName)) && (!String.IsNullOrEmpty(itemShortName)))
                     {
-                        if(itemShortName.Any(Char.IsWhiteSpace))
+                        if (itemShortName.Any(Char.IsWhiteSpace))
                         {
                             toastService.ShowError("You must enter a valid short name with no spaces!");
                             break;
@@ -354,6 +501,50 @@
                                         serviceResponse = await ResourceProjAppSvcService.PostItem(resourceProjAppSvc);
                                     }
                                     break;
+                                case "ResourceType":
+                                    // Check if the item already exists
+                                    serviceResponse = await ResourceTypeService.GetItems();
+                                    ArgumentNullException.ThrowIfNull(servicesData.ResourceTypes);
+                                    List<ResourceType> resourceTypes = servicesData.ResourceTypes;
+                                    if (resourceTypes.Any(x => GeneralHelper.NormalizeName(x.Resource, true) == normailzedname || x.ShortName == itemShortName))
+                                    {
+                                        toastService.ShowError("You must enter a unique Resource Type name and short name!");
+                                    }
+                                    else
+                                    {
+                                        try
+                                        {
+                                            // Check the regex is valid
+                                            Regex regx = new(itemRegEx);
+                                        }
+                                        catch (Exception)
+                                        {
+                                            toastService.ShowError("The Regex is not valid. Please review the code and try again!");
+                                            return;
+                                        }
+
+                                        // If the above code is valid, then continue with the execution
+                                        valid = true;
+                                        ResourceType resourceType = new ResourceType()
+                                            {
+                                                Resource = itemName,
+                                                ShortName = itemShortName,
+                                                LengthMin = itemMinLength,
+                                                LengthMax = itemMaxLength,
+                                                ApplyDelimiter = itemApplyDelimiter,
+                                                Regx = itemRegEx,
+                                                Scope = itemScope,
+                                                ValidText = itemValidText,
+                                                InvalidText = itemInvalidText,
+                                                InvalidCharacters = itemInvalidCharacters,
+                                                InvalidCharactersStart = itemInvalidCharactersStart,
+                                                InvalidCharactersEnd = itemInvalidCharactersEnd,
+                                                InvalidCharactersConsecutive = itemInvalidCharactersConsecutive,
+                                                StaticValues = itemStaticValues
+                                            };
+                                        serviceResponse = await ResourceTypeService.PostItem(resourceType);
+                                    }
+                                    break;
                                 case "ResourceUnitDept":
                                     // Check if the item already exists
                                     serviceResponse = await ResourceUnitDeptService.GetItems();
@@ -469,6 +660,9 @@
                     case "applydelimiterafter":
                         itemApplyDelimiterAfter = (bool)e.Value;
                         break;
+                    case "applydelimiter":
+                        itemApplyDelimiter = (bool)e.Value;
+                        break;
                 }
             }
             else
diff --git a/src/Components/Modals/EditModal.razor b/src/Components/Modals/EditModal.razor
index c459d42c..7b02159b 100644
--- a/src/Components/Modals/EditModal.razor
+++ b/src/Components/Modals/EditModal.razor
@@ -2,6 +2,7 @@
 @using AzureNamingTool.Models
 @using AzureNamingTool.Services
 @using Microsoft.AspNetCore.Html
+@using System.Text.RegularExpressions
 @inject IJSRuntime JsRuntime
 @inject IToastService toastService
 @inject ILogger<EditModal> Logger
@@ -10,7 +11,7 @@
 
 <div class="modal fade show d-block" tabindex="-1" role="dialog">
     <div class="modal-backdrop fade show" @onclick="Cancel"></div>
-    <div class="modal-dialog" style="z-index: 1050">
+    <div class="modal-dialog modal-lg" style="z-index: 1050">
         <!-- Pop it above the backdrop -->
         <div class="modal-content @theme.ThemeStyle">
             <div class="modal-header @headerstyle text-white">
@@ -20,6 +21,42 @@
                 <p>
                     @((MarkupString)message)
                 </p>
+                @if (type == "ResourceType")
+                {
+                    if (Convert.ToBoolean(config.ResourceTypeEditingAllowed))
+                    {
+                        <div class="alert alert-danger alert-dismissible fade show mb-3" role="alert">
+                            <h4>ATTENTION</h4>
+                            <div class="mb-3">
+                                <p>
+                                    Resource Type settings are configured by the Azure Naming Tool team and match the Azure portal validation requirements. Overriding these values may result in invalid names for a resource.
+                                </p>
+                                <p class="fw-bold">
+                                    Please see the <a href="https://github.com/mspnp/AzureNamingTool/wiki/Resource-Type-Editing" target="_blank">Resource Type Editing documentation</a> for guidance on metadata editing.
+                                </p>
+                            </div>
+                            <div>
+                                <button type="button" class="close btn btn-light" data-bs-dismiss="alert" aria-label="Dismiss">
+                                    <span aria-hidden="true">Dismiss</span>
+                                </button>
+                            </div>
+                        </div>
+                    }
+                    else
+                    {
+                        <div class="alert alert-warning alert-dismissible fade show mb-3" role="alert">
+                            <h4>NOTE</h4>
+                            <div class="mb-3">
+                                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.
+                            </div>
+                            <div>
+                                <button type="button" class="close btn btn-light" data-bs-dismiss="alert" aria-label="Dismiss">
+                                    <span aria-hidden="true">Dismiss</span>
+                                </button>
+                            </div>
+                        </div>
+                    }
+                }
                 <div class="card mb-3">
                     <div class="card-header bg-default text-dark fw-bold">
                         Configuration
@@ -30,19 +67,12 @@
                         </div>
                         <div class="mb-3">
                             <div class="fw-bold">
-                                Name
+                                @namelabel
                             </div>
                             <div>
-                                @if (protectedName)
+                                @if ((isProtectedName) || ((type == "ResourceType") && (!Convert.ToBoolean(config.ResourceTypeEditingAllowed))))
                                 {
-                                    @if (type == "ResourceComponent")
-                                    {
-                                        <input title="Name" value="@itemDisplayName" disabled type="text" class="form-control @theme.ThemeStyle" id="name" @onchange="@((ui) => { itemName = (string)ui.Value!;})" />
-                                    }
-                                    else
-                                    {
-                                        <input title="Name" value="@itemName" disabled type="text" class="form-control @theme.ThemeStyle" id="name" @onchange="@((ui) => { itemName = (string)ui.Value!;})" />
-                                    }
+                                    <input title="Name" value="@itemName" disabled type="text" class="form-control @theme.ThemeStyle" id="name" />
                                 }
                                 else
                                 {
@@ -57,7 +87,14 @@
                                     Short Name
                                 </div>
                                 <div>
-                                    <input title="Short Name" value="@itemShortName" type="text" class="form-control @theme.ThemeStyle" id="shortname" @onchange="@((ui) => { itemShortName = (string)ui.Value!;})" />
+                                    @if (((type == "ResourceType") && (!Convert.ToBoolean(config.ResourceTypeEditingAllowed))))
+                                    {
+                                        <input title="Short Name" disabled value="@itemShortName" type="text" class="form-control @theme.ThemeStyle" id="shortname" />
+                                    }
+                                    else
+                                    {
+                                        <input title="Short Name" value="@itemShortName" type="text" class="form-control @theme.ThemeStyle" id="shortname" @onchange="@((ui) => { itemShortName = (string)ui.Value!;})" />
+                                    }
                                 </div>
                             </div>
                         }
@@ -113,21 +150,6 @@
                                     </div>
                                 }
                             }
-                            @if (type == "ResourceType")
-                            {
-                                <hr class="mt-1 mb-3" />
-                                <div class="alert alert-danger alert-dismissible fade show mb-3" role="alert">
-                                    <h4>ATTENTION</h4>
-                                    <div class="mb-3">
-                                        These settings are configured by the Azure Naming Tool team and match the Azure portal validation requirements. Overriding these values may result in invalid names for a resource.
-                                    </div>
-                                    <div>
-                                        <button type="button" class="close btn btn-light" data-bs-dismiss="alert" aria-label="Dismiss">
-                                            <span aria-hidden="true">Dismiss</span>
-                                        </button>
-                                    </div>
-                                </div>
-                            }
                             <div class="mb-3">
                                 <div class="fw-bold">
                                     Minimum Length
@@ -177,7 +199,7 @@
                                     </div>
                                 </div>
                             }
-                            if(type == "ResourceType")
+                            if (type == "ResourceType")
                             {
                                 <div class="mb-3">
                                     <div class="fw-bold">
@@ -193,41 +215,107 @@
                                         </label>
                                         <span class="align-text-top"> Enable</span>
                                     </div>
-                                </div>                                
+                                </div>
+                                <div id="typemetdadatacontainer" class="card mb-3">
+                                    <div class="card-header bg-default text-dark fw-bold">
+                                        <a id="typemetdadatalink" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#typemetdadata" role="button" aria-expanded="false" aria-controls="typemetdadata">
+                                            <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resoure Type Metadata
+                                        </a>
+                                    </div>
+                                    <div class="collapse card card-body @theme.ThemeStyle" id="typemetdadata">
+                                        <div class="mb-3">
+                                            <p>
+                                                This section allows you to edit the Resouce Type metadata.
+                                            </p>
+                                            <div class="alert alert-danger mb-3" role="alert">
+                                                <h4>ATTENTION</h4>
+                                                <span class="fw-bold">Please see the <a href="https://github.com/mspnp/AzureNamingTool/wiki/Resource-Type-Editing" target="_blank">Resource Type Editing documentation</a> for guidance on metadata editing.</span>
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="mb-3">
+                                                <div class="fw-bold">
+                                                    Regex
+                                                </div>
+                                                <div class="mb-3">
+                                                    Regex to apply to generated names.
+                                                </div>
+                                                <div>
+                                                    <input title="RegEx" value="@itemRegEx" type="text" class="form-control @theme.ThemeStyle" id="regex" @onchange="@((ui) => { itemRegEx = (string)ui.Value!;})" />
+                                                </div>
+                                            </div>
+
+                                            <div class="fw-bold">
+                                                Scope
+                                            </div>
+                                            <div>
+                                                <input title="Scope" value="@itemScope" type="text" class="form-control @theme.ThemeStyle" id="scope" @onchange="@((ui) => { itemScope = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Valid Text
+                                            </div>
+                                            <div>
+                                                <input title="Valid Text" value="@itemValidText" type="text" class="form-control @theme.ThemeStyle" id="validtext" @onchange="@((ui) => { itemValidText = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Text
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Text" value="@itemInvalidText" type="text" class="form-control @theme.ThemeStyle" id="invalidtext" @onchange="@((ui) => { itemInvalidText = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Characters
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Characters" value="@itemInvalidCharacters" type="text" class="form-control @theme.ThemeStyle" id="invalidcharacters" @onchange="@((ui) => { itemInvalidCharacters = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Characters Start
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Characters Start" value="@itemInvalidCharactersStart" type="text" class="form-control @theme.ThemeStyle" id="invalidcharactersstart" @onchange="@((ui) => { itemInvalidCharactersStart = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Characters End
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Characters End" value="@itemInvalidCharactersEnd" type="text" class="form-control @theme.ThemeStyle" id="invalidcharactersend" @onchange="@((ui) => { itemInvalidCharactersEnd = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Characters Consecutive
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Characters Consecutive" value="@itemInvalidCharactersConsecutive" type="text" class="form-control @theme.ThemeStyle" id="invalidcharactersconsecutive" @onchange="@((ui) => { itemInvalidCharactersConsecutive = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Static Values
+                                            </div>
+                                            <div>
+                                                <input title="Static Values" value="@itemStaticValues" type="text" class="form-control @theme.ThemeStyle" id="staticvalues" @onchange="@((ui) => { itemStaticValues = (string)ui.Value!;})" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                             }
                         }
                         else
                         {
                             @if ((type == "ResourceType") && (!Convert.ToBoolean(config.ResourceTypeEditingAllowed)))
                             {
-                                <hr class="mt-1 mb-3" />
-                                <div class="alert alert-warning alert-dismissible fade show mb-3" role="alert">
-                                    <h4>NOTE</h4>
-                                    <div class="mb-3">
-                                        These settings are disabled by default. You can allow the editing of these values by enabling the "Resource Type Editing" setting in the Admin section.
-                                    </div>
-                                    <div>
-                                        <button type="button" class="close btn btn-light" data-bs-dismiss="alert" aria-label="Dismiss">
-                                            <span aria-hidden="true">Dismiss</span>
-                                        </button>
-                                    </div>
-                                </div>
-                                <div class="mb-3">
-                                    <div class="fw-bold">
-                                        Minimum Length
-                                    </div>
-                                    <div>
-                                        <input title="Minimum Length" value="@itemMinLength" type="text" disabled class="form-control @theme.ThemeStyle" id="minlength" @onchange="@((ui) => { itemMinLength = (string)ui.Value!;})" onkeypress="return (event.charCode !=8 && event.charCode ==0 || (event.charCode >= 48 && event.charCode <= 57))" />
-                                    </div>
-                                </div>
-                                <div class="mb-3">
-                                    <div class="fw-bold">
-                                        Maximum Length
-                                    </div>
-                                    <div>
-                                        <input title="Maximum Length" value="@itemMaxLength" type="text" disabled class="form-control @theme.ThemeStyle" id="maxlength" @onchange="@((ui) => { itemMaxLength = (string)ui.Value!;})" onkeypress="return (event.charCode !=8 && event.charCode ==0 || (event.charCode >= 48 && event.charCode <= 57))" />
-                                    </div>
-                                </div>
                                 <div class="mb-3">
                                     <div class="fw-bold">
                                         Apply Delimiter
@@ -238,7 +326,7 @@
                                     <div>
                                         @if (itemApplyDelimiter)
                                         {
-                                         <span class="fst-italic">ENABLED</span>   
+                                            <span class="fst-italic">ENABLED</span>
                                         }
                                         else
                                         {
@@ -246,6 +334,93 @@
                                         }
                                     </div>
                                 </div>
+                                <div id="typemetdadatadisabledcontainer" class="card mb-3">
+                                    <div class="card-header bg-default text-dark fw-bold">
+                                        <a id="typemetdadatadisabledlink" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#typemetdadatadisabled" role="button" aria-expanded="false" aria-controls="typemetdadatadisabled">
+                                            <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Resoure Type Metadata
+                                        </a>
+                                    </div>
+                                    <div class="collapse card card-body @theme.ThemeStyle" id="typemetdadatadisabled">
+                                        <div class="mb-3">
+                                            This section allows you to view the Resouce Type metadata.
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Regex
+                                            </div>
+                                            <div class="mb-3">
+                                                Regex to apply to generated names.
+                                            </div>
+                                            <div>
+                                                <input title="RegEx" value="@itemRegEx" type="text" disabled class="form-control @theme.ThemeStyle" id="regex" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Scope
+                                            </div>
+                                            <div>
+                                                <input title="Scope" value="@itemScope" type="text" disabled class="form-control @theme.ThemeStyle" id="scope" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Valid Text
+                                            </div>
+                                            <div>
+                                                <input title="Valid Text" value="@itemValidText" type="text" disabled class="form-control @theme.ThemeStyle" id="validtext" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Text
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Text" value="@itemInvalidText" type="text" disabled class="form-control @theme.ThemeStyle" id="invalidtext" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Characters
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Characters" value="@itemInvalidCharacters" type="text" disabled class="form-control @theme.ThemeStyle" id="invalidcharacters" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Characters Start
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Characters Start" value="@itemInvalidCharactersStart" type="text" disabled class="form-control @theme.ThemeStyle" id="invalidcharactersstart" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Characters End
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Characters End" value="@itemInvalidCharactersEnd" type="text" disabled class="form-control @theme.ThemeStyle" id="invalidcharactersend" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Invalid Characters Consecutive
+                                            </div>
+                                            <div>
+                                                <input title="Invalid Characters Consecutive" value="@itemInvalidCharactersConsecutive" type="text" disabled class="form-control @theme.ThemeStyle" id="invalidcharactersconsecutive" />
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="fw-bold">
+                                                Static Values
+                                            </div>
+                                            <div>
+                                                <input title="Static Values" value="@itemStaticValues" type="text" disabled class="form-control @theme.ThemeStyle" id="staticvalues" />
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                             }
                         }
                     </div>
@@ -328,17 +503,6 @@
                 }
                 @if ((type == "ResourceType") && (GeneralHelper.IsNotNull(resourceComponents)))
                 {
-                    @if (bool.Parse(ConfigurationHelper.GetAppSetting("DevMode")))
-                    {
-                        <div id="globallyoptionalcontainer" class="card mb-3">
-                            <div class="card-header bg-default text-dark fw-bold">
-                                Regex
-                            </div>
-                            <div class="card card-body @theme.ThemeStyle">
-                                <input title="RegEx" value="@itemRegEx" type="text" class="form-control @theme.ThemeStyle" id="shortname" @onchange="@((ui) => { itemRegEx = (string)ui.Value!;})" />
-                            </div>
-                        </div>
-                    }
                     <div id="optional" class="card mb-3">
                         <div class="card-header bg-default text-dark fw-bold">
                             <a id="OptionalComponents" class="link-dark text-decoration-none" data-bs-toggle="collapse" href="#optionalcomponents" role="button" aria-expanded="false" aria-controls="optionalcomponents">
@@ -426,7 +590,7 @@
     [Parameter] public string title { get; set; } = String.Empty;
     [Parameter] public string message { get; set; } = String.Empty;
     [Parameter] public string type { get; set; } = String.Empty;
-    [Parameter] public bool protectedName { get; set; } = false;
+    [Parameter] public bool isProtectedName { get; set; } = false;
     [Parameter] public string parentcomponent { get; set; } = String.Empty;
     [Parameter] public string headerstyle { get; set; } = String.Empty;
     [Parameter] public bool admin { get; set; } = false;
@@ -441,6 +605,14 @@
     private string itemMaxLength = String.Empty;
     private string itemMinLengthOriginal = String.Empty;
     private string itemMaxLengthOriginal = String.Empty;
+    private string itemScope = "global";
+    private string itemValidText = String.Empty;
+    private string itemInvalidText = String.Empty;
+    private string itemInvalidCharacters = String.Empty;
+    private string itemInvalidCharactersStart = String.Empty;
+    private string itemInvalidCharactersEnd = String.Empty;
+    private string itemInvalidCharactersConsecutive = String.Empty;
+    private string itemStaticValues = String.Empty;
     private bool itemIsCustom = false;
     private string itemComponentType = "standard";
     private bool itemIsFreeText = false;
@@ -455,6 +627,7 @@
     private string exclude = String.Empty;
     private bool ischecked = false;
     private string currentuser = String.Empty;
+    private string namelabel = "Name";
     private ResponseMessage responseMessage = new();
     private SiteConfiguration config = ConfigurationHelper.GetConfigurationData();
 
@@ -510,6 +683,7 @@
                 serviceResponse = await ResourceTypeService.GetItem(id);
                 ResourceType resourceType = servicesData.ResourceTypes!.Find(x => x.Id == id)!;
                 itemName = resourceType.Resource;
+                namelabel = "Resource";
                 itemShortName = resourceType.ShortName;
                 optional = resourceType.Optional;
                 exclude = resourceType.Exclude;
@@ -519,6 +693,14 @@
                 itemMaxLength = resourceType.LengthMax;
                 itemMaxLengthOriginal = itemMaxLength;
                 itemApplyDelimiter = resourceType.ApplyDelimiter;
+                itemScope = resourceType.Scope;
+                itemValidText = resourceType.ValidText;
+                itemInvalidText = resourceType.InvalidText;
+                itemInvalidCharacters = resourceType.InvalidCharacters;
+                itemInvalidCharactersStart = resourceType.InvalidCharactersStart;
+                itemInvalidCharactersEnd = resourceType.InvalidCharactersEnd;
+                itemInvalidCharactersConsecutive = resourceType.InvalidCharactersConsecutive;
+                itemStaticValues = resourceType.StaticValues;
                 resourceComponents = servicesData.ResourceComponents!.OrderBy(x => x.Name).ToList();
                 break;
             case "ResourceUnitDept":
@@ -538,6 +720,7 @@
                 break;
         }
         currentuser = await IdentityHelper.GetCurrentUser(session);
+        StateHasChanged();
     }
 
     async void Save()
@@ -629,6 +812,16 @@
                 {
                     if (await ValidationHelper.ValidateShortName(type, itemShortName, this.parentcomponent))
                     {
+                        try
+                        {
+                            // Check the regex is valid
+                            Regex regx = new(itemRegEx);
+                        }
+                        catch (Exception)
+                        {
+                            toastService.ShowError("The Regex is not valid. Please review the code and try again!");
+                            return;
+                        }
                         valid = true;
                         switch (type)
                         {
@@ -675,10 +868,15 @@
                                         resourceType.LengthMax = itemMaxLength.ToString();
                                     }
                                 }
-                                if (bool.Parse(ConfigurationHelper.GetAppSetting("DevMode")))
-                                {
-                                    resourceType.Regx = itemRegEx;
-                                }
+                                resourceType.Regx = itemRegEx;
+                                resourceType.Scope = itemScope;
+                                resourceType.ValidText = itemValidText;
+                                resourceType.InvalidText = itemInvalidText;
+                                resourceType.InvalidCharacters = itemInvalidCharacters;
+                                resourceType.InvalidCharactersStart = itemInvalidCharactersStart;
+                                resourceType.InvalidCharactersEnd = itemInvalidCharactersEnd;
+                                resourceType.InvalidCharactersConsecutive = itemInvalidCharactersConsecutive;
+                                resourceType.StaticValues = itemStaticValues;
 
                                 // Update the Optional and Exclude components
                                 foreach (ResourceComponent resourceComponent in resourceComponents)
diff --git a/src/Components/Pages/Admin.razor b/src/Components/Pages/Admin.razor
index 18ff0231..038e3bdb 100644
--- a/src/Components/Pages/Admin.razor
+++ b/src/Components/Pages/Admin.razor
@@ -104,7 +104,7 @@
                                 <span class="oi oi-chevron-bottom" aria-hidden="true"></span> Customization
                             </a>
                         </h5>
-                        <div class="collapse show card card-body @theme.ThemeStyle" id="customization">
+                        <div class="collapse card card-body @theme.ThemeStyle" id="customization">
                             <p>
                                 This section allows your to customize the Azure Naming Tool site. This includes Custom Home content, logo, and navigation links displayed for non-admin users.
                             </p>
@@ -656,6 +656,12 @@
                                         <p>
                                             By default, <span class="fw-bold">Resource Type Validation</span> is configured to match the Azure portal. These values can be overriden by enabling the following setting.
                                         </p>
+                                        <div class="alert alert-danger alert-dismissible fade show mb-3" role="alert">
+                                            <h4>ATTENTION</h4>
+                                            <p class="fw-bold">
+                                                Please see the <a href="https://github.com/mspnp/AzureNamingTool/wiki/Resource-Type-Editing" target="_blank">Resource Type Editing documentation</a> for guidance on metadata editing.
+                                            </p>
+                                        </div>
                                     </div>
                                     <div>
                                         <label class="switch" title="Resource Type Editing Enabled">
@@ -666,6 +672,7 @@
                                     </div>
                                 </div>
                             </div>
+
                             <!--// TO DO: Implement retention of the selected values
                             <div class="card mb-3" style="width:auto;">
                                 <div class="card-header bg-default text-dark">
diff --git a/src/Components/Pages/Configuration.razor b/src/Components/Pages/Configuration.razor
index e23e72af..452c4359 100644
--- a/src/Components/Pages/Configuration.razor
+++ b/src/Components/Pages/Configuration.razor
@@ -1526,6 +1526,14 @@
                                                             </div>
                                                         </div>
                                                     </div>
+                                                    @if ((admin) && (Convert.ToBoolean(config.ResourceTypeEditingAllowed)))
+                                                    {
+                                                    <p>
+                                                        <button type="button" class="btn btn-success" @onclick="@(e => FormAction("ResourceType",0,"add"))" title="Add Resource Type">
+                                                            <span class="oi oi-plus" aria-hidden="true"></span> Add Resource Type
+                                                        </button>
+                                                    </p>
+                                                    }
                                                 </p>
                                                 <div class="table-responsive">
                                                     <table class="table @theme.ThemeStyle">
@@ -1607,6 +1615,13 @@
                                                                                     <span class="oi oi-plus" aria-hidden="true"></span>
                                                                                 </button>
                                                                             }
+                                                                            @if ((servicesData.ResourceTypes.Count > 1) && (Convert.ToBoolean(config.ResourceTypeEditingAllowed)))
+                                                                            {
+                                                                                <span> </span>
+                                                                                <button type="button" class="btn btn-danger" @onclick="@(e => FormAction("ResourceType",item.Id,"delete"))" title="Delete">
+                                                                                    <span class="oi oi-x" aria-hidden="true"></span>
+                                                                                </button>
+                                                                            }
                                                                         </td>
                                                                     }
                                                                 </tr>
@@ -2066,6 +2081,8 @@
 
     private ResponseMessage message = new();
 
+    private SiteConfiguration config = ConfigurationHelper.GetConfigurationData();
+
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
         currentuser = await IdentityHelper.GetCurrentUser(session);
@@ -3035,7 +3052,7 @@
                                 case "edit":
                                     if (GeneralHelper.IsNotNull(thisresourceComponent))
                                     {
-                                        confirm = await ModalHelper.ShowEditModal(Modal, servicesData, theme, "bg-navcolor", "Edit Location", "<p>Edit the Location.</p><p><span class=\"fw-bold\">NOTES</span></p><ul><li>Short Name value will be converted to lower case.</li><li>Short Name must be " + thisresourceComponent.MinLength + "-" + thisresourceComponent.MaxLength + " characters.</li></ul>", (int)id, "ResourceLocation", true);
+                                        confirm = await ModalHelper.ShowEditModal(Modal, servicesData, theme, "bg-navcolor", "Edit Location", "<p>Edit the Location.</p><p><span class=\"fw-bold\">NOTES</span></p><ul><li>Short Name value will be converted to lower case.</li><li>Short Name must be " + thisresourceComponent.MinLength + "-" + thisresourceComponent.MaxLength + " characters.</li></ul>", (int)id, "ResourceLocation", false);
                                         if (confirm)
                                         {
                                             servicesData = await ServicesHelper.LoadServicesData(servicesData, admin);
@@ -3725,7 +3742,7 @@
                                     resourceType = servicesData.ResourceTypes!.Find(x => x.Id == id)!;
                                     if (GeneralHelper.IsNotNull(resourceType))
                                     {
-                                        confirm = await ModalHelper.ShowEditModal(Modal, servicesData, theme, "bg-navcolor", "Edit Resource Type", "<p>Edit the Resource Type.</p><p><span class=\"fw-bold\">NOTES</span></p><ul><li>Short Name value will be converted to lower case.</li><li>Short Name must be " + resourceType.LengthMin + "-" + resourceType.LengthMax + " characters.</li></ul>", (int)id, "ResourceType", true);
+                                        confirm = await ModalHelper.ShowEditModal(Modal, servicesData, theme, "bg-navcolor", "Edit Resource Type", "<p>Edit the Resource Type.</p><p><span class=\"fw-bold\">NOTES</span></p><ul><li>Short Name value will be converted to lower case.</li><li>Short Name must be " + resourceType.LengthMin + "-" + resourceType.LengthMax + " characters.</li></ul>", (int)id, "ResourceType", false);
                                         if (confirm)
                                         {
                                             servicesData = await ServicesHelper.LoadServicesData(servicesData, admin);
@@ -3739,6 +3756,48 @@
                                     }
                                     break;
 
+                                case "delete":
+                                    confirm = await ModalHelper.ShowConfirmationModal(Modal!, "ATTENTION", "<div class=\"my-4\">This will delete the Resource Type and cannot be undone!</div><div class=\"my-4\">Are you sure?</div>", "bg-danger", theme);
+                                    if (confirm)
+                                    {
+                                        resourceType = servicesData.ResourceTypes!.Find(x => x.Id == id)!;
+                                        if (GeneralHelper.IsNotNull(resourceType))
+                                        {
+                                            serviceResponse = await ResourceTypeService.DeleteItem(Convert.ToInt32(resourceType.Id));
+                                            if (serviceResponse.Success)
+                                            {
+                                                message.Type = MessageTypesEnum.SUCCESS;
+                                                message.Message = resourceType.Resource + " deleted!";
+                                            }
+                                            else
+                                            {
+                                                message.Type = MessageTypesEnum.ERROR;
+                                                message.Message = resourceType.Resource + " deletion failed! Please check the Admin Log for details.";
+                                                message.MessageDetails = serviceResponse.ResponseMessage;
+                                            }
+                                        }
+                                        else
+                                        {
+                                            generalerror = true;
+                                        }
+                                    }
+                                    break;
+                                case "add":
+                                    if (GeneralHelper.IsNotNull(thisresourceComponent))
+                                    {
+                                        response = await ModalHelper.ShowAddModal(Modal!, servicesData, theme, "bg-navcolor", "Add Resource Type", "<p>Add a Resource Type.</p><p><span class=\"fw-bold\">NOTES</span></p><ul><li>Short Name value will be converted to lower case.</li><li>Short Name must be " + thisresourceComponent.MinLength + "-" + thisresourceComponent.MaxLength + " characters.</li><li>Short Name must not contain spaces.</li></ul>", (int)id, "ResourceType", admin, "");
+                                        if (response)
+                                        {
+                                            servicesData = await ServicesHelper.LoadServicesData(servicesData, admin);
+                                            state.SetNavReload(true);
+                                            StateHasChanged();
+                                        }
+                                    }
+                                    else
+                                    {
+                                        generalerror = true;
+                                    }
+                                    break;
                                 case "uppercase":
                                     confirm = await ModalHelper.ShowConfirmationModal(Modal!, "ATTENTION", "<div class=\"my-4\">This will update all the short names to <span class=\"fw-bold\">uppercase</span> characters!</div><div class=\"my-4\">Are you sure?</div>", "bg-danger", theme);
                                     if (confirm)
diff --git a/src/Helpers/ModalHelper.cs b/src/Helpers/ModalHelper.cs
index ba41590e..ebee9b2d 100644
--- a/src/Helpers/ModalHelper.cs
+++ b/src/Helpers/ModalHelper.cs
@@ -169,10 +169,10 @@ public static async Task<bool> ShowAddModal(IModalService modal, ServicesData se
         /// <param name="message">The message of the modal.</param>
         /// <param name="id">The ID of the modal.</param>
         /// <param name="type">The type of the modal.</param>
-        /// <param name="protectedname">A boolean indicating if the name is protected.</param>
+        /// <param name="isprotectedname">A boolean indicating if the name is protected.</param>
         /// <param name="parentcomponent">The parent component of the modal.</param>
         /// <returns>A task representing the asynchronous operation. The task result contains a boolean indicating the user's response.</returns>
-        public static async Task<bool> ShowEditModal(IModalService modal, ServicesData servicesData, ThemeInfo theme, string headerstyle, string title, string message, int id, string type, bool protectedname = true, string? parentcomponent = null)
+        public static async Task<bool> ShowEditModal(IModalService modal, ServicesData servicesData, ThemeInfo theme, string headerstyle, string title, string message, int id, string type, bool isprotectedname = false, string? parentcomponent = null)
         {
             bool response = false;
             try
@@ -183,7 +183,7 @@ public static async Task<bool> ShowEditModal(IModalService modal, ServicesData s
                         { nameof(EditModal.type), type },
                         { nameof(EditModal.message), message },
                         { nameof(EditModal.title), title },
-                        { nameof(EditModal.protectedName), protectedname },
+                        { nameof(EditModal.isProtectedName), isprotectedname },
                         { nameof(EditModal.parentcomponent), parentcomponent! },
                         { nameof(EditModal.servicesData), servicesData },
                         { nameof(EditModal.headerstyle), headerstyle },
diff --git a/src/programsettings.json b/src/programsettings.json
index d322d97b..ec11b715 100644
--- a/src/programsettings.json
+++ b/src/programsettings.json
@@ -1,5 +1,5 @@
 {
   "FeedbackURL": "https://forms.office.com/r/M2EZLg6zKq",  
   "latestNewsEnabled": "false",
-  "toolVersion":"4.2.1"
+  "toolVersion":"4.3.0"
 }
diff --git a/src/versionalerts.json b/src/versionalerts.json
index 0a49e801..03fd42c2 100644
--- a/src/versionalerts.json
+++ b/src/versionalerts.json
@@ -18,5 +18,10 @@
     "id": 3,
     "version": "4.1.0",
     "alert": "<p><span class=\"fw-bold\">IMPORTANT NOTES</span></p><ul><li class=\"mb-3\">With the release of v4.1.0, the Azure Naming Tool now supports uppercase and lowercase characters for resource names. Use the Configuration page to update the component options."
+  },
+  {
+    "id": 4,
+    "version": "4.3.0",
+    "alert": "<p><span class=\"fw-bold\">IMPORTANT NOTES</span></p><ul><li class=\"mb-3\">With the release of <a href=\"https://github.com/mspnp/AzureNamingTool/wiki/v4.3.0\" target=\"_blank\">v4.3.0</a>, the Azure Naming Tool now supports Resource Type editing. Please see the <a href=\"https://github.com/mspnp/AzureNamingTool/wiki/Resource-Type-Editing\" target=\"_blank\">Resource Type Editing documentation</a> for guidance on metadata editing."
   }
 ]

From 30ca94bda5b1418b67476df14659bcce84c19092 Mon Sep 17 00:00:00 2001
From: bryansoltis <github@soltisweb.com>
Date: Wed, 25 Sep 2024 08:41:40 -0500
Subject: [PATCH 2/4] - UPdated NUget packages

---
 src/AzureNamingTool.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/AzureNamingTool.csproj b/src/AzureNamingTool.csproj
index 2b201162..89441d3a 100644
--- a/src/AzureNamingTool.csproj
+++ b/src/AzureNamingTool.csproj
@@ -25,10 +25,10 @@
     <PackageReference Include="Blazored.Toast" Version="4.2.1" />
     <PackageReference Include="Markdig" Version="0.37.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="PSC.Blazor.Components.MarkdownEditor" Version="8.0.4" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.7.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.7.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.7.0" />
+    <PackageReference Include="PSC.Blazor.Components.MarkdownEditor" Version="8.0.5" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.8.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.8.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.8.0" />
     <PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
   </ItemGroup>
 

From 5813b8f54c0a5ba918cb2b7524c0c65f1c2c44f0 Mon Sep 17 00:00:00 2001
From: bryansoltis <github@soltisweb.com>
Date: Wed, 9 Oct 2024 09:34:17 -0500
Subject: [PATCH 3/4] - Updated Nuget packages

---
 src/AzureNamingTool.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/AzureNamingTool.csproj b/src/AzureNamingTool.csproj
index 89441d3a..70f6a01e 100644
--- a/src/AzureNamingTool.csproj
+++ b/src/AzureNamingTool.csproj
@@ -26,10 +26,10 @@
     <PackageReference Include="Markdig" Version="0.37.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="PSC.Blazor.Components.MarkdownEditor" Version="8.0.5" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.8.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.8.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.8.0" />
-    <PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.8.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.8.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.8.1" />
+    <PackageReference Include="System.Runtime.Caching" Version="8.0.1" />
   </ItemGroup>
 
   <ItemGroup>

From e57e799f35947e69f07545e4ac6955e4f67c2acf Mon Sep 17 00:00:00 2001
From: bryansoltis <github@soltisweb.com>
Date: Tue, 19 Nov 2024 10:04:28 -0600
Subject: [PATCH 4/4] - Removed /Tests projects

---
 src/AzureNamingTool.csproj       | 10 +++++-----
 src/AzureNamingTool.sln          | 16 ----------------
 src/Components/Pages/Admin.razor |  2 --
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/AzureNamingTool.csproj b/src/AzureNamingTool.csproj
index 70f6a01e..a6b02ba7 100644
--- a/src/AzureNamingTool.csproj
+++ b/src/AzureNamingTool.csproj
@@ -23,13 +23,13 @@
     <PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
     <PackageReference Include="Blazored.Modal" Version="7.3.1" />
     <PackageReference Include="Blazored.Toast" Version="4.2.1" />
-    <PackageReference Include="Markdig" Version="0.37.0" />
+    <PackageReference Include="Markdig" Version="0.38.0" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
     <PackageReference Include="PSC.Blazor.Components.MarkdownEditor" Version="8.0.5" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.8.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.8.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="6.8.1" />
-    <PackageReference Include="System.Runtime.Caching" Version="8.0.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="7.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="7.0.0" />
+    <PackageReference Include="System.Runtime.Caching" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/AzureNamingTool.sln b/src/AzureNamingTool.sln
index b8c64f28..12630818 100644
--- a/src/AzureNamingTool.sln
+++ b/src/AzureNamingTool.sln
@@ -7,10 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureNamingTool", "AzureNam
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{6BE80029-5D03-4BAB-8F79-1FAFFD432A62}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureNamingTool.UiTests", "..\tests\AzureNamingTool.UiTests\AzureNamingTool.UiTests.csproj", "{3CF1ECAB-78C5-4F54-A2D7-65D9025CF9FD}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AzureNamingTool.UnitTests", "..\tests\AzureNamingTool.UnitTests\AzureNamingTool.UnitTests.csproj", "{C981F613-2990-4962-A4F8-AFC75FECD597}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -21,14 +17,6 @@ Global
 		{B9EC3E06-9B4D-4CA0-ABBD-E4115384B730}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B9EC3E06-9B4D-4CA0-ABBD-E4115384B730}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B9EC3E06-9B4D-4CA0-ABBD-E4115384B730}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3CF1ECAB-78C5-4F54-A2D7-65D9025CF9FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3CF1ECAB-78C5-4F54-A2D7-65D9025CF9FD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3CF1ECAB-78C5-4F54-A2D7-65D9025CF9FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3CF1ECAB-78C5-4F54-A2D7-65D9025CF9FD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C981F613-2990-4962-A4F8-AFC75FECD597}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C981F613-2990-4962-A4F8-AFC75FECD597}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C981F613-2990-4962-A4F8-AFC75FECD597}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C981F613-2990-4962-A4F8-AFC75FECD597}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -36,8 +24,4 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {903E93DC-11BB-4512-A444-F59A4BE2EEF8}
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{3CF1ECAB-78C5-4F54-A2D7-65D9025CF9FD} = {6BE80029-5D03-4BAB-8F79-1FAFFD432A62}
-		{C981F613-2990-4962-A4F8-AFC75FECD597} = {6BE80029-5D03-4BAB-8F79-1FAFFD432A62}
-	EndGlobalSection
 EndGlobal
diff --git a/src/Components/Pages/Admin.razor b/src/Components/Pages/Admin.razor
index 038e3bdb..d3c164bb 100644
--- a/src/Components/Pages/Admin.razor
+++ b/src/Components/Pages/Admin.razor
@@ -816,8 +816,6 @@
     private List<KeyValuePair<string, string>> environmentvariables = new();
     private string releasenotesurl = String.Empty;
     private long maxFileSize = 2000000;
-    private int maxAllowedFiles = 1;
-    private bool isLoading;
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {