updates for razor pages crud and blazor crud templates (#3086)

* updates for razor pages crud and blazor crud templates * PR fixes
dotnet · Dec 5, 2024 · 1399917 · 1399917
1 parent 51866dd
commit 1399917
Show file tree

Hide file tree

Showing 16 changed files with 87 additions and 58 deletions.
diff --git a/scripts/install-aspnet-codegenerator.cmd b/scripts/install-aspnet-codegenerator.cmd
@@ -1,4 +1,4 @@
-set VERSION=9.0.0-dev
+set VERSION=10.0.0-dev
 set DEFAULT_NUPKG_PATH=C:\Nuget
 set SRC_DIR=%cd%
 set NUPKG=artifacts\packages\Debug\Shipping\

diff --git a/scripts/install-scaffold-all.cmd b/scripts/install-scaffold-all.cmd
@@ -1,4 +1,4 @@
-set VERSION=9.0.0-dev
+set VERSION=10.0.0-dev
 set DEFAULT_NUPKG_PATH=%userprofile%/.nuget/packages
 set SRC_DIR=%cd%
 set NUPKG=artifacts/packages/Debug/Shipping/

diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.cs
@@ -68,9 +68,13 @@ public virtual string TransformText()
                     string propertyShortTypeName = property.ShortTypeName.Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var ariaRequiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.IsRequired ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 
-            this.Write("<div class=\"mb-3\">\r\n                <label for=\"");
+            this.Write("<div class=\"mb-3\">");
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredSpanAttributeHtml));
+            this.Write("\r\n                <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
             this.Write("\" class=\"form-label\">");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
@@ -85,7 +89,7 @@ public virtual string TransformText()
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
             this.Write("\" ");
-            this.Write(this.ToStringHelper.ToStringWithCulture(requiredAttributeHtml));
+            this.Write(this.ToStringHelper.ToStringWithCulture(ariaRequiredAttributeHtml));
             this.Write("/> \r\n                <ValidationMessage For=\"() => ");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");

diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.tt b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Create.tt
@@ -44,11 +44,13 @@
                     string propertyShortTypeName = property.ShortTypeName.Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var ariaRequiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.IsRequired ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
             #>
-<div class="mb-3">
+<div class="mb-3"><#= requiredSpanAttributeHtml #>
                 <label for="<#= modelPropertyNameLowercase #>" class="form-label"><#= modelPropertyName #>:</label> 
-                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredAttributeHtml #>/> 
+                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= ariaRequiredAttributeHtml #>/> 
                 <ValidationMessage For="() => <#= modelName #>.<#= modelPropertyName #>" class="text-danger" /> 
             </div>        
             <#  } #>

diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.cs b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.cs
@@ -83,9 +83,13 @@ public virtual string TransformText()
                     string propertyShortTypeName = property.ShortTypeName.Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var ariaRequiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.IsRequired ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 
-            this.Write("                <div class=\"mb-3\">\r\n                    <label for=\"");
+            this.Write("                <div class=\"mb-3\">");
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredSpanAttributeHtml));
+            this.Write("\r\n                    <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
             this.Write("\" class=\"form-label\">");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
@@ -100,7 +104,7 @@ public virtual string TransformText()
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
             this.Write("\" ");
-            this.Write(this.ToStringHelper.ToStringWithCulture(requiredHtml));
+            this.Write(this.ToStringHelper.ToStringWithCulture(ariaRequiredAttributeHtml));
             this.Write("/>\r\n                    <ValidationMessage For=\"() => ");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");

diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.tt b/src/Scaffolding/VS.Web.CG.Mvc/Templates/Blazor/Edit.tt
@@ -55,11 +55,13 @@ else
                     string propertyShortTypeName = property.ShortTypeName.Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var ariaRequiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.IsRequired ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 #>
-                <div class="mb-3">
+                <div class="mb-3"><#= requiredSpanAttributeHtml #>
                     <label for="<#= modelPropertyNameLowercase #>" class="form-label"><#= modelPropertyName #>:</label>
-                    <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredHtml #>/>
+                    <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= ariaRequiredAttributeHtml #>/>
                     <ValidationMessage For="() => <#= modelName #>.<#= modelPropertyName #>" class="text-danger" />
                 </div>
 <#  } #>

diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Create.cshtml b/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Create.cshtml
@@ -48,14 +48,15 @@
     foreach (var property in Model.ModelMetadata.Properties)
     {
         var sixteenWhitespace = new string(' ', 16);
-        var propertyRequiredText = property.IsRequired ? $"\n{sixteenWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
+        var propertyRequiredText = property.IsRequired ? $"\r\n{sixteenWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
+        var ariaRequiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
         if (property.Scaffold && !property.IsAutoGenerated && !property.IsReadOnly)
             {
                 if (property.IsForeignKey)
                 {
             @:<div class="form-group">@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName)[email protected]" class="control-label"></label>
-                @:<select asp-for="@(Model.ModelTypeName)[email protected]" class ="form-control" asp-items="[email protected]"></select>
+                @:<select asp-for="@(Model.ModelTypeName)[email protected]" class ="form-control" asp-items="[email protected]" @ariaRequiredAttributeHtml></select>
             @:</div>
                     continue;
                 }
@@ -65,31 +66,31 @@
                 {
             @:<div class="form-group form-check">@propertyRequiredText
                 @:<label class="form-check-label">
-                    @:<input class="form-check-input" asp-for="@(Model.ModelTypeName)[email protected]" /> @@Html.DisplayNameFor(model => model.@(Model.ModelTypeName).@GetValueExpression(property))
+                    @:<input class="form-check-input" asp-for="@(Model.ModelTypeName)[email protected]" @ariaRequiredAttributeHtml/> @@Html.DisplayNameFor(model => model.@(Model.ModelTypeName).@GetValueExpression(property))
                 @:</label>
             @:</div>
                 }
                 else if (property.IsEnum && !property.IsEnumFlags)
                 {
             @:<div class="form-group">@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName)[email protected]" class="control-label"></label>
-                @:<select asp-for="@(Model.ModelTypeName)[email protected]" class="form-control"></select>
+                @:<select asp-for="@(Model.ModelTypeName)[email protected]" class="form-control" @ariaRequiredAttributeHtml></select>
                 @:<span asp-validation-for="@(Model.ModelTypeName)[email protected]" class="text-danger"></span>
             @:</div>
                 }
                 else if (property.IsMultilineText)
                 {
             @:<div class="form-group">@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName)[email protected]" class="control-label"></label>
-                @:<textarea asp-for="@(Model.ModelTypeName)[email protected]" class="form-control"></textarea>
+                @:<textarea asp-for="@(Model.ModelTypeName)[email protected]" class="form-control" @ariaRequiredAttributeHtml></textarea>
                 @:<span asp-validation-for="@(Model.ModelTypeName)[email protected]" class="text-danger"></span>
             @:</div>
                 }
                 else
                 {
             @:<div class="form-group">@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName)[email protected]" class="control-label"></label>
