Skip to content
This repository has been archived by the owner on Oct 14, 2024. It is now read-only.

fix(ui): data display #1986

Merged
merged 3 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 ui/src/layout/AssetScans/AssetScansTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 8 additions & 3 deletions ui/src/layout/AssetScans/TabAssetScanDetails.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down Expand Up @@ -111,7 +112,7 @@ const TabAssetScanDetails = ({ data }) => {

const { scan, asset, status, stats } = data || {};
const { id: assetId, assetInfo } = asset || {};
const { instanceID, objectType, location } = assetInfo || {};
const { objectType, location, repoDigests, image } = assetInfo || {};
const { id: scanId, startTime, endTime } = scan || {};
const { state, message } = status || {};

Expand All @@ -126,9 +127,13 @@ const TabAssetScanDetails = ({ data }) => {
Asset
</Title>
<TitleValueDisplayRow>
<TitleValueDisplay title="Name">{instanceID}</TitleValueDisplay>
<TitleValueDisplay title="Name">
{getAssetName(assetInfo)}
</TitleValueDisplay>
<TitleValueDisplay title="Type">{objectType}</TitleValueDisplay>
<TitleValueDisplay title="Location">{location}</TitleValueDisplay>
<TitleValueDisplay title="Location">
{location || repoDigests?.[0] || image.repoDigests?.[0]}
</TitleValueDisplay>
</TitleValueDisplayRow>
<Title
medium
Expand Down
3 changes: 2 additions & 1 deletion ui/src/layout/Assets/AssetsForFindingTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ const AssetsForFindingTable = (props) => {
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",
Expand Down
4 changes: 3 additions & 1 deletion ui/src/layout/Assets/AssetsTable.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions ui/src/layout/Scans/ConfigurationReadOnlyDisplay.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => (
<div
Expand Down Expand Up @@ -43,7 +43,7 @@ const ConfigurationReadOnlyDisplay = ({ configData }) => {
<TitleValueDisplayRow>
<TitleValueDisplay title="Scope">{scope}</TitleValueDisplay>
<TitleValueDisplay title="Maximum parallel scans">
{maxParallelScanners}
{formatNumber(maxParallelScanners)}
</TitleValueDisplay>
</TitleValueDisplayRow>
<Title medium>Asset Scan Configuration</Title>
Expand Down Expand Up @@ -76,7 +76,7 @@ export const ScanReadOnlyDisplay = ({ scanData }) => {
<TitleValueDisplayRow>
<TitleValueDisplay title="Scope">{scope}</TitleValueDisplay>
<TitleValueDisplay title="Maximum parallel scans">
{maxParallelScanners}
{formatNumber(maxParallelScanners)}
</TitleValueDisplay>
</TitleValueDisplayRow>
<Title medium>Asset Scan Configuration</Title>
Expand Down
Loading