[19743] Status layout with problems per entity

include/fastdds_monitor/backend/backend_types.h

@@ -35,6 +35,7 @@ using EntityId = eprosima::statistics_backend::EntityId;
 using EntityKind = eprosima::statistics_backend::EntityKind;
 using DataKind = eprosima::statistics_backend::DataKind;
 using StatusKind = eprosima::statistics_backend::StatusKind;
+using StatusLevel = eprosima::statistics_backend::StatusLevel;
 using StatisticKind = eprosima::statistics_backend::StatisticKind;
 using EntityInfo = eprosima::statistics_backend::Info;
 using Timestamp = eprosima::statistics_backend::Timestamp;

include/fastdds_monitor/backend/backend_utils.h

@@ -91,6 +91,10 @@ std::string statistic_kind_to_string(
 std::string status_kind_to_string(
         const StatusKind& status_kind);
 
+//! Converts the \c StatusLevel to string
+std::string status_level_to_string(
+        const StatusLevel& status_level);
+
 //! Retrieves the \c EntityKind related with its name in QString
 backend::EntityKind string_to_entity_kind(
         const QString& entity_kind);

include/fastdds_monitor/model/tree/StatusTreeItem.h

@@ -71,15 +71,15 @@ class StatusTreeItem
     explicit StatusTreeItem(
             const backend::EntityId& id,
             const std::string& name,
-            const bool& is_error,
+            const backend::StatusLevel& status_level,
             const std::string& description);
 
     //! Create an item with the status parameters
     explicit StatusTreeItem(
             const backend::EntityId& id,
             const backend::StatusKind& kind,
             const std::string& name,
-            const bool& is_error,
+            const backend::StatusLevel& status_level,
             const std::string& value,
             const std::string& description);
 
@@ -122,10 +122,10 @@ class StatusTreeItem
 
     backend::StatusKind kind();
 
-    bool is_error();
+    backend::StatusLevel status_level();
 
-    void is_error(
-            bool val);
+    void status_level(
+            backend::StatusLevel val);
 
     std::string name_str();
 
@@ -154,14 +154,14 @@ class StatusTreeItem
     backend::EntityId id_;
     backend::StatusKind kind_;
     std::string name_;
-    bool is_status_error_;
+    backend::StatusLevel status_level_;
     std::string value_;
     std::string description_;
     bool is_active_;
     QVariant id_variant_;
     QVariant kind_variant_;
     QVariant name_variant_;
-    QVariant is_status_error_variant_;
+    QVariant status_level_variant_;
     QVariant value_variant_;
     QVariant description_variant_;
     QVariant is_active_variant_;

include/fastdds_monitor/model/tree/StatusTreeModel.h

@@ -171,7 +171,7 @@ class StatusTreeModel : public QAbstractItemModel
     StatusTreeItem*  getTopLevelItem(
             const backend::EntityId& id,
             const std::string& data,
-            const bool& is_error,
+            const backend::StatusLevel& status,
             const std::string& description);
 
     void set_source_model(
@@ -187,7 +187,7 @@ class StatusTreeModel : public QAbstractItemModel
     StatusTreeItem* internalPointer(
             const QModelIndex& index) const;
 
-    StatusTreeItem* copy(
+    StatusTreeItem* filtered_copy(
             StatusTreeItem* source,
             const backend::EntityId entity_id);
 

qml/DomainGraphLayout.qml

@@ -27,7 +27,7 @@ Item
 
     // Public properties
     property var model: {}                          // domain view graph JSON model
-    property int entity_id                          // entity id associated to the domain id
+    property int domain_entity_id                   // entity id associated to the domain id
     property int domain_id                          // domain id
     required property string component_id           // mandatory to be included when object created
 
@@ -237,7 +237,7 @@ Item
                         onClicked:
                         {
                             if(mouse.button & Qt.RightButton) {
-                                openTopicMenu(entity_id, domain_id, modelData["id"], modelData["alias"], modelData["kind"])
+                                openTopicMenu(domain_entity_id, domain_id, modelData["id"], modelData["alias"], modelData["kind"])
                             } else {
                                 controller.topic_click(modelData["id"])
                             }
@@ -573,7 +573,7 @@ Item
                             onClicked:
                             {
                                 if(mouse.button & Qt.RightButton) {
-                                    openEntitiesMenu(entity_id, modelData["id"], modelData["alias"], modelData["kind"])
+                                    openEntitiesMenu(domain_entity_id, modelData["id"], modelData["alias"], modelData["kind"])
                                 } else {
                                     controller.host_click(modelData["id"])
                                 }
@@ -717,7 +717,7 @@ Item
                                     onClicked:
                                     {
                                         if(mouse.button & Qt.RightButton) {
-                                            openEntitiesMenu(entity_id, modelData["id"], modelData["alias"], modelData["kind"])
+                                            openEntitiesMenu(domain_entity_id, modelData["id"], modelData["alias"], modelData["kind"])
                                         } else {
                                             controller.user_click(modelData["id"])
                                         }
@@ -860,7 +860,7 @@ Item
                                             onClicked:
                                             {
                                                 if(mouse.button & Qt.RightButton) {
-                                                    openEntitiesMenu(entity_id, modelData["id"], modelData["alias"], modelData["kind"])
+                                                    openEntitiesMenu(domain_entity_id, modelData["id"], modelData["alias"], modelData["kind"])
                                                 } else {
                                                     controller.process_click(modelData["id"])
                                                 }
@@ -1001,7 +1001,7 @@ Item
                                                     onClicked:
                                                     {
                                                         if(mouse.button & Qt.RightButton) {
-                                                            openEntitiesMenu(entity_id, modelData["id"], modelData["alias"], modelData["kind"])
+                                                            openEntitiesMenu(domain_entity_id, modelData["id"], modelData["alias"], modelData["kind"])
                                                         } else {
                                                             controller.participant_click(modelData["id"])
                                                         }
@@ -1198,7 +1198,7 @@ Item
                                                             onClicked:
                                                             {
                                                                 if(mouse.button & Qt.RightButton) {
-                                                                    openEntitiesMenu(entity_id, modelData["id"], modelData["alias"], modelData["kind"])
+                                                                    openEntitiesMenu(domain_entity_id, modelData["id"], modelData["alias"], modelData["kind"])
                                                                 } else {
                                                                     controller.endpoint_click(modelData["id"])
                                                                 }
@@ -1333,7 +1333,7 @@ Item
         clear_graph()
 
         // Obtain model from backend
-        var model_string = controller.get_domain_view_graph(entity_id)
+        var model_string = controller.get_domain_view_graph(domain_entity_id)
 
         // declare obtained hosts and topics variables
         var new_topics = []
@@ -1616,15 +1616,15 @@ Item
         if (domainEntityId != "")
         {
             // belongs to the current domain
-            if (entity_id.toString() != domainEntityId)
+            if (domain_entity_id.toString() != domainEntityId)
             {
                 return false
             }
         }
         // check all entities by entityId
 
         // check domain
-        if(entity_id.toString() == entityId)
+        if(domain_entity_id.toString() == entityId)
         {
             return true
         }

qml/GraphConnection.qml

@@ -30,7 +30,7 @@ Item {
         color: "white"
     }
 
-    //background to make connection overlap nicely left panel
+    // background to make connection overlap nicely left panel
     Rectangle {
         id: left_background
         anchors.top: parent.top; anchors.bottom: parent.bottom

qml/StatusLayout.qml

@@ -277,8 +277,8 @@ Item
         }
         IconSVG {
             id: warning_icon
-            anchors.left: error_icon.right
-            anchors.leftMargin: elements_spacing_ * 4
+            anchors.left: error_value.right
+            anchors.leftMargin: elements_spacing_ 
             anchors.verticalCenter: parent.verticalCenter
             name: "issues"
             size: parent.height - elements_spacing_

qml/StatusTreeViewItem.qml

@@ -115,10 +115,12 @@ Item {
         IconSVG {
             id: status_icon
             visible: !(currentRow.currentId === "all" && currentRow.currentKind === "INVALID")
+                    && currentRow.currentStatus != "OK"
             anchors.left: parent.left; anchors.leftMargin: -5
             anchors.verticalCenter: parent.verticalCenter
-            name: currentRow.currentStatus ? "error" :"issues"
-            color: currentRow.currentAlive ? currentRow.currentStatus ? "red" :"black" : "grey"
+            name: currentRow.currentStatus == "ERROR" ? "error"
+                    : currentRow.currentStatus == "WARNING" ? "issues" : ""
+            color: currentRow.currentAlive ? currentRow.currentStatus == "ERROR" ? "red" :"black" : "grey"
             size: 15
         }
 

qml/TabLayout.qml

@@ -223,9 +223,9 @@ Item {
                                     for (var j=0; j<stack_layout.count; j++)
                                     {
                                         if (stack_layout.children[j].stack_id == tabLayout.tab_model_[i]["stack_id"] &&
-                                            stack_layout.children[j].currentItem.entity_id > 0)
+                                            stack_layout.children[j].currentItem.domain_entity_id > 0)
                                         {
-                                            controller.domain_click(stack_layout.children[j].currentItem.entity_id)
+                                            controller.domain_click(stack_layout.children[j].currentItem.domain_entity_id)
                                             break;
                                         }
                                     }
@@ -247,15 +247,15 @@ Item {
                             function onInitialize_domain_view_(stack_id, entity_id, domain_id) {
                                 if (domainGraphLayout.component_id == stack_id)
                                 {
-                                    domainGraphLayout.entity_id = entity_id
+                                    domainGraphLayout.domain_entity_id = entity_id
                                     domainGraphLayout.domain_id = domain_id
                                     domainGraphLayout.load_model()
                                 }
                             }
 
                             function onFilter_domain_view_by_topic_(stack_id, domain_entity_id, topic_id) {
                                 if (domainGraphLayout.component_id == stack_id &&
-                                    domainGraphLayout.entity_id == domain_entity_id)
+                                    domainGraphLayout.domain_entity_id == domain_entity_id)
                                 {
                                     domainGraphLayout.filter_model_by_topic(topic_id)
                                 }
@@ -507,9 +507,9 @@ Item {
                 for (var i=0; i<stack_layout.count; i++)
                 {
                     if (stack_layout.children[i].stack_id == tabLayout.tab_model_[idx]["stack_id"] &&
-                        stack_layout.children[i].currentItem.entity_id > 0)
+                        stack_layout.children[i].currentItem.domain_entity_id > 0)
                     {
-                        controller.domain_click(stack_layout.children[i].currentItem.entity_id)
+                        controller.domain_click(stack_layout.children[i].currentItem.domain_entity_id)
                         break;
                     }
                 }
@@ -634,7 +634,7 @@ Item {
     function refresh_domain_graph_view(domainEntityId, entityId) {
         for (var i=0; i<stack_layout.count; i++)
         {
-            if (stack_layout.children[i].currentItem.entity_id != undefined)
+            if (stack_layout.children[i].currentItem.domain_entity_id != undefined)
             {
                 if (stack_layout.children[i].currentItem.contains_entity(domainEntityId, entityId))
                 {