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

Jump to bottom

feat(dashboard): add vuln / non-vuln footer to projects and components cards #714

Merged
merged 2 commits into from
Jan 30, 2024
Merged

feat(dashboard): add vuln / non-vuln footer to projects and components cards #714

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
23c0719
feat(dashboard): add vuln / non-vuln footer to projects and component…
setchy Jan 29, 2024
2b4b4f2
feat(dashboard): add vuln / non-vuln footer to projects and component…
setchy Jan 29, 2024
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: 4 additions & 0 deletions src/assets/scss/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ $severity-label-bg: $grey-900 !default;
$notification-fail: $red;
$notification-warn: $yellow;
$notification-info: $blue;
$notification-pass: $green;
$notification-note: #777777;

// Components
//
Expand Down Expand Up @@ -231,6 +233,8 @@ $recessed: $grey-850;
--notification-fail: #{$notification-fail};
--notification-warn: #{$notification-warn};
--notification-info: #{$notification-info};
--notification-pass: #{$notification-pass};
--notification-note: #{$notification-note};

--component-active-color: #{$component-active-color};

Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
"fsf_libre": "FSF Libre",
"total": "Total",
"vulnerable": "Vulnerable",
"non_vulnerable": "Non Vulnerable",
"portfolio_statistics": "Portfolio Statistics",
"suppress": "Suppress",
"suppressed": "Suppressed",
Expand Down
52 changes: 44 additions & 8 deletions src/views/Dashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<b-row class="text-center">
<b-col class="mb-sm-2 mb-0">
<div class="text-muted">{{ $t('message.vulnerable_projects') }}</div>
<strong>{{vulnerableProjects}} ({{vulnerableProjectPercent}}%)</strong>
<b-progress height={} class="progress-xs mt-2 status-passed" :precision="1" v-bind:value="vulnerableProjectPercent"></b-progress>
<strong>{{vulnerableProjects}} ({{vulnerableProjectsPercent}}%)</strong>
<b-progress height={} class="progress-xs mt-2 status-passed" :precision="1" v-bind:value="vulnerableProjectsPercent"></b-progress>
</b-col>
<b-col class="mb-sm-2 mb-0 d-md-down-none">
<div class="text-muted">{{ $t('message.violations_audited') }}</div>
Expand All @@ -27,8 +27,8 @@
</b-col>
<b-col class="mb-sm-2 mb-0">
<div class="text-muted">{{ $t('message.vulnerable_components') }}</div>
<strong>{{vulnerableComponents}} ({{vulnerableComponentPercent}}%)</strong>
<b-progress height={} class="progress-xs mt-2 status-warning" :precision="1" v-bind:value="vulnerableComponentPercent"></b-progress>
<strong>{{vulnerableComponents}} ({{vulnerableComponentsPercent}}%)</strong>
<b-progress height={} class="progress-xs mt-2 status-warning" :precision="1" v-bind:value="vulnerableComponentsPercent"></b-progress>
</b-col>
<b-col class="mb-sm-2 mb-0">
<div class="text-muted">{{ $t('message.findings_audited') }}</div>
Expand Down Expand Up @@ -96,6 +96,20 @@
</b-col>
</b-row>
<chart-project-vulnerabilities ref="chartProjectVulnerabilities" chartId="chartProjectVulnerabilities" class="chart-wrapper" style="height:200px;margin-top:40px;" :height="200"></chart-project-vulnerabilities>
<div slot="footer">
<b-row class="text-center">
<b-col class="mb-sm-2 mb-0">
<div class="text-muted">{{ $t("message.non_vulnerable") }}</div>
<strong>{{ nonVulnerableProjects }} ({{ nonVulnerableProjectsPercent }}%)</strong>
<b-progress height="{}" class="progress-xs mt-2 status-passed" :precision="1" v-bind:value="nonVulnerableProjectsPercent"></b-progress>
</b-col>
<b-col class="mb-sm-2 mb-0">
<div class="text-muted">{{ $t("message.vulnerable") }}</div>
<strong>{{ vulnerableProjects }} ({{ vulnerableProjectsPercent }}%)</strong>
<b-progress height="{}" class="progress-xs mt-2 status-warning" :precision="1" v-bind:value="vulnerableProjectsPercent"></b-progress>
</b-col>
</b-row>
</div>
</b-card>
</b-col>
<b-col sm="6">
Expand All @@ -108,6 +122,20 @@
</b-col>
</b-row>
<chart-component-vulnerabilities ref="chartComponentVulnerabilities" chartId="chartComponentVulnerabilities" class="chart-wrapper" style="height:200px;margin-top:40px;" :height="200"></chart-component-vulnerabilities>
<div slot="footer">
<b-row class="text-center">
<b-col class="mb-sm-2 mb-0">
<div class="text-muted">{{ $t("message.non_vulnerable") }}</div>
<strong>{{ nonVulnerableComponents }} ({{ nonVulnerableComponentsPercent }}%)</strong>
<b-progress height="{}" class="progress-xs mt-2 status-passed" :precision="1" v-bind:value="nonVulnerableComponentsPercent"></b-progress>
</b-col>
<b-col class="mb-sm-2 mb-0">
<div class="text-muted">{{ $t("message.vulnerable") }}</div>
<strong>{{ vulnerableComponents }} ({{ vulnerableComponentsPercent }}%)</strong>
<b-progress height="{}" class="progress-xs mt-2 status-warning" :precision="1" v-bind:value="vulnerableComponentsPercent"></b-progress>
</b-col>
</b-row>
</div>
</b-card>
</b-col>
</b-row>
Expand Down Expand Up @@ -183,11 +211,15 @@
return {
totalProjects: 0,
vulnerableProjects: 0,
vulnerableProjectPercent: 0,
vulnerableProjectsPercent: 0,
nonVulnerableProjects: 0,
nonVulnerableProjectsPercent: 0,

totalComponents: 0,
vulnerableComponents: 0,
vulnerableComponentPercent: 0,
vulnerableComponentsPercent: 0,
nonVulnerableComponents: 0,
nonVulnerableComponentsPercent: 0,

totalFindings: 0,
auditedFindings: 0,
Expand Down Expand Up @@ -216,11 +248,15 @@
let metric = metrics[metrics.length - 1]; //Use the most recent metric
this.totalProjects = common.valueWithDefault(metric.projects, "0");
this.vulnerableProjects = common.valueWithDefault(metric.vulnerableProjects, "0");
this.vulnerableProjectPercent = common.calcProgressPercent(this.totalProjects, this.vulnerableProjects);
this.vulnerableProjectsPercent = common.calcProgressPercent(this.totalProjects, this.vulnerableProjects);
this.nonVulnerableProjects = this.totalProjects - this.vulnerableProjects;
this.nonVulnerableProjectsPercent = common.calcProgressPercent(this.totalProjects, this.nonVulnerableProjects);

this.totalComponents = common.valueWithDefault(metric.components, "0");
this.vulnerableComponents = common.valueWithDefault(metric.vulnerableComponents, "0");
this.vulnerableComponentPercent = common.calcProgressPercent(this.totalComponents, this.vulnerableComponents);
this.vulnerableComponentsPercent = common.calcProgressPercent(this.totalComponents, this.vulnerableComponents);
this.nonVulnerableComponents = this.totalComponents - this.vulnerableComponents;
this.nonVulnerableComponentsPercent = common.calcProgressPercent(this.totalComponents, this.nonVulnerableComponents);

this.totalFindings = common.valueWithDefault(metric.findingsTotal, "0");
this.auditedFindings = common.valueWithDefault(metric.findingsAudited, "0");
Expand Down
15 changes: 13 additions & 2 deletions src/views/dashboard/ChartComponentVulnerabilities.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,26 @@
},
methods: {
render: function(metrics) {
const totalStyle = getStyle('--severity-unassigned');
const affectedStyle = getStyle('--severity-info');
const totalStyle = getStyle('--notification-note');
const affectedStyle = getStyle('--notification-warn');
const nonAffectedStyle = getStyle('--notification-pass');

let labels = [];
let totalData = [];
let affectedData = [];
let nonAffectedData = [];

for (let i = 0; i < metrics.length; i++) {
labels.push(common.formatTimestamp(metrics[i].firstOccurrence));
totalData.push(metrics[i].components);
affectedData.push(metrics[i].vulnerableComponents);
nonAffectedData.push(metrics[i].components - metrics[i].vulnerableComponents)

if (i === metrics.length - 1) {
labels.push(common.formatTimestamp(metrics[i].lastOccurrence));
totalData.push(metrics[i].components);
affectedData.push(metrics[i].vulnerableComponents);
nonAffectedData.push(metrics[i].components - metrics[i].vulnerableComponents)
}
}

Expand All @@ -40,6 +44,13 @@
pointHoverBackgroundColor: '#fff',
data: totalData
},
{
label: this.$t('message.non_vulnerable'),
backgroundColor: hexToRgba(nonAffectedStyle, 10),
borderColor: nonAffectedStyle,
pointHoverBackgroundColor: '#fff',
data: nonAffectedData
},
{
label: this.$t('message.vulnerable'),
backgroundColor: hexToRgba(affectedStyle, 10),
Expand Down
15 changes: 13 additions & 2 deletions src/views/dashboard/ChartProjectVulnerabilities.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,26 @@
},
methods: {
render: function(metrics) {
const totalStyle = getStyle('--severity-unassigned');
const affectedStyle = getStyle('--severity-info');
const totalStyle = getStyle('--notification-note');
const affectedStyle = getStyle('--notification-warn');
const nonAffectedStyle = getStyle('--notification-pass');

let labels = [];
let totalData = [];
let affectedData = [];
let nonAffectedData = [];

for (let i = 0; i < metrics.length; i++) {
labels.push(common.formatTimestamp(metrics[i].firstOccurrence));
totalData.push(metrics[i].projects);
affectedData.push(metrics[i].vulnerableProjects);
nonAffectedData.push(metrics[i].projects - metrics[i].vulnerableProjects)

if (i === metrics.length - 1) {
labels.push(common.formatTimestamp(metrics[i].lastOccurrence));
totalData.push(metrics[i].projects);
affectedData.push(metrics[i].vulnerableProjects);
nonAffectedData.push(metrics[i].projects - metrics[i].vulnerableProjects)
}
}

Expand All @@ -40,6 +44,13 @@
pointHoverBackgroundColor: '#fff',
data: totalData
},
{
label: this.$t('message.non_vulnerable'),
backgroundColor: hexToRgba(nonAffectedStyle, 10),
borderColor: nonAffectedStyle,
pointHoverBackgroundColor: '#fff',
data: nonAffectedData
},
{
label: this.$t('message.vulnerable'),
backgroundColor: hexToRgba(affectedStyle, 10),
Expand Down