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.

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

Update the style for severity #19525

Merged
merged 1 commit into from
Nov 2, 2023
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
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,7 @@
.min-width {
min-width: 9rem !important;
}

.label {
min-width: 3rem;
}
Original file line number Diff line number Diff line change
Expand Up @@ -93,3 +93,12 @@ export function getRepoLink(proId: number | string, repoName: string): any {
}

export const CVSS3_REG = /^([0-9]|10)(\.\d)?$/;

export enum SeverityColors {
CRITICAL = '#FF4D2E',
HIGH = '#FF8F3D',
MEDIUM = '#FFCE66',
LOW = '#FFF1AD',
NONE = '#2EC0FF',
NA = 'gray',
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
} from '@angular/core';
import { DangerousArtifact } from '../../../../../../../ng-swagger-gen/models/dangerous-artifact';
import * as echarts from 'echarts/core';
import { SeverityColors } from '../security-hub.interface';
import { TranslateService } from '@ngx-translate/core';

@Component({
selector: 'app-single-bar',
Expand All @@ -23,6 +25,8 @@
@ViewChild('container', { static: true })
container: ElementRef;

constructor(private translate: TranslateService) {}

ngOnChanges(changes: SimpleChanges) {
if (changes && changes['dangerousArtifact']) {
this.initChart();
Expand All @@ -31,74 +35,87 @@

initChart() {
const chart = echarts.init(this.container.nativeElement);
chart.setOption({
color: ['red', '#e64524', 'orange'],
title: {
text: '',
},
tooltip: {
formatter: '{b}: {c}',
textStyle: {
fontSize: '12px',
whiteSpace: 'nowrap',
const [severity, c, h, m] = [

Check warning on line 38 in src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability-database/single-bar/single-bar.component.ts

View check run for this annotation

Codecov / codecov/patch

src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability-database/single-bar/single-bar.component.ts#L38

Added line #L38 was not covered by tests
'VULNERABILITY.GRID.COLUMN_SEVERITY',
'VULNERABILITY.SEVERITY.CRITICAL',
'VULNERABILITY.SEVERITY.HIGH',
'VULNERABILITY.SEVERITY.MEDIUM',
];
this.translate.get([severity, c, h, m]).subscribe(res => {
chart.setOption({

Check warning on line 45 in src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability-database/single-bar/single-bar.component.ts

View check run for this annotation

Codecov / codecov/patch

src/portal/src/app/base/left-side-nav/interrogation-services/vulnerability-database/single-bar/single-bar.component.ts#L44-L45

Added lines #L44 - L45 were not covered by tests
color: [
SeverityColors.CRITICAL,
SeverityColors.HIGH,
SeverityColors.MEDIUM,
],
title: {
text: '',
},
},
legend: {
show: false,
},
series: [
{
type: 'pie',
radius: '65%',
name: 'Severity',
// adjust the start angle
startAngle: 180,
itemStyle: {
borderRadius: 2,
borderWidth: 1,
},
labelLine: {
show: false,
tooltip: {
formatter: '{b}: {c}',
textStyle: {
fontSize: '12px',
whiteSpace: 'nowrap',
},
label: {
show: true,
position: 'inside',
formatter: '{c}',
fontSize: '9px',
},
data: [
{
name: 'Critical',
value: this.dangerousArtifact?.critical_cnt || 0,
},
legend: {
show: false,
},
series: [
{
type: 'pie',
radius: '65%',
name: res[severity],
// adjust the start angle
startAngle: 180,
itemStyle: {
borderRadius: 2,
borderWidth: 1,
},
{
name: 'High',
value: this.dangerousArtifact?.high_cnt || 0,
labelLine: {
show: false,
},
{
name: 'Medium',
value: this.dangerousArtifact?.medium_cnt || 0,
label: {
show: true,
position: 'inside',
formatter: '{c}',
fontSize: '9px',
},
{
// make a record to fill the bottom 50%
value:
this.dangerousArtifact?.critical_cnt +
this.dangerousArtifact?.high_cnt +
this.dangerousArtifact?.medium_cnt || 0,
itemStyle: {
// stop the chart from rendering this piece
color: 'none',
decal: {
symbol: 'none',
},
data: [
{
name: res[c],
value:
this.dangerousArtifact?.critical_cnt || 0,
},
label: {
show: false,
{
name: res[h],
value: this.dangerousArtifact?.high_cnt || 0,
},
},
],
},
],
{
name: res[m],
value: this.dangerousArtifact?.medium_cnt || 0,
},
{
// make a record to fill the bottom 50%
value:
this.dangerousArtifact?.critical_cnt +
this.dangerousArtifact?.high_cnt +
this.dangerousArtifact?.medium_cnt || 0,
itemStyle: {
// stop the chart from rendering this piece
color: 'none',
decal: {
symbol: 'none',
},
},
label: {
show: false,
},
},
],
},
],
});
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,7 @@ $row-height: 48px;
display: flex;
align-items: center;
}

.label {
min-width: 3rem;
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@ import {
import { SecurityhubService } from '../../../../../../../ng-swagger-gen/services/securityhub.service';
import { SecuritySummary } from '../../../../../../../ng-swagger-gen/models/security-summary';
import { MessageHandlerService } from '../../../../../shared/services/message-handler.service';
import { getDigestLink, severityText, VUL_ID } from '../security-hub.interface';
import {
getDigestLink,
SeverityColors,
severityText,
VUL_ID,
} from '../security-hub.interface';
import { HAS_STYLE_MODE, StyleMode } from '../../../../../services/theme';
import { Subscription } from 'rxjs';
import {
Expand Down Expand Up @@ -97,7 +102,14 @@ export class VulnerabilitySummaryComponent implements OnInit, OnDestroy {
];
this.translate.get([severity, c, h, m, l, n, u]).subscribe(res => {
this.chart.setOption({
color: ['red', '#e64524', 'orange', '#007CBB', 'grey', 'green'],
color: [
SeverityColors.CRITICAL,
SeverityColors.HIGH,
SeverityColors.MEDIUM,
SeverityColors.LOW,
SeverityColors.NA,
SeverityColors.NONE,
],
title: {
text: '',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,7 @@
.mt-5px {
margin-top: 5px;
}

.label {
min-width: 3rem;
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import { BuildHistoryComponent } from './artifact-additions/build-history/build-
import { ArtifactVulnerabilitiesComponent } from './artifact-additions/artifact-vulnerabilities/artifact-vulnerabilities.component';
import { ArtifactDefaultService, ArtifactService } from './artifact.service';
import { ArtifactDetailRoutingResolverService } from '../../../../services/routing-resolvers/artifact-detail-routing-resolver.service';
import { ResultTipComponent } from './vulnerability-scanning/result-tip.component';
import { ResultBarChartComponent } from './vulnerability-scanning/result-bar-chart.component';
import { ResultTipHistogramComponent } from './vulnerability-scanning/result-tip-histogram/result-tip-histogram.component';
import { HistogramChartComponent } from './vulnerability-scanning/histogram-chart/histogram-chart.component';
Expand Down Expand Up @@ -80,7 +79,6 @@ const routes: Routes = [
DependenciesComponent,
BuildHistoryComponent,
ArtifactVulnerabilitiesComponent,
ResultTipComponent,
ResultBarChartComponent,
ResultTipHistogramComponent,
HistogramChartComponent,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { ResultBarChartComponent } from './result-bar-chart.component';
import { ResultTipComponent } from './result-tip.component';
import { ResultTipHistogramComponent } from './result-tip-histogram/result-tip-histogram.component';
import { HistogramChartComponent } from './histogram-chart/histogram-chart.component';
import {
Expand Down Expand Up @@ -35,7 +34,6 @@ describe('ResultBarChartComponent (inline template)', () => {
imports: [SharedTestingModule],
declarations: [
ResultBarChartComponent,
ResultTipComponent,
ResultTipHistogramComponent,
HistogramChartComponent,
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,21 +125,10 @@ $twenty-two-pixel: 18px;
}
}

.label.label-medium {
background-color: #ffe4a9;
border: 1px solid orange;
color: orange;
}

.tip-icon-medium {
color: orange;
}

.label.label-low {
background: rgb(251 255 0 / 38%);
color: #c5c50b;
border: 1px solid #e6e63f;
}

.tip-icon-low {
color: #007CBB;
Expand Down Expand Up @@ -178,30 +167,6 @@ hr {
margin-left: 3px;
}

.shadow-critical {
box-shadow: 1px -1px 1px red;
}

.shadow-high {
box-shadow: 1px -1px 1px #e64524;
}

.shadow-medium {
box-shadow: 1px -1px 1px orange;
}

.shadow-low {
box-shadow: 1px -1px 1px #007CBB;
}

.shadow-none {
box-shadow: 1px -1px 1px green;
}

.shadow-unknown {
box-shadow: 1px -1px 1px gray;
}

.w-360 {
width: 360px !important;
}
Expand Down Expand Up @@ -248,23 +213,23 @@ hr {
}

.level-critical {
background:red;
color:red;
background:#FF4D2E;
color:#FF4D2E;
}

.level-high {
background:#e64524;
color:#e64524;
background:#FF8F3D;
color:#FF8F3D;
}

.level-medium {
background-color: orange;
color:orange;
background-color: #FFCE66;
color:#FFCE66;
}

.level-low {
background: #007CBB;
color:#007CBB;
background: #FFF1AD;
color:#FFF1AD;
}

.level-none {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
VULNERABILITY_SEVERITY,
} from '../../../../../../shared/units/utils';
import { HAS_STYLE_MODE, StyleMode } from '../../../../../../services/theme';
import { SeverityColors } from '../../../../../left-side-nav/interrogation-services/vulnerability-database/security-hub.interface';

const MIN = 60;
const MIN_STR = 'min ';
Expand Down Expand Up @@ -229,27 +230,27 @@ export class ResultTipHistogramComponent implements OnInit {
{
text: 'VULNERABILITY.SEVERITY.CRITICAL',
value: this.criticalCount ? this.criticalCount : 0,
color: 'red',
color: SeverityColors.CRITICAL,
},
{
text: 'VULNERABILITY.SEVERITY.HIGH',
value: this.highCount ? this.highCount : 0,
color: '#e64524',
color: SeverityColors.HIGH,
},
{
text: 'VULNERABILITY.SEVERITY.MEDIUM',
value: this.mediumCount ? this.mediumCount : 0,
color: 'orange',
color: SeverityColors.MEDIUM,
},
{
text: 'VULNERABILITY.SEVERITY.LOW',
value: this.lowCount ? this.lowCount : 0,
color: '#007CBB',
color: SeverityColors.LOW,
},
{
text: 'VULNERABILITY.SEVERITY.NONE',
value: this.noneCount ? this.noneCount : 0,
color: 'grey',
color: SeverityColors.NA,
},
];
}
Expand Down
Loading
Loading