diff --git a/src/components/Header/Crest.tsx b/src/components/Header/Crest.tsx index 53eb68a..28a91cc 100644 --- a/src/components/Header/Crest.tsx +++ b/src/components/Header/Crest.tsx @@ -7,7 +7,8 @@ export const Crest = () => { return (
- + + Border Force - Dynamic Response Tool
) diff --git a/src/components/Header/Header.stories.tsx b/src/components/Header/Header.stories.tsx index 97c5972..414a82e 100644 --- a/src/components/Header/Header.stories.tsx +++ b/src/components/Header/Header.stories.tsx @@ -18,7 +18,7 @@ export const Header: Story = { 'health-checks:edit', ], portMenuItems: [ - { label: 'National Dashboard', link: '/regional-dashboard' }, + { label: 'National Dashboard', link: '/national-pressure' }, { label: 'CWL (Cardiff)', link: '/cwi' } ], adminMenuItems: [ @@ -58,6 +58,7 @@ export const Header: Story = { icon: 'MenuBook', } ], + initialSelectedPortMenuItem: '/national-pressure', routingFunction: (string) => console.log(string), logoutLink: () => {}, }, diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx index 20b7c55..f978c76 100644 --- a/src/components/Header/Header.tsx +++ b/src/components/Header/Header.tsx @@ -20,6 +20,7 @@ export interface IHeader { leftMenuItems?: MenuItem[], rightMenuItems?: MenuItem[], portMenuItems: MenuItem[], + initialSelectedPortMenuItem: string, routingFunction: (route:string) => void, logoutLink: () => void, } @@ -29,8 +30,9 @@ const linkStyles = { color: '#000', } -const Header = ({userRoles, adminMenuItems, rightMenuItems, leftMenuItems, portMenuItems, routingFunction, logoutLink}: IHeader) => { +const Header = ({userRoles, adminMenuItems, rightMenuItems, leftMenuItems, portMenuItems, initialSelectedPortMenuItem, routingFunction, logoutLink}: IHeader) => { const [anchorEl, setAnchorEl] = React.useState(null); + const [selectedPortOption, setSelectedPortOption] = React.useState(initialSelectedPortMenuItem); const open = Boolean(anchorEl); const handleClick = (event: React.MouseEvent) => { setAnchorEl(event.currentTarget); @@ -55,7 +57,7 @@ const Header = ({userRoles, adminMenuItems, rightMenuItems, leftMenuItems, portM width: '35px' } }}> - + Border Force Dynamic Response Tool @@ -110,7 +112,7 @@ const Header = ({userRoles, adminMenuItems, rightMenuItems, leftMenuItems, portM - + { leftMenuItems && leftMenuItems.map((menuItem) => { diff --git a/src/components/Header/__tests__/Header.test.tsx b/src/components/Header/__tests__/Header.test.tsx index eebaf3c..dd95801 100644 --- a/src/components/Header/__tests__/Header.test.tsx +++ b/src/components/Header/__tests__/Header.test.tsx @@ -9,7 +9,7 @@ import '@testing-library/jest-dom'; const headerProps = { userRoles: [] as string[], portMenuItems: [ - { label: 'National Dashboard', link: '/regional-dashboard' }, + { label: 'National Dashboard', link: '/national-pressure' }, { label: 'CWL (Cardiff)', link: '/cwi' } ], adminMenuItems: [ @@ -49,6 +49,7 @@ const headerProps = { icon: 'MenuBook', } ], + initialSelectedPortMenuItem: '/national-pressure', routingFunction: jest.fn(), logoutLink: jest.fn(), } @@ -88,7 +89,7 @@ test("it renders the port menu items", async () => { await fireEvent.mouseDown(trigger); expect(await screen.getByTestId('port-selector-/cwi')).toBeTruthy(); - expect(await screen.getByTestId('port-selector-/regional-dashboard')).toBeTruthy(); + expect(await screen.getByTestId('port-selector-/national-pressure')).toBeTruthy(); expect(await screen.queryByTestId('port-selector-/lhr')).toBeNull(); })