MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

chg: [graph.js] Updated to version 4.1.1

pull/8826/head
Sami Mokaddem 2022-12-20 13:02:32 +01:00
parent 4c3bceec70
commit ba533e9b3d
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
4 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/View/Elements/view_event_distribution_graph.ctp
View File

@ -1,7 +1,7 @@
<div id="distribution_graph_container">
<div class="loadingPopover">
<div class="spinner"></div>
<div class="loadingText"><?php echo __('Loading');?></div>
<div class="loadingText"><?php echo __('Loading'); ?></div>
</div>
<div id="eventdistri_graph" data-event-id="<?php echo h($event['Event']['id']); ?>" data-event-distribution="<?php echo h($event['Event']['distribution']); ?>" data-event-distribution-text="<?php echo $event['Event']['distribution'] == 4 ? h($event['SharingGroup']['name']) : h($distributionLevels[$event['Event']['distribution']]); ?>" data-user-manipulation="<?php echo $mayModify || $isSiteAdmin ? 'true' : 'false'; ?>" data-extended="<?php echo $extended; ?>">

12
app/webroot/css/distribution-graph.css
View File

@ -62,6 +62,12 @@ label.center-in-network-header {
#eventdistri_graph {
position: relative;
height: 290px;
width: 400px;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column-reverse;
}
#eventdistri_pb_container {
@ -71,13 +77,11 @@ label.center-in-network-header {
#eventdistri_pb_background {
width: 400px;
display: flex;
display: flex;
}
.distribution_checkboxes_dataset {
position: absolute;
width: 100%;
display: inline-block;
margin-top: 0.5em;
}
.distribution_checkboxes_dataset label {
margin-bottom: 0px;

11
app/webroot/js/Chart.min.js vendored
View File

File diff suppressed because one or more lines are too long

17
app/webroot/js/event-distribution-graph.js
View File

@ -8,15 +8,15 @@ var distribution_chart;
var distributionData;
function clickHandlerGraph(evt) {
var firstPoint = distribution_chart.getElementAtEvent(evt)[0];
var firstPoint = distribution_chart.getElementsAtEventForMode(evt, 'nearest', { intersect: true }, false)[0];
var distribution_id;
if (firstPoint) {
var value = distribution_chart.data.datasets[firstPoint._datasetIndex].data[firstPoint._index];
var value = distribution_chart.data.datasets[firstPoint.datasetIndex].data[firstPoint.index];
if (value == 0) {
document.getElementById('attributesFilterField').value = "";
filterAttributes('all');
} else {
distribution_id = distribution_chart.data.distribution[firstPoint._index].value;
distribution_id = distribution_chart.data.distribution[firstPoint.index].value;
var value_to_set = String(distribution_id);
value_to_set += distribution_id == event_distribution ? '|' + '5' : '';
value_to_set = value_to_set.split('|');
@ -323,6 +323,9 @@ function construct_piechart(data) {
count += data.event[i];
}
if (count > 0) {
if (distribution_chart) {
distribution_chart.destroy()
}
distribution_chart = new Chart(ctx, {
type: 'doughnut',
data: {
@ -331,13 +334,13 @@ function construct_piechart(data) {
datasets: doughnut_dataset,
},
options: {
title: {
display: false
},
animation: {
duration: 500
},
tooltips: {
title: {
display: false
},
tooltip: {
callbacks: {
label: function(item, data) {
return data.datasets[item.datasetIndex].label