From 6e1073947915e9660cc8b5e04260c971427b89ac Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Thu, 29 Aug 2024 16:11:31 +0100 Subject: [PATCH] refactor: Update email descriptions in settings pages --- AdminDashboard/src/Pages/Settings/Email/Index.tsx | 2 +- .../src/Components/CustomSMTP/CustomSMTPTable.tsx | 2 +- .../src/Utils/Breadcrumbs/TelemetryBreadcrumbs.ts | 10 ++++++++++ Dashboard/src/Utils/RouteMap.ts | 9 ++++++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/AdminDashboard/src/Pages/Settings/Email/Index.tsx b/AdminDashboard/src/Pages/Settings/Email/Index.tsx index 7a40e1d6cc4..efd72400246 100644 --- a/AdminDashboard/src/Pages/Settings/Email/Index.tsx +++ b/AdminDashboard/src/Pages/Settings/Email/Index.tsx @@ -249,7 +249,7 @@ const Settings: FunctionComponent = (): ReactElement => { fieldType: FormFieldSchemaType.Email, required: true, description: - "This is the display email your team and customers see, when they receive emails from OneUptime.", + "Email used to log in to this SMTP Server. This is also the email your customers will see. ", placeholder: "email@company.com", }, { diff --git a/Dashboard/src/Components/CustomSMTP/CustomSMTPTable.tsx b/Dashboard/src/Components/CustomSMTP/CustomSMTPTable.tsx index 759224b9541..819975f7e38 100644 --- a/Dashboard/src/Components/CustomSMTP/CustomSMTPTable.tsx +++ b/Dashboard/src/Components/CustomSMTP/CustomSMTPTable.tsx @@ -177,7 +177,7 @@ const CustomSMTPTable: FunctionComponent = (): ReactElement => { fieldType: FormFieldSchemaType.Email, required: true, description: - "This is the display email your team and customers see, when they receive emails from OneUptime.", + "Email used to log in to this SMTP Server. This is also the email your customers will see. ", placeholder: "email@company.com", }, { diff --git a/Dashboard/src/Utils/Breadcrumbs/TelemetryBreadcrumbs.ts b/Dashboard/src/Utils/Breadcrumbs/TelemetryBreadcrumbs.ts index e2d5bd5509c..5320d95a5d4 100644 --- a/Dashboard/src/Utils/Breadcrumbs/TelemetryBreadcrumbs.ts +++ b/Dashboard/src/Utils/Breadcrumbs/TelemetryBreadcrumbs.ts @@ -108,6 +108,16 @@ export function getTelemetryBreadcrumbs(path: string): Array | undefined { ["Project", "Telemetry", "Services", "View Service", "Exceptions"], ), + // service exceptions. + ...BuildBreadcrumbLinksByTitles(PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTION, [ + "Project", + "Telemetry", + "Services", + "View Service", + "Exceptions", + "View Exception", + ]), + ...BuildBreadcrumbLinksByTitles( PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_UNRESOLVED, [ diff --git a/Dashboard/src/Utils/RouteMap.ts b/Dashboard/src/Utils/RouteMap.ts index d690007fbbd..afe064b028f 100644 --- a/Dashboard/src/Utils/RouteMap.ts +++ b/Dashboard/src/Utils/RouteMap.ts @@ -83,7 +83,7 @@ export const TelemetryRoutePath: Dictionary = { [PageMap.TELEMETRY_SERVICES_VIEW]: `services/${RouteParams.ModelID}`, [PageMap.TELEMETRY_SERVICES_VIEW_DELETE]: `services/${RouteParams.ModelID}/delete`, [PageMap.TELEMETRY_SERVICES_VIEW_LOGS]: `services/${RouteParams.ModelID}/logs`, - [PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTION]: `services/${RouteParams.ModelID}/exception/${RouteParams.SubModelID}`, + [PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTION]: `services/${RouteParams.ModelID}/exceptions/${RouteParams.SubModelID}`, [PageMap.TELEMETRY_SERVICES_VIEW_TRACES]: `services/${RouteParams.ModelID}/traces`, [PageMap.TELEMETRY_SERVICES_VIEW_TRACE]: `services/${RouteParams.ModelID}/traces/${RouteParams.SubModelID}`, [PageMap.TELEMETRY_SERVICES_VIEW_METRICS]: `services/${RouteParams.ModelID}/metrics`, @@ -91,6 +91,7 @@ export const TelemetryRoutePath: Dictionary = { [PageMap.TELEMETRY_SERVICES_VIEW_DASHBOARDS]: `services/${RouteParams.ModelID}/dashboards`, [PageMap.TELEMETRY_SERVICES_VIEW_SETTINGS]: `services/${RouteParams.ModelID}/settings`, [PageMap.TELEMETRY_SERVICES_VIEW_DOCUMENTATION]: `services/${RouteParams.ModelID}/documentation`, + [PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS]: `services/${RouteParams.ModelID}/exceptions`, // service exceptions. [PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_ARCHIVED]: `services/${RouteParams.ModelID}/exceptions/archived`, @@ -1021,6 +1022,12 @@ const RouteMap: Dictionary = { }`, ), + [PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTION]: new Route( + `/dashboard/${RouteParams.ProjectID}/telemetry/${ + TelemetryRoutePath[PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTION] + }`, + ), + //TELEMETRY_SERVICE_VIEW_TRACES [PageMap.TELEMETRY_SERVICES_VIEW_TRACES]: new Route( `/dashboard/${RouteParams.ProjectID}/telemetry/${