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

chg: [worfklows:editor] UI Improvements on labels

pull/8530/head
Sami Mokaddem 2022-08-01 11:45:08 +02:00
parent d83039f520
commit 19ff550823
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/View/Workflows/editor.ctp
View File

@ -7,6 +7,7 @@ $allModules = array_merge($usableModules['modules_action'], $usableModules['modu
$triggerModules = $modules['modules_trigger'];
$selectedTrigger = Hash::get($selectedWorkflow, 'Workflow.listening_triggers.0', []);
$isBlockingTrigger = $selectedTrigger['blocking'] ?? false;
$isMISPFormat = $selectedTrigger['misp_core_format'] ?? false;
?>
<div class="root-container">
<div class="topbar">
@ -29,6 +30,11 @@ $isBlockingTrigger = $selectedTrigger['blocking'] ?? false;
<?= __('Non blocking') ?>
</span>
<?php endif; ?>
<?php if (!empty($isMISPFormat)) : ?>
<span class="label label-important" style="line-height: 20px; background-color: #009fdc;" title="<?= __('The data passed by this trigger is compliant with the MISP core format') ?>">
<img src="/img/misp-logo-no-text.png" alt="MISP Core format" width="18" height="18" style="filter: brightness(0) invert(1);">
</span>
<?php endif; ?>
</span>
<span style="display: flex; align-items: center;">
<button id="saveWorkflow" class="btn btn-primary" href="#">

12
app/webroot/js/workflows-editor/workflows-editor.js
View File

@ -47,9 +47,17 @@ var dotBlock_trigger = doT.template(' \
<strong style="margin-left: 0.25em;"> \
{{=it.module_data.name}} \
</strong> \
<span style="margin-left: auto; display: flex; align-items: center;"> \
<span style="margin-left: auto; display: flex; align-items: center; gap: 3px;"> \
{{? it.module_data.blocking }} \
<span class="label label-important" style="line-height: 20px;" title="This workflow is a blocking worklow and can prevent the default MISP behavior to execute"> \
<i class="fa-lg fa-fw fas fa-stop-circle"></i> \
Blocking \
</span> \
{{?}} \
{{? it.module_data.misp_core_format }} \
<img src="/img/misp-logo-no-text.png" alt="Icon of {{=it.module_data.name}}" width="18" height="18" style="margin: auto 0;" title="The data passed by this trigger is compliant with the MISP core format"> \
<span class="label" style="margin: auto 3px; line-height: 20px; background-color: #009fdc;"> \
<img src="/img/misp-logo-no-text.png" alt="MISP Core format" width="18" height="18" style="filter: brightness(0) invert(1);" title="The data passed by this trigger is compliant with the MISP core format"> \
</span> \
{{?}} \
<span class="block-notification-container"> \
{{=it._node_notification_html}} \