Merge branch 'dev' of https://github.com/introlab/opentera-dashboards…

…-service into dev
introlab · Mar 1, 2024 · 8708e61 · 8708e61
2 parents fd7bf40 + 3614ea7
commit 8708e61
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 106 deletions.
diff --git a/Frontend/DashboardsViewer/CMakeLists.txt b/Frontend/DashboardsViewer/CMakeLists.txt
@@ -45,7 +45,6 @@ target_link_libraries(DashboardsViewerApp PRIVATE
     Qt6::Qml
     Qt6::Quick
     opentera_libs_client_user_qmlplugin
-    dashboardviewer_qml_cpp_modules_config_parser_qml
     dashboardviewer_qml_cpp_modules_config_parser_qmlplugin
     dashboardsviewer_resources
 )

diff --git a/Frontend/DashboardsViewer/content/CMakeLists.txt b/Frontend/DashboardsViewer/content/CMakeLists.txt
@@ -33,9 +33,9 @@ qt6_add_qml_module(content
         dataSources/ParticipantSessionListDataSource.qml
         # Delegates
         delegates/ParticipantDelegate.qml
+        delegates/SessionDelegate.qml
 
     RESOURCES
         fonts/Arimo-VariableFont_wght.ttf
         images/logos/LogoOpenTera.png
-
 )
diff --git a/Frontend/DashboardsViewer/content/dataSources/ParticipantListDataSource.qml b/Frontend/DashboardsViewer/content/dataSources/ParticipantListDataSource.qml
@@ -2,61 +2,12 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts
 import OpenTeraLibs.UserClient 1.0
