From 77edcf214dfbb6d91757f546bb9736c348068c71 Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <sami.mokaddem@circl.lu>
Date: Tue, 26 Jul 2022 13:32:45 +0200
Subject: [PATCH] chg: [workflows:editor] Added duplicate shortcut

---
 app/View/Elements/Workflows/infoModal.ctp     | 22 ++++++++++++++-----
 app/View/Workflows/editor.ctp                 |  2 +-
 .../js/workflows-editor/workflows-editor.js   | 16 ++++++++++----
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/View/Elements/Workflows/infoModal.ctp b/app/View/Elements/Workflows/infoModal.ctp
index dbffefa4d..3616dbeb2 100644
--- a/app/View/Elements/Workflows/infoModal.ctp
+++ b/app/View/Elements/Workflows/infoModal.ctp
@@ -123,12 +123,22 @@ $data_passed_to_if_module = [
 
             <div class="tab-pane" id="modal-info-usage">
                 <h3><?= __('Shortcuts') ?></h3>
-                <ul>
-                    <li><code>Ctrl + Mouse_wheel</code>: <?= __('Zoom in / out') ?></li>
-                    <li><code>Shift + Click</code>: <?= __('Multi-select tool') ?></li>
-                    <li><code>Ctrl + s</code>: <?= __('Save workflow') ?></li>
-                    <li><code>c</code>: <?= __('Center canvas in viewport') ?></li>
-                </ul>
+                <table class="table table-condensed">
+                    <thead>
+                        <tr>
+                            <th><?= __('Shortcut') ?></th>
+                            <th><?= __('Effect') ?></th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr><td><code>Ctrl + Mouse_wheel</code></td><td> <?= __('Zoom in / out') ?></td></tr>
+                        <tr><td><code>Shift + Ctrck</code></td><td> <?= __('Multi-select tool') ?></td></tr>
+                        <tr><td><code>Ctrl + s</code></td><td> <?= __('Save workflow') ?></td></tr>
+                        <tr><td><code>Ctrl + d</code></td><td> <?= __('Duptrcate selection') ?></td></tr>
+                        <tr><td><code>delete</code></td><td> <?= __('Deletion selection') ?></td></tr>
+                        <tr><td><code>c</code></td><td> <?= __('Center canvas in viewport') ?></td></tr>
+                    </tbody>
+                </table>
             </div>
         </div>
     </div>
diff --git a/app/View/Workflows/editor.ctp b/app/View/Workflows/editor.ctp
index a25cd86b1..7b67db721 100644
--- a/app/View/Workflows/editor.ctp
+++ b/app/View/Workflows/editor.ctp
@@ -217,7 +217,7 @@ $isBlockingTrigger = $selectedTrigger['blocking'] ?? false;
     </div>
     <div class="modal-footer">
         <button id="delete-selected-node" class="btn btn-danger" style="float: left;"><?= __('Delete node') ?></button>
-        <button class="btn btn-success" data-dismiss="modal" aria-hidden="true"><?= __('Save') ?></button>
+        <button class="btn" data-dismiss="modal" aria-hidden="true"><?= __('Close') ?></button>
     </div>
 </div>
 
diff --git a/app/webroot/js/workflows-editor/workflows-editor.js b/app/webroot/js/workflows-editor/workflows-editor.js
index c95dfc97e..3fa2f6c61 100644
--- a/app/webroot/js/workflows-editor/workflows-editor.js
+++ b/app/webroot/js/workflows-editor/workflows-editor.js
@@ -184,6 +184,10 @@ function initDrawflow() {
         if (evt.keyCode == 46 && $drawflow.is(evt.target)) {
             deleteSelectedNodes(true)
         }
+        if (evt.keyCode == 68 && evt.ctrlKey && $drawflow.is(evt.target)) {
+            duplicateSelection()
+            evt.preventDefault()
+        }
     })
     editor.translate_to = function (x, y) {
         this.canvas_x = x;
@@ -422,10 +426,7 @@ function initDrawflow() {
         })
     
     $controlDuplicateButton.click(function() {
-        var currentSelection = selection.getSelection()
-        var newNodes = duplicateNodesFromHtml(currentSelection)
-        selection.clearSelection()
-        selection.select(newNodes)
+        duplicateSelection()
     })
     $controlDeleteButton.click(function() {
         deleteSelectedNodes(false)
@@ -512,6 +513,13 @@ function saveBlueprint(href) {
     })
 }
 
+function duplicateSelection() {
+    var currentSelection = selection.getSelection()
+    var newNodes = duplicateNodesFromHtml(currentSelection)
+    selection.clearSelection()
+    selection.select(newNodes)
+}
+
 function buildModalForBlock(node_id, block) {
     var html = genBlockParamHtml(block, false)
     $blockModal