Clean up error details in notification dialog properly

Fix RedisInsight#5052
ETCPark · May 20, 2021 · cb2245c · cb2245c
1 parent 78455de
commit cb2245c
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 10 deletions.
diff --git a/src/qml/app.qml b/src/qml/app.qml
@@ -130,22 +130,48 @@ ApplicationWindow {
         }
     }
 
-    OkDialog {
+    Loader {
         id: notification
-        objectName: "rdm_qml_error_dialog"
-        visible: false
+
+        property var icon
+        property string text
+        property string details
 
         function showError(msg, details="") {
             icon = StandardIcon.Warning
             text = msg
-            detailedText = details
-            open()
+            notification.details = details
+            sourceComponent = notificationTemplate
         }
 
         function showMsg(msg) {
             icon = StandardIcon.Information
             text = msg
-            open()
+            details = ""
+            sourceComponent = notificationTemplate
+        }
+
+        onLoaded: {
+            item.open()
+        }
+
+        Component {
+            id: notificationTemplate
+
+            OkDialog {
+                objectName: "rdm_qml_error_dialog"
+                visible: false
+
+                icon: notification.icon
+                text: notification.text
+                detailedText: notification.details
+
+                onVisibleChanged: {
+                    if (!visible) {
+                        notification.sourceComponent = undefined
+                    }
+                }
+            }
         }
     }
 

diff --git a/src/qml/bulk-operations/BulkOperationsDialog.qml b/src/qml/bulk-operations/BulkOperationsDialog.qml
@@ -50,7 +50,10 @@ Dialog {
         bulkErrorNotification.text = text
         if (details) {
             bulkErrorNotification.detailedText = details
+        } else {
+            bulkErrorNotification.detailedText = ""
         }
+
         bulkErrorNotification.open()
     }
 
@@ -363,7 +366,7 @@ Dialog {
                                 bulkSuccessNotification.open()
                             }
 
-                            function onError(e) {
+                            function onError(e, details) {
                                 showError(qsTranslate("RDM","Bulk Operation finished with errors"), e, details)
                             }
                         }
@@ -428,10 +431,39 @@ Dialog {
                 MouseArea { anchors.fill: parent }
             }
 
-            OkDialog {
+            Loader {
                 id: bulkErrorNotification
-                modality: Qt.NonModal
-                visible: false
+
+                property var icon: StandardIcon.Warning
+                property string title
+                property string text
+                property string detailedText
+
+                Component {
+                    id: bulkNotificationTemplate
+
+                    OkDialog {
+                        modality: Qt.NonModal
+                        title: bulkErrorNotification.title
+                        icon: bulkErrorNotification.icon
+                        text: bulkErrorNotification.text
+                        detailedText: bulkErrorNotification.detailedText
+
+                        onVisibleChanged: {
+                            if (!visible) {
+                                bulkErrorNotification.sourceComponent = undefined
+                            }
+                        }
+                    }
+                }
+
+                onLoaded: {
+                    item.open()
+                }
+
+                function open() {
+                    sourceComponent = bulkNotificationTemplate
+                }
             }
 
             OkDialog {