From a3ee04f87937a3fd0284c0cd68a6ded30ae38476 Mon Sep 17 00:00:00 2001 From: Simon Larsen Date: Fri, 3 Feb 2023 12:28:03 +0000 Subject: [PATCH] nav workflow --- CommonUI/src/Components/Icon/Icon.tsx | 12 ++++++++++++ Dashboard/src/Pages/Workflow/View/Delete.tsx | 6 +++--- Dashboard/src/Pages/Workflow/View/SideMenu.tsx | 6 +++--- Dashboard/src/Utils/RouteMap.ts | 10 +++++----- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/CommonUI/src/Components/Icon/Icon.tsx b/CommonUI/src/Components/Icon/Icon.tsx index 01ca187078..361332d3b5 100644 --- a/CommonUI/src/Components/Icon/Icon.tsx +++ b/CommonUI/src/Components/Icon/Icon.tsx @@ -21,6 +21,7 @@ export enum ThickProp { export enum IconProp { File, Automation, + Workflow, Layout, Compass, User, @@ -103,6 +104,7 @@ export enum IconProp { Chat, Wrench, TransparentCube, + Logs } export enum IconType { @@ -216,6 +218,10 @@ const Icon: FunctionComponent = ({ d="M6 18L18 6M6 6l12 12" /> ); + } else if (icon === IconProp.Logs) { + return getSvgWrapper( + + ); } else if (icon === IconProp.Chat) { return getSvgWrapper( = ({ d="M12 20.25c4.97 0 9-3.694 9-8.25s-4.03-8.25-9-8.25S3 7.444 3 12c0 2.104.859 4.023 2.273 5.48.432.447.74 1.04.586 1.641a4.483 4.483 0 01-.923 1.785A5.969 5.969 0 006 21c1.282 0 2.47-.402 3.445-1.087.81.22 1.668.337 2.555.337z" /> ); + } else if (icon === IconProp.Workflow) { + return getSvgWrapper( + + + + ); } else if (icon === IconProp.TransparentCube) { return getSvgWrapper( = ( _props: PageComponentProps @@ -51,11 +51,11 @@ const Delete: FunctionComponent = ( sideMenu={} > { Navigation.navigate( - RouteMap[PageMap.STATUS_PAGES] as Route + RouteMap[PageMap.WORKFLOWS] as Route ); }} /> diff --git a/Dashboard/src/Pages/Workflow/View/SideMenu.tsx b/Dashboard/src/Pages/Workflow/View/SideMenu.tsx index aca8f23d20..000e49f6d4 100644 --- a/Dashboard/src/Pages/Workflow/View/SideMenu.tsx +++ b/Dashboard/src/Pages/Workflow/View/SideMenu.tsx @@ -26,7 +26,7 @@ const DashboardSideMenu: FunctionComponent = ( props.modelId ), }} - icon={IconProp.Info} + icon={IconProp.Workflow} /> = ( title: 'Runs & Logs', to: RouteUtil.populateRouteParams( RouteMap[ - PageMap.WORKFLOW_LOGS + PageMap.WORKFLOW_LOGS ] as Route, props.modelId ), }} - icon={IconProp.Anouncement} + icon={IconProp.Logs} /> diff --git a/Dashboard/src/Utils/RouteMap.ts b/Dashboard/src/Utils/RouteMap.ts index a03b1d0a26..741bed0bf2 100644 --- a/Dashboard/src/Utils/RouteMap.ts +++ b/Dashboard/src/Utils/RouteMap.ts @@ -262,15 +262,15 @@ const RouteMap: Dictionary = { // workflows. [PageMap.WORKFLOWS]: new Route( - `/dashboard/${RouteParams.ProjectID}/workflows/${RouteParams.ModelID}` + `/dashboard/${RouteParams.ProjectID}/workflows` ), [PageMap.WORKFLOW_BUILDER]: new Route( - `/dashboard/${RouteParams.ProjectID}/workflows/${RouteParams.ModelID}/builder` + `/dashboard/${RouteParams.ProjectID}/workflows/${RouteParams.ModelID}` ), [PageMap.WORKFLOW_VIEW]: new Route( - `/dashboard/${RouteParams.ProjectID}/workflows/${RouteParams.ModelID}/builder` + `/dashboard/${RouteParams.ProjectID}/workflows/${RouteParams.ModelID}` ), [PageMap.WORKFLOW_LOGS]: new Route( @@ -281,7 +281,7 @@ const RouteMap: Dictionary = { `/dashboard/${RouteParams.ProjectID}/workflows/${RouteParams.ModelID}/delete` ), - + // logout. [PageMap.LOGOUT]: new Route(`/dashboard/logout`), @@ -292,7 +292,7 @@ export class RouteUtil { if ( route.toString() === RouteMap[PageMap.USER_PROFILE]?.toString() || route.toString() === - RouteMap[PageMap.PROJECT_INVITATIONS]?.toString() || + RouteMap[PageMap.PROJECT_INVITATIONS]?.toString() || route.toString() === RouteMap[PageMap.ACTIVE_INCIDENTS]?.toString() ) { return true;