More cleanups

javiercn · javiercn · commit de5750de6277 · 2019-02-21T06:30:49.000-08:00
diff --git a/src/Components/Server/src/Builder/EndpointBuilderComponentExtensions.cs b/src/Components/Server/src/Builder/EndpointBuilderComponentExtensions.cs
@@ -10,14 +10,14 @@ namespace Microsoft.AspNetCore.Builder
     /// <summary>
     /// Extensions for <see cref="IEndpointConventionBuilder"/>.
     /// </summary>
-    public static class IEndpointConventionBuilderExtensions
+    public static class EndpointConventionBuilderComponentsExtensions
     {
         /// <summary>
         /// Adds <typeparamref name="TComponent"/> to the list of components registered with this <see cref="ComponentHub"/> instance.
         /// </summary>
         /// <typeparam name="TComponent">The component type.</typeparam>
         /// <param name="builder">The <see cref="IEndpointConventionBuilder"/>.</param>
-        /// <param name="selector">The component selector in the DOM for the <typeparamref name="TComponent"/>.</param>
+        /// <param name="selector">A CSS selector that identifies the DOM element into which the <typeparamref name="TComponent"/> will be placed.</param>
         /// <returns>The <paramref name="builder"/>.</returns>
         public static IEndpointConventionBuilder AddComponent<TComponent>(this IEndpointConventionBuilder builder, string selector)
         {
diff --git a/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs b/src/Components/Server/src/Circuits/DefaultCircuitFactory.cs
@@ -96,13 +96,15 @@ private static IList<ComponentDescriptor> ResolveComponentMetadata(HttpContext h
                 var endpoint = endpointFeature?.Endpoint;
                 if (endpoint == null)
                 {
-                    throw new InvalidOperationException("CompnentHub doesn't have an associated endpoint.");
+                    throw new InvalidOperationException(
+                        "ComponentHub doesn't have an associated endpoint. " +
+                        "Use 'app.UseRouting(routes => routes.MapComponentHub<App>(\"app\"))' to register your hub.");
                 }
 
                 var componentsMetadata = endpoint.Metadata.OfType<ComponentDescriptor>().ToList();
                 if (componentsMetadata.Count == 0)
                 {
-                    throw new InvalidOperationException("No component was added to the component hub.");
+                    throw new InvalidOperationException("No component was registered with the component hub.");
                 }
                 else
                 {
diff --git a/src/Components/test/testassets/ComponentsApp.Server/Pages/Index.cshtml b/src/Components/test/testassets/ComponentsApp.Server/Pages/Index.cshtml
@@ -1,8 +1,6 @@
 @page "{*clientroutes}"
 @using ComponentsApp.App
-@model ComponentsApp.Server.Pages.IndexModel
-@{
-}
+
 <!DOCTYPE html>
 <html>
 <head>
@@ -19,4 +17,3 @@
     <script src="_framework/components.server.js"></script>
 </body>
 </html>
-
diff --git a/src/Components/test/testassets/ComponentsApp.Server/Pages/Index.cshtml.cs b/src/Components/test/testassets/ComponentsApp.Server/Pages/Index.cshtml.cs
diff --git a/src/Mvc/Mvc.ViewFeatures/src/Infrastructure/HttpUriHelper.cs b/src/Mvc/Mvc.ViewFeatures/src/Infrastructure/HttpUriHelper.cs
@@ -51,30 +51,9 @@ private string GetContextBaseUri()
 
         protected override void NavigateToCore(string uri, bool forceLoad)
         {
-            // For now throw.
-            // We don't have a good way to do redirects on a prerendering context.
-            // Currently there's no good way to stop the rendering process. We can fix
-            // this by passing in a cancellation token to RenderRootComponentAsync and
-            // having that checked before we await on every ProcessAsynchronousWork iteration
-            // if we choose to go that way. Upon redirect we could trigger the cancellation here
-            // and do _context.Response.Redirect(uri)
-            // The bigger (not easily solvable problem) is that the response might have already
-            // started (for example when the page/view has already been flushed) which will mean
-            // that the behavior of this feature is not reliable, and not easily to diagnose as
-            // the developer only notices it when this happens at runtime; something we don't really want.
+            // For now throw as we don't have a good way of aborting the request from here.
             throw new InvalidOperationException(
                 "Redirects are not supported on a prerendering environment.");
-
-            // We need to do something here about the hash to prevent infinite redirects
-            // as the hash portion of a url doesn't get sent to the browser.
-            // This means that the hash won't be respected for prerendering scenarios.
-            // There are several involved things that we could do. Bake the knowledge into
-            // the IUriHelper abstraction so that we can produce a special link where we
-            // encode the hash as a query stirng parameter.
-            // We would preprocess this on the server to set the appropriate url.
-            // For example: 
-            // CurrentUrl = "http://www.localhost/base/path?query=value#top
-            // Redirect = "http://www.localhost/base/path?query=value#first
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -96,13 +96,15 @@ private static IList<ComponentDescriptor> ResolveComponentMetadata(HttpContext h`
`96`	`96`	`var endpoint = endpointFeature?.Endpoint;`
`97`	`97`	`if (endpoint == null)`
`98`	`98`	`{`
`99`		`- throw new InvalidOperationException("CompnentHub doesn't have an associated endpoint.");`
	`99`	`+ throw new InvalidOperationException(`
	`100`	`+ "ComponentHub doesn't have an associated endpoint. " +`
	`101`	`+ "Use 'app.UseRouting(routes => routes.MapComponentHub<App>(\"app\"))' to register your hub.");`
`100`	`102`	`}`
`101`	`103`
`102`	`104`	`var componentsMetadata = endpoint.Metadata.OfType<ComponentDescriptor>().ToList();`
`103`	`105`	`if (componentsMetadata.Count == 0)`
`104`	`106`	`{`
`105`		`- throw new InvalidOperationException("No component was added to the component hub.");`
	`107`	`+ throw new InvalidOperationException("No component was registered with the component hub.");`
`106`	`108`	`}`
`107`	`109`	`else`
`108`	`110`	`{`