Fix issues in New Key dialog

Author: uglide

src/modules/value-editor/viewmodel.cpp

@@ -106,15 +106,17 @@ QHash<int, QByteArray> ValueEditor::ViewModel::roleNames() const
     return roles;
 }
 
-void ValueEditor::ViewModel::addKey(QString keyName, QString keyType, const QVariantMap &row)
+void ValueEditor::ViewModel::addKey(QString keyName, QString keyType,
+                                    const QVariantMap &row, QJSValue jsCallback)
 {
     try {
         m_keyFactory->addKey(m_newKeyRequest.first,
                              keyName.toUtf8(), m_newKeyRequest.second,
                              keyType, row);
         m_newKeyCallback();
-    } catch (const Model::Exception& e) {
-        emit keyError(-1, "Can't add new key: " + QString(e.what()));
+        jsCallback.call(QJSValueList {});
+    } catch (const Model::Exception& e) {        
+        jsCallback.call(QJSValueList { "Can't add new key: " + QString(e.what()) });
     }
 }
 

src/modules/value-editor/viewmodel.h

@@ -5,6 +5,7 @@
 #include <QPair>
 #include <QByteArray>
 #include <QSharedPointer>
+#include <QJSValue>
 #include "abstractkeyfactory.h"
 #include "keymodel.h"
 
@@ -41,7 +42,8 @@ class ViewModel : public QAbstractListModel
 
 
 public: // methods exported to QML
-    Q_INVOKABLE void addKey(QString keyName, QString keyType, const QVariantMap &row);
+    Q_INVOKABLE void addKey(QString keyName, QString keyType,
+                            const QVariantMap &row, QJSValue jsCallback);
     Q_INVOKABLE void renameKey(int index, const QString& newKeyName);
     Q_INVOKABLE void removeKey(int i);
     Q_INVOKABLE void closeTab(int i);

src/resources/qml/AddKeyDialog.qml

@@ -77,13 +77,21 @@ Item {
                             }
 
                             var row = valueAddEditor.item.getValue()
-                            viewModel.addKey(newKeyName.text,
-                                             typeSelector.model[typeSelector.currentIndex],
-                                             row)
-
-                            newKeyName.text = ''
-                            valueAddEditor.item.reset()
-                            root.close()
+                            viewModel.addKey(
+                                newKeyName.text,
+                                typeSelector.model[typeSelector.currentIndex],
+                                row,
+                                function callback(err) {
+                                     if (!err) {
+                                         newKeyName.text = ''
+                                         valueAddEditor.item.reset()
+                                         root.close()
+                                     } else {
+                                        addError.text = err
+                                        addError.open()
+                                     }
+                                 }
+                            )
                         }
                     }
 
@@ -97,12 +105,12 @@ Item {
         }
 
         MessageDialog {
-            id: addConfirmation
-            title: "Save value"
+            id: addError
+            title: "Error"
             text: ""
             visible: false
             modality: Qt.ApplicationModal
-            icon: StandardIcon.Information
+            icon: StandardIcon.Warning
             standardButtons: StandardButton.Ok
         }
     }

src/resources/qml/editors/HashItemEditor.qml

@@ -20,6 +20,7 @@ AbstractEditor {
         value: ""
         enabled: originalValue != "" || root.state !== "edit"
         property var originalValue: ""
+        showFormatters: root.state != "new"
 
         style: TextAreaStyle {
             backgroundColor: (!keyText.value && keyText.enabled

src/resources/qml/editors/SingleItemEditor.qml

@@ -52,7 +52,7 @@ AbstractEditor {
     }
 
     function reset() {
-        textArea.text = ''
+        textArea.value = ''
         console.log("reset")
     }
 }

src/resources/qml/value-editor.qml

@@ -134,8 +134,7 @@ Rectangle {
                tabs.removeTab(0)
         }
 
-        onNewKeyDialog: {
-            console.log(dbIdentificationString, keyPrefix)
+        onNewKeyDialog: {            
             addNewKeyDialog.open()
         }
     }