Fix regression in Value Editor RedisInsight#3679

Author: uglide

src/app/models/key-models/hashkey.h

@@ -20,7 +20,7 @@ class HashKeyModel : public KeyModel<QPair<QByteArray, QByteArray>>
     void addLoadedRowsToCache(const QVariantList& list, int rowStart) override;
 
 private:
-    enum Roles { Value = Qt::UserRole + 1, RowNumber, Key};
+    enum Roles { RowNumber = Qt::UserRole + 1, Key, Value};
 
     void setHashRow(const QByteArray &hashKey, const QByteArray &hashValue, bool updateIfNotExist = true);
     void deleteHashRow(const QByteArray& hashKey);

src/app/models/key-models/listlikekey.h

@@ -17,7 +17,7 @@ class ListLikeKeyModel : public KeyModel<QByteArray>
     QVariant getData(int rowIndex, int dataRole) override;
 
 protected:
-    enum Roles { Value = Qt::UserRole + 1, RowNumber};
+    enum Roles { RowNumber = Qt::UserRole + 1, Value};
 
 protected:
     void addLoadedRowsToCache(const QVariantList& rows, int rowStart) override;

src/app/models/key-models/sortedsetkey.h

@@ -20,7 +20,7 @@ class SortedSetKeyModel : public KeyModel<QPair<QByteArray, QByteArray>>
     void addLoadedRowsToCache(const QVariantList& list, int rowStart) override;
 
 private:
-    enum Roles { Value = Qt::UserRole + 1, RowNumber, Score};
+    enum Roles { RowNumber = Qt::UserRole + 1, Value, Score};
 
     bool addSortedSetRow(const QByteArray &value, QByteArray score);
     void deleteSortedSetRow(const QByteArray& value);

src/modules/value-editor/viewmodel.cpp

@@ -89,7 +89,7 @@ QVariant ValueEditor::ViewModel::data(const QModelIndex &index, int role) const
         case keyNameRole: return model->getKeyName();
         case keyDisplayName: return model->getKeyTitle();
         case keyTTL: return model->getTTL();
-        case keyType: return model->getType();        
+        case keyType: return model->getType();                
         case showValueNavigation: return model->isMultiRow();
         case columnNames: return QVariant(model->getColumnNames()).toList();
         case count: return static_cast<qulonglong>(model->rowsCount());
@@ -108,8 +108,7 @@ QHash<int, QByteArray> ValueEditor::ViewModel::roleNames() const
     roles[keyType] = "keyType";    
     roles[showValueNavigation] = "showValueNavigation";
     roles[columnNames] = "columnNames";
-    roles[count] = "valuesCount";
-    roles[keyValue] = "keyValue";
+    roles[count] = "valuesCount";    
     return roles;
 }
 
@@ -206,7 +205,7 @@ void ValueEditor::ViewModel::setCurrentTab(int i)
     m_currentTabIndex = i;
 }
 
-QObject* ValueEditor::ViewModel::getValue(int i)
+QObject* ValueEditor::ViewModel::getValue(int i) const
 {
     if (!isIndexValid(index(i, 0)))
         return nullptr;
@@ -215,7 +214,6 @@ QObject* ValueEditor::ViewModel::getValue(int i)
 
     QList<QObject *> valueEditors = model->getConnector()->findChildren<QObject *>();
 
-
     if (valueEditors.isEmpty())
         return new ValueEditor::ValueViewModel(model);
     else
@@ -257,7 +255,7 @@ void ValueEditor::ViewModel::loadModel(QSharedPointer<ValueEditor::Model> model,
         m_valueModels.insert(m_currentTabIndex, model);
         m_valueModels.removeAt(m_currentTabIndex+1);
         emit dataChanged(index(m_currentTabIndex, 0), index(m_currentTabIndex, 0));
-        emit replaceTab(m_currentTabIndex);        
+        emit replaceTab(m_currentTabIndex);
     }
 }
 

src/modules/value-editor/viewmodel.h

@@ -18,7 +18,6 @@ namespace ValueEditor {
 class ViewModel : public QAbstractListModel
 {
     Q_OBJECT
-
 public:
     enum Roles {
         keyNameRole = Qt::UserRole + 1,
@@ -28,8 +27,7 @@ class ViewModel : public QAbstractListModel
         keyType,        
         showValueNavigation,
         columnNames,
-        count,
-        keyValue
+        count
     };
 
 public:
@@ -49,7 +47,7 @@ class ViewModel : public QAbstractListModel
     Q_INVOKABLE void setTTL(int i, const QString& newTTL);
     Q_INVOKABLE void closeTab(int i);
     Q_INVOKABLE void setCurrentTab(int i);
-    Q_INVOKABLE QObject* getValue(int i);    
+    Q_INVOKABLE QObject* getValue(int i) const;    
 
 signals:
     void keyError(int index, const QString& error);