chg: [workflow] Renaming and UI Improvements

app/Model/Workflow.php

@@ -352,7 +352,7 @@ class Workflow extends AppModel
             return true;
         }
 
-        if (empty($trigger['canAbort'])) {
+        if (empty($trigger['blocking'])) {
             $this->Job = ClassRegistry::init('Job');
             $jobId = $this->Job->createJob(
                 'SYSTEM',

app/Model/WorkflowModules/WorkflowBaseModule.php

@@ -174,5 +174,5 @@ class WorkflowBaseModule
 
 class WorkflowBaseTriggerModule extends WorkflowBaseModule
 {
-    public $canAbort = false;
+    public $blocking = false;
 }

app/Model/WorkflowModules/trigger/Module_attribute_after_save.php

@@ -9,7 +9,7 @@ class Module_attribute_after_save extends WorkflowBaseTriggerModule
     public $icon = 'cube';
     public $inputs = 0;
     public $outputs = 1;
-    public $canAbort = false;
+    public $blocking = false;
 
     public function __construct()
     {

app/Model/WorkflowModules/trigger/Module_email_before_send.php

@@ -9,7 +9,7 @@ class Module_email_before_send extends WorkflowBaseTriggerModule
     public $icon = 'envelope';
     public $inputs = 0;
     public $outputs = 1;
-    public $canAbort = true;
+    public $blocking = true;
 
     public function __construct()
     {

app/Model/WorkflowModules/trigger/Module_enrichment_before_query.php

@@ -9,7 +9,7 @@ class Module_enrichment_before_query extends WorkflowBaseTriggerModule
     public $icon = 'asterisk';
     public $inputs = 0;
     public $outputs = 1;
-    public $canAbort = true;
+    public $blocking = true;
 
     public function __construct()
     {

app/Model/WorkflowModules/trigger/Module_object_after_save.php

@@ -9,7 +9,7 @@ class Module_object_after_save extends WorkflowBaseTriggerModule
     public $icon = 'cubes';
     public $inputs = 0;
     public $outputs = 1;
-    public $canAbort = false;
+    public $blocking = false;
 
     public function __construct()
     {

app/Model/WorkflowModules/trigger/Module_publish.php

@@ -9,7 +9,7 @@ class Module_publish extends WorkflowBaseTriggerModule
     public $icon = 'upload';
     public $inputs = 0;
     public $outputs = 1;
-    public $canAbort = true;
+    public $blocking = true;
 
     public function __construct()
     {

app/Model/WorkflowModules/trigger/Module_user_after_save.php

@@ -9,7 +9,7 @@ class Module_user_after_save extends WorkflowBaseTriggerModule
     public $icon = 'user-edit';
     public $inputs = 0;
     public $outputs = 1;
-    public $canAbort = false;
+    public $blocking = false;
 
     public function __construct()
     {

app/Model/WorkflowModules/trigger/Module_user_before_save.php

@@ -9,7 +9,7 @@ class Module_user_before_save extends WorkflowBaseTriggerModule
     public $icon = 'user-plus';
     public $inputs = 0;
     public $outputs = 1;
-    public $canAbort = true;
+    public $blocking = true;
 
     public function __construct()
     {

app/View/Workflows/editor.ctp

@@ -60,8 +60,7 @@ $triggerModules = $modules['blocks_trigger'];
                         <div id="block-filter-group" class="btn-group" data-toggle="buttons-radio">
                             <button type="button" class="btn btn-primary active" data-type="enabled" onclick="filterBlocks(this)"><?= __('Enabled') ?></button>
                             <button type="button" class="btn btn-primary" data-type="misp-module" onclick="filterBlocks(this)">
-                                misp-module
-                                <sup class="<?= $this->FontAwesome->getClass('python') ?>"></sup>
+                                misp-module<span class="is-misp-module"></span>
                             </button>
                             <button type="button" class="btn btn-primary" data-type="is-blocking" onclick="filterBlocks(this)">
                                 <?= __('Blocking') ?>
@@ -92,6 +91,11 @@ $triggerModules = $modules['blocks_trigger'];
                         </div>
                     </div>
                     <div class="tab-pane" id="container-blueprints">
+                        <div style="margin-left: 0.75em; margin-bottom: 0.5em;">
+                            <a id="saveBlueprint" class="btn btn-primary" href="<?= $baseurl . '/workflowBlueprints/add/1' ?>">
+                                <i class="<?= $this->FontAwesome->getClass('save') ?>"></i> <?= __('Save blueprint') ?>
+                            </a>
+                        </div>
                         <select type="text" placeholder="Search for a block" class="chosen-container blocks blueprint-select" autocomplete="off" style="width: 305px; margin: 0 0.5em;">
                             <?php foreach ($workflowBlueprints as $workflowBlueprint) : ?>
                                 <option value="<?= h($workflowBlueprint['WorkflowBlueprint']['id']) ?>"><?= h($workflowBlueprint['WorkflowBlueprint']['name']) ?></option>

app/View/Workflows/triggers.ctp

@@ -15,9 +15,9 @@
             'data_path' => 'description',
         ],
         [
-            'name' => __('Can Abort Operation'),
-            'sort' => 'canAbort',
-            'data_path' => 'canAbort',
+            'name' => __('Blocking Workflow'),
+            'sort' => 'blocking',
+            'data_path' => 'blocking',
             'element' => 'boolean',
             'colors' => true,
         ],

app/webroot/css/workflows-editor.css

@@ -90,6 +90,17 @@
     margin: 5px 6px;
 }
 
+.side-panel #block-filter-group .is-misp-module {
+    filter: invert(1);
+    display: inline-block;
+    content: ' ';
+    height: 14px;
+    width: 14px;
+    background: url(/img/misp-modules-bold.png);
+    background-size: 14px;
+    background-repeat: no-repeat;
+}
+
 .side-panel .loading-span {
     margin-right: 5px;
     margin-left: 0px;