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

Use lookup results to show counts in ThreatGraph side panel #1477

Merged
merged 2 commits into from
Aug 28, 2023
Merged

Use lookup results to show counts in ThreatGraph side panel #1477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d9fe62
fix prettier issue
manV Aug 28, 2023
28b9a86
use lookup results to show counts on threatgraph side panel
manV Aug 28, 2023
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
3 changes: 2 additions & 1 deletion deepfence_frontend/apps/dashboard/src/components/hosts-connector/K8ConnectorForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,8 @@ const FirstCommand = () => {
return (
<div className="relative flex items-center">
<pre className="h-fit text-p7 dark:text-text-text-and-icon">
helm repo add deepfence https://deepfence-helm-charts.s3.amazonaws.com/threatmapper
helm repo add deepfence
https://deepfence-helm-charts.s3.amazonaws.com/threatmapper
</pre>
<div className="flex items-center ml-auto self-start">
{isCopied ? 'copied' : null}
Expand Down
63 changes: 35 additions & 28 deletions deepfence_frontend/apps/dashboard/src/features/threat-graph/data-components/DetailsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,36 +116,43 @@ const ModalContent = ({
const nodesData = useMemo(() => {
if (!data) return null;
if (!data.length) return [];
return Object.keys(nodes ?? {}).map((nodeId) => {
const node = nodes![nodeId];
const nodeData = data.find((item) => item.node_id === node.node_id);
if (nodeType === 'host') {

return Object.keys(nodes ?? {})
.map((nodeId) => {
const node = nodes![nodeId];
const nodeData = data.find((item) => item.node_id === node.node_id);
if (!nodeData) return null;
if (nodeType === 'host') {
return {
...node,
latest_vulnerability_scan_id: (nodeData as ModelHost)
?.vulnerability_latest_scan_id,
vulnerability_count: (nodeData as ModelHost)?.vulnerabilities_count,
latest_secret_scan_id: (nodeData as ModelHost)?.secret_latest_scan_id,
secrets_count: (nodeData as ModelHost)?.secrets_count,
latest_compliance_scan_id: (nodeData as ModelHost)?.compliance_latest_scan_id,
compliance_count: (nodeData as ModelHost)?.compliances_count,
latest_cloud_compliance_scan_id: undefined,
};
}

return {
...node,
latest_vulnerability_scan_id: (nodeData as ModelHost)
?.vulnerability_latest_scan_id,
latest_secret_scan_id: (nodeData as ModelHost)?.secret_latest_scan_id,
latest_malware_scan_id: (nodeData as ModelHost)?.malware_latest_scan_id,
latest_compliance_scan_id: (nodeData as ModelHost)?.compliance_latest_scan_id,
latest_cloud_compliance_scan_id: undefined,
latest_cloud_compliance_scan_id: (nodeData as ModelCloudResource)
?.cloud_compliance_latest_scan_id,
cloud_compliance_count: (nodeData as ModelCloudResource)
?.cloud_compliances_count,
latest_vulnerability_scan_id: undefined,
latest_secret_scan_id: undefined,
latest_compliance_scan_id: undefined,
};
}

return {
...node,
latest_cloud_compliance_scan_id: (nodeData as ModelCloudResource)
?.cloud_compliance_latest_scan_id,
latest_vulnerability_scan_id: undefined,
latest_secret_scan_id: undefined,
latest_malware_scan_id: undefined,
latest_compliance_scan_id: undefined,
};
});
})
.filter((data) => !!data);
}, [data]);
return (
<div className="py-7 px-5 flex flex-col gap-5">
{nodesData?.map((item) => (
<div key={item.node_id} className="mb-4">
<div key={item?.node_id} className="mb-4">
<div className="flex items-center gap-2">
<div className="w-4 h-4 shrink-0">
<img
Expand All @@ -155,34 +162,34 @@ const ModalContent = ({
height="100%"
/>
</div>
<div className="text-h5 dark:text-text-text-and-icon">{item.node_id}</div>
<div className="text-h5 dark:text-text-text-and-icon">{item?.node_id}</div>
</div>
<div className="flex items-center justify-start gap-4 py-3">
{item.vulnerability_count ? (
{item?.vulnerability_count ? (
<CountCard
count={item.vulnerability_count}
nodeType={nodeType}
scanType={ScanTypeEnum.VulnerabilityScan}
scanId={item.latest_vulnerability_scan_id}
/>
) : null}
{item.secrets_count ? (
{item?.secrets_count ? (
<CountCard
count={item.secrets_count}
nodeType={nodeType}
scanType={ScanTypeEnum.SecretScan}
scanId={item.latest_secret_scan_id}
/>
) : null}
{item.compliance_count ? (
{item?.compliance_count ? (
<CountCard
count={item.compliance_count}
nodeType={nodeType}
scanType={ScanTypeEnum.ComplianceScan}
scanId={item.latest_compliance_scan_id}
/>
) : null}
{item.cloud_compliance_count ? (
{item?.cloud_compliance_count ? (
<CountCard
count={item.cloud_compliance_count}
nodeType={nodeType}
Expand Down