Qt: Enable searching by transaction id #11395

luke-jr · 2017-09-25T04:20:02Z

No description provided.

meshcollider

utACK 3b35414

nit: use snake_case since you are refactoring the variable names anyway

promag

Concept ACK.

promag · 2017-09-25T09:10:57Z

src/qt/transactionfilterproxy.cpp

@@ -51,8 +52,11 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
        return false;
    if(datetime < dateFrom || datetime > dateTo)
        return false;
-    if (!address.contains(searchString, Qt::CaseInsensitive) && !label.contains(searchString, Qt::CaseInsensitive))
+    if (!address.contains(searchString, Qt::CaseInsensitive)


Avoid unnecessary code execution?

if (!searchString.isEmpty()) { ... }

address.contains("") will immediately return true, so the other two clauses won't get executed. I don't know that we need to over-optimise here.

Ok, not so immediately as isEmpty but agree with you.

promag · 2017-09-25T09:11:53Z

src/qt/transactionfilterproxy.cpp

@@ -36,6 +36,7 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
    int type = index.data(TransactionTableModel::TypeRole).toInt();
    QDateTime datetime = index.data(TransactionTableModel::DateRole).toDateTime();
    bool involvesWatchAddress = index.data(TransactionTableModel::WatchonlyRole).toBool();
+    QString txid = index.data(TransactionTableModel::TxIDRole).toString();


Nit, declare after label (sorted and follows the same test order below)?

promag · 2017-09-25T09:12:08Z

src/qt/transactionfilterproxy.cpp

@@ -51,8 +52,11 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
        return false;
    if(datetime < dateFrom || datetime > dateTo)
        return false;
-    if (!address.contains(searchString, Qt::CaseInsensitive) && !label.contains(searchString, Qt::CaseInsensitive))
+    if (!address.contains(searchString, Qt::CaseInsensitive)
+     && !  label.contains(searchString, Qt::CaseInsensitive)


Nit, drop alignments?

As it is clang-format makes it one line. This is preserved by clang-format:

if (!address.contains(searchString, Qt::CaseInsensitive) && !label.contains(searchString, Qt::CaseInsensitive) && !txid.contains(searchString, Qt::CaseInsensitive)) {

promag · 2017-09-25T09:14:46Z

src/qt/transactionfilterproxy.cpp

@@ -66,9 +66,9 @@ void TransactionFilterProxy::setDateRange(const QDateTime &from, const QDateTime
    invalidateFilter();
 }

-void TransactionFilterProxy::setAddressPrefix(const QString &_addrPrefix)
+void TransactionFilterProxy::setSearchString(const QString &_searchString)


Nit, const QString& search_string.

promag · 2017-09-25T09:15:06Z

src/qt/transactionfilterproxy.cpp

@@ -20,7 +20,7 @@ TransactionFilterProxy::TransactionFilterProxy(QObject *parent) :
    QSortFilterProxyModel(parent),
    dateFrom(MIN_DATE),
    dateTo(MAX_DATE),
-    addrPrefix(),
+    searchString(),


New convention m_search_string?

promag · 2017-09-25T09:16:59Z

src/qt/transactionview.cpp

@@ -305,11 +305,11 @@ void TransactionView::chooseWatchonly(int idx)
        (TransactionFilterProxy::WatchOnlyFilter)watchOnlyWidget->itemData(idx).toInt());
 }

-void TransactionView::changedPrefix(const QString &prefix)
+void TransactionView::changedSearch(const QString &prefix)


Renameprefix variable too?

promag · 2017-09-25T09:18:03Z

src/qt/transactionview.cpp

 {
    if(!transactionProxyModel)
        return;
-    transactionProxyModel->setAddressPrefix(prefix);
+    transactionProxyModel->setSearchString(prefix);


Suggestion, sanitize input, like trim?

Only a suggestion really.

promag · 2017-09-25T09:18:29Z

src/qt/transactionfilterproxy.cpp

 {
-    this->addrPrefix = _addrPrefix;
+    this->searchString = _searchString;


Nit:

if (this->m_search_string == search_string) return;

I think that would actually make performance worse...?

As it is now yes because QLineEdit doesn't emit unnecessary signals. But from this method perspective IMO this makes sense, the cost of the condition is way cheaper than invalidating the filter.

BTW, we could lower case the stored m_search_string to make the filter faster.

Ah, good points.

On second thought, we should never get to this point if the string hasn't changed, and lowercasing the search string doesn't make the filter faster because label/address aren't lowercased.

Imagine if pressing the ESC key erases the search string, pressing it the 2nd time would do nothing if the check is there.

So why .contains(..., Qt::CaseInsensitive)?

promag · 2017-09-25T23:38:31Z

src/qt/transactionfilterproxy.cpp

@@ -51,8 +52,11 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
        return false;
    if(datetime < dateFrom || datetime > dateTo)
        return false;
-    if (!address.contains(addrPrefix, Qt::CaseInsensitive) && !label.contains(addrPrefix, Qt::CaseInsensitive))
+    if (!address.contains(m_search_string, Qt::CaseInsensitive) &&
+        !  label.contains(m_search_string, Qt::CaseInsensitive) &&


clang-format will remove these whitespaces.

I consider this a shortcoming of clang-format, then. I don't consider the remaining nits as things that should be changed.

promag · 2017-09-25T23:41:57Z

src/qt/transactionfilterproxy.cpp

@@ -66,9 +66,9 @@ void TransactionFilterProxy::setDateRange(const QDateTime &from, const QDateTime
    invalidateFilter();
 }

-void TransactionFilterProxy::setAddressPrefix(const QString &_addrPrefix)
+void TransactionFilterProxy::setSearchString(const QString &search_string)


const QString& search_string.

promag · 2017-09-25T23:42:30Z

src/qt/transactionfilterproxy.h

@@ -35,7 +35,7 @@ class TransactionFilterProxy : public QSortFilterProxyModel
    };

    void setDateRange(const QDateTime &from, const QDateTime &to);
-    void setAddressPrefix(const QString &addrPrefix);
+    void setSearchString(const QString &);


const QString&.

Nit: I prefer having the variable names in the header (all others in this header do too). Unsure if there's a general preference though

promag · 2017-09-25T23:43:20Z

src/qt/transactionview.cpp

@@ -305,11 +305,11 @@ void TransactionView::chooseWatchonly(int idx)
        (TransactionFilterProxy::WatchOnlyFilter)watchOnlyWidget->itemData(idx).toInt());
 }

-void TransactionView::changedPrefix(const QString &prefix)
+void TransactionView::changedSearch(const QString &search_string)


Nit, const QString& search_string.

promag · 2017-09-25T23:43:53Z

src/qt/transactionview.h

@@ -66,7 +66,7 @@ class TransactionView : public QWidget
    QComboBox *dateWidget;
    QComboBox *typeWidget;
    QComboBox *watchOnlyWidget;
-    QLineEdit *addressWidget;
+    QLineEdit *search_widget;


Nit, QLineEdit* m_search_widget.

promag · 2017-09-25T23:44:23Z

src/qt/transactionview.h

@@ -110,7 +110,7 @@ public Q_SLOTS:
    void chooseDate(int idx);
    void chooseType(int idx);
    void chooseWatchonly(int idx);
-    void changedPrefix(const QString &prefix);
+    void changedSearch(const QString &search_string);


Nit, const QString& search_string.

promag · 2017-09-25T23:50:03Z

src/qt/transactionfilterproxy.cpp

@@ -51,8 +52,11 @@ bool TransactionFilterProxy::filterAcceptsRow(int sourceRow, const QModelIndex &
        return false;
    if(datetime < dateFrom || datetime > dateTo)
        return false;
-    if (!address.contains(addrPrefix, Qt::CaseInsensitive) && !label.contains(addrPrefix, Qt::CaseInsensitive))
+    if (!address.contains(m_search_string, Qt::CaseInsensitive) &&


BTW, back to if (!m_search_string.isEmpty()) { ... }, it can also save querying the model for those properties:

if (!m_search_string_lowered_case.isEmpty()) { QString address = ...toLowerCase(); ... return ...; }

Sounds like more complication for little value.

Probably, maybe @lclc can bench the change in #11015 for his use case.

promag · 2017-09-26T12:22:01Z

I don't consider the remaining nits as things that should be changed.

These aren't significant changes so why not comply with developer notes?

luke-jr · 2017-09-26T19:26:58Z

The developer notes don't say anything about which side * and & should hug, or the rest. Nitpicking such minor details seems like just a waste of time.

jonasschnelli · 2017-09-26T22:02:00Z

Concept ACK (haven't looked at the code so far).

promag · 2017-10-07T08:02:20Z

Needs rebase.

Sjors · 2017-11-09T13:45:03Z

Concept ACK. It's a bit strange to search for a field that's not visible in the table. Adding (part of) the transaction hash as a column would be more consistent, but obviously a bigger change and perhaps a waste of horizontal space. However that could all be added later.

It works for me:

promag · 2017-11-09T14:04:59Z

@luke-jr ping.

promag · 2017-11-09T14:08:08Z

It's a bit strange to search for a field that's not visible in the table

It is also strange to not have the txid in the "Transactions" view. 🙄 Agree it can be improved later.

luke-jr · 2017-11-10T11:50:32Z

Rebased

promag · 2017-11-12T12:34:51Z

Restarted travis job due to unrelated error.

promag · 2017-11-12T12:36:29Z

utACK.

meshcollider

re-utACK c407c61

meshcollider · 2017-11-13T11:12:55Z

src/qt/transactionfilterproxy.h

@@ -35,7 +35,7 @@ class TransactionFilterProxy : public QSortFilterProxyModel
    };

    void setDateRange(const QDateTime &from, const QDateTime &to);
-    void setAddressPrefix(const QString &addrPrefix);
+    void setSearchString(const QString &);


Nit: I prefer having the variable names in the header (all others in this header do too). Unsure if there's a general preference though

jonasschnelli

Tested ACK c407c61

eac2abc Qt: Enable searching by transaction id (Luke Dashjr) c407c61 Qt: Avoid invalidating the search filter, when it doesn't really change (Luke Dashjr) b1f6342 Qt: Rename confusingly-named "address prefix" to "search string" (Luke Dashjr) Pull request description: Tree-SHA512: 1c67037d19689fbaff21d15ed7848ac86188e5de34728312e1f9758dada759cab50d913a5bc09e413ecaa3e07557cf253809b95b5637ff79f2e3cf24d86dd3ed

Summary: eac2abc Qt: Enable searching by transaction id (Luke Dashjr) c407c61 Qt: Avoid invalidating the search filter, when it doesn't really change (Luke Dashjr) b1f6342 Qt: Rename confusingly-named "address prefix" to "search string" (Luke Dashjr) Pull request description: Tree-SHA512: 1c67037d19689fbaff21d15ed7848ac86188e5de34728312e1f9758dada759cab50d913a5bc09e413ecaa3e07557cf253809b95b5637ff79f2e3cf24d86dd3ed Backport of Core PR11395 bitcoin/bitcoin#11395 Depends on D3832 Test Plan: make check ./bitcoin-qt -> transactions -> enter transaction id to filter by Reviewers: deadalnix, Fabien, jasonbcox, O1 Bitcoin ABC, #bitcoin_abc Reviewed By: Fabien, O1 Bitcoin ABC, #bitcoin_abc Differential Revision: https://reviews.bitcoinabc.org/D3833

Summary: eac2abca0 Qt: Enable searching by transaction id (Luke Dashjr) c407c61c5 Qt: Avoid invalidating the search filter, when it doesn't really change (Luke Dashjr) b1f634242 Qt: Rename confusingly-named "address prefix" to "search string" (Luke Dashjr) Pull request description: Tree-SHA512: 1c67037d19689fbaff21d15ed7848ac86188e5de34728312e1f9758dada759cab50d913a5bc09e413ecaa3e07557cf253809b95b5637ff79f2e3cf24d86dd3ed Backport of Core PR11395 bitcoin/bitcoin#11395 Depends on D3832 Test Plan: make check ./bitcoin-qt -> transactions -> enter transaction id to filter by Reviewers: deadalnix, Fabien, jasonbcox, O1 Bitcoin ABC, #bitcoin_abc Reviewed By: Fabien, O1 Bitcoin ABC, #bitcoin_abc Differential Revision: https://reviews.bitcoinabc.org/D3833

eac2abc Qt: Enable searching by transaction id (Luke Dashjr) c407c61 Qt: Avoid invalidating the search filter, when it doesn't really change (Luke Dashjr) b1f6342 Qt: Rename confusingly-named "address prefix" to "search string" (Luke Dashjr) Pull request description: Tree-SHA512: 1c67037d19689fbaff21d15ed7848ac86188e5de34728312e1f9758dada759cab50d913a5bc09e413ecaa3e07557cf253809b95b5637ff79f2e3cf24d86dd3ed

fanquake added the GUI label Sep 25, 2017

meshcollider reviewed Sep 25, 2017

View reviewed changes

promag reviewed Sep 25, 2017

View reviewed changes

luke-jr force-pushed the gui_search_txid branch from 3b35414 to 93f0dfd Compare September 25, 2017 23:31

promag reviewed Sep 25, 2017

View reviewed changes

luke-jr added 3 commits November 10, 2017 11:50

Qt: Rename confusingly-named "address prefix" to "search string"

b1f6342

Qt: Avoid invalidating the search filter, when it doesn't really change

c407c61

Qt: Enable searching by transaction id

eac2abc

luke-jr force-pushed the gui_search_txid branch from 93f0dfd to eac2abc Compare November 10, 2017 11:50

meshcollider reviewed Nov 13, 2017

View reviewed changes

jonasschnelli approved these changes Nov 29, 2017

View reviewed changes

jonasschnelli merged commit eac2abc into bitcoin:master Nov 29, 2017

meshcollider mentioned this pull request Jan 17, 2018

TODO for release notes 0.16.0 #11054

Closed

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

Qt: Enable searching by transaction id #11395

Qt: Enable searching by transaction id #11395

Conversation

luke-jr commented Sep 25, 2017

meshcollider left a comment • edited

Choose a reason for hiding this comment

promag left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

promag commented Sep 26, 2017

luke-jr commented Sep 26, 2017

jonasschnelli commented Sep 26, 2017

promag commented Oct 7, 2017

Sjors commented Nov 9, 2017

promag commented Nov 9, 2017

promag commented Nov 9, 2017

luke-jr commented Nov 10, 2017

promag commented Nov 12, 2017

promag commented Nov 12, 2017

meshcollider left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jonasschnelli left a comment

Choose a reason for hiding this comment

meshcollider left a comment •

edited