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

chg: [UI] Fetch job progress in one query

pull/8370/head
Jakub Onderka 2022-05-13 16:14:56 +02:00
parent 6518795dc5
commit e86a02e7c6
4 changed files with 89 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controller/AppController.php
View File

@ -1440,6 +1440,17 @@ class AppController extends Controller
return parent::_getViewObject();
}
/**
* Close session without writing changes to them and return current user.
* @return array
*/
protected function _closeSession()
{
$user = $this->Auth->user();
session_abort();
return $user;
}
/**
* Decode JSON with proper error handling.
* @param string $dataToDecode

44
app/Controller/JobsController.php
View File

@ -16,6 +16,15 @@ class JobsController extends AppController
),
);
public function beforeFilter()
{
parent::beforeFilter();
if ($this->request->action === 'getGenerateCorrelationProgress') {
$this->Security->doNotGenerateToken = true;
}
}
public function index($queue = false)
{
if (!Configure::read('MISP.background_jobs')) {
@ -24,9 +33,9 @@ class JobsController extends AppController
$this->loadModel('Server');
$issueCount = 0;
$workers = $this->Server->workerDiagnostics($issueCount);
$queues = array('email', 'default', 'cache', 'prio', 'update');
$queues = ['email', 'default', 'cache', 'prio', 'update'];
if ($queue && in_array($queue, $queues, true)) {
$this->paginate['conditions'] = array('Job.worker' => $queue);
$this->paginate['conditions'] = ['Job.worker' => $queue];
}
$jobs = $this->paginate();
foreach ($jobs as &$job) {
@ -37,9 +46,9 @@ class JobsController extends AppController
$job['Job']['job_status'] = 'Unknown';
$job['Job']['failed'] = null;
}
if(Configure::read('SimpleBackgroundJobs.enabled')){
if (Configure::read('SimpleBackgroundJobs.enabled')) {
$job['Job']['worker_status'] = true;
}else{
} else {
$job['Job']['worker_status'] = isset($workers[$job['Job']['worker']]) && $workers[$job['Job']['worker']]['ok'];
}
}
@ -78,20 +87,27 @@ class JobsController extends AppController
}
}
public function getGenerateCorrelationProgress($id)
public function getGenerateCorrelationProgress($ids)
{
$job = $this->Job->find('first', [
'fields' => ['progress', 'process_id'],
'conditions' => ['id' => $id],
$this->_closeSession();
$ids = explode(",", $ids);
$jobs = $this->Job->find('all', [
'fields' => ['id', 'progress', 'process_id'],
'conditions' => ['id' => $ids],
'recursive' => -1,
]);
if (!$job) {
throw new NotFoundException("Job with ID `$id` not found");
if (empty($jobs)) {
throw new NotFoundException('No jobs found');
}
$output = [];
foreach ($jobs as $job) {
$output[$job['Job']['id']] = [
'job_status' => $this->__getJobStatus($job['Job']['process_id']),
'progress' => (int)$job['Job']['progress'],
];
}
$output = [
'job_status' => $this->__getJobStatus($job['Job']['process_id']),
'progress' => (int)$job['Job']['progress'],
];
return $this->RestResponse->viewData($output, 'json');
}

83
app/View/Jobs/index.ctp
View File

@ -1,7 +1,7 @@
<div class="jobs index">
<h2><?php echo __('Jobs');?></h2>
<h4><?php echo __('Purge job entries:');?></h4>
<span>
<span style="float: left;margin-right: 10px;font-size: 120%;"><?= __('Purge job entries:') ?></span>
<?php
echo $this->Form->postLink(
__('Completed'),
@ -17,7 +17,7 @@
);
?>
</span>
<br />
<br>
<div class="pagination">
<ul>
<?php
@ -27,30 +27,6 @@
?>
</ul>
</div>
<script type="text/javascript">
var intervalArray = [];
function queueInterval(k, id) {
intervalArray[k] = setInterval(function() {
if (!document.hidden) {
$.getJSON('<?php echo $baseurl; ?>/jobs/getGenerateCorrelationProgress/' + id, function(data) {
var x = document.getElementById("bar" + id);
if (data.progress == 0) {
x.innerText = data.job_status;
} else if (data.progress > 0 && data.progress < 100) {
x.style.width = data.progress + "%";
x.innerText = data.progress + "%";
} else if (data.progress == 100) {
x.style.width = "100%";
x.innerText = "<?php echo __('Completed.');?>";
x.parentElement.className = "progress";
clearInterval(intervalArray[k]);
}
});
}
}, 3000);
}
</script>
<?php
$data = array(
'children' => array(
@ -134,8 +110,8 @@
}
}
?>
<tr>
<td class="short"><?php echo h($item['Job']['id']); ?></td>
<tr data-primary-id="<?= intval($item['Job']['id']) ?>" data-refresh="<?= $startRefreshing ? 'true' : 'false' ?>">
<td class="short"><?= intval($item['Job']['id']) ?></td>
<td class="short"><?= $this->Time->time($item['Job']['date_created']) ?></td>
<td class="short"><?= $this->Time->time($item['Job']['date_modified']) ?></td>
<td class="short"><?php echo h($item['Job']['process_id']); ?></td>
@ -149,26 +125,17 @@
echo h($item['Job']['job_status']);
if ($item['Job']['failed']):
?>
<div class="fa fa-search useCursorPointer queryPopover" title="<?php echo __('View stacktrace');?>" role="button" tabindex="0" aria-label="<?php echo __('View stacktrace');?>" data-url="<?php echo $baseurl; ?>/jobs/getError" data-id="<?php echo h($item['Job']['process_id']); ?>"></div>
<div class="fa fa-search useCursorPointer queryPopover" title="<?php echo __('View stacktrace');?>" role="button" tabindex="0" aria-label="<?php echo __('View stacktrace');?>" data-url="<?php echo $baseurl; ?>/jobs/getError/<?= h($item['Job']['process_id']) ?>"></div>
<?php
endif;
?>
</td>
<td style="width:200px;">
<div class="<?php echo $progress_bar_type; ?>" style="margin-bottom: 0px;">
<div id="bar<?php echo h($item['Job']['id']); ?>" class="bar" style="width: <?php echo $progress; ?>%;">
<div class="<?php echo $progress_bar_type; ?>" style="margin-bottom: 0">
<div class="bar" style="width: <?php echo $progress; ?>%;">
<?= h($progress_message); ?>
</div>
</div>
<?php
if ($startRefreshing):
?>
<script type="text/javascript">
queueInterval("<?php echo $k; ?>", "<?php echo h($item['Job']['id']); ?>");
</script>
<?php
endif;
?>
</td>
</tr><?php
endforeach; ?>
@ -191,4 +158,40 @@
</ul>
</div>
</div>
<script>
$(function () {
var refreshIds = [];
$("[data-refresh=true]").each(function () {
refreshIds.push($(this).data("primary-id"));
});
var interval = setInterval(function() {
if (!document.hidden) {
if (refreshIds.length === 0) {
clearInterval(interval);
return;
}
var url = baseurl + '/jobs/getGenerateCorrelationProgress/' + refreshIds.join(",");
$.getJSON(url, function(allData) {
$.each(allData, function (index, data) {
var $tr = $("[data-primary-id=" + index + "]");
var bar = $tr.find(".bar")[0];
if (data.progress == 0) {
bar.innerText = data.job_status;
} else if (data.progress > 0 && data.progress < 100) {
bar.style.width = data.progress + "%";
bar.innerText = data.progress + "%";
} else if (data.progress == 100) {
bar.style.width = "100%";
bar.innerText = data.job_status;
bar.parentElement.className = "progress";
refreshIds = refreshIds.filter(function(e) { return e != index })
}
});
});
}
}, 3000);
});
</script>
<?= $this->element('/genericElements/SideMenu/side_menu', array('menuList' => 'admin', 'menuItem' => 'jobs'));

10
app/webroot/js/misp.js
View File

@ -4611,11 +4611,11 @@ $(function() {
}
});
$(".queryPopover").click(function() {
url = $(this).data('url');
id = $(this).data('id');
$.get(url + '/' + id, function(data) {
$('#popover_form').html(data);
openPopup('#popover_form');
var url = $(this).data('url');
$.get(url, function(data) {
var $popover = $('#popover_form');
$popover.html(data);
openPopup($popover);
}).fail(xhrFailCallback)
});
$('.servers_default_role_checkbox').click(function() {