Skip to content

Commit

Permalink
Merge pull request #1152 from Rudra-Garg/issue-#1142
Browse files Browse the repository at this point in the history
  • Loading branch information
@nscuro
nscuro authored Feb 1, 2025
2 parents b0a55cf + c9f67c4 commit d7174e0
Show file tree
Hide file tree
Showing 11 changed files with 141 additions and 18 deletions.
17 changes: 15 additions & 2 deletions src/views/dashboard/ChartAuditingFindingsProgress.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ export default {
let collectionLogicChangedData = [];
for (let i = 0; i < metrics.length; i++) {
labels.push(common.formatTimestamp(metrics[i].firstOccurrence));
labels.push(metrics[i].firstOccurrence);
totalData.push(metrics[i].findingsTotal);
auditedData.push(metrics[i].findingsAudited);
collectionLogicChangedData.push(metrics[i].collectionLogicChanged);
if (i === metrics.length - 1) {
labels.push(common.formatTimestamp(metrics[i].lastOccurrence));
labels.push(metrics[i].lastOccurrence);
totalData.push(metrics[i].findingsTotal);
auditedData.push(metrics[i].findingsAudited);
}
Expand Down Expand Up @@ -86,6 +86,12 @@ export default {
chart.data.datasets[tooltipItem.datasetIndex].borderColor,
};
},
title: function (tooltipItems, data) {
return common.formatTimestamp(
data.labels[tooltipItems[0].index],
true,
);
},
},
},
maintainAspectRatio: false,
Expand All @@ -98,6 +104,13 @@ export default {
gridLines: {
drawOnChartArea: false,
},
ticks: {
callback: function (value, index) {
return common.formatTimestamp(
this.chart.data.labels[index],
);
},
},
},
],
yAxes: [
Expand Down
17 changes: 15 additions & 2 deletions src/views/dashboard/ChartAuditingViolationsProgress.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ export default {
let collectionLogicChangedData = [];
for (let i = 0; i < metrics.length; i++) {
labels.push(common.formatTimestamp(metrics[i].firstOccurrence));
labels.push(metrics[i].firstOccurrence);
totalData.push(metrics[i].policyViolationsTotal);
auditedData.push(metrics[i].policyViolationsAudited);
collectionLogicChangedData.push(metrics[i].collectionLogicChanged);
if (i === metrics.length - 1) {
labels.push(common.formatTimestamp(metrics[i].lastOccurrence));
labels.push(metrics[i].lastOccurrence);
totalData.push(metrics[i].policyViolationsTotal);
auditedData.push(metrics[i].policyViolationsAudited);
}
Expand Down Expand Up @@ -86,6 +86,12 @@ export default {
chart.data.datasets[tooltipItem.datasetIndex].borderColor,
};
},
title: function (tooltipItems, data) {
return common.formatTimestamp(
data.labels[tooltipItems[0].index],
true,
);
},
},
},
maintainAspectRatio: false,
Expand All @@ -98,6 +104,13 @@ export default {
gridLines: {
drawOnChartArea: false,
},
ticks: {
callback: function (value, index) {
return common.formatTimestamp(
this.chart.data.labels[index],
);
},
},
},
],
yAxes: [
Expand Down
17 changes: 15 additions & 2 deletions src/views/dashboard/ChartComponentVulnerabilities.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default {
let collectionLogicChangedData = [];
for (let i = 0; i < metrics.length; i++) {
labels.push(common.formatTimestamp(metrics[i].firstOccurrence));
labels.push(metrics[i].firstOccurrence);
totalData.push(metrics[i].components);
affectedData.push(metrics[i].vulnerableComponents);
nonAffectedData.push(
Expand All @@ -34,7 +34,7 @@ export default {
collectionLogicChangedData.push(metrics[i].collectionLogicChanged);
if (i === metrics.length - 1) {
labels.push(common.formatTimestamp(metrics[i].lastOccurrence));
labels.push(metrics[i].lastOccurrence);
totalData.push(metrics[i].components);
affectedData.push(metrics[i].vulnerableComponents);
nonAffectedData.push(
Expand Down Expand Up @@ -101,6 +101,12 @@ export default {
chart.data.datasets[tooltipItem.datasetIndex].borderColor,
};
},
title: function (tooltipItems, data) {
return common.formatTimestamp(
data.labels[tooltipItems[0].index],
true,
);
},
},
},
maintainAspectRatio: false,
Expand All @@ -113,6 +119,13 @@ export default {
gridLines: {
drawOnChartArea: false,
},
ticks: {
callback: function (value, index) {
return common.formatTimestamp(
this.chart.data.labels[index],
);
},
},
},
],
yAxes: [
Expand Down
17 changes: 15 additions & 2 deletions src/views/dashboard/ChartPolicyViolationsClassification.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ export default {
let operationalData = [];
let licenseData = [];
for (let i = 0; i < metrics.length; i++) {
labels.push(common.formatTimestamp(metrics[i].firstOccurrence));
labels.push(metrics[i].firstOccurrence);
securityData.push(metrics[i].policyViolationsSecurityTotal);
operationalData.push(metrics[i].policyViolationsOperationalTotal);
licenseData.push(metrics[i].policyViolationsLicenseTotal);
if (i === metrics.length - 1) {
labels.push(common.formatTimestamp(metrics[i].lastOccurrence));
labels.push(metrics[i].lastOccurrence);
securityData.push(metrics[i].policyViolationsSecurityTotal);
operationalData.push(metrics[i].policyViolationsOperationalTotal);
licenseData.push(metrics[i].policyViolationsLicenseTotal);
Expand Down Expand Up @@ -70,6 +70,12 @@ export default {
chart.data.datasets[tooltipItem.datasetIndex].borderColor,
};
},
title: function (tooltipItems, data) {
return common.formatTimestamp(
data.labels[tooltipItems[0].index],
true,
);
},
},
},
maintainAspectRatio: false,
Expand All @@ -82,6 +88,13 @@ export default {
gridLines: {
drawOnChartArea: false,
},
ticks: {
callback: function (value, index) {
return common.formatTimestamp(
this.chart.data.labels[index],
);
},
},
},
],
yAxes: [
Expand Down
17 changes: 15 additions & 2 deletions src/views/dashboard/ChartPolicyViolationsState.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ export default {
let collectionLogicChangedData = [];
for (let i = 0; i < metrics.length; i++) {
labels.push(common.formatTimestamp(metrics[i].firstOccurrence));
labels.push(metrics[i].firstOccurrence);
failData.push(metrics[i].policyViolationsFail);
warnData.push(metrics[i].policyViolationsWarn);
infoData.push(metrics[i].policyViolationsInfo);
collectionLogicChangedData.push(metrics[i].collectionLogicChanged);
if (i === metrics.length - 1) {
labels.push(common.formatTimestamp(metrics[i].lastOccurrence));
labels.push(metrics[i].lastOccurrence);
failData.push(metrics[i].policyViolationsFail);
warnData.push(metrics[i].policyViolationsWarn);
infoData.push(metrics[i].policyViolationsInfo);
Expand Down Expand Up @@ -97,6 +97,12 @@ export default {
chart.data.datasets[tooltipItem.datasetIndex].borderColor,
};
},
title: function (tooltipItems, data) {
return common.formatTimestamp(
data.labels[tooltipItems[0].index],
true,
);
},
},
},
maintainAspectRatio: false,
Expand All @@ -109,6 +115,13 @@ export default {
gridLines: {
drawOnChartArea: false,
},
ticks: {
callback: function (value, index) {
return common.formatTimestamp(
this.chart.data.labels[index],
);
},
},
},
],
yAxes: [
Expand Down
17 changes: 15 additions & 2 deletions src/views/dashboard/ChartPortfolioVulnerabilities.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default {
let collectionLogicChangedData = [];
for (let i = 0; i < metrics.length; i++) {
labels.push(common.formatTimestamp(metrics[i].firstOccurrence));
labels.push(metrics[i].firstOccurrence);
criticalData.push(metrics[i].critical);
highData.push(metrics[i].high);
mediumData.push(metrics[i].medium);
Expand All @@ -38,7 +38,7 @@ export default {
collectionLogicChangedData.push(metrics[i].collectionLogicChanged);
if (i === metrics.length - 1) {
labels.push(common.formatTimestamp(metrics[i].lastOccurrence));
labels.push(metrics[i].lastOccurrence);
criticalData.push(metrics[i].critical);
highData.push(metrics[i].high);
mediumData.push(metrics[i].medium);
Expand Down Expand Up @@ -119,6 +119,12 @@ export default {
chart.data.datasets[tooltipItem.datasetIndex].borderColor,
};
},
title: function (tooltipItems, data) {
return common.formatTimestamp(
data.labels[tooltipItems[0].index],
true,
);
},
},
},
maintainAspectRatio: false,
Expand All @@ -131,6 +137,13 @@ export default {
gridLines: {
drawOnChartArea: false,
},
ticks: {
callback: function (value, index) {
return common.formatTimestamp(
this.chart.data.labels[index],
);
},
},
},
],
yAxes: [
Expand Down
17 changes: 15 additions & 2 deletions src/views/dashboard/ChartProjectVulnerabilities.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ export default {
let nonAffectedData = [];
for (let i = 0; i < metrics.length; i++) {
labels.push(common.formatTimestamp(metrics[i].firstOccurrence));
labels.push(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));
labels.push(metrics[i].lastOccurrence);
totalData.push(metrics[i].projects);
affectedData.push(metrics[i].vulnerableProjects);
nonAffectedData.push(
Expand Down Expand Up @@ -79,6 +79,12 @@ export default {
chart.data.datasets[tooltipItem.datasetIndex].borderColor,
};
},
title: function (tooltipItems, data) {
return common.formatTimestamp(
data.labels[tooltipItems[0].index],
true,
);
},
},
},
maintainAspectRatio: false,
Expand All @@ -91,6 +97,13 @@ export default {
gridLines: {
drawOnChartArea: false,
},
ticks: {
callback: function (value, index) {
return common.formatTimestamp(
this.chart.data.labels[index],
);
},
},
},
],
yAxes: [
Expand Down
10 changes: 9 additions & 1 deletion src/views/dashboard/WidgetInheritedRiskScore.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default {
let chartLabels = [];
let chartData = [];
for (let i = 0; i < metrics.length; i++) {
chartLabels.push(common.formatTimestamp(metrics[i].firstOccurrence));
chartLabels.push(metrics[i].firstOccurrence); // Store raw timestamp
chartData.push(metrics[i].inheritedRiskScore);
}
Expand All @@ -39,6 +39,14 @@ export default {
tooltips: {
enabled: false,
custom: CustomTooltips,
callbacks: {
title: function (tooltipItems, data) {
return common.formatTimestamp(
data.labels[tooltipItems[0].index],
true,
);
},
},
},
maintainAspectRatio: false,
legend: {
Expand Down
10 changes: 9 additions & 1 deletion src/views/dashboard/WidgetPortfolioVulnerabilities.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default {
let chartLabels = [];
let chartData = [];
for (let i = 0; i < metrics.length; i++) {
chartLabels.push(common.formatTimestamp(metrics[i].firstOccurrence));
chartLabels.push(metrics[i].firstOccurrence);
chartData.push(metrics[i].vulnerabilities);
}
Expand All @@ -39,6 +39,14 @@ export default {
tooltips: {
enabled: false,
custom: CustomTooltips,
callbacks: {
title: function (tooltipItems, data) {
return common.formatTimestamp(
data.labels[tooltipItems[0].index],
true,
);
},
},
},
maintainAspectRatio: false,
legend: {
Expand Down
10 changes: 9 additions & 1 deletion src/views/dashboard/WidgetProjectsAtRisk.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default {
let chartLabels = [];
let chartData = [];
for (let i = 0; i < metrics.length; i++) {
chartLabels.push(common.formatTimestamp(metrics[i].firstOccurrence));
chartLabels.push(metrics[i].firstOccurrence); // Store raw timestamp
chartData.push(metrics[i].vulnerableProjects);
}
Expand All @@ -39,6 +39,14 @@ export default {
tooltips: {
enabled: false,
custom: CustomTooltips,
callbacks: {
title: function (tooltipItems, data) {
return common.formatTimestamp(
data.labels[tooltipItems[0].index],
true,
);
},
},
},
maintainAspectRatio: false,
legend: {
Expand Down
Loading

0 comments on commit d7174e0

Please sign in to comment.