Merge pull request #4079 from uglide/fix_regression

Fix regression in Value Editor
RedisInsight · Apr 4, 2018 · 5519ad0 · 5519ad0
2 parents b7f6d57 + 210dec5
commit 5519ad0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/qml/value-editor/editors/HashItemEditor.qml b/src/qml/value-editor/editors/HashItemEditor.qml
@@ -32,6 +32,10 @@ AbstractEditor {
         enabled: root.active || root.state !== "edit"
         showFormatters: root.state == "edit"
         objectName: "rdm_key_hash_text_field"
+
+        function validationRule(raw) {
+            return true;
+        }
     }
 
     function initEmpty() {
@@ -41,7 +45,9 @@ AbstractEditor {
 
     function validateValue(callback) {
         keyText.validate(function (keyTextValid) {
-            return callback(keyTextValid);
+            textArea.validate(function (textAreaValid) {
+                return callback(keyTextValid && textAreaValid);
+            });
         });
     }
 

diff --git a/src/qml/value-editor/editors/MultilineEditor.qml b/src/qml/value-editor/editors/MultilineEditor.qml
@@ -26,6 +26,11 @@ ColumnLayout
         textView.textFormat = TextEdit.PlainText
     }
 
+    function validationRule(raw)
+    {
+        return qmlUtils.binaryStringLength(raw) > 0
+    }
+
     function validate(callback) {
         loadRawValue(function (error, raw) {            
 
@@ -34,7 +39,7 @@ ColumnLayout
                 return callback(false);
             }            
 
-            var valid = qmlUtils.binaryStringLength(raw) > 0
+            var valid = validationRule(raw)
 
             if (valid) {
                 hideValidationError()
@@ -168,8 +173,7 @@ ColumnLayout
         id: texteditorWrapper
         Layout.fillWidth: true
         Layout.fillHeight: true
-        Layout.preferredHeight: 100
-        objectName: "rdm_key_multiline_text_field"
+        Layout.preferredHeight: 100        
 
         color: "white"
         border.color: "#cccccc"
@@ -190,6 +194,7 @@ ColumnLayout
                 delegate:
                     NewTextArea {
                         id: textAreaPart
+                        objectName: "rdm_key_multiline_text_field_" + index
                         width: textView.width
                         height: textAreaPart.contentHeight < texteditorWrapper.height? texteditorWrapper.height - 5 : textAreaPart.contentHeight