Rename LayoutDisplay to PageDisplay

Author: SteveSandersonMS

src/Components/Components/src/Layouts/LayoutDisplay.cs renamed to src/Components/Components/src/Layouts/PageDisplay.cs

@@ -6,15 +6,15 @@
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Components;
-using Microsoft.AspNetCore.Components.RenderTree;
+using Microsoft.AspNetCore.Components.Layouts;
 
-namespace Microsoft.AspNetCore.Components.Layouts
+namespace Microsoft.AspNetCore.Components
 {
     /// <summary>
     /// Displays the specified page component, rendering it inside its layout
-    /// and any further nested layouts.
+    /// and any further nested layouts, plus applying any authorization rules.
     /// </summary>
-    public class LayoutDisplay : IComponent
+    public class PageDisplay : IComponent
     {
         internal const string NameOfPage = nameof(Page);
         internal const string NameOfPageParameters = nameof(PageParameters);

src/Components/Components/src/Routing/Router.cs

@@ -78,9 +78,9 @@ private string StringUntilAny(string str, char[] chars)
         /// <inheritdoc />
         protected virtual void Render(RenderTreeBuilder builder, Type handler, IDictionary<string, object> parameters)
         {
-            builder.OpenComponent(0, typeof(LayoutDisplay));
-            builder.AddAttribute(1, LayoutDisplay.NameOfPage, handler);
-            builder.AddAttribute(2, LayoutDisplay.NameOfPageParameters, parameters);
+            builder.OpenComponent(0, typeof(PageDisplay));
+            builder.AddAttribute(1, PageDisplay.NameOfPage, handler);
+            builder.AddAttribute(2, PageDisplay.NameOfPageParameters, parameters);
             builder.CloseComponent();
         }
 

src/Components/Components/test/LayoutTest.cs renamed to src/Components/Components/test/PageDisplayTest.cs

@@ -11,26 +11,26 @@
 
 namespace Microsoft.AspNetCore.Components.Test
 {
-    public class LayoutTest
+    public class PageDisplayTest
     {
         private TestRenderer _renderer = new TestRenderer();
-        private LayoutDisplay _layoutDisplayComponent = new LayoutDisplay();
-        private int _layoutDisplayComponentId;
+        private PageDisplay _pageDisplayComponent = new PageDisplay();
+        private int _pageDisplayComponentId;
 
-        public LayoutTest()
+        public PageDisplayTest()
         {
             _renderer = new TestRenderer();
-            _layoutDisplayComponent = new LayoutDisplay();
-            _layoutDisplayComponentId = _renderer.AssignRootComponentId(_layoutDisplayComponent);
+            _pageDisplayComponent = new PageDisplay();
+            _pageDisplayComponentId = _renderer.AssignRootComponentId(_pageDisplayComponent);
         }
 
         [Fact]
         public void DisplaysComponentInsideLayout()
         {
             // Arrange/Act
-            _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
+            _renderer.Invoke(() => _pageDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
             {
-                { LayoutDisplay.NameOfPage, typeof(ComponentWithLayout) }
+                { PageDisplay.NameOfPage, typeof(ComponentWithLayout) }
             })));
 
             // Assert
@@ -85,9 +85,9 @@ public void DisplaysComponentInsideLayout()
         public void DisplaysComponentInsideNestedLayout()
         {
             // Arrange/Act
-            _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
+            _renderer.Invoke(() => _pageDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
             {
-                { LayoutDisplay.NameOfPage, typeof(ComponentWithNestedLayout) }
+                { PageDisplay.NameOfPage, typeof(ComponentWithNestedLayout) }
             })));
 
             // Assert
@@ -112,15 +112,15 @@ public void DisplaysComponentInsideNestedLayout()
         public void CanChangeDisplayedPageWithSameLayout()
         {
             // Arrange
-            _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
+            _renderer.Invoke(() => _pageDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
             {
-                { LayoutDisplay.NameOfPage, typeof(ComponentWithLayout) }
+                { PageDisplay.NameOfPage, typeof(ComponentWithLayout) }
             })));
 
             // Act
-            _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
+            _renderer.Invoke(() => _pageDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
             {
-                { LayoutDisplay.NameOfPage, typeof(DifferentComponentWithLayout) }
+                { PageDisplay.NameOfPage, typeof(DifferentComponentWithLayout) }
             })));
 
             // Assert
@@ -163,15 +163,15 @@ public void CanChangeDisplayedPageWithSameLayout()
         public void CanChangeDisplayedPageWithDifferentLayout()
         {
             // Arrange
-            _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
+            _renderer.Invoke(() => _pageDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
             {
-                { LayoutDisplay.NameOfPage, typeof(ComponentWithLayout) }
+                { PageDisplay.NameOfPage, typeof(ComponentWithLayout) }
             })));
 
             // Act
-            _renderer.Invoke(() => _layoutDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
+            _renderer.Invoke(() => _pageDisplayComponent.SetParametersAsync(ParameterCollection.FromDictionary(new Dictionary<string, object>
             {
-                { LayoutDisplay.NameOfPage, typeof(ComponentWithNestedLayout) }
+                { PageDisplay.NameOfPage, typeof(ComponentWithNestedLayout) }
             })));
 
             // Assert