#9348 fixed update relations

pandora_console/include/javascript/functions_pandora_networkmap.js

@@ -252,6 +252,7 @@ function delete_link(
               const rowCount = $(".relation_link_row").length;
               if (rowCount === 0) {
                 $("#relations_table-no_relations").show();
+                $(`#update_relations_button`).remove();
               }
             }
           );
@@ -599,6 +600,8 @@ function update_link(row_index, id_link) {
 
   $(".edit_icon_" + row_index).css("display", "none");
 
+  let result = false;
+
   var params = [];
   params.push("update_link=1");
   params.push("networkmap_id=" + networkmap_id);
@@ -613,6 +616,7 @@ function update_link(row_index, id_link) {
     data: params.join("&"),
     dataType: "json",
     type: "POST",
+    async: false,
     url: window.base_url_homedir + "/ajax.php",
     success: function(data) {
       $(".edit_icon_progress_" + row_index).css("display", "none");
@@ -718,11 +722,14 @@ function update_link(row_index, id_link) {
         draw_elements_graph();
         init_drag_and_drop();
         set_positions_graph();
+        result = data["id_db_link"];
       } else {
         $(".edit_icon_fail_" + row_index).css("display", "");
       }
     }
   });
+
+  return result;
 }
 
 function delete_link_from_id(index) {
@@ -1118,6 +1125,12 @@ function load_interfaces(selected_links) {
       "align-items": "center",
       "justify-content": "center"
     });
+
+    $(
+      "#relations_table-template_row-edit .delete_icon",
+      template_relation_row
+    ).attr("id", `delete_icon_${i}`);
+
     $(
       "#relations_table-template_row-edit .delete_icon",
       template_relation_row
@@ -1147,6 +1160,7 @@ function load_interfaces(selected_links) {
     template_relation_row = null;
   });
 
+  if (selected_links.length > 0) {
     $("#relations_table")
       .parent()
       .append(
@@ -1157,10 +1171,31 @@ function load_interfaces(selected_links) {
 
     $("#update_relations_button").click(function() {
       jQuery.each(selected_links, function(i, link_each) {
-      update_link(i, link_each.id_db);
+        const new_id_db = update_link(i, link_each.id_db);
+        if (new_id_db !== false) {
+          selected_links[i]["id_db"] = new_id_db;
+          $(`#delete_icon_${i}`).attr(
+            "href",
+            "javascript: " +
+              "delete_link(" +
+              link_each.source.id_db +
+              "," +
+              link_each.id_module_start +
+              "," +
+              link_each.target.id_db +
+              "," +
+              link_each.id_module_end +
+              "," +
+              new_id_db +
+              "," +
+              i +
+              ");"
+          );
+        }
       });
     });
   }
+}
 
 function add_node() {
   $("#agent_name").val("");

pandora_console/operation/agentes/pandora_networkmap.php

@@ -751,7 +751,11 @@ switch ($tab) {
                 }
 
                 if ($network_map['id_group'] > 0) {
-                    $nodes = db_get_all_rows_sql('SELECT style FROM titem WHERE id_map = '.$network_map['id'].' AND deleted = 0');
+                    $nodes = db_get_all_rows_sql(
+                        'SELECT style 
+                        FROM titem 
+                        WHERE id_map = '.$network_map['id'].' AND deleted = 0 AND type <> 2'
+                    );
                     $count = 0;
                     foreach ($nodes as $node) {
                         $node_style = json_decode($node['style'], true);
@@ -763,7 +767,7 @@ switch ($tab) {
                     $count = db_get_value_sql(
                         'SELECT COUNT(*)
 						FROM titem
-						WHERE id_map = '.$network_map['id'].' AND deleted = 0 AND type = 0'
+						WHERE id_map = '.$network_map['id'].' AND deleted = 0 AND type <> 2'
                     );
                 }
 
@@ -780,8 +784,7 @@ switch ($tab) {
                         $data['nodes'] = __('Pending to generate');
                     }
                 } else {
-                    $data['nodes'] = ($network_map['id_group'] == 0) ? ($count - 1) : $count;
-                    // PandoraFMS node is not an agent
+                    $data['nodes'] = $count;
                 }
 
                 $data['groups'] = ui_print_group_icon($network_map['id_group_map'], true);