p15693087
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Island UI: fix a bug in side navigation that causes the report side navigation button to go out of "active" mode on ransomware report tab

This commit is contained in:
VakarisZ 2021-07-15 10:42:15 +03:00
parent dae669282d
commit e9094bdfd6
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
monkey/monkey_island/cc/ui/src/components/Main.tsx
View File

@ -33,12 +33,18 @@ import IslandHttpClient from "./IslandHttpClient";
let notificationIcon = require('../images/notification-logo-512x512.png'); let notificationIcon = require('../images/notification-logo-512x512.png');
const reportZeroTrustRoute = '/report/zeroTrust';
const Routes = { const Routes = {
LandingPage: '/landing-page', LandingPage: '/landing-page',
GettingStartedPage: '/' GettingStartedPage: '/',
Report: '/report',
AttackReport: '/report/attack',
ZeroTrustReport: '/report/zeroTrust',
SecurityReport: '/report/security',
RansomwareReport: '/report/ransomware',
}
export function isReportRoute(route){
return route.startsWith(Routes.Report);
} }
class AppComponent extends AuthComponent { class AppComponent extends AuthComponent {
@ -237,7 +243,7 @@ class AppComponent extends AuthComponent {
const hostname = window.location.hostname; const hostname = window.location.hostname;
const port = window.location.port; const port = window.location.port;
const protocol = window.location.protocol; const protocol = window.location.protocol;
const url = `${protocol}//${hostname}:${port}${reportZeroTrustRoute}`; const url = `${protocol}//${hostname}:${port}${Routes.ZeroTrustReport}`;
Notifier.start( Notifier.start(
'Monkey Island', 'Monkey Island',

5
monkey/monkey_island/cc/ui/src/components/SideNavComponent.tsx
View File

@ -7,6 +7,7 @@ import {faExternalLinkAlt} from '@fortawesome/free-solid-svg-icons';
import VersionComponent from './side-menu/VersionComponent'; import VersionComponent from './side-menu/VersionComponent';
import '../styles/components/SideNav.scss'; import '../styles/components/SideNav.scss';
import {CompletedSteps} from "./side-menu/CompletedSteps"; import {CompletedSteps} from "./side-menu/CompletedSteps";
import {isReportRoute} from "./Main";
const guardicoreLogoImage = require('../images/guardicore-logo.png'); const guardicoreLogoImage = require('../images/guardicore-logo.png');
@ -53,9 +54,7 @@ const SideNavComponent = ({disabled=false, completedSteps}: Props) => {
<NavLink to='/report/security' <NavLink to='/report/security'
className={getNavLinkClass()} className={getNavLinkClass()}
isActive={(_match, location) => { isActive={(_match, location) => {
return (location.pathname === '/report/attack' return (isReportRoute(location.pathname))
|| location.pathname === '/report/zeroTrust'
|| location.pathname === '/report/security')
}}> }}>
<span className='number'>3.</span> <span className='number'>3.</span>
Security Reports Security Reports