diff --git a/Common/Models/DatabaseModels/Service.ts b/Common/Models/DatabaseModels/Service.ts index 237e4829d1..b7d3ef169e 100644 --- a/Common/Models/DatabaseModels/Service.ts +++ b/Common/Models/DatabaseModels/Service.ts @@ -239,6 +239,7 @@ export default class Service extends BaseModel { @TableColumn({ required: false, type: TableColumnType.LongText, + canReadOnRelationQuery: true, title: "Description", description: "Friendly description that will help you remember", example: diff --git a/Common/Types/Icon/IconProp.ts b/Common/Types/Icon/IconProp.ts index 6cdb3f09a8..084600741a 100644 --- a/Common/Types/Icon/IconProp.ts +++ b/Common/Types/Icon/IconProp.ts @@ -146,6 +146,7 @@ enum IconProp { Bug = "Bug", ChartPie = "ChartPie", Heartbeat = "Heartbeat", + Waterfall = "Waterfall", } export default IconProp; diff --git a/Common/UI/Components/Icon/Icon.tsx b/Common/UI/Components/Icon/Icon.tsx index 2aa688e8a9..9b74b59344 100644 --- a/Common/UI/Components/Icon/Icon.tsx +++ b/Common/UI/Components/Icon/Icon.tsx @@ -1307,9 +1307,9 @@ const Icon: FunctionComponent = ({ />, ); } else if (icon === IconProp.FlowDiagram) { - // Flow diagram icon matching home page workflows - two boxes at top, one at bottom, connected + // Flow diagram icon matching home page workflows - two boxes at top, one at bottom, connected (rotated 180°) return getSvgWrapper( - <> + @@ -1317,7 +1317,7 @@ const Icon: FunctionComponent = ({ strokeLinecap="round" d="M6 7v3a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V7M12 12v5" /> - , + , ); } else if (icon === IconProp.Bug) { // Bug icon for exceptions - matching home page @@ -1362,6 +1362,16 @@ const Icon: FunctionComponent = ({ /> , ); + } else if (icon === IconProp.Waterfall) { + // Waterfall/span diagram icon for traces - matching home page + return getSvgWrapper( + <> + + + + + , + ); } return <>; diff --git a/Dashboard/src/Components/NavBar/NavBar.tsx b/Dashboard/src/Components/NavBar/NavBar.tsx index 064ec8ee0d..6ca8d7d15a 100644 --- a/Dashboard/src/Components/NavBar/NavBar.tsx +++ b/Dashboard/src/Components/NavBar/NavBar.tsx @@ -120,7 +120,7 @@ const DashboardNavbar: FunctionComponent = ( description: "Distributed tracing analysis.", route: RouteUtil.populateRouteParams(RouteMap[PageMap.TRACES] as Route), activeRoute: RouteMap[PageMap.TRACES], - icon: IconProp.RectangleStack, + icon: IconProp.Waterfall, iconColor: "yellow", category: "Observability", },