Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UI drilldown modifications #255

Merged
merged 1 commit into from
Apr 17, 2023
Merged

UI drilldown modifications #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/src/layout/AssetScans/AssetScanDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const AssetScanDetails = () => (

return ({
title: target?.targetInfo?.instanceID,
subTitle: `scanned by ${scanConfigSnapshot?.name} on ${formatDate(startTime)}`
subTitle: `scanned by '${scanConfigSnapshot?.name}' on ${formatDate(startTime)}`
})
}}
detailsContent={props => <DetailsContent {...props} />}
Expand Down
7 changes: 6 additions & 1 deletion ui/src/layout/AssetScans/TabAssetScanDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { formatDate, calculateDuration } from 'utils/utils';
import { SCANS_PATHS } from 'layout/Scans';
import StatusIndicator from './StatusIndicator';

import COLORS from 'utils/scss_variables.module.scss';

const STATUS_DISPLAY_ITEMS = [
VULNERABIITY_FINDINGS_ITEM,
...Object.values(FINDINGS_MAPPING).filter(({value}) => value !== FINDINGS_MAPPING.PACKAGES.value)
Expand Down Expand Up @@ -59,7 +61,10 @@ const TabAssetScanDetails = ({data}) => {
rightPlaneDisplay={() => (
<>
<Title medium>Asset scan status</Title>
<StatusDisplay state={state} errors={errors} />
<TitleValueDisplay title="Overview">
<StatusDisplay state={state} errors={errors} />
</TitleValueDisplay>
<div style={{borderBottom: `2px solid ${COLORS["color-grey-lighter"]}`, margin: "20px 0"}}></div>
{
STATUS_DISPLAY_ITEMS.map(({dataKey, title}) => {
const {state, errors} = (status || {})[dataKey] || {};
Expand Down
4 changes: 2 additions & 2 deletions ui/src/layout/Findings/Exploits/ExploitDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ const DetailsContent = ({data}) => {
id: "asset",
title: "Asset details",
path: EXPLOIT_DETAILS_PATHS.ASSET_DETAILS,
component: () => <AssetDetails assetData={asset} />
component: () => <AssetDetails assetData={asset} withAssetLink />
},
{
id: "scan",
title: "Scan details",
path: EXPLOIT_DETAILS_PATHS.SCAN_DETAILS,
component: () => <ScanDetails scanData={scan} />
component: () => <ScanDetails scanData={scan} withScanLink />
}
]}
withInnerPadding={false}
Expand Down
4 changes: 2 additions & 2 deletions ui/src/layout/Findings/Malware/MalwareDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ const DetailsContent = ({data}) => {
id: "asset",
title: "Asset details",
path: MALWARE_DETAILS_PATHS.ASSET_DETAILS,
component: () => <AssetDetails assetData={asset} />
component: () => <AssetDetails assetData={asset} withAssetLink />
},
{
id: "scan",
title: "Scan details",
path: MALWARE_DETAILS_PATHS.SCAN_DETAILS,
component: () => <ScanDetails scanData={scan} />
component: () => <ScanDetails scanData={scan} withScanLink />
}
]}
withInnerPadding={false}
Expand Down
4 changes: 2 additions & 2 deletions ui/src/layout/Findings/Misconfigurations/MisconfigurationDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ const DetailsContent = ({data}) => {
id: "asset",
title: "Asset details",
path: MISCONFIGURATION_DETAILS_PATHS.ASSET_DETAILS,
component: () => <AssetDetails assetData={asset} />
component: () => <AssetDetails assetData={asset} withAssetLink />
},
{
id: "scan",
title: "Scan details",
path: MISCONFIGURATION_DETAILS_PATHS.SCAN_DETAILS,
component: () => <ScanDetails scanData={scan} />
component: () => <ScanDetails scanData={scan} withScanLink />
}
]}
withInnerPadding={false}
Expand Down
4 changes: 2 additions & 2 deletions ui/src/layout/Findings/Packages/PackageDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ const DetailsContent = ({data}) => {
id: "asset",
title: "Asset details",
path: PACKAGE_DETAILS_PATHS.ASSET_DETAILS,
component: () => <AssetDetails assetData={asset} />
component: () => <AssetDetails assetData={asset} withAssetLink />
},
{
id: "scan",
title: "Scan details",
path: PACKAGE_DETAILS_PATHS.SCAN_DETAILS,
component: () => <ScanDetails scanData={scan} />
component: () => <ScanDetails scanData={scan} withScanLink />
}
]}
withInnerPadding={false}
Expand Down
4 changes: 2 additions & 2 deletions ui/src/layout/Findings/Rootkits/RootkitDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ const DetailsContent = ({data}) => {
id: "asset",
title: "Asset details",
path: ROOTKIT_DETAILS_PATHS.ASSET_DETAILS,
component: () => <AssetDetails assetData={asset} />
component: () => <AssetDetails assetData={asset} withAssetLink />
},
{
id: "scan",
title: "Scan details",
path: ROOTKIT_DETAILS_PATHS.SCAN_DETAILS,
component: () => <ScanDetails scanData={scan} />
component: () => <ScanDetails scanData={scan} withScanLink />
}
]}
withInnerPadding={false}
Expand Down
4 changes: 2 additions & 2 deletions ui/src/layout/Findings/Secrets/SecretDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ const DetailsContent = ({data}) => {
id: "asset",
title: "Asset details",
path: SECRET_DETAILS_PATHS.ASSET_DETAILS,
component: () => <AssetDetails assetData={asset} />
component: () => <AssetDetails assetData={asset} withAssetLink />
},
{
id: "scan",
title: "Scan details",
path: SECRET_DETAILS_PATHS.SCAN_DETAILS,
component: () => <ScanDetails scanData={scan} />
component: () => <ScanDetails scanData={scan} withScanLink />
}
]}
withInnerPadding={false}
Expand Down
4 changes: 2 additions & 2 deletions ui/src/layout/Findings/Vulnerabilities/VulnerabilityDetails.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ const DetailsContent = ({data}) => {
id: "asset",
title: "Asset details",
path: VULNERABILITY_DETAILS_PATHS.ASSET_DETAILS,
component: () => <AssetDetails assetData={asset} />
component: () => <AssetDetails assetData={asset} withAssetLink />
},
{
id: "scan",
title: "Scan details",
path: VULNERABILITY_DETAILS_PATHS.SCAN_DETAILS,
component: () => <ScanDetails scanData={scan} />
component: () => <ScanDetails scanData={scan} withScanLink />
}
]}
withInnerPadding={false}
Expand Down
8 changes: 5 additions & 3 deletions ui/src/layout/detail-displays/AssetDetails/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,17 @@ const AssetScansDisplay = ({assetName, targetId}) => {
)
}

