Fix regression in ValueEditor

Fix #5068
Fix #5066

Author: uglide

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

@@ -9,14 +9,14 @@ HashKeyModel::HashKeyModel(QSharedPointer<RedisClient::Connection> connection,
 QString HashKeyModel::type() { return "hash"; }
 
 QStringList HashKeyModel::getColumnNames() {
-  return QStringList() << "row"
+  return QStringList() << "rowNumber"
                        << "key"
                        << "value";
 }
 
 QHash<int, QByteArray> HashKeyModel::getRoles() {
   QHash<int, QByteArray> roles;
-  roles[Roles::RowNumber] = "row";
+  roles[Roles::RowNumber] = "rowNumber";
   roles[Roles::Key] = "key";
   roles[Roles::Value] = "value";
   return roles;

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

@@ -6,14 +6,14 @@ ListLikeKeyModel::ListLikeKeyModel(
     : KeyModel(connection, fullPath, dbIndex, ttl, rowsCountCmd, rowsLoadCmd) {}
 
 QStringList ListLikeKeyModel::getColumnNames() {
-  return QStringList() << "row"
+  return QStringList() << "rowNumber"
                        << "value";
 }
 
 QHash<int, QByteArray> ListLikeKeyModel::getRoles() {
   QHash<int, QByteArray> roles;
   roles[Roles::Value] = "value";
-  roles[Roles::RowNumber] = "row";
+  roles[Roles::RowNumber] = "rowNumber";
   return roles;
 }
 

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

@@ -10,14 +10,14 @@ SortedSetKeyModel::SortedSetKeyModel(
 QString SortedSetKeyModel::type() { return "zset"; }
 
 QStringList SortedSetKeyModel::getColumnNames() {
-  return QStringList() << "row"
+  return QStringList() << "rowNumber"
                        << "value"
                        << "score";
 }
 
 QHash<int, QByteArray> SortedSetKeyModel::getRoles() {
   QHash<int, QByteArray> roles;
-  roles[Roles::RowNumber] = "row";
+  roles[Roles::RowNumber] = "rowNumber";
   roles[Roles::Value] = "value";
   roles[Roles::Score] = "score";
   return roles;

src/app/models/key-models/stream.cpp

@@ -9,14 +9,14 @@ StreamKeyModel::StreamKeyModel(
 QString StreamKeyModel::type() { return "stream"; }
 
 QStringList StreamKeyModel::getColumnNames() {
-  return QStringList() << "row"
+  return QStringList() << "rowNumber"
                        << "id"
                        << "value";
 }
 
 QHash<int, QByteArray> StreamKeyModel::getRoles() {
   QHash<int, QByteArray> roles;
-  roles[Roles::RowNumber] = "row";
+  roles[Roles::RowNumber] = "rowNumber";
   roles[Roles::ID] = "id";
   roles[Roles::Value] = "value";
   return roles;

src/modules/common/sortfilterproxymodel.cpp

@@ -96,15 +96,6 @@ int SortFilterProxyModel::getOriginalRowIndex(int i)
     return mapToSource(proxyIndex).row();
 }
 
-int SortFilterProxyModel::getProxyRowIndex(int i)
-{
-    if (!sourceModel())
-      return -1;
-
-    QModelIndex originalIndex = sourceModel()->index(i, 0);
-    return mapFromSource(originalIndex).row();
-}
-
 int SortFilterProxyModel::roleKey(const QByteArray &role) const
 {
     QHash<int, QByteArray> roles = roleNames();

src/modules/common/sortfilterproxymodel.h

@@ -50,8 +50,7 @@ class SortFilterProxyModel : public QSortFilterProxyModel, public QQmlParserStat
     void classBegin();
     void componentComplete();
 
-    Q_INVOKABLE int getOriginalRowIndex(int i);
-    Q_INVOKABLE int getProxyRowIndex(int i);
+    Q_INVOKABLE int getOriginalRowIndex(int i);    
 
 signals:
     void filterStringChanged();

src/qml/value-editor/ValueTable.qml

@@ -50,7 +50,13 @@ Item {
 
                         BetterLabel {
                             anchors.centerIn: parent
-                            text: modelData
+                            text: {
+                                if (modelData === "rowNumber") {
+                                    return "#";
+                                } else {
+                                    return modelData
+                                }
+                            }
                             color: sysPalette.windowText
                         }
 
@@ -183,6 +189,7 @@ Item {
                         reuseItems: false
                         model: searchModel ? searchModel : null
 
+                        // Proxy model row index from 0 to maxItemsOnPage
                         property int currentRow: -1
                         property var searchField
                         property var currentStart: 0
@@ -266,14 +273,18 @@ Item {
                             DelegateChoice {
                                 column: 0
 
+
+                                // NOTE: rowNumber - key model zero based index from 0 to rowsCount
+                                // NOTE: row - from 0 to pageSize
+
                                 ValueTableCell {
                                     objectName: "rdm_value_table_cell_col1"
                                     implicitWidth: table.firstColumnWidth
                                     implicitHeight: 30
-                                    text: Number(row) + 1
-                                    selected: table.model.getOriginalRowIndex(table.currentRow) === row
+                                    text: Number(rowNumber) + 1
+                                    selected: table.currentRow === row
                                     onClicked: {
-                                        table.currentRow = table.model.getProxyRowIndex(row)
+                                        table.currentRow = row
                                         table.forceActiveFocus()
                                     }
                                 }
@@ -287,12 +298,9 @@ Item {
                                     implicitWidth: table.valueColumnWidth
                                     implicitHeight: 30
                                     text: renderText(display)
-                                    selected: table.model.getOriginalRowIndex(table.currentRow) === row
+                                    selected: table.currentRow === row
                                     onClicked: {
-                                        table.currentRow = table.model.getProxyRowIndex(row)
-
-                                        console.log(table.model.getProxyRowIndex(row), row)
-
+                                         table.currentRow = row
                                         table.forceActiveFocus()
                                     }
                                 }
@@ -306,9 +314,9 @@ Item {
                                     implicitWidth: table.valueColumnWidth
                                     implicitHeight: 30
 
-                                    selected: table.model.getOriginalRowIndex(table.currentRow) === row
+                                    selected: table.currentRow === row
                                     onClicked: {
-                                        table.currentRow = table.model.getProxyRowIndex(row)
+                                        table.currentRow = row
                                         table.forceActiveFocus()
                                     }
 
@@ -430,7 +438,7 @@ Item {
                         onCurrentRowChanged: {
                             console.log("Current row in table changed: ", currentRow)
                             if (currentRow >= 0) {
-                                valueEditor.loadRowValue(table.model.getOriginalRowIndex(currentRow))
+                                valueEditor.loadRowValue(currentStart + table.model.getOriginalRowIndex(currentRow))
                             }
                         }
                     }

src/qml/value-editor/ValueTableActions.qml

@@ -113,7 +113,7 @@ ColumnLayout {
 
             console.log("removing row", table.currentRow)
 
-            deleteRowConfirmation.rowToDelete = table.currentRow
+            deleteRowConfirmation.rowToDelete = table.model.getOriginalRowIndex(table.currentRow)
             deleteRowConfirmation.open()
         }
 

src/qml/value-editor/ValueTabs.qml

@@ -349,6 +349,8 @@ Repeater {
 
                         Loader {
                             id: valueEditor
+                            objectName: "rdm_value_editor_loader"
+
                             Layout.topMargin: 5
                             Layout.fillWidth: true
                             Layout.fillHeight: true