Skip to content

Commit c0092e5

Browse files
tlmiiJamesNK
tlmii
and
JamesNK
authored
Implement Custom 404 Page (#3011)
* Implement Custom 404 Page * Fix gRPC test failure --------- Co-authored-by: James Newton-King <[email protected]>
1 parent f2a731b commit c0092e5

22 files changed

+292
-81
lines changed

‎src/Aspire.Dashboard/Components/Pages/NotFound.razor‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
@page "/error/404"
2+
@inject IStringLocalizer<Dashboard.Resources.Routes> Loc
3+
4+
<PageTitle>@Loc[nameof(Dashboard.Resources.Routes.NotFoundPageTitle)]</PageTitle>
5+
6+
<div class="error-stack">
7+
<div class="error-code">404</div>
8+
<div class="error-description">@Loc[nameof(Dashboard.Resources.Routes.NotFoundDescription)]</div>
9+
<div>@Loc[nameof(Dashboard.Resources.Routes.NotFoundDetails)]</div>
10+
</div>

‎src/Aspire.Dashboard/Components/Pages/NotFound.razor.css‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.error-stack {
2+
display: flex;
3+
flex-direction: column;
4+
align-items: center;
5+
margin-top: calc(var(--design-unit) * 10px);
6+
}
7+
8+
.error-code {
9+
--error-code-font-size: 90px;
10+
font-size: var(--error-code-font-size);
11+
line-height: var(--error-code-font-size);
12+
}
13+
14+
.error-description {
15+
font-size: var(--type-ramp-plus-6-font-size);
16+
line-height: var(--type-ramp-plus-6-line-height);
17+
}

‎src/Aspire.Dashboard/Components/Routes.razor‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<RouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)" />
66
</Found>
77
<NotFound>
8-
<PageTitle>@Loc[nameof(Resources.Routes.RoutesPageTitle)]</PageTitle>
8+
<PageTitle>@Loc[nameof(Resources.Routes.NotFoundPageTitle)]</PageTitle>
99
<LayoutView Layout="@typeof(Layout.MainLayout)">
10-
<p role="alert">@Loc[nameof(Resources.Routes.RoutesNotFoundDescription)]</p>
10+
<Aspire.Dashboard.Components.Pages.NotFound />
1111
</LayoutView>
1212
</NotFound>
1313
</Router>

‎src/Aspire.Dashboard/DashboardWebApplication.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ public DashboardWebApplication(Action<WebApplicationBuilder>? configureBuilder =
171171
//_app.UseHsts();
172172
}
173173

174+
_app.UseStatusCodePagesWithReExecute("/error/{0}");
175+
174176
if (isAllHttps)
175177
{
176178
_app.UseHttpsRedirection();

‎src/Aspire.Dashboard/Otlp/Grpc/OtlpLogsService.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
using Aspire.Dashboard.Otlp.Storage;
77
using Grpc.Core;
88
using Microsoft.AspNetCore.Authorization;
9+
using Microsoft.AspNetCore.Mvc;
910
using OpenTelemetry.Proto.Collector.Logs.V1;
1011

1112
namespace Aspire.Dashboard.Otlp.Grpc;
1213

1314
[Authorize(Policy = OtlpAuthorization.PolicyName)]
15+
[SkipStatusCodePages]
1416
public class OtlpLogsService : LogsService.LogsServiceBase
1517
{
1618
private readonly ILogger<OtlpLogsService> _logger;

‎src/Aspire.Dashboard/Otlp/Grpc/OtlpMetricsService.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
using Aspire.Dashboard.Otlp.Storage;
77
using Grpc.Core;
88
using Microsoft.AspNetCore.Authorization;
9+
using Microsoft.AspNetCore.Mvc;
910
using OpenTelemetry.Proto.Collector.Metrics.V1;
1011

1112
namespace Aspire.Dashboard.Otlp.Grpc;
1213

1314
[Authorize(Policy = OtlpAuthorization.PolicyName)]
15+
[SkipStatusCodePages]
1416
public class OtlpMetricsService : MetricsService.MetricsServiceBase
1517
{
1618
private readonly ILogger<OtlpMetricsService> _logger;

‎src/Aspire.Dashboard/Otlp/Grpc/OtlpTraceService.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@
66
using Aspire.Dashboard.Otlp.Storage;
77
using Grpc.Core;
88
using Microsoft.AspNetCore.Authorization;
9+
using Microsoft.AspNetCore.Mvc;
910
using OpenTelemetry.Proto.Collector.Trace.V1;
1011

1112
namespace Aspire.Dashboard.Otlp.Grpc;
1213

1314
[Authorize(Policy = OtlpAuthorization.PolicyName)]
15+
[SkipStatusCodePages]
1416
public class OtlpTraceService : TraceService.TraceServiceBase
1517
{
1618
private readonly ILogger<OtlpTraceService> _logger;

‎src/Aspire.Dashboard/Resources/Routes.Designer.cs‎

Lines changed: 14 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Aspire.Dashboard/Resources/Routes.resx‎

Lines changed: 111 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,129 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
32
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
462
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
564
<xsd:element name="root" msdata:IsDataSet="true">
6-
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
7106
</xsd:element>
8107
</xsd:schema>
9108
<resheader name="resmimetype">
10109
<value>text/microsoft-resx</value>
11110
</resheader>
12111
<resheader name="version">
13-
<value>1.3</value>
112+
<value>2.0</value>
14113
</resheader>
15114
<resheader name="reader">
16-
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
17116
</resheader>
18117
<resheader name="writer">
19-
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
20119
</resheader>
21-
<data name="RoutesPageTitle" xml:space="preserve">
120+
<data name="NotFoundPageTitle" xml:space="preserve">
121+
<value>Not found</value>
122+
</data>
123+
<data name="NotFoundDescription" xml:space="preserve">
22124
<value>Not found</value>
23125
</data>
24-
<data name="RoutesNotFoundDescription" xml:space="preserve">
25-
<value>Sorry, there's nothing at this address.</value>
126+
<data name="NotFoundDetails" xml:space="preserve">
127+
<value>The page you requested could not be found</value>
26128
</data>
27-
</root>
129+
</root>

‎src/Aspire.Dashboard/Resources/xlf/Routes.cs.xlf‎

Lines changed: 10 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)