diff --git a/Dashboard/src/Components/Exceptions/ExceptionElement.tsx b/Dashboard/src/Components/Exceptions/ExceptionElement.tsx index b554d5a7f2..d700184dcb 100644 --- a/Dashboard/src/Components/Exceptions/ExceptionElement.tsx +++ b/Dashboard/src/Components/Exceptions/ExceptionElement.tsx @@ -20,7 +20,7 @@ const TelemetryExceptionElement: FunctionComponent = ( props: ComponentProps, ): ReactElement => { const viewRoute: Route = RouteUtil.populateRouteParams( - RouteMap[PageMap.TELEMETRY_EXCEPTIONS_ROOT]!, + RouteMap[PageMap.EXCEPTIONS_VIEW_ROOT]!, ); const getResolvedIcon: GetReactElementFunction = (): ReactElement => { diff --git a/Dashboard/src/Components/Exceptions/ExceptionsTable.tsx b/Dashboard/src/Components/Exceptions/ExceptionsTable.tsx index 792f8ef4ac..c26aaeaeb5 100644 --- a/Dashboard/src/Components/Exceptions/ExceptionsTable.tsx +++ b/Dashboard/src/Components/Exceptions/ExceptionsTable.tsx @@ -35,19 +35,10 @@ export interface ComponentProps { const TelemetryExceptionTable: FunctionComponent = ( props: ComponentProps, ): ReactElement => { - let viewRoute: Route = RouteUtil.populateRouteParams( + const viewRoute: Route = RouteUtil.populateRouteParams( RouteMap[PageMap.EXCEPTIONS_VIEW_ROOT]!, ); - if (props.telemetryServiceId) { - viewRoute = RouteUtil.populateRouteParams( - RouteMap[PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS]!, - { - modelId: props.telemetryServiceId, - }, - ); - } - return ( diff --git a/Dashboard/src/Pages/Telemetry/Exceptions/Archived.tsx b/Dashboard/src/Pages/Telemetry/Exceptions/Archived.tsx deleted file mode 100644 index e45ba73d03..0000000000 --- a/Dashboard/src/Pages/Telemetry/Exceptions/Archived.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import PageComponentProps from "../../PageComponentProps"; -import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage"; -import React, { FunctionComponent, ReactElement } from "react"; -import ExceptionsTable from "../../../Components/Exceptions/ExceptionsTable"; - -const Services: FunctionComponent = ( - props: PageComponentProps, -): ReactElement => { - const disableTelemetryForThisProject: boolean = - props.currentProject?.reseller?.enableTelemetryFeatures === false; - - if (disableTelemetryForThisProject) { - return ( - - ); - } - - return ( - - ); -}; - -export default Services; diff --git a/Dashboard/src/Pages/Telemetry/Exceptions/Resolved.tsx b/Dashboard/src/Pages/Telemetry/Exceptions/Resolved.tsx deleted file mode 100644 index 3419c9837f..0000000000 --- a/Dashboard/src/Pages/Telemetry/Exceptions/Resolved.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import PageComponentProps from "../../PageComponentProps"; -import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage"; -import React, { FunctionComponent, ReactElement } from "react"; -import ExceptionsTable from "../../../Components/Exceptions/ExceptionsTable"; - -const Services: FunctionComponent = ( - props: PageComponentProps, -): ReactElement => { - const disableTelemetryForThisProject: boolean = - props.currentProject?.reseller?.enableTelemetryFeatures === false; - - if (disableTelemetryForThisProject) { - return ( - - ); - } - - return ( - - ); -}; - -export default Services; diff --git a/Dashboard/src/Pages/Telemetry/Exceptions/Unresolved.tsx b/Dashboard/src/Pages/Telemetry/Exceptions/Unresolved.tsx deleted file mode 100644 index 1d4be7934c..0000000000 --- a/Dashboard/src/Pages/Telemetry/Exceptions/Unresolved.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import PageComponentProps from "../../PageComponentProps"; -import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage"; -import React, { FunctionComponent, ReactElement } from "react"; -import ExceptionsTable from "../../../Components/Exceptions/ExceptionsTable"; - -const Services: FunctionComponent = ( - props: PageComponentProps, -): ReactElement => { - const disableTelemetryForThisProject: boolean = - props.currentProject?.reseller?.enableTelemetryFeatures === false; - - if (disableTelemetryForThisProject) { - return ( - - ); - } - - return ( - - ); -}; - -export default Services; diff --git a/Dashboard/src/Pages/Telemetry/Exceptions/View/Index.tsx b/Dashboard/src/Pages/Telemetry/Exceptions/View/Index.tsx deleted file mode 100644 index bd0585d6d2..0000000000 --- a/Dashboard/src/Pages/Telemetry/Exceptions/View/Index.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import Navigation from "Common/UI/Utils/Navigation"; -import ExceptionExplorer from "../../../../Components/Exceptions/ExceptionExplorer"; -import PageComponentProps from "../../../PageComponentProps"; -import React, { Fragment, FunctionComponent, ReactElement } from "react"; -import ObjectID from "Common/Types/ObjectID"; - -const TelemetryMetricViewPage: FunctionComponent< - PageComponentProps -> = (): ReactElement => { - const exceptionId: string = Navigation.getLastParamAsString(0); - - return ( - - - - ); -}; - -export default TelemetryMetricViewPage; diff --git a/Dashboard/src/Pages/Telemetry/Exceptions/View/Layout.tsx b/Dashboard/src/Pages/Telemetry/Exceptions/View/Layout.tsx deleted file mode 100644 index 42e12cee2b..0000000000 --- a/Dashboard/src/Pages/Telemetry/Exceptions/View/Layout.tsx +++ /dev/null @@ -1,35 +0,0 @@ -import { getTelemetryBreadcrumbs } from "../../../../Utils/Breadcrumbs"; -import RouteMap, { RouteUtil } from "../../../../Utils/RouteMap"; -import PageComponentProps from "../../../PageComponentProps"; -import Page from "Common/UI/Components/Page/Page"; -import Navigation from "Common/UI/Utils/Navigation"; -import React, { FunctionComponent, ReactElement } from "react"; -import { Outlet } from "react-router-dom"; -import PageMap from "../../../../Utils/PageMap"; - -const MetricsLayout: FunctionComponent< - PageComponentProps -> = (): ReactElement => { - const path: string = Navigation.getRoutePath(RouteUtil.getRoutes()); - - if (path.endsWith("exceptions")) { - Navigation.navigate( - RouteUtil.populateRouteParams( - RouteMap[PageMap.TELEMETRY_EXCEPTIONS_UNRESOLVED]!, - ), - ); - - return <>; - } - - return ( - - - - ); -}; - -export default MetricsLayout; diff --git a/Dashboard/src/Pages/Telemetry/Services/View/Exceptions/Archived.tsx b/Dashboard/src/Pages/Telemetry/Services/View/Exceptions/Archived.tsx deleted file mode 100644 index 505d9ff7fe..0000000000 --- a/Dashboard/src/Pages/Telemetry/Services/View/Exceptions/Archived.tsx +++ /dev/null @@ -1,86 +0,0 @@ -import PageComponentProps from "../../../../PageComponentProps"; -import ObjectID from "Common/Types/ObjectID"; -import Navigation from "Common/UI/Utils/Navigation"; -import React, { - FunctionComponent, - ReactElement, - useEffect, - useState, -} from "react"; -import TelemetryService from "Common/Models/DatabaseModels/TelemetryService"; -import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage"; -import PageLoader from "Common/UI/Components/Loader/PageLoader"; -import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI"; -import API from "Common/UI/Utils/API/API"; -import { PromiseVoidFunction } from "Common/Types/FunctionTypes"; -import ExceptionsTable from "../../../../../Components/Exceptions/ExceptionsTable"; - -const MetricsTablePage: FunctionComponent< - PageComponentProps -> = (): ReactElement => { - const modelId: ObjectID = Navigation.getLastParamAsObjectID(2); - - const [telemetryService, setTelemetryService] = - useState(null); - const [isLoading, setIsLoading] = useState(false); - const [error, setError] = useState(""); - - useEffect(() => { - fetchTelemetryService().catch((err: Error) => { - setError(API.getFriendlyMessage(err)); - }); - }, []); - - const fetchTelemetryService: PromiseVoidFunction = - async (): Promise => { - try { - setIsLoading(true); - - const telemetryService: TelemetryService | null = - await ModelAPI.getItem({ - modelType: TelemetryService, - id: modelId, - select: { - name: true, - }, - }); - - if (!telemetryService) { - setIsLoading(false); - setError("Telemetry Service not found."); - return; - } - - setTelemetryService(telemetryService); - setIsLoading(false); - } catch (err) { - setIsLoading(false); - setError(API.getFriendlyMessage(err)); - } - }; - - if (error) { - return ; - } - - if (isLoading) { - return ; - } - - if (!telemetryService) { - return ; - } - - return ( - - ); -}; - -export default MetricsTablePage; diff --git a/Dashboard/src/Pages/Telemetry/Services/View/Exceptions/Resolved.tsx b/Dashboard/src/Pages/Telemetry/Services/View/Exceptions/Resolved.tsx deleted file mode 100644 index c0419e3b50..0000000000 --- a/Dashboard/src/Pages/Telemetry/Services/View/Exceptions/Resolved.tsx +++ /dev/null @@ -1,87 +0,0 @@ -import PageComponentProps from "../../../../PageComponentProps"; -import ObjectID from "Common/Types/ObjectID"; -import Navigation from "Common/UI/Utils/Navigation"; -import React, { - FunctionComponent, - ReactElement, - useEffect, - useState, -} from "react"; -import TelemetryService from "Common/Models/DatabaseModels/TelemetryService"; -import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage"; -import PageLoader from "Common/UI/Components/Loader/PageLoader"; -import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI"; -import API from "Common/UI/Utils/API/API"; -import { PromiseVoidFunction } from "Common/Types/FunctionTypes"; -import ExceptionsTable from "../../../../../Components/Exceptions/ExceptionsTable"; - -const MetricsTablePage: FunctionComponent< - PageComponentProps -> = (): ReactElement => { - const modelId: ObjectID = Navigation.getLastParamAsObjectID(2); - - const [telemetryService, setTelemetryService] = - useState(null); - const [isLoading, setIsLoading] = useState(false); - const [error, setError] = useState(""); - - useEffect(() => { - fetchTelemetryService().catch((err: Error) => { - setError(API.getFriendlyMessage(err)); - }); - }, []); - - const fetchTelemetryService: PromiseVoidFunction = - async (): Promise => { - try { - setIsLoading(true); - - const telemetryService: TelemetryService | null = - await ModelAPI.getItem({ - modelType: TelemetryService, - id: modelId, - select: { - name: true, - }, - }); - - if (!telemetryService) { - setIsLoading(false); - setError("Telemetry Service not found."); - return; - } - - setTelemetryService(telemetryService); - setIsLoading(false); - } catch (err) { - setIsLoading(false); - setError(API.getFriendlyMessage(err)); - } - }; - - if (error) { - return ; - } - - if (isLoading) { - return ; - } - - if (!telemetryService) { - return ; - } - - return ( - - ); -}; - -export default MetricsTablePage; diff --git a/Dashboard/src/Pages/Telemetry/Services/View/Exceptions/Unresolved.tsx b/Dashboard/src/Pages/Telemetry/Services/View/Exceptions/Unresolved.tsx deleted file mode 100644 index 5edc7862b6..0000000000 --- a/Dashboard/src/Pages/Telemetry/Services/View/Exceptions/Unresolved.tsx +++ /dev/null @@ -1,87 +0,0 @@ -import PageComponentProps from "../../../../PageComponentProps"; -import ObjectID from "Common/Types/ObjectID"; -import Navigation from "Common/UI/Utils/Navigation"; -import React, { - FunctionComponent, - ReactElement, - useEffect, - useState, -} from "react"; -import TelemetryService from "Common/Models/DatabaseModels/TelemetryService"; -import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage"; -import PageLoader from "Common/UI/Components/Loader/PageLoader"; -import ModelAPI from "Common/UI/Utils/ModelAPI/ModelAPI"; -import API from "Common/UI/Utils/API/API"; -import { PromiseVoidFunction } from "Common/Types/FunctionTypes"; -import ExceptionsTable from "../../../../../Components/Exceptions/ExceptionsTable"; - -const MetricsTablePage: FunctionComponent< - PageComponentProps -> = (): ReactElement => { - const modelId: ObjectID = Navigation.getLastParamAsObjectID(2); - - const [telemetryService, setTelemetryService] = - useState(null); - const [isLoading, setIsLoading] = useState(false); - const [error, setError] = useState(""); - - useEffect(() => { - fetchTelemetryService().catch((err: Error) => { - setError(API.getFriendlyMessage(err)); - }); - }, []); - - const fetchTelemetryService: PromiseVoidFunction = - async (): Promise => { - try { - setIsLoading(true); - - const telemetryService: TelemetryService | null = - await ModelAPI.getItem({ - modelType: TelemetryService, - id: modelId, - select: { - name: true, - }, - }); - - if (!telemetryService) { - setIsLoading(false); - setError("Telemetry Service not found."); - return; - } - - setTelemetryService(telemetryService); - setIsLoading(false); - } catch (err) { - setIsLoading(false); - setError(API.getFriendlyMessage(err)); - } - }; - - if (error) { - return ; - } - - if (isLoading) { - return ; - } - - if (!telemetryService) { - return ; - } - - return ( - - ); -}; - -export default MetricsTablePage; diff --git a/Dashboard/src/Pages/Telemetry/Services/View/Exceptions/View/Index.tsx b/Dashboard/src/Pages/Telemetry/Services/View/Exceptions/View/Index.tsx deleted file mode 100644 index d1093408a4..0000000000 --- a/Dashboard/src/Pages/Telemetry/Services/View/Exceptions/View/Index.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import PageComponentProps from "../../../../../PageComponentProps"; -import ObjectID from "Common/Types/ObjectID"; -import Navigation from "Common/UI/Utils/Navigation"; -import React, { Fragment, FunctionComponent, ReactElement } from "react"; -import ExceptionExplorer from "../../../../../../Components/Exceptions/ExceptionExplorer"; - -const ServiceDelete: FunctionComponent< - PageComponentProps -> = (): ReactElement => { - const modelId: ObjectID = Navigation.getLastParamAsObjectID(); - - return ( - - - - ); -}; - -export default ServiceDelete; diff --git a/Dashboard/src/Pages/Telemetry/Services/View/SideMenu.tsx b/Dashboard/src/Pages/Telemetry/Services/View/SideMenu.tsx index cbab219599..4aab48c413 100644 --- a/Dashboard/src/Pages/Telemetry/Services/View/SideMenu.tsx +++ b/Dashboard/src/Pages/Telemetry/Services/View/SideMenu.tsx @@ -3,14 +3,10 @@ import RouteMap, { RouteUtil } from "../../../../Utils/RouteMap"; import Route from "Common/Types/API/Route"; import IconProp from "Common/Types/Icon/IconProp"; import ObjectID from "Common/Types/ObjectID"; -import { BadgeType } from "Common/UI/Components/Badge/Badge"; import SideMenu from "Common/UI/Components/SideMenu/SideMenu"; import SideMenuItem from "Common/UI/Components/SideMenu/SideMenuItem"; import SideMenuSection from "Common/UI/Components/SideMenu/SideMenuSection"; import React, { FunctionComponent, ReactElement } from "react"; -import TelemetryException from "Common/Models/DatabaseModels/TelemetryException"; -import CountModelSideMenuItem from "Common/UI/Components/SideMenu/CountModelSideMenuItem"; -import ProjectUtil from "Common/UI/Utils/Project"; export interface ComponentProps { modelId: ObjectID; @@ -75,52 +71,6 @@ const DashboardSideMenu: FunctionComponent = ( icon={IconProp.ChartBar} /> - - - link={{ - title: "Unresolved", - to: RouteUtil.populateRouteParams( - RouteMap[ - PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_UNRESOLVED - ] as Route, - { modelId: props.modelId }, - ), - }} - badgeType={BadgeType.DANGER} - icon={IconProp.Alert} - countQuery={{ - projectId: ProjectUtil.getCurrentProjectId()!, - isResolved: false, - isArchived: false, - telemetryServiceId: props.modelId, - }} - modelType={TelemetryException} - /> - - - > = return import("../Pages/Telemetry/Traces"); }); -const TelemetryServiceViewException: LazyExoticComponent< - FunctionComponent -> = lazy(() => { - return import("../Pages/Telemetry/Services/View/Exceptions/View/Index"); -}); - const TelemetryMetrics: LazyExoticComponent> = lazy(() => { return import("../Pages/Telemetry/Metrics"); @@ -103,25 +97,6 @@ const TelemetryServiceViewMetrics: LazyExoticComponent< return import("../Pages/Telemetry/Services/View/Metrics/Index"); }); -// Exceptions Service -const TelemetryExceptionsServiceUnresolved: LazyExoticComponent< - FunctionComponent -> = lazy(() => { - return import("../Pages/Telemetry/Services/View/Exceptions/Unresolved"); -}); - -const TelemetryExceptionsServiceResolved: LazyExoticComponent< - FunctionComponent -> = lazy(() => { - return import("../Pages/Telemetry/Services/View/Exceptions/Resolved"); -}); - -const TelemetryExceptionsServiceArchived: LazyExoticComponent< - FunctionComponent -> = lazy(() => { - return import("../Pages/Telemetry/Services/View/Exceptions/Archived"); -}); - const TelemetryServicesViewSettings: LazyExoticComponent< FunctionComponent > = lazy(() => { @@ -323,82 +298,6 @@ const TelemetryRoutes: FunctionComponent = ( } /> - {/** Telemetry Service Exceptions */} - - - - - } - /> - - - - - } - /> - - - - - } - /> - - - - - } - /> - | undefined { "Metrics", ]), - ...BuildBreadcrumbLinksByTitles(PageMap.TELEMETRY_EXCEPTIONS_ARCHIVED, [ - "Project", - "Telemetry", - "Exceptions", - "Archived", - ]), - - ...BuildBreadcrumbLinksByTitles(PageMap.TELEMETRY_EXCEPTIONS_RESOLVED, [ - "Project", - "Telemetry", - "Exceptions", - "Resolved", - ]), - - ...BuildBreadcrumbLinksByTitles(PageMap.TELEMETRY_EXCEPTIONS_UNRESOLVED, [ - "Project", - "Telemetry", - "Exceptions", - "Unresolved", - ]), - - ...BuildBreadcrumbLinksByTitles(PageMap.TELEMETRY_EXCEPTIONS_VIEW, [ - "Project", - "Telemetry", - "Exceptions", - "View Exception", - ]), - ...BuildBreadcrumbLinksByTitles(PageMap.TELEMETRY_METRIC_VIEW, [ "Project", "Telemetry", @@ -97,55 +69,6 @@ export function getTelemetryBreadcrumbs(path: string): Array | undefined { "Metrics", ]), - // service exceptions. - ...BuildBreadcrumbLinksByTitles( - PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS, - ["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, - [ - "Project", - "Telemetry", - "Services", - "View Service", - "Exceptions", - "Unresolved", - ], - ), - ...BuildBreadcrumbLinksByTitles( - PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_RESOLVED, - [ - "Project", - "Telemetry", - "Services", - "View Service", - "Exceptions", - "Resolved", - ], - ), - ...BuildBreadcrumbLinksByTitles( - PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_ARCHIVED, - [ - "Project", - "Telemetry", - "Services", - "View Service", - "Exceptions", - "Archived", - ], - ), ...BuildBreadcrumbLinksByTitles(PageMap.TELEMETRY_SERVICES_VIEW_TRACES, [ "Project", "Telemetry", diff --git a/Dashboard/src/Utils/PageMap.ts b/Dashboard/src/Utils/PageMap.ts index e8de838528..eda812d6b8 100644 --- a/Dashboard/src/Utils/PageMap.ts +++ b/Dashboard/src/Utils/PageMap.ts @@ -13,20 +13,12 @@ enum PageMap { TELEMETRY_METRIC_ROOT = "TELEMETRY_METRIC_ROOT", TELEMETRY_TRACE_ROOT = "TELEMETRY_TRACE_ROOT", TELEMETRY_LOG_ROOT = "TELEMETRY_LOG_ROOT", - TELEMETRY_EXCEPTIONS_ROOT = "TELEMETRY_EXCEPTIONS_ROOT", TELEMETRY_SERVICES_VIEW_ROOT = "TELEMETRY_SERVICES_VIEW_ROOT", TELEMETRY = "TELEMETRY", TELEMETRY_SERVICES = "TELEMETRY_SERVICES", TELEMETRY_DOCUMENTATION = "TELEMETRY_DOCUMENTATION", - TELEMETRY_EXCEPTIONS = "TELEMETRY_EXCEPTIONS", - TELEMETRY_EXCEPTIONS_UNRESOLVED = "TELEMETRY_EXCEPTIONS_UNRESOLVED", - TELEMETRY_EXCEPTIONS_RESOLVED = "TELEMETRY_EXCEPTIONS_RESOLVED", - TELEMETRY_EXCEPTIONS_ARCHIVED = "TELEMETRY_EXCEPTIONS_ARCHIVED", - TELEMETRY_EXCEPTIONS_VIEW = "TELEMETRY_EXCEPTIONS_VIEW", - TELEMETRY_EXCEPTIONS_VIEW_DELETE = "TELEMETRY_EXCEPTIONS_VIEW_DELETE", - TELEMETRY_TRACES = "TELEMETRY_TRACES", TELEMETRY_TRACE_VIEW = "TELEMETRY_TRACE_VIEW", @@ -42,16 +34,6 @@ enum PageMap { // Telemetry - LOGS TELEMETRY_SERVICES_VIEW_LOGS = "TELEMETRY_SERVICE_VIEW_LOGS", - // Exceptions - TELEMETRY_SERVICES_VIEW_EXCEPTIONS = "TELEMETRY_SERVICE_VIEW_EXCEPTIONS", - TELEMETRY_SERVICES_VIEW_EXCEPTION = "TELEMETRY_SERVICE_VIEW_EXCEPTION", - // Exceptions - Unresolved - TELEMETRY_SERVICES_VIEW_EXCEPTIONS_UNRESOLVED = "TELEMETRY_SERVICE_VIEW_EXCEPTIONS_UNRESOLVED", - // Exceptions - Resolved - TELEMETRY_SERVICES_VIEW_EXCEPTIONS_RESOLVED = "TELEMETRY_SERVICE_VIEW_EXCEPTIONS_RESOLVED", - // Exceptions - Archived - TELEMETRY_SERVICES_VIEW_EXCEPTIONS_ARCHIVED = "TELEMETRY_SERVICE_VIEW_EXCEPTIONS_ARCHIVED", - // Traces TELEMETRY_SERVICES_VIEW_TRACES = "TELEMETRY_SERVICE_VIEW_TRACES", TELEMETRY_SERVICES_VIEW_TRACE = "TELEMETRY_SERVICE_VIEW_TRACE", diff --git a/Dashboard/src/Utils/RouteMap.ts b/Dashboard/src/Utils/RouteMap.ts index a3a1ab549e..25a9655b3d 100644 --- a/Dashboard/src/Utils/RouteMap.ts +++ b/Dashboard/src/Utils/RouteMap.ts @@ -78,10 +78,6 @@ export const TelemetryRoutePath: Dictionary = { [PageMap.TELEMETRY_LOGS]: "logs", [PageMap.TELEMETRY_TRACES]: "traces", [PageMap.TELEMETRY_METRICS]: "metrics", - [PageMap.TELEMETRY_EXCEPTIONS]: "exceptions/unresolved", - [PageMap.TELEMETRY_EXCEPTIONS_RESOLVED]: "exceptions/resolved", - [PageMap.TELEMETRY_EXCEPTIONS_UNRESOLVED]: "exceptions/unresolved", - [PageMap.TELEMETRY_EXCEPTIONS_ARCHIVED]: "exceptions/archived", [PageMap.TELEMETRY_SERVICES_VIEW_ROOT]: "services", [PageMap.TELEMETRY_METRIC_ROOT]: `metric`, @@ -90,27 +86,17 @@ export const TelemetryRoutePath: Dictionary = { [PageMap.TELEMETRY_TRACE_ROOT]: `traces/view`, [PageMap.TELEMETRY_TRACE_VIEW]: `traces/view/${RouteParams.ModelID}`, // modelID is spanId - [PageMap.TELEMETRY_EXCEPTIONS_ROOT]: `exceptions`, - [PageMap.TELEMETRY_EXCEPTIONS_VIEW]: `exceptions/${RouteParams.ModelID}`, - [PageMap.TELEMETRY_LOG_ROOT]: `logs`, [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}/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`, [PageMap.TELEMETRY_SERVICES_VIEW_METRIC]: `services/${RouteParams.ModelID}/metrics/view`, [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`, - [PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_UNRESOLVED]: `services/${RouteParams.ModelID}/exceptions/unresolved`, - [PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_RESOLVED]: `services/${RouteParams.ModelID}/exceptions/resolved`, }; export const ExceptionsRoutePath: Dictionary = { @@ -1451,71 +1437,12 @@ const RouteMap: Dictionary = { }`, ), - [PageMap.TELEMETRY_EXCEPTIONS_ROOT]: new Route( - `/dashboard/${RouteParams.ProjectID}/telemetry/${ - TelemetryRoutePath[PageMap.TELEMETRY_EXCEPTIONS_ROOT] - }`, - ), - [PageMap.TELEMETRY_TRACES]: new Route( `/dashboard/${RouteParams.ProjectID}/telemetry/${ TelemetryRoutePath[PageMap.TELEMETRY_TRACES] }`, ), - // Exceptions - - [PageMap.TELEMETRY_EXCEPTIONS]: new Route( - `/dashboard/${RouteParams.ProjectID}/telemetry/${ - TelemetryRoutePath[PageMap.TELEMETRY_EXCEPTIONS] - }`, - ), - - [PageMap.TELEMETRY_EXCEPTIONS_VIEW]: new Route( - `/dashboard/${RouteParams.ProjectID}/telemetry/${ - TelemetryRoutePath[PageMap.TELEMETRY_EXCEPTIONS_VIEW] - }`, - ), - - // Exceptions - Unresolved, Resolved, Archived. - [PageMap.TELEMETRY_EXCEPTIONS_UNRESOLVED]: new Route( - `/dashboard/${RouteParams.ProjectID}/telemetry/${ - TelemetryRoutePath[PageMap.TELEMETRY_EXCEPTIONS_UNRESOLVED] - }`, - ), - - [PageMap.TELEMETRY_EXCEPTIONS_RESOLVED]: new Route( - `/dashboard/${RouteParams.ProjectID}/telemetry/${ - TelemetryRoutePath[PageMap.TELEMETRY_EXCEPTIONS_RESOLVED] - }`, - ), - - [PageMap.TELEMETRY_EXCEPTIONS_ARCHIVED]: new Route( - `/dashboard/${RouteParams.ProjectID}/telemetry/${ - TelemetryRoutePath[PageMap.TELEMETRY_EXCEPTIONS_ARCHIVED] - }`, - ), - - // Service Exceptions - Unresolved, Resolved, Archived. - - [PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_RESOLVED]: new Route( - `/dashboard/${RouteParams.ProjectID}/telemetry/${ - TelemetryRoutePath[PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_RESOLVED] - }`, - ), - - [PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_UNRESOLVED]: new Route( - `/dashboard/${RouteParams.ProjectID}/telemetry/${ - TelemetryRoutePath[PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_UNRESOLVED] - }`, - ), - - [PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_ARCHIVED]: new Route( - `/dashboard/${RouteParams.ProjectID}/telemetry/${ - TelemetryRoutePath[PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS_ARCHIVED] - }`, - ), - [PageMap.TELEMETRY_SERVICES_VIEW_ROOT]: new Route( `/dashboard/${RouteParams.ProjectID}/telemetry/${ TelemetryRoutePath[PageMap.TELEMETRY_SERVICES_VIEW_ROOT] @@ -1565,19 +1492,6 @@ const RouteMap: Dictionary = { }`, ), - // view exceptions. - [PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS]: new Route( - `/dashboard/${RouteParams.ProjectID}/telemetry/${ - TelemetryRoutePath[PageMap.TELEMETRY_SERVICES_VIEW_EXCEPTIONS] - }`, - ), - - [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/${