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

chore: two minor ui changes #2339

Merged
merged 1 commit into from
Dec 12, 2024
Merged

chore: two minor ui changes #2339

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
4 changes: 2 additions & 2 deletions frontend/src/core/observations/ObservationReviewList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,14 +254,14 @@ const ObservationsReviewList = ({ product }: ObservationsReviewListProps) => {
{(!product || (product && product.has_cloud_resource)) && (
<TextField
source="origin_cloud_qualified_resource"
label="Cloud resource"
label="Cloud res."
sx={{ wordBreak: "break-word" }}
/>
)}
{(!product || (product && product.has_kubernetes_resource)) && (
<TextField
source="origin_kubernetes_qualified_resource"
label="Kubernetes resource"
label="Kube. res."
sx={{ wordBreak: "break-word" }}
/>
)}
Expand Down
16 changes: 7 additions & 9 deletions frontend/src/core/observations/ObservationShowHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,19 +60,18 @@ const ObservationShowHeader = ({ observation }: ObservationShowHeaderProps) => {
<Labeled>
<SeverityField label="Severity" source="current_severity" />
</Labeled>
{!in_observation_log &&
observation.parser_severity != "" &&
{observation.parser_severity != "" &&
(observation.rule_severity != "" || observation.assessment_severity != "") && (
<Labeled>
<TextField source="parser_severity" />
</Labeled>
)}
{!in_observation_log && observation.rule_severity != "" && (
{observation.rule_severity != "" && (
<Labeled>
<TextField source="rule_severity" />
</Labeled>
)}
{!in_observation_log && observation.assessment_severity != "" && (
{observation.assessment_severity != "" && (
<Labeled>
<TextField source="assessment_severity" />
</Labeled>
Expand All @@ -82,26 +81,25 @@ const ObservationShowHeader = ({ observation }: ObservationShowHeaderProps) => {
<Labeled>
<ChipField source="current_status" label="Status" />
</Labeled>
{!in_observation_log &&
observation.parser_status != "" &&
{observation.parser_status != "" &&
(observation.rule_status != "" ||
observation.assessment_status != "" ||
observation.vex_status != "") && (
<Labeled>
<TextField source="parser_status" />
</Labeled>
)}
{!in_observation_log && observation.vex_status != "" && (
{observation.vex_status != "" && (
<Labeled label="VEX status">
<TextField source="vex_status" />
</Labeled>
)}
{!in_observation_log && observation.rule_status != "" && (
{observation.rule_status != "" && (
<Labeled>
<TextField source="rule_status" />
</Labeled>
)}
{!in_observation_log && observation.assessment_status != "" && (
{observation.assessment_status != "" && (
<Labeled>
<TextField source="assessment_status" />
</Labeled>
Expand Down
Loading