From 0f28ecccb0dbd7c2f39e2c4676e17ca0c38464a2 Mon Sep 17 00:00:00 2001 From: Ravi Pendurty Date: Wed, 3 Feb 2021 16:10:57 +0100 Subject: Migrate odlux Migrate odlux to Aluminium Issue-ID: CCSDK-3136 Signed-off-by: Ravi Pendurty Change-Id: I3200a809a31e87021c95fe103a9c95e03011f503 Signed-off-by: Ravi Pendurty --- .../src/components/material-table/tableToolbar.tsx | 1 + .../src/components/material-ui/listItemLink.tsx | 7 ++-- .../framework/src/components/navigationMenu.tsx | 41 ++++++++++++++++------ 3 files changed, 36 insertions(+), 13 deletions(-) (limited to 'sdnr/wt/odlux/framework/src/components') diff --git a/sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx b/sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx index 96bcbf375..3b2f8e0a8 100644 --- a/sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx +++ b/sdnr/wt/odlux/framework/src/components/material-table/tableToolbar.tsx @@ -29,6 +29,7 @@ import MenuItem from '@material-ui/core/MenuItem'; import Menu from '@material-ui/core/Menu'; import { lighten } from '@material-ui/core/styles/colorManipulator'; import { SvgIconProps } from '@material-ui/core/SvgIcon/SvgIcon'; +import { Button } from '@material-ui/core'; const styles = (theme: Theme) => createStyles({ root: { diff --git a/sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx b/sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx index 8c4b740a0..8828ac3fc 100644 --- a/sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx +++ b/sdnr/wt/odlux/framework/src/components/material-ui/listItemLink.tsx @@ -36,11 +36,14 @@ export interface IListItemLinkProps extends WithStyles { secondary?: React.ComponentType; to: string; exact?: boolean; + external?: boolean; } export const ListItemLink = withStyles(styles)((props: IListItemLinkProps) => { - const { icon, primary: Primary, secondary: Secondary, classes, to, exact = false } = props; - const renderLink = (itemProps: any): JSX.Element => (); + const { icon, primary: Primary, secondary: Secondary, classes, to, exact = false, external=false } = props; + const renderLink = (itemProps: any): JSX.Element => ( + props.external ? : + ); const ariaLabel = typeof Primary === 'string' ? "link-to-"+Primary.toLowerCase().replace(/\s/g, "-") : "link-to-"+Primary.displayName?.toLowerCase(); return ( diff --git a/sdnr/wt/odlux/framework/src/components/navigationMenu.tsx b/sdnr/wt/odlux/framework/src/components/navigationMenu.tsx index 790677ae3..437ba1b3a 100644 --- a/sdnr/wt/odlux/framework/src/components/navigationMenu.tsx +++ b/sdnr/wt/odlux/framework/src/components/navigationMenu.tsx @@ -26,12 +26,14 @@ import List from '@material-ui/core/List'; import Divider from '@material-ui/core/Divider'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; +import { faProjectDiagram } from '@fortawesome/free-solid-svg-icons'; import ListItemLink from '../components/material-ui/listItemLink'; import connect, { Connect } from '../flux/connect'; import { MenuAction } from '../actions/menuAction'; import * as classNames from 'classnames'; +import { transportPCEUrl } from '../app'; const drawerWidth = 240; @@ -125,6 +127,33 @@ export const NavigationMenu = withStyles(styles)(connect()(({ classes, state, di window.dispatchEvent(new Event('menu-resized')); }, [isOpen]) + let menuItems = state.framework.applicationRegistraion && Object.keys(state.framework.applicationRegistraion).map(key => { + const reg = state.framework.applicationRegistraion[key]; + return reg && ( + || null} /> + ) || null; + }) || null; + + const transportPCELink = } + external/>; + + const linkFound = menuItems.find(obj=>obj.key === "linkCalculation"); + if(linkFound){ + const index = menuItems.indexOf(linkFound); + menuItems.splice(index+1,0,transportPCELink); + }else{ + menuItems.push(transportPCELink); + } + return ( } /> { - state.framework.applicationRegistraion && Object.keys(state.framework.applicationRegistraion).map(key => { - const reg = state.framework.applicationRegistraion[key]; - return reg && ( - || null} /> - ) || null; - }) || null + menuItems } } /> -- cgit 1.2.3-korg