+import "../delegates"
 
 Item {
 
     property string url: "" // Empty URL
     property int id_project: 0 // Empty Project
-    property Component delegate:  Component {
-    id: myDelegate
-
-        Rectangle {
-            id: myRectangle
-            width: parent.width
-            height: 80
-            color: "#cccccc"
-            border.color: "black"
-            border.width: 1
-            radius: 5
-
-            ColumnLayout {
-                id: columnLayout
-                anchors.fill: parent
-
-
-                // Customize delegate appearance as needed
-                Text {
-                    height: 20
-                    text:  "Name: " + participant_name
-                    color: "red"
-                }
-
-                Text {
-                    height: 20
-                    text:  "Enabled: " + participant_enabled
-                    color: "green"
-                }
-
-                Text {
-                    height: 20
-                    text:  "UUID: " + participant_uuid
-                    color: "blue"
-                }
-            }
-
-            MouseArea {
-                id: mouseArea
-                anchors.fill: parent
-                onClicked: {
-                    console.log("Clicked on: " + participant_name);
-                    console.log("Id participant", id_participant);
-                    console.log("Id project", id_project)
-                    fetch.participantClicked(id_participant);
-                }
-            }
-        }
-    } // Component
-
     property ListModel model: ListModel {
         id: myModel
     }

diff --git a/Frontend/DashboardsViewer/content/dataSources/ParticipantSessionListDataSource.qml b/Frontend/DashboardsViewer/content/dataSources/ParticipantSessionListDataSource.qml
@@ -2,46 +2,15 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts
 import OpenTeraLibs.UserClient 1.0
+import "../delegates"
 
 Item {
 
     property string url: "/api/user/sessions" // Empty URL
     property int id_participant: 0 // Empty Participant
-    property Component delegate:  Component {
-    id: myDelegate
-
-        Rectangle {
-            id: myRectangle
-            width: parent.width
-            height: 80
-            color: "#cccccc"
-            border.color: "black"
-            border.width: 1
-            radius: 5
-
-            ColumnLayout {
-                id: columnLayout
-                anchors.fill: parent
-
-                Text {
-                    id: text1
-                    text: id_session + "(" + session_name + ")"
-                    font.bold: true
-                    font.pixelSize: 20
-                    color: "black"
-                }
-
-            }
-
-            MouseArea {
-                id: mouseArea
-                anchors.fill: parent
-                onClicked: {
-
-                }
-            }
-        }
-    } // Component
+    property Component delegate: SessionDelegate {
+        id: myDelegate
+    }
 
     property ListModel model: ListModel {
         id: myModel

diff --git a/Frontend/DashboardsViewer/content/delegates/ParticipantDelegate.qml b/Frontend/DashboardsViewer/content/delegates/ParticipantDelegate.qml
@@ -3,19 +3,11 @@ import QtQuick.Controls 2.15
 import QtQuick.Layouts
 
 
-Component {
+Item {
     id: myDelegate
 
-    // Default property values
-    property string participant_name: ""
-    property string participant_enabled: ""
-    property string participant_uuid: ""
-    property int id_participant: 0
-    property int id_project: 0
-
     signal participantClicked(int id);
 
-
     Rectangle {
         id: myRectangle
         width: 500
@@ -50,6 +42,7 @@ Component {
             }
         }
 
+
         MouseArea {
             id: mouseArea
             anchors.fill: parent
@@ -60,5 +53,6 @@ Component {
                 participantClicked(id_participant);
             }
         }
+
     }
 } // Component
diff --git a/Frontend/DashboardsViewer/content/delegates/SessionDelegate.qml b/Frontend/DashboardsViewer/content/delegates/SessionDelegate.qml
@@ -0,0 +1,39 @@
+import QtQuick 2.15
+import QtQuick.Controls 2.15
+import QtQuick.Layouts
+
+Item {
+    id: myDelegate
+
+        Rectangle {
+            id: myRectangle
+            width: 500
+            height: 80
+            color: "#cccccc"
+            border.color: "black"
+            border.width: 1
+            radius: 5
+
+            ColumnLayout {
+                id: columnLayout
+                anchors.fill: parent
+
+                Text {
+                    id: text1
+                    text: id_session + "(" + session_name + ")"
+                    font.bold: true
+                    font.pixelSize: 20
+                    color: "black"
+                }
+
+            }
+
+            MouseArea {
+                id: mouseArea
+                anchors.fill: parent
+                onClicked: {
+                    console.log("SessionDelegate clicked");
+                }
+            }
+        }
+    } // Component
diff --git a/Frontend/DashboardsViewer/qml_cpp_modules/config_parser/src/CMakeLists.txt b/Frontend/DashboardsViewer/qml_cpp_modules/config_parser/src/CMakeLists.txt
@@ -15,5 +15,5 @@ qt_add_qml_module(dashboardviewer_qml_cpp_modules_config_parser_qml
     OUTPUT_DIRECTORY ${QT_QML_OUTPUT_DIRECTORY}/DashboardsViewer/ConfigParser
     SOURCES ${dashboardviewer_qml_cpp_modules_config_parser_headers} ${dashboardviewer_qml_cpp_modules_config_parser_srcs}
 )
-target_link_libraries(dashboardviewer_qml_cpp_modules_config_parser_qml PUBLIC Qt${QT_VERSION_MAJOR}::Core  Qt${QT_VERSION_MAJOR}::Qml)
-target_include_directories(dashboardviewer_qml_cpp_modules_config_parser_qml PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(dashboardviewer_qml_cpp_modules_config_parser_qmlplugin PUBLIC Qt${QT_VERSION_MAJOR}::Core  Qt${QT_VERSION_MAJOR}::Qml)
+target_include_directories(dashboardviewer_qml_cpp_modules_config_parser_qmlplugin PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
diff --git a/Frontend/DashboardsViewer/qml_cpp_modules/config_parser/src/ConfigParser.cpp b/Frontend/DashboardsViewer/qml_cpp_modules/config_parser/src/ConfigParser.cpp
@@ -9,6 +9,7 @@
 #include <QDirIterator>
 #include <QBuffer>
 #include <QTextStream>
+#include <QRegularExpression>
 
 ConfigParser::ConfigParser(QObject *parent)
 :   QObject(parent)
@@ -21,6 +22,14 @@ ConfigParser::~ConfigParser()
 
 }
 
+
+
+bool ConfigParser::isValidString(const QString &input) {
+    QRegularExpression regex("^[a-zA-Z0-9. |]+$");
+    return regex.match(input).hasMatch();
+}
+
+
 QVariantList ConfigParser::parseConfig(const QString &configPath)
 {
     qDebug() << "ConfigParser::parseConfig() called with configPath: " << configPath;
@@ -189,19 +198,38 @@ void ConfigParser::writeProperties(const QJsonObject &properties, QTextStream &s
 
         if (type == "string")
         {
-            stream << "    " << it.key() << ": \"" << property["value"].toString() << "\";\n";
+            stream << "    " << it.key() << ": \"" << property["value"].toString() << "\"\n";
         }
         else if (type == "raw")
         {
-            stream << "    " << it.key() << ": " << property["value"].toString() << ";\n";
+            QString value = property["value"].toString();
+            if (isValidString(value))
+            {
+                stream << "    " << it.key() << ": " << value << "\n";
+            }
+            else {
+                qDebug() << "Invalid value for raw type : " << value;
+            }
         }
         else if (type == "int")
         {
-            stream << "    " << it.key() << ": " << property["value"].toInt() << ";\n";
+            stream << "    " << it.key() << ": " << property["value"].toInt() << "\n";
         }
         else if (type == "bool")
         {
-            stream << "    " << it.key() << ": " << property["value"].toString() << ";\n";
+            stream << "    " << it.key() << ": " << property["value"].toString() << "\n";
+        }
+        else if (type == "delegate")
+        {
+            QString value = property["value"].toString();
+            if (isValidString(value))
+            {
+                stream << "    " << it.key() << ": " << property["value"].toString() << "{}\n";
+            }
+            else
+            {
+                qDebug() << "Invalid value for delegate type : " << value;
+            }
         }
         else
         {

diff --git a/Frontend/DashboardsViewer/qml_cpp_modules/config_parser/src/ConfigParser.h b/Frontend/DashboardsViewer/qml_cpp_modules/config_parser/src/ConfigParser.h
@@ -21,7 +21,7 @@ class ConfigParser : public QObject
 
 
 private:
-
+    bool isValidString(const QString &input);
     void writeLayout(const QJsonObject &layout, QTextStream &stream);
     void writeWidget(const QJsonObject &widget, QTextStream &stream);
     void writeProperties(const QJsonObject &properties, QTextStream &stream);

diff --git a/Frontend/DashboardsViewer/resources/json/TestDashboardv2.json b/Frontend/DashboardsViewer/resources/json/TestDashboardv2.json
@@ -78,7 +78,7 @@
                            "id": {"type": "raw", "value": "participantList"},
                            "Layout.alignment": {"type": "raw", "value": "Qt.AlignVCenter | Qt.AlignHCenter"},
                            "model": {"type": "raw", "value": "participantListData.model"},
-                           "delegate": {"type": "raw", "value": "participantListData.delegate"}
+                           "delegate": {"type": "delegate", "value": "ParticipantDelegate"}
                        }
                     },
                     {
@@ -87,7 +87,7 @@
                            "id": {"type": "raw", "value": "participantSessionList"},
                            "Layout.alignment": {"type": "raw", "value": "Qt.AlignVCenter | Qt.AlignHCenter"},
                            "model": {"type": "raw", "value": "participantSessionListData.model"},
-                           "delegate": {"type": "raw", "value": "participantSessionListData.delegate"}
+                           "delegate": {"type": "delegate", "value": "SessionDelegate"}
                        }
                     }
                 ]
@@ -118,7 +118,7 @@
             "target": {"object": "participantListData", "slot": "update", "args": []}
         },
         {
-            "source": {"object": "participantListData", "signal": "onParticipantClicked"},
+            "source": {"object": "participantList.delegate", "signal": "onParticipantClicked"},
             "target": {"object": "participantSessionListData", "slot": "setParticipant", "args": ["id_participant"]}
         }
     ]