From f7ab47e63761906dfe6ee0d9fbaf9ff51ed88985 Mon Sep 17 00:00:00 2001
From: Daniel Maya <daniel.maya@artica.es>
Date: Fri, 26 Jul 2019 14:17:14 +0200
Subject: [PATCH] Fixed delete item

---
 .../javascript/pandora_visual_console.js      | 17 ++++++++++------
 pandora_console/include/rest-api/index.php    |  9 +++++++++
 .../operation/visual_console/view.php         | 20 ++++++++-----------
 3 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/pandora_console/include/javascript/pandora_visual_console.js b/pandora_console/include/javascript/pandora_visual_console.js
index ebbd12e914..8e22de3174 100755
--- a/pandora_console/include/javascript/pandora_visual_console.js
+++ b/pandora_console/include/javascript/pandora_visual_console.js
@@ -379,7 +379,6 @@ function createVisualConsole(
             id,
             data,
             function(error, data) {
-              // if (!error && !data) return;
               if (error || !data) {
                 console.log(
                   "[ERROR]",
@@ -388,8 +387,17 @@ function createVisualConsole(
                   error ? error.message : "Invalid response"
                 );
 
-                // Move the element to its initial position.
-                // e.item.move(e.prevPosition.x, e.prevPosition.y);
+                // Add the item to the list.
+                visualConsole.elementsById[e.item.props.id] = e.item;
+                visualConsole.elementIds.push(e.item.props.id);
+                // Item event handlers.
+                e.item.onClick(visualConsole.handleElementClick);
+                e.item.onDblClick(visualConsole.handleElementDblClick);
+                e.item.onMoved(visualConsole.handleElementMovement);
+                e.item.onResized(visualConsole.handleElementResizement);
+                e.item.onRemove(visualConsole.handleElementRemove);
+                // Add the item to the DOM.
+                visualConsole.containerRef.append(e.item.elementRef);
               }
 
               done();
@@ -403,9 +411,6 @@ function createVisualConsole(
           };
         })
         .init();
-      // console.log(visualConsole.containerRef);
-      // console.log(e.item.elementRef);
-      // Add the item to the DOM.
     });
 
     if (updateInterval != null && updateInterval > 0) {
diff --git a/pandora_console/include/rest-api/index.php b/pandora_console/include/rest-api/index.php
index c4bcc732b0..ae8f68af8c 100644
--- a/pandora_console/include/rest-api/index.php
+++ b/pandora_console/include/rest-api/index.php
@@ -112,6 +112,15 @@ if ($getVisualConsole === true) {
     }
 } else if ($removeVisualConsoleItem === true) {
     $itemId = (int) get_parameter('visualConsoleItemId');
+
+    try {
+        $item = VisualConsole::getItemFromDB($itemId);
+    } catch (\Throwable $th) {
+        // There is no item in the database.
+        echo true;
+        return;
+    }
+
     $data = get_parameter('data');
     $class = VisualConsole::getItemClass((int) $data['type']);
     $result = $class::delete($itemId);
diff --git a/pandora_console/operation/visual_console/view.php b/pandora_console/operation/visual_console/view.php
index fd26771252..a57f644424 100644
--- a/pandora_console/operation/visual_console/view.php
+++ b/pandora_console/operation/visual_console/view.php
@@ -164,11 +164,11 @@ if ($pure === false) {
     echo html_print_checkbox_switch('edit-mode', 1, false, true);
     echo '</span>';
     echo '</div>';
-    echo '<div id ="prueba" class="visual-console-edit-controls" style="visibility:hidden">';
+    echo '<div id ="edit-controls" class="visual-console-edit-controls" style="visibility:hidden">';
     html_print_button(
         'delete_item',
         'button_toolbox2',
-        false,
+        true,
         '',
         'class="sub visual_editor_button_toolbox delete_item delete_min"',
         false,
@@ -361,11 +361,11 @@ $visualConsoleItems = VisualConsole::getItemsFromDB(
         if ($(this).prop('checked')) {
             visualConsoleManager.visualConsole.enableEditMode();
             visualConsoleManager.changeUpdateInterval(0);
-            $('#prueba').css('visibility', '');
+            $('#edit-controls').css('visibility', '');
         } else {
             visualConsoleManager.visualConsole.disableEditMode();
             visualConsoleManager.changeUpdateInterval(<?php echo ($refr * 1000); ?>); // To ms.
-            $('#prueba').css('visibility', 'hidden');
+            $('#edit-controls').css('visibility', 'hidden');
         }
     });
 
@@ -386,14 +386,10 @@ $visualConsoleItems = VisualConsole::getItemsFromDB(
         }
     });
 
-    // $(".visual-console-item, .is-editing").bind("click", function(event) {
-    //     console.log('jejejeje');
-    // });
-
-    // $("#visual-console-container, .is-editing").bind("click", function(event) {
-    //     // $(".visual-console-item, .is-editing").unbind("click");
-    //     // console.log('jijijiji');
-    // });
+    $(".visual-console-item, .is-editing").bind("click", function(event) {
+        var prueba = event.currentTarget;
+        console.log(prueba);
+    });
 
     $('#button-button_toolbox2').click(function (event){
         visualConsoleManager.visualConsole.deleteItem();