From 675ed1229e76cefb1b8ceffacbe72fe95848ae1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20J=C3=A1ky?= Date: Thu, 8 Aug 2024 15:40:38 +0200 Subject: [PATCH 1/3] fix(ui): display `location` data properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit for ContainerInfo and ContainerImageInfo asset types as well Signed-off-by: András Jáky --- ui/src/layout/AssetScans/AssetScansTable.jsx | 3 ++- ui/src/layout/AssetScans/TabAssetScanDetails.jsx | 7 +++++-- ui/src/layout/Assets/AssetsForFindingTable.jsx | 3 ++- ui/src/layout/Assets/AssetsTable.jsx | 4 +++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ui/src/layout/AssetScans/AssetScansTable.jsx b/ui/src/layout/AssetScans/AssetScansTable.jsx index 521540e27..4473c278e 100644 --- a/ui/src/layout/AssetScans/AssetScansTable.jsx +++ b/ui/src/layout/AssetScans/AssetScansTable.jsx @@ -52,7 +52,8 @@ const AssetScansTable = () => { sortIds: ["asset.assetInfo.location"], accessor: (assetScan) => assetScan.asset.assetInfo.location || - assetScan.asset.assetInfo.repoDigests?.[0], + assetScan.asset.assetInfo.repoDigests?.[0] || + assetScan.asset.assetInfo.image.repoDigests?.[0], }, { Header: "Scan name", diff --git a/ui/src/layout/AssetScans/TabAssetScanDetails.jsx b/ui/src/layout/AssetScans/TabAssetScanDetails.jsx index f0d0ef8e9..261120290 100644 --- a/ui/src/layout/AssetScans/TabAssetScanDetails.jsx +++ b/ui/src/layout/AssetScans/TabAssetScanDetails.jsx @@ -111,7 +111,8 @@ const TabAssetScanDetails = ({ data }) => { const { scan, asset, status, stats } = data || {}; const { id: assetId, assetInfo } = asset || {}; - const { instanceID, objectType, location } = assetInfo || {}; + const { instanceID, objectType, location, repoDigests, image } = + assetInfo || {}; const { id: scanId, startTime, endTime } = scan || {}; const { state, message } = status || {}; @@ -128,7 +129,9 @@ const TabAssetScanDetails = ({ data }) => { {instanceID} {objectType} - {location} + + {location || repoDigests?.[0] || image.repoDigests?.[0]} + { sortIds: LOCATION_SORT_IDS, accessor: (original) => original.asset.assetInfo.location || - original.asset.assetInfo.repoDigests?.[0], + original.asset.assetInfo.repoDigests?.[0] || + original.asset.assetInfo.image.repoDigests?.[0], }, { Header: "Last Seen", diff --git a/ui/src/layout/Assets/AssetsTable.jsx b/ui/src/layout/Assets/AssetsTable.jsx index 83d7c4509..36c51004b 100644 --- a/ui/src/layout/Assets/AssetsTable.jsx +++ b/ui/src/layout/Assets/AssetsTable.jsx @@ -94,7 +94,9 @@ const AssetsTable = () => { id: "location", sortIds: LOCATION_SORT_IDS, accessor: (original) => - original.assetInfo.location || original.assetInfo.repoDigests?.[0], + original.assetInfo.location || + original.assetInfo.repoDigests?.[0] || + original.assetInfo.image.repoDigests?.[0], }, { Header: "Last Seen", From 10353831bc7f05417419945682115fc046e578f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20J=C3=A1ky?= <ajaky@cisco.com> Date: Thu, 8 Aug 2024 15:42:06 +0200 Subject: [PATCH 2/3] fix(ui): display asset name properly on AssetScanDetails tab MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: András Jáky <ajaky@cisco.com> --- ui/src/layout/AssetScans/TabAssetScanDetails.jsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ui/src/layout/AssetScans/TabAssetScanDetails.jsx b/ui/src/layout/AssetScans/TabAssetScanDetails.jsx index 261120290..1daa90875 100644 --- a/ui/src/layout/AssetScans/TabAssetScanDetails.jsx +++ b/ui/src/layout/AssetScans/TabAssetScanDetails.jsx @@ -16,6 +16,7 @@ import { import { formatDate, calculateDuration } from "utils/utils"; import { SCANS_PATHS } from "layout/Scans"; import StatusIndicator from "./StatusIndicator"; +import { getAssetName } from "utils/utils"; import COLORS from "utils/scss_variables.module.scss"; @@ -111,8 +112,7 @@ const TabAssetScanDetails = ({ data }) => { const { scan, asset, status, stats } = data || {}; const { id: assetId, assetInfo } = asset || {}; - const { instanceID, objectType, location, repoDigests, image } = - assetInfo || {}; + const { objectType, location, repoDigests, image } = assetInfo || {}; const { id: scanId, startTime, endTime } = scan || {}; const { state, message } = status || {}; @@ -127,7 +127,9 @@ const TabAssetScanDetails = ({ data }) => { Asset - {instanceID} + + {getAssetName(assetInfo)} + {objectType} {location || repoDigests?.[0] || image.repoDigests?.[0]} From ae1f3a832dc55fb6363a16499989ef4eaf07be00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A1s=20J=C3=A1ky?= Date: Thu, 8 Aug 2024 15:42:51 +0200 Subject: [PATCH 3/3] fix(ui): display max parellel run number properly MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: András Jáky --- ui/src/layout/Scans/ConfigurationReadOnlyDisplay.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/src/layout/Scans/ConfigurationReadOnlyDisplay.jsx b/ui/src/layout/Scans/ConfigurationReadOnlyDisplay.jsx index 07cfefa6e..5c4c40588 100644 --- a/ui/src/layout/Scans/ConfigurationReadOnlyDisplay.jsx +++ b/ui/src/layout/Scans/ConfigurationReadOnlyDisplay.jsx @@ -8,7 +8,7 @@ import { getEnabledScanTypesList, getScanTimeTypeTag, } from "layout/Scans/utils"; -import { cronExpressionToHuman, formatDate } from "utils/utils"; +import { cronExpressionToHuman, formatDate, formatNumber } from "utils/utils"; const FlagPropDisplay = ({ checked, label }) => (
{ {scope} - {maxParallelScanners} + {formatNumber(maxParallelScanners)} Asset Scan Configuration @@ -76,7 +76,7 @@ export const ScanReadOnlyDisplay = ({ scanData }) => { {scope} - {maxParallelScanners} + {formatNumber(maxParallelScanners)} Asset Scan Configuration