-                @:<input asp-for="@(Model.ModelTypeName)[email protected]" class="form-control" />
+                @:<input asp-for="@(Model.ModelTypeName)[email protected]" class="form-control" @ariaRequiredAttributeHtml/>
                 @:<span asp-validation-for="@(Model.ModelTypeName)[email protected]" class="text-danger"></span>
             @:</div>
                 }

diff --git a/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Edit.cshtml b/src/Scaffolding/VS.Web.CG.Mvc/Templates/RazorPageGenerator/Bootstrap5/Edit.cshtml
@@ -47,7 +47,8 @@
             @:<div asp-validation-summary="ModelOnly" class="text-danger"></div>
         foreach (PropertyMetadata property in Model.ModelMetadata.Properties)
         {
-            var propertyRequiredText = property.IsRequired ? "<span class=\"text-danger\">*</span>" : string.Empty;
+            var propertyRequiredText = property.IsRequired ? "\r\n<span class=\"text-danger\">*</span>" : string.Empty;
+            var ariaRequiredAttributeHtml = property.IsRequired ? "aria-required=\"true\"" : string.Empty;
             if (property.IsPrimaryKey)
             {
             @:<input type="hidden" asp-for="@(Model.ModelTypeName)[email protected]" />
@@ -63,10 +64,9 @@
 
                 if (property.IsForeignKey)
                 {
-            @:<div class="form-group">
-                @:@propertyRequiredText
+            @:<div class="form-group">@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName)[email protected]" class="control-label"></label>
-                @:<select asp-for="@(Model.ModelTypeName)[email protected]" class="form-control" asp-items="[email protected]"></select>
+                @:<select asp-for="@(Model.ModelTypeName)[email protected]" class="form-control" asp-items="[email protected]" @ariaRequiredAttributeHtml></select>
                 @:<span asp-validation-for="@(Model.ModelTypeName)[email protected]" class="text-danger"></span>
             @:</div>
                     continue;
@@ -75,37 +75,33 @@
                 bool isCheckbox = property.TypeName.Equals("System.Boolean");
                 if (isCheckbox)
                 {
-            @:<div class="form-group form-check">
-                @:@propertyRequiredText
+            @:<div class="form-group form-check">@propertyRequiredText
                 @:<label class="form-check-label">
-                    @:<input class="form-check-input" asp-for="@(Model.ModelTypeName)[email protected]" /> @@Html.DisplayNameFor(model => model.@(Model.ModelTypeName).@GetValueExpression(property))
+                    @:<input class="form-check-input" asp-for="@(Model.ModelTypeName)[email protected]" @ariaRequiredAttributeHtml/> @@Html.DisplayNameFor(model => model.@(Model.ModelTypeName).@GetValueExpression(property))
                 @:</label>
             @:</div>
                 }
                 else if (property.IsEnum && !property.IsEnumFlags)
                 {
-            @:<div class="form-group">
-                @:@propertyRequiredText
+            @:<div class="form-group">@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName)[email protected]" class="control-label"></label>
-                @:<select asp-for="@(Model.ModelTypeName)[email protected]" class="form-control"></select>
+                @:<select asp-for="@(Model.ModelTypeName)[email protected]" class="form-control" @ariaRequiredAttributeHtml></select>
                 @:<span asp-validation-for="@(Model.ModelTypeName)[email protected]" class="text-danger"></span>
             @:</div>
                 }
                 else if (property.IsMultilineText)
                 {
-            @:<div class="form-group">
-                @:@propertyRequiredText
+            @:<div class="form-group">@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName)[email protected]" class="control-label"></label>
-                @:<textarea asp-for="@(Model.ModelTypeName)[email protected]" class="form-control"></textarea>
+                @:<textarea asp-for="@(Model.ModelTypeName)[email protected]" class="form-control" @ariaRequiredAttributeHtml></textarea>
                 @:<span asp-validation-for="@(Model.ModelTypeName)[email protected]" class="text-danger"></span>
             @:</div>
                 }
                 else
                 {
-            @:<div class="form-group">
-                @:@propertyRequiredText
+            @:<div class="form-group">@propertyRequiredText
                 @:<label asp-for="@(Model.ModelTypeName)[email protected]" class="control-label"></label>
-                @:<input asp-for="@(Model.ModelTypeName)[email protected]" class="form-control" />
+                @:<input asp-for="@(Model.ModelTypeName)[email protected]" class="form-control" @ariaRequiredAttributeHtml/>
                 @:<span asp-validation-for="@(Model.ModelTypeName)[email protected]" class="text-danger"></span>
             @:</div>
                 }

diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.cs
@@ -70,9 +70,13 @@ public virtual string TransformText()
                     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+                    var ariaRequiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.HasRequiredAttribute() ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
 
-            this.Write("<div class=\"mb-3\">\r\n                <label for=\"");
+            this.Write("<div class=\"mb-3\">");
+            this.Write(this.ToStringHelper.ToStringWithCulture(requiredSpanAttributeHtml));
+            this.Write("\r\n                <label for=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyNameLowercase));
             this.Write("\" class=\"form-label\">");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelPropertyName));
@@ -87,7 +91,7 @@ public virtual string TransformText()
             this.Write("\" class=\"");
             this.Write(this.ToStringHelper.ToStringWithCulture(inputClass));
             this.Write("\" ");
-            this.Write(this.ToStringHelper.ToStringWithCulture(requiredAttributeHtml));
+            this.Write(this.ToStringHelper.ToStringWithCulture(ariaRequiredAttributeHtml));
             this.Write("/> \r\n                <ValidationMessage For=\"() => ");
             this.Write(this.ToStringHelper.ToStringWithCulture(modelName));
             this.Write(".");

diff --git a/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt b/src/dotnet-scaffolding/dotnet-scaffold-aspnet/Templates/BlazorCrud/Create.tt
@@ -46,11 +46,13 @@
                     string propertyShortTypeName = property.Type.ToDisplayString().Replace("?", string.Empty);
                     var inputTypeName = Model.GetInputType(propertyShortTypeName);
                     var inputClass = Model.GetInputClassType(propertyShortTypeName);
-                    var requiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+                    var ariaRequiredAttributeHtml = property.HasRequiredAttribute() ? "aria-required=\"true\"" : string.Empty;
+                    var divWhitespace = new string(' ', 16);
+                    var requiredSpanAttributeHtml = property.HasRequiredAttribute() ? $"\r\n{divWhitespace}<span class=\"text-danger\">*</span>" : string.Empty;
             #>
-<div class="mb-3">
+<div class="mb-3"><#= requiredSpanAttributeHtml #>
                 <label for="<#= modelPropertyNameLowercase #>" class="form-label"><#= modelPropertyName #>:</label> 
-                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= requiredAttributeHtml #>/> 
+                <<#= inputTypeName #> id="<#= modelPropertyNameLowercase #>" @bind-Value="<#= modelName #>.<#= modelPropertyName #>" class="<#= inputClass #>" <#= ariaRequiredAttributeHtml #>/> 
                 <ValidationMessage For="() => <#= modelName #>.<#= modelPropertyName #>" class="text-danger" /> 
             </div>        
             <#  } #>