const AssetDetails = ({assetData, withAssetScansLink=false}) => {
const AssetDetails = ({assetData, withAssetLink=false, withAssetScansLink=false}) => {
const navigate = useNavigate();

const {id, targetInfo} = assetData;
const {instanceID, objectType, location} = targetInfo || {};

return (
<DoublePaneDisplay
leftPaneDisplay={() => (
<>
<Title medium>Asset</Title>
<Title medium onClick={withAssetLink ? () => navigate(`${ROUTES.ASSETS}/${id}`) : undefined}>Asset</Title>
<TitleValueDisplayRow>
<TitleValueDisplay title="Name">{instanceID}</TitleValueDisplay>
<TitleValueDisplay title="Type">{objectType}</TitleValueDisplay>
Expand Down
5 changes: 3 additions & 2 deletions ui/src/layout/detail-displays/ScanDetails/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ import DoublePaneDisplay from 'components/DoublePaneDisplay';
import Title from 'components/Title';
import ScanProgressBar from 'components/ScanProgressBar';
import Button from 'components/Button';
import { SCANS_PATHS } from 'layout/Scans';
import ConfigurationReadOnlyDisplay from 'layout/Scans/ConfigurationReadOnlyDisplay';
import { formatDate, calculateDuration, formatNumber } from 'utils/utils';
import { ROUTES } from 'utils/systemConsts';
import { useFilterDispatch, setFilters, FILTER_TYPES } from 'context/FiltersProvider';
import ConfigurationAlertLink from './ConfigurationAlertLink';

const ScanDetails = ({scanData, withAssetScansLink=false}) => {
const ScanDetails = ({scanData, withScanLink=false, withAssetScansLink=false}) => {
const {pathname} = useLocation();
const navigate = useNavigate();
const filtersDispatch = useFilterDispatch();
Expand Down Expand Up @@ -46,7 +47,7 @@ const ScanDetails = ({scanData, withAssetScansLink=false}) => {
)}
rightPlaneDisplay={() => (
<>
<Title medium>Status</Title>
<Title medium onClick={withScanLink ? () => navigate(`${ROUTES.SCANS}/${SCANS_PATHS.SCANS}/${id}`) : undefined}>Scan</Title>
<div style={{marginBottom: "20px"}}>
<ScanProgressBar
state={state}
Expand Down