Merge 6014482 into 5519ad0

RedisInsight · Apr 4, 2018 · c4a766c · c4a766c
2 parents 5519ad0 + 6014482
commit c4a766c
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 14 deletions.
diff --git a/src/app/models/treeoperations.cpp b/src/app/models/treeoperations.cpp
@@ -127,6 +127,11 @@ QString TreeOperations::getNamespaceSeparator()
     return static_cast<ServerConfig>(m_connection->getConfig()).namespaceSeparator();
 }
 
+QString TreeOperations::defaultFilter()
+{
+    return static_cast<ServerConfig>(m_connection->getConfig()).keysPattern();
+}
+
 void TreeOperations::openKeyTab(ConnectionsTree::KeyItem& key, bool openInNewTab)
 {
     emit m_manager.openValueTab(m_connection, key, openInNewTab);

diff --git a/src/app/models/treeoperations.h b/src/app/models/treeoperations.h
@@ -28,6 +28,8 @@ class TreeOperations : public QObject, public ConnectionsTree::Operations,
 
     QString getNamespaceSeparator() override;    
 
+    QString defaultFilter() override;
+
     void openKeyTab(ConnectionsTree::KeyItem& key, bool openInNewTab = false) override;
 
     void openConsoleTab() override;

diff --git a/src/modules/connections-tree/items/abstractnamespaceitem.cpp b/src/modules/connections-tree/items/abstractnamespaceitem.cpp
@@ -15,7 +15,8 @@ AbstractNamespaceItem::AbstractNamespaceItem(Model& model,
                                              uint dbIndex)
     : TreeItem(model),
       m_parent(parent),
-      m_operations(operations),      
+      m_operations(operations),
+      m_filter(operations->defaultFilter()),
       m_expanded(false),
       m_dbIndex(dbIndex)
 {

diff --git a/src/modules/connections-tree/items/databaseitem.cpp b/src/modules/connections-tree/items/databaseitem.cpp
@@ -88,7 +88,7 @@ QByteArray DatabaseItem::getFullPath() const
 
 QString DatabaseItem::getDisplayName() const
 {          
-    QString filter =  m_filter.isEmpty()? "" : QString("[filter: %1]").arg(m_filter.pattern());
+    QString filter =  m_filter.pattern() == "*"? "" : QString("[filter: %1]").arg(m_filter.pattern());
     QString liveUpdate = m_liveUpdateTimer.isActive()? "[live update]" : "";
 
     return QString("db%1 %2 (%3) %4")
@@ -140,7 +140,7 @@ void DatabaseItem::loadKeys(std::function<void ()> callback)
 
 QVariantMap DatabaseItem::metadata() const
 {
-    QVariantMap metadata = TreeItem::metadata();
+    QVariantMap metadata = TreeItem::metadata();    
     metadata["filter"] = m_filter.pattern();
     metadata["live_update"] = m_liveUpdateTimer.isActive();
     return metadata;
@@ -223,7 +223,7 @@ void DatabaseItem::filterKeys(const QRegExp &filter)
 
 void DatabaseItem::resetFilter()
 {
-    m_filter = QRegExp();
+    m_filter = QRegExp(m_operations->defaultFilter());
     emit m_model.itemChanged(getSelf());
     reload();
 }
diff --git a/src/modules/connections-tree/keysrendering.cpp b/src/modules/connections-tree/keysrendering.cpp
@@ -27,14 +27,6 @@ void KeysTreeRenderer::renderKeys(QSharedPointer<Operations> operations,
     }
 
     for (QByteArray rawKey : keys) {
-
-        //if filter enabled - skip keys
-        if (!settings.filter.isEmpty()) {
-            QString key = QString::fromUtf8(rawKey); // UTF filtering
-            if (!key.contains(settings.filter))
-                continue;
-        }
-
         renderLazily(parent, rawKey.mid(unprocessedPartStart), rawKey, operations, settings,
                      expandedNamespaces);
     }

diff --git a/src/modules/connections-tree/operations.h b/src/modules/connections-tree/operations.h
@@ -50,6 +50,8 @@ namespace ConnectionsTree {
          */
         virtual QString getNamespaceSeparator() = 0;
 
+        virtual QString defaultFilter() = 0;
+
         virtual void openKeyTab(KeyItem& key, bool openInNewTab) = 0;
 
         virtual void openConsoleTab() = 0;

diff --git a/src/qml/ConnectionSettignsDialog.qml b/src/qml/ConnectionSettignsDialog.qml
@@ -373,7 +373,7 @@ Dialog {
 
                         columns: 2
 
-                        Label { text: qsTr("Keys glob-style pattern:") }
+                        Label { text: qsTr("Default filter:") }
 
                         TextField
                         {

diff --git a/src/qml/connections-tree/menu/InlineMenu.qml b/src/qml/connections-tree/menu/InlineMenu.qml
@@ -49,8 +49,16 @@ RowLayout {
                 }
 
                 tooltip: modelData['help'] != undefined ? modelData['help'] + " (" + modelData["shortcut"] + ")"  : ""
-                objectName: modelData['event'] != undefined ? "rdm_inline_menu_button_" + modelData['event'] : ""                
 
+                objectName: {
+                    if (modelData['event'] != undefined)
+                        return "rdm_inline_menu_button_" + modelData['event']
+
+                    if (modelData['callback'] != undefined)
+                        return "rdm_inline_menu_button_" + modelData['callback']
+
+                     return ""
+                }
             }
 
             Shortcut {

diff --git a/tests/unit_tests/testcases/connections-tree/mocks/itemoperationsmock.h b/tests/unit_tests/testcases/connections-tree/mocks/itemoperationsmock.h
@@ -44,6 +44,9 @@ class ItemOperationsMock : public ConnectionsTree::Operations {
     QString namespaceSeparator = ":";
     QString getNamespaceSeparator() { return namespaceSeparator; }
 
+    QString defaultKeysFilter = "*";
+    QString defaultFilter() { return defaultKeysFilter; }
+
     void disconnect() {}
 
     virtual void openKeyTab(ConnectionsTree::KeyItem&, bool) override {}