2023-10-26 - BryanSoltis - v3.1.1 Updates

- Fixed mspnp#33 - Updated Generate page to rperoply set selected reource type
dgilbertatmartin · Oct 26, 2023 · 7c79740 · 7c79740
1 parent 35ee912
commit 7c79740
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/src/AzureNamingTool.csproj b/src/AzureNamingTool.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-	<Version>3.1.0</Version>
+	<Version>3.1.1</Version>
     <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Models/ValidateNameRequest.cs b/src/Models/ValidateNameRequest.cs
@@ -2,6 +2,7 @@
 {
     public class ValidateNameRequest
     {
+        public long? ResourceTypeId { get; set;} 
         public string? ResourceType { get; set; }
         public string? Name { get; set; }
     }

diff --git a/src/Services/ResourceNamingRequestService.cs b/src/Services/ResourceNamingRequestService.cs
@@ -172,6 +172,7 @@ public static async Task<ResourceNameResponse> RequestNameWithComponents(Resourc
                 // CALL VALIDATION FUNCTION
                 ValidateNameRequest validateNameRequest = new()
                 {
+                    ResourceTypeId = resourceType.Id,
                     ResourceType = resourceType.ShortName,
                     Name = name
                 };
@@ -706,6 +707,7 @@ public static async Task<ResourceNameResponse> RequestName(ResourceNameRequest r
                 // Validate the generated name for the resource type
                 ValidateNameRequest validateNameRequest = new()
                 {
+                    ResourceTypeId = resourceType.Id,
                     ResourceType = resourceType.ShortName,
                     Name = name
                 };

diff --git a/src/Services/ResourceTypeService.cs b/src/Services/ResourceTypeService.cs
@@ -485,8 +485,17 @@ public static async Task<ServiceResponse> ValidateResourceTypeName(ValidateNameR
                         List<ResourceType> resourceTypes = (List<ResourceType>)serviceResponse.ResponseObject!;
                         if (GeneralHelper.IsNotNull(resourceTypes))
                         {
-                            // Get the specified resoure type
-                            ResourceType resourceType = resourceTypes.FirstOrDefault(x => x.ShortName == validateNameRequest.ResourceType)!;
+                            ResourceType resourceType = null;
+                            if (GeneralHelper.IsNotNull(validateNameRequest.ResourceTypeId))
+                            {
+                                // Get the specified resoure type by id
+                                resourceType = resourceTypes.FirstOrDefault(x => x.Id == validateNameRequest.ResourceTypeId)!;
+                            }
+                            else
+                            {
+                                // Get the specified resoure type by short name
+                                resourceType = resourceTypes.FirstOrDefault(x => x.ShortName == validateNameRequest.ResourceType)!;
+                            }
                             if (GeneralHelper.IsNotNull(resourceType))
                             {
                                 // Create a validate name request

diff --git a/src/programsettings.json b/src/programsettings.json
@@ -1,5 +1,5 @@
 {
   "FeedbackURL": "https://forms.office.com/r/M2EZLg6zKq",  
   "latestNewsEnabled": "false",
-  "toolVersion":"3.1.0"
+  "toolVersion":"3.1.1"
 }