From 9e7519325790e2c0b3574800cd8865b3e8c9696d Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 10 Aug 2020 14:48:29 +0300
Subject: [PATCH 1/3] Improve search: allow search with space

---
 CHANGELOG.md                                  |  2 ++
 .../templates/layout/_topnav.html.eex         |  4 +--
 apps/block_scout_web/priv/gettext/default.pot |  6 ++++-
 .../priv/gettext/en/LC_MESSAGES/default.po    |  6 ++++-
 apps/explorer/lib/explorer/chain.ex           | 25 ++++++++++++++-----
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b5b71f816..a667e96beb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@
 - [#3224](https://github.com/poanetwork/blockscout/pull/3224) - Top tokens page
 
 ### Fixes
+- [#3231](https://github.com/poanetwork/blockscout/pull/3231) - Improve search: allow search with space
+- [#3231](https://github.com/poanetwork/blockscout/pull/3231) - Improve search: order by token holders in descendant order
 - [#3226](https://github.com/poanetwork/blockscout/pull/3226) - Fix notifier query for live update of token transfers
 - [#3220](https://github.com/poanetwork/blockscout/pull/3220) - Allow interaction with navbar menu at block-not-found page
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
index 7698f84521..cc6956779f 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
@@ -167,7 +167,7 @@
                 <%= awesomplete(f, :q,
                     [
                     class: "form-control me auto",
-                    placeholder: gettext("Search by address, token symbol name, transaction hash, or block number"),
+                    placeholder: gettext("Search by address, token symbol, name, transaction hash, or block number"),
                     "aria-describedby": "search-icon",
                     "aria-label": gettext("Search"),
                     "data-test": "search_input"
@@ -178,7 +178,7 @@
                     value: "contract_address_hash",
                     label: "contract_address_hash",
                     descrSearch: true,
-                    descr: "symbol"
+                    descr: "name"
                     ]) %>
                 <div class="input-group-append">
                   <button class="input-group-text" id="search-icon">
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 231453cca2..13afaf24e4 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -1250,7 +1250,6 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:166
-#: lib/block_scout_web/templates/layout/_topnav.html.eex:170
 msgid "Search by address, token symbol name, transaction hash, or block number"
 msgstr ""
 
@@ -1940,3 +1939,8 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:15
 msgid "Copy Raw Trace"
 msgstr ""
+
+#, elixir-format
+#: lib/block_scout_web/templates/layout/_topnav.html.eex:170
+msgid "Search by address, token symbol, name, transaction hash, or block number"
+msgstr ""
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index 231453cca2..a10040b7b6 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -1250,7 +1250,6 @@ msgstr ""
 
 #, elixir-format
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:166
-#: lib/block_scout_web/templates/layout/_topnav.html.eex:170
 msgid "Search by address, token symbol name, transaction hash, or block number"
 msgstr ""
 
@@ -1940,3 +1939,8 @@ msgstr ""
 #: lib/block_scout_web/templates/transaction_raw_trace/index.html.eex:15
 msgid "Copy Raw Trace"
 msgstr ""
+
+#, elixir-format, fuzzy
+#: lib/block_scout_web/templates/layout/_topnav.html.eex:170
+msgid "Search by address, token symbol, name, transaction hash, or block number"
+msgstr ""
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index fc6b51977f..d6d01669dd 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1034,13 +1034,22 @@ defmodule Explorer.Chain do
 
   @spec search_token(String.t()) :: [Token.t()]
   def search_token(word) do
-    term = String.replace(word, ~r/\W/u, "") <> ":*"
+    term =
+      word
+      |> String.replace(~r/ +/, " & ")
+
+    term_final = term <> ":*"
 
     query =
       from(token in Token,
-        where: fragment("to_tsvector('english', symbol || ' ' || name ) @@ to_tsquery(?)", ^term),
+        where: fragment("to_tsvector('english', symbol || ' ' || name ) @@ to_tsquery(?)", ^term_final),
         limit: 5,
-        select: %{contract_address_hash: token.contract_address_hash, symbol: token.symbol, name: token.name}
+        select: %{
+          contract_address_hash: token.contract_address_hash,
+          symbol: token.symbol,
+          name: fragment("coalesce(?, '') || ' (' || coalesce(?, '') || ')'", token.name, token.symbol)
+        },
+        order_by: [desc: token.holder_count]
       )
 
     Repo.all(query)
@@ -1048,13 +1057,17 @@ defmodule Explorer.Chain do
 
   @spec search_contract(String.t()) :: [SmartContract.t()]
   def search_contract(word) do
-    term = String.replace(word, ~r/\W/u, "") <> ":*"
+    term =
+      word
+      |> String.replace(~r/ +/, " & ")
+
+    term_final = term <> ":*"
 
     query =
       from(smart_contract in SmartContract,
-        where: fragment("to_tsvector('english', name ) @@ to_tsquery(?)", ^term),
+        where: fragment("to_tsvector('english', name ) @@ to_tsquery(?)", ^term_final),
         limit: 5,
-        select: %{contract_address_hash: smart_contract.address_hash, symbol: smart_contract.name}
+        select: %{contract_address_hash: smart_contract.address_hash, name: smart_contract.name}
       )
 
     Repo.all(query)

From 17f71985eaab52318749238c5d2aa0271446f806 Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Mon, 10 Aug 2020 17:15:15 +0300
Subject: [PATCH 2/3] Unlimited number of tokens in search results

---
 CHANGELOG.md                                              | 1 +
 apps/block_scout_web/assets/css/components/_navbar.scss   | 8 ++++++++
 .../lib/block_scout_web/templates/layout/_topnav.html.eex | 1 +
 apps/block_scout_web/priv/gettext/default.pot             | 2 +-
 .../priv/gettext/en/LC_MESSAGES/default.po                | 4 ++--
 apps/explorer/lib/explorer/chain.ex                       | 2 --
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a667e96beb..4d6e5e4231 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - [#3224](https://github.com/poanetwork/blockscout/pull/3224) - Top tokens page
 
 ### Fixes
+- [#3231](https://github.com/poanetwork/blockscout/pull/3231) - Improve search: unlimited number of searching results
 - [#3231](https://github.com/poanetwork/blockscout/pull/3231) - Improve search: allow search with space
 - [#3231](https://github.com/poanetwork/blockscout/pull/3231) - Improve search: order by token holders in descendant order
 - [#3226](https://github.com/poanetwork/blockscout/pull/3226) - Fix notifier query for live update of token transfers
diff --git a/apps/block_scout_web/assets/css/components/_navbar.scss b/apps/block_scout_web/assets/css/components/_navbar.scss
index 05ab0f109d..e22a3ee82c 100644
--- a/apps/block_scout_web/assets/css/components/_navbar.scss
+++ b/apps/block_scout_web/assets/css/components/_navbar.scss
@@ -186,6 +186,14 @@ $navbar-logo-width: auto !default;
   }
 }
 
+.input-group {
+
+  .awesomplete > ul {
+      overflow-y: auto !important;
+      max-height: 300px !important;
+  }
+}
+
 .navbar-collapse.collapsing,
 .navbar-collapse.collapse.show {
   display: flex;
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
index cc6956779f..abe4e6e9b6 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
@@ -174,6 +174,7 @@
                     ],
                     [ url: "#{chain_path(@conn, :token_autocomplete)}?q=",
                     limit: 0,
+                    maxItems: 1000,
                     minChars: 2,
                     value: "contract_address_hash",
                     label: "contract_address_hash",
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index 13afaf24e4..fdf58f2081 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -1244,7 +1244,7 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/address_logs/index.html.eex:14
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:172
-#: lib/block_scout_web/templates/layout/_topnav.html.eex:189
+#: lib/block_scout_web/templates/layout/_topnav.html.eex:190
 msgid "Search"
 msgstr ""
 
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index a10040b7b6..fdf58f2081 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -1244,7 +1244,7 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/address_logs/index.html.eex:14
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:172
-#: lib/block_scout_web/templates/layout/_topnav.html.eex:189
+#: lib/block_scout_web/templates/layout/_topnav.html.eex:190
 msgid "Search"
 msgstr ""
 
@@ -1940,7 +1940,7 @@ msgstr ""
 msgid "Copy Raw Trace"
 msgstr ""
 
-#, elixir-format, fuzzy
+#, elixir-format
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:170
 msgid "Search by address, token symbol, name, transaction hash, or block number"
 msgstr ""
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index d6d01669dd..504f3ac721 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1043,7 +1043,6 @@ defmodule Explorer.Chain do
     query =
       from(token in Token,
         where: fragment("to_tsvector('english', symbol || ' ' || name ) @@ to_tsquery(?)", ^term_final),
-        limit: 5,
         select: %{
           contract_address_hash: token.contract_address_hash,
           symbol: token.symbol,
@@ -1066,7 +1065,6 @@ defmodule Explorer.Chain do
     query =
       from(smart_contract in SmartContract,
         where: fragment("to_tsvector('english', name ) @@ to_tsquery(?)", ^term_final),
-        limit: 5,
         select: %{contract_address_hash: smart_contract.address_hash, name: smart_contract.name}
       )
 

From 8ed7eb240b46aabdd8a07ddccb72f128e0ebf83a Mon Sep 17 00:00:00 2001
From: Victor Baranov <baranov.viktor.27@gmail.com>
Date: Tue, 11 Aug 2020 12:51:22 +0300
Subject: [PATCH 3/3] Searching results: improve ordering: token holders desc,
 name asc

---
 CHANGELOG.md                                      |  2 +-
 .../templates/layout/_topnav.html.eex             | 15 ++++++++++++++-
 apps/block_scout_web/priv/gettext/default.pot     |  2 +-
 .../priv/gettext/en/LC_MESSAGES/default.po        |  2 +-
 apps/explorer/lib/explorer/chain.ex               |  8 +++++++-
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d6e5e4231..3aec245318 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@
 ### Fixes
 - [#3231](https://github.com/poanetwork/blockscout/pull/3231) - Improve search: unlimited number of searching results
 - [#3231](https://github.com/poanetwork/blockscout/pull/3231) - Improve search: allow search with space
-- [#3231](https://github.com/poanetwork/blockscout/pull/3231) - Improve search: order by token holders in descendant order
+- [#3231](https://github.com/poanetwork/blockscout/pull/3231) - Improve search: order by token holders in descending order and token/contract name is ascending order
 - [#3226](https://github.com/poanetwork/blockscout/pull/3226) - Fix notifier query for live update of token transfers
 - [#3220](https://github.com/poanetwork/blockscout/pull/3220) - Allow interaction with navbar menu at block-not-found page
 
diff --git a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
index abe4e6e9b6..4d0ef2d6c9 100644
--- a/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
+++ b/apps/block_scout_web/lib/block_scout_web/templates/layout/_topnav.html.eex
@@ -179,7 +179,20 @@
                     value: "contract_address_hash",
                     label: "contract_address_hash",
                     descrSearch: true,
-                    descr: "name"
+                    descr: "name",
+                    sort: "function(x1, x2){
+                      const tokenName1 = x1.split('<b>').length > 1 ? x1.split('<b>')[1].split('</b>')[0].toLowerCase() : ''
+                      const tokenName2 = x2.split('<b>').length > 1 ? x2.split('<b>')[1].split('</b>')[0].toLowerCase() : ''
+                      const holdersCount1 = x1.split('<i>').length > 1 ? parseInt(x1.split('<i>')[1].split('</i>')[0].split('holder')[0], 10) : null
+                      const holdersCount2 = x2.split('<i>').length > 1 ? parseInt(x2.split('<i>')[1].split('</i>')[0].split('holder')[0], 10) : null
+                      if (holdersCount1 && holdersCount2 && holdersCount1 !== holdersCount2 || (holdersCount1 && !holdersCount2) || (!holdersCount1 && holdersCount2)) {
+                        holdersCount1 > holdersCount2
+                      } else {
+                        if (tokenName1 < tokenName2) { return -1 }
+                        if (tokenName1 > tokenName2) { return 1 }
+                        return 0
+                      }
+                    }"
                     ]) %>
                 <div class="input-group-append">
                   <button class="input-group-text" id="search-icon">
diff --git a/apps/block_scout_web/priv/gettext/default.pot b/apps/block_scout_web/priv/gettext/default.pot
index fdf58f2081..e5a28cae50 100644
--- a/apps/block_scout_web/priv/gettext/default.pot
+++ b/apps/block_scout_web/priv/gettext/default.pot
@@ -1244,7 +1244,7 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/address_logs/index.html.eex:14
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:172
-#: lib/block_scout_web/templates/layout/_topnav.html.eex:190
+#: lib/block_scout_web/templates/layout/_topnav.html.eex:203
 msgid "Search"
 msgstr ""
 
diff --git a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
index fdf58f2081..e5a28cae50 100644
--- a/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
+++ b/apps/block_scout_web/priv/gettext/en/LC_MESSAGES/default.po
@@ -1244,7 +1244,7 @@ msgstr ""
 #, elixir-format
 #: lib/block_scout_web/templates/address_logs/index.html.eex:14
 #: lib/block_scout_web/templates/layout/_topnav.html.eex:172
-#: lib/block_scout_web/templates/layout/_topnav.html.eex:190
+#: lib/block_scout_web/templates/layout/_topnav.html.eex:203
 msgid "Search"
 msgstr ""
 
diff --git a/apps/explorer/lib/explorer/chain.ex b/apps/explorer/lib/explorer/chain.ex
index 504f3ac721..e689f1b9a8 100644
--- a/apps/explorer/lib/explorer/chain.ex
+++ b/apps/explorer/lib/explorer/chain.ex
@@ -1046,7 +1046,13 @@ defmodule Explorer.Chain do
         select: %{
           contract_address_hash: token.contract_address_hash,
           symbol: token.symbol,
-          name: fragment("coalesce(?, '') || ' (' || coalesce(?, '') || ')'", token.name, token.symbol)
+          name:
+            fragment(
+              "'<b>' || coalesce(?, '') || '</b>' || ' (' || coalesce(?, '') || ') ' || '<i>' || coalesce(?::varchar(255), '') || ' holder(s)' || '</i>'",
+              token.name,
+              token.symbol,
+              token.holder_count
+            )
         },
         order_by: [desc: token.holder_count]
       )