- Updated name generation functionality

mspnp · Nov 30, 2023 · f0f9490 · f0f9490
1 parent d8ddad8
commit f0f9490
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/Pages/Generate.razor b/src/Pages/Generate.razor
@@ -279,7 +279,7 @@
                                                     }
                                                     else
                                                     {
-                                                        <span>(@resourceComponent.MinLength - @resourceComponent.MaxLength digits) </span>
+                                                        <span> (@resourceComponent.MinLength - @resourceComponent.MaxLength digits) </span>
                                                     }
                                                     @if (((selectedResourceTypeOptional.ToLower().Split(',').Contains("instance")) && (multiselectedResourceTypes.Count == 0)))
                                                     {

diff --git a/src/Services/ResourceNamingRequestService.cs b/src/Services/ResourceNamingRequestService.cs
@@ -321,7 +321,6 @@ public static async Task<ResourceNameResponse> RequestName(ResourceNameRequest r
                         {
                             // Set the resource type ot the first value
                             resourceType = resourceTypesByShortName[0];
-                            applyDelimiter = resourceType.ApplyDelimiter;
                         }
                     }
 
@@ -482,7 +481,7 @@ public static async Task<ResourceNameResponse> RequestName(ResourceNameRequest r
                                                                     if (name != "")
                                                                     {
                                                                         // Check if the component should apply the delimiter
-                                                                        if ((component.ApplyDelimiterBefore) && (previousdelimiterappliedafter) && (applyDelimiter))
+                                                                        if ((component.ApplyDelimiterBefore) && (previousdelimiterappliedafter) && (resourceType.ApplyDelimiter))
                                                                         {
                                                                             name += resourceDelimiter.Delimiter;
                                                                         }
@@ -501,7 +500,7 @@ public static async Task<ResourceNameResponse> RequestName(ResourceNameRequest r
                                                                 if (!String.IsNullOrEmpty(name))
                                                                 {
                                                                     // Check if the component should apply the delimiter
-                                                                    if ((component.ApplyDelimiterBefore) && (previousdelimiterappliedafter) && (applyDelimiter))
+                                                                    if ((component.ApplyDelimiterBefore) && (previousdelimiterappliedafter) && (resourceType.ApplyDelimiter))
                                                                     {
                                                                         name += resourceDelimiter.Delimiter;
                                                                     }
@@ -592,7 +591,7 @@ public static async Task<ResourceNameResponse> RequestName(ResourceNameRequest r
                                                                                     }
                                                                                     else
                                                                                     {
-                                                                                        if (!String.IsNullOrEmpty(name) && (applyDelimiter))
+                                                                                        if (!String.IsNullOrEmpty(name) && (resourceType.ApplyDelimiter))
                                                                                         {
                                                                                             name += resourceDelimiter.Delimiter;
                                                                                         }
@@ -671,7 +670,7 @@ public static async Task<ResourceNameResponse> RequestName(ResourceNameRequest r
                                                                 if (!String.IsNullOrEmpty(name))
                                                                 {
                                                                     // Check if the component should apply the delimiter
-                                                                    if ((component.ApplyDelimiterBefore) && (previousdelimiterappliedafter) && (applyDelimiter))
+                                                                    if ((component.ApplyDelimiterBefore) && (previousdelimiterappliedafter) && (resourceType.ApplyDelimiter))
                                                                     {
                                                                         name += resourceDelimiter.Delimiter;
                                                